Commit: c9a28e4f8521840f3919c5a38817906e6be1fdef - pixivd (git)

D wrapper around (some) of the pixiv web API

Commit MetaInfo

• Revision: c9a28e4f8521840f3919c5a38817906e6be1fdef (tree)
• Time: 2023-09-26 18:56:48
• Author: supercell <stigma@disr...>
• Commiter: supercell

Log Message

Include current progress in PageAlreadyDownloaded

Change Summary

• modified: source/pixivd/client.d

Incremental Difference

--- a/source/pixivd/client.d
+++ b/source/pixivd/client.d
@@ -44,6 +44,10 @@ struct DownloadCompleteEvent
 ///
 struct PageAlreadyDownloadedEvent
 {
+    /// The current page number (1-based numbering)
+    size_t currentPage;
+    /// The total number of pages (1-based numbering)
+    size_t totalPages;
 }
 
 /**
@@ -814,7 +818,12 @@ private:
             throw new PixivJSONException("JSON response contains no 'body'.");
         }
 
-        foreach (jsonobj; json["body"].array)
+        const jsonBody = json["body"].array;
+        // +1 so this matches PageAlreadyDownloaded containing the
+        // 1-based numbering of the current page.
+        const totalNumberOfPages = jsonBody.length + 1;
+
+        foreach (pageNumber, jsonobj; jsonBody)
         {
             import std.path : baseName, stripExtension;
 
@@ -824,7 +833,7 @@ private:
             string mode = "w+";
 
             if (true == exists(baseFileName) && false == overwrite) {
-                emit(PageAlreadyDownloadedEvent());
+                emit(PageAlreadyDownloadedEvent(pageNumber + 1, totalNumberOfPages));
                 continue;
             }