Commit: ab3f05ebdbae3ed2731ae9221fbc72a4f9c977df - pixivd (git)

D wrapper around (some) of the pixiv web API

Commit MetaInfo

• Revision: ab3f05ebdbae3ed2731ae9221fbc72a4f9c977df (tree)
• Time: 2023-08-13 12:03:36
• Author: supercell <stigma@disr...>
• Commiter: supercell

Log Message

Improve partial download support

Should now work for multi-paged illustrations and manga.

Change Summary

• modified: source/pixivd/client.d

Incremental Difference

--- a/source/pixivd/client.d
+++ b/source/pixivd/client.d
@@ -1,8 +1,7 @@
 module pixivd.client;
 
-import core.sync.mutex : Mutex;
-
 import std.array : appender;
+import std.file : FileException, rename;
 import std.format : format;
 import std.json;
 import std.net.curl : HTTP;
@@ -721,33 +720,22 @@ private:
     {
         import std.datetime.systime;
 
-        import std.file : FileException, exists, getSize, rename, setTimes;
+        import std.file : exists, rename, setTimes;
         import std.path : extension;
         import std.stdio : File;
 
         const baseFileName = illust.id ~ illust.urls["original"].extension;
         const partFileName = baseFileName ~ ".part";
+        string mode = "w+";
 
         if (true == exists(baseFileName) && false == overwrite)
         {
             throw new FileException(baseFileName, "File already exists");
         }
-
-        string mode = "w+";
-
-        if (exists(partFileName)) {
-            // Resume previous attempt at downloading.
-            m_client.url = illust.urls["original"];
-            m_client.method = HTTP.Method.head;
-            m_client.perform();
-            if ("accept-ranges" in m_client.responseHeaders()) {
-                ulong bytesRead = getSize(partFileName);
-                m_client.addRequestHeader("Range", format!"bytes=%d-"(bytesRead));
-                mode = "a+";
-            }
-            // If the "accept-ranges" header was not present,
-            // we'll restart the entire download.
-            m_client.method = HTTP.Method.get;
+        if (true == exists(partFileName)) {
+            this._setupPartialDownload(illust.urls["original"], partFileName);
+            mode = "a+";
+            this._resetHeaders();
         }
 
         File imageFile = File(partFileName, mode);
@@ -813,7 +801,17 @@ private:
             import std.path : baseName, stripExtension;
 
             const url = jsonobj["urls"]["original"].str;
-            File img = File(baseName(url), "w+");
+            const baseFileName = baseName(url);
+            const partFileName = baseFileName ~ ".part";
+            string mode = "w+";
+
+            if (true == exists(partFileName)) {
+                this._setupPartialDownload(jsonobj["urls"]["original"].str, partFileName);
+                mode = "a+";
+                this._resetHeaders();
+            }
+
+            File img = File(partFileName, mode);
 
             m_client.url = url;
             m_client.onReceive = (ubyte[] data) {
@@ -828,6 +826,7 @@ private:
 
             m_client.perform();
             img.close();
+            rename(partFileName, baseFileName);
             emit(DownloadCompleteEvent());
         }
     }
@@ -870,11 +869,20 @@ private:
         auto bodyArr = json["body"].array;
 
         foreach(obj; bodyArr) {
-            auto filename = baseName(obj["urls"]["original"].str);
-            if (true == exists(filename) && false == overwrite) {
-                throw new FileException(filename, "File already exists");
+            const baseFileName = baseName(obj["urls"]["original"].str);
+            const partFileName = baseFileName ~ ".part";
+            string mode = "w+";
+
+            if (true == exists(baseFileName) && false == overwrite) {
+                throw new FileException(baseFileName, "File already exists");
+            }
+            if (true == exists(partFileName)) {
+                this._setupPartialDownload(obj["urls"]["original"].str, partFileName);
+                mode = "a+";
+                this._resetHeaders();
             }
-            File outFile = File(filename, "w+");
+
+            File outFile = File(partFileName, mode);
             m_client.url = obj["urls"]["original"].str;
             m_client.onReceive = (ubyte[] data) {
                 outFile.rawWrite(data);
@@ -886,11 +894,12 @@ private:
             };
             m_client.perform();
             outFile.close();
+            rename(partFileName, baseFileName);
             emit(DownloadCompleteEvent());
 
             SysTime createDate = SysTime.fromISOExtString(illust.createDate);
 
-            setTimes(filename, createDate, createDate);
+            setTimes(baseFileName, createDate, createDate);
         }
     }
 
@@ -1059,4 +1068,25 @@ private:
             m_client.setCookie("PHPSESSID=" ~ m_phpsessid);
         }
     }
+
+    ///
+    /// Setup m_client for resuming a previous download.
+    ///
+    /// If the particular request doesn't support partial
+    /// downloads
+    void _setupPartialDownload(string url, string filename)
+    {
+        import std.file : getSize;
+
+        m_client.url = url;
+        m_client.method = HTTP.Method.head;
+        m_client.perform();
+        if ("accept-ranges" in m_client.responseHeaders()) {
+            ulong bytesRead = getSize(filename);
+            m_client.addRequestHeader("Range", format!"bytes=%d-"(bytesRead));
+        }
+        // If the "accept-ranges" header was not present,
+        // we'll restart the entire download.
+        m_client.method = HTTP.Method.get;
+    }
 }