提交: 081637a32943c1815825d7e4341edbbbcbc8e32b - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• 修訂: 081637a32943c1815825d7e4341edbbbcbc8e32b (tree)
• 時間: 2023-09-29 19:40:47
• 作者: mio <stigma@disr...>
• Commiter: mio

Log Message

Fix trailing percentage for previously downloaded

e.g.:

Previously downloaded page 1/2.%).
Previously downloaded page 2/2.

Change Summary

• modified: source/app.d

差異

--- a/source/app.d
+++ b/source/app.d
@@ -60,23 +60,30 @@ class ProgressMonitor
     {
         import std.conv : ConvException, to;
         import std.format : format;
+        import std.range : repeat;
+        import util : getTerminalColumns;
 
         string value;
         if (convertToString(ev.totalPages, value)) {
             const numerOfDigits = value.length;
             const modifier = format("%%%dd", numerOfDigits);
             // ^ Determines the padding (e.g. %2d)
-            const prompt = format("\r  Previously downloaded page %s/%d.",
+            const msg = format("\r  Previously downloaded page %s/%d.",
                 modifier, ev.totalPages);
-            writefln(prompt, ev.currentPage);
+            const prompt = format(msg, ev.currentPage);
+            write(prompt);
+            write(' '.repeat(getTerminalColumns() - prompt.length));
         } else {
             debug(app)
             {
                 log.errorf("Converting size_t to string: %d", ev.totalPages);
             }
-            writefln("\r  Previously downloaded page %d/%d.",
+            const prompt = format("\r  Previously downloaded page %d/%d.",
                 ev.currentPage, ev.totalPages);
+            write(prompt);
+            write(' '.repeat(getTerminalColumns() - prompt.length));
         }
+        write("\n");
         currentPage += 1;
     }