Commit: fff4a231002b0048fdae574183f4343848f0bfeb - pixivd (git)

D wrapper around (some) of the pixiv web API

Commit MetaInfo

• Révision: fff4a231002b0048fdae574183f4343848f0bfeb (tree)
• l'heure: 2023-08-13 10:11:17
• Auteur: supercell <stigma@disr...>
• Commiter: supercell

Message de Log

Add signals for download progress and completion

This makes use of std.signals. This will emit the DownloadProgressEvent
when downloading individual pages or the ZIP (in the case of Ugoira).

The DownloadCompleteEvent is emitted after the file being written to has
been closed.

Change Summary

• modified: source/pixivd/client.d

Modification

--- a/source/pixivd/client.d
+++ b/source/pixivd/client.d
@@ -6,6 +6,7 @@ import std.array : appender;
 import std.format : format;
 import std.json;
 import std.net.curl : HTTP;
+import std.signals;
 
 import graphicsmagick_c;
 import graphicsmagick_c.magick.api;
@@ -17,6 +18,16 @@ import pixivd.types;
 public enum PixivDVersion = 0.8;
 public enum PixivDVersionString = "0.8";
 
+struct DownloadProgressEvent
+{
+    size_t total;
+    size_t current;
+}
+
+struct DownloadCompleteEvent
+{
+}
+
 /**
  *
  * The main client for performing pixiv API requests.
@@ -85,6 +96,10 @@ public:
 	    }
     }
 
+    /* Signals */
+    mixin Signal!(DownloadProgressEvent);
+    mixin Signal!(DownloadCompleteEvent);
+
     /**
      * Fetch an illustration
      *
@@ -713,9 +728,14 @@ private:
             imageFile.rawWrite(data);
             return data.length;
         };
+        m_client.onProgress = (size_t dlTotal, size_t dlNow, size_t ulTotal, size_t ulNow) {
+            emit(DownloadProgressEvent(dlTotal, dlNow));
+            return 0;
+        };
 
         m_client.perform();
         imageFile.close();
+        emit(DownloadCompleteEvent());
 
         SysTime createDate = SysTime.fromISOExtString(illust.createDate);
 
@@ -769,9 +789,15 @@ private:
                 img.rawWrite(data);
                 return data.length;
             };
+            m_client.onProgress = (size_t dlTotal, size_t dlNow, size_t ulTotal, size_t ulNow) {
+                emit(DownloadProgressEvent(dlTotal, dlNow));
+                return 0;
+            };
+
 
             m_client.perform();
             img.close();
+            emit(DownloadCompleteEvent());
         }
     }
 
@@ -823,8 +849,13 @@ private:
                 outFile.rawWrite(data);
                 return data.length;
             };
+            m_client.onProgress = (size_t dlTotal, size_t dlNow, size_t ulTotal, size_t ulNow) {
+                emit(DownloadProgressEvent(dlTotal, dlNow));
+                return 0;
+            };
             m_client.perform();
             outFile.close();
+            emit(DownloadCompleteEvent());
 
             SysTime createDate = SysTime.fromISOExtString(illust.createDate);
 
@@ -887,6 +918,10 @@ private:
             zipFile.rawWrite(data);
             return data.length;
         };
+        m_client.onProgress = (size_t dlTotal, size_t dlNow, size_t ulTotal, size_t ulNow) {
+            emit(DownloadProgressEvent(dlTotal, dlNow));
+            return 0;
+        };
 
         m_client.perform();
         zipFile.close();
@@ -977,5 +1012,6 @@ private:
         }
 
         DestroyExceptionInfo(&exception);
+        emit(DownloadCompleteEvent());
     }
 }