Commit: 8dbbeef616745b389f9f6d256d1fbe966d3ac1a4 - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• Revision: 8dbbeef616745b389f9f6d256d1fbe966d3ac1a4 (tree)
• Time: 2023-09-27 17:27:55
• Author: mio <stigma@disr...>
• Commiter: mio

Log Message

Pad 'Already downloaded page X' values

Also considering changing the message to 'Already downloaded page x/y'

Change Summary

• modified: dub.sdl
• add: dub.selections.json
• modified: source/app.d

Incremental Difference

--- a/dub.sdl
+++ b/dub.sdl
@@ -18,7 +18,7 @@ dependency "magickd:graphicsmagick_c" \
 
 dependency "pixivd" \
 	repository="git+https://pf.osdn.net/gitroot/n/ne/nemophila/pixivd.git" \
-	version="1085361d86366542741e8ae5b845fed74c0a8aa5"
+	version="c9a28e4f8521840f3919c5a38817906e6be1fdef"
 
         ########################################################
         # If you are using the "fetch_dependencies.sh" script, #

--- /dev/null
+++ b/dub.selections.json
@@ -0,0 +1,7 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"magickd": {"version":"dd4985919d78d0cf37ab4b2ab99bb2ecec6aec15","repository":"git+https://repo.or.cz/magickd.git"},
+		"pixivd": {"version":"c9a28e4f8521840f3919c5a38817906e6be1fdef","repository":"git+https://pf.osdn.net/gitroot/n/ne/nemophila/pixivd.git"}
+	}
+}

--- a/source/app.d
+++ b/source/app.d
@@ -48,21 +48,31 @@ import pixivd.client;
 
 class ProgressMonitor
 {
+    import std.format : format;
+    import util : getTerminalColumns;
+
     size_t currentImage = 1;
 
     void alreadyComplete(PageAlreadyDownloadedEvent ev)
     {
-        import std.format : format;
-        import util : getTerminalColumns;
-
-        string prompt = "\r  Already downloaded page %d.".format(currentImage);
-        size_t remLength = getTerminalColumns() - prompt.length;
-
-        write(prompt);
-        for (int i = 0; i < remLength; i++) {
-            write(' ');
+        import std.conv : ConvException, to;
+
+        size_t promptLength = 0;
+
+        try {
+            const numberOfDigits = to!string(ev.totalPages).length;
+            const modifier = format("%%%dd", numberOfDigits);
+            const promptWM = format("\r  Already downloaded page %s.",
+                    modifier);
+            writefln(promptWM, currentImage);
+        } catch (ConvException ce) {
+            debug(app)
+            {
+                stderr.writefln("ERORR converting size_t to string");
+                stderr.writefln("  --> %s", ce.msg);
+            }
+            writefln("\r Already downloaded page %d.", currentImage);
         }
-        write('\n');
         currentImage += 1;
     }
 
@@ -84,10 +94,18 @@ class ProgressMonitor
 
     void complete(DownloadCompleteEvent ev)
     {
-        write('\n');
         if (ev.forPage) {
+            string prompt = "\r  Downloaded page %d.".format(currentImage);
+            size_t remLength = getTerminalColumns() - prompt.length;
+
+            write(prompt);
+            for (int i = 0; i < remLength; i++) {
+                write(' ');
+            }
+
             currentImage += 1;
         }
+        write('\n');
     }
 }