Commit: b92948ac0f252dcebc91ac0482b6556acec037ec - pixivd (git)

D wrapper around (some) of the pixiv web API

Commit MetaInfo

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

Message de Log

Start implementation of partial downloads

Currently it's limited to single-paged illustrations; Some cleanup and
refactoring is needed first.

Change Summary

• modified: source/pixivd/client.d

Modification

--- a/source/pixivd/client.d
+++ b/source/pixivd/client.d
@@ -18,6 +18,8 @@ import pixivd.types;
 public enum PixivDVersion = 0.8;
 public enum PixivDVersionString = "0.8";
 
+enum kUserAgent = "Mozilla/5.0 (Windows NT 10.0; rv:108.0) Gecko/20100101 Firefox/108.0";
+
 struct DownloadProgressEvent
 {
     size_t total;
@@ -44,17 +46,24 @@ class Client
 private:
 
     string m_phpsessid;
+
     HTTP m_client;
 
     bool m_isGMInitialized = false;
 
 public:
 
+    /**
+     * Return the PHPSESSID that is being used.
+     */
     @property string phpsessid() const
     {
         return m_phpsessid;
     }
 
+    /**
+     * Set a new PHPSESSID to be used for new requests.
+     */
     @property void phpsessid(string sessionID)
     {
         m_phpsessid = sessionID;
@@ -72,17 +81,19 @@ public:
     {
         m_phpsessid = phpsessid;
         m_client = HTTP();
-        m_client.addRequestHeader("Accept", "application/json, */*");
-        m_client.addRequestHeader("Host", "www.pixiv.net");
-        m_client.addRequestHeader("Referer", "https://www.pixiv.net/");
-        m_client.setUserAgent(
-            "Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefix/91.0");
-        if ("" != m_phpsessid)
-        {
-            m_client.setCookie("PHPSESSID=" ~ m_phpsessid);
-        }
+        this._resetHeaders();
     }
 
+    /**
+     * Create a new instance of Client.
+     *
+     * This will allow you to interact with the pixiv API without an
+     * account.  However, your access will be limited to what is
+     * publically available.
+     *
+     * Use `phpsessid(string)` to set a PHPSESSID, meaning you will
+     * be logged in.
+     */
     this()
     {
         this("");
@@ -710,18 +721,36 @@ private:
     {
         import std.datetime.systime;
 
-        import std.file : FileException, exists, setTimes;
+        import std.file : FileException, exists, getSize, rename, setTimes;
         import std.path : extension;
         import std.stdio : File;
 
         const baseFileName = illust.id ~ illust.urls["original"].extension;
+        const partFileName = baseFileName ~ ".part";
 
         if (true == exists(baseFileName) && false == overwrite)
         {
             throw new FileException(baseFileName, "File already exists");
         }
 
-        File imageFile = File(baseFileName, "w+");
+        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;
+        }
+
+        File imageFile = File(partFileName, mode);
 
         m_client.url = illust.urls["original"];
         m_client.onReceive = (ubyte[] data) {
@@ -735,11 +764,13 @@ private:
 
         m_client.perform();
         imageFile.close();
+        rename(partFileName, baseFileName);
         emit(DownloadCompleteEvent());
 
         SysTime createDate = SysTime.fromISOExtString(illust.createDate);
-
         setTimes(baseFileName, createDate, createDate);
+
+        this._resetHeaders();
     }
 
     void _downloadPagedIllust(Illustration illust, bool overwrite)
@@ -1014,4 +1045,18 @@ private:
         DestroyExceptionInfo(&exception);
         emit(DownloadCompleteEvent());
     }
+
+    void _resetHeaders()
+    {
+        m_client.clearRequestHeaders();
+
+        m_client.addRequestHeader("Accept", "application/json, */*");
+        m_client.addRequestHeader("Host", "www.pixiv.net");
+        m_client.addRequestHeader("Referer", "https://www.pixiv.net/");
+        m_client.setUserAgent(kUserAgent);
+        if ("" != m_phpsessid)
+        {
+            m_client.setCookie("PHPSESSID=" ~ m_phpsessid);
+        }
+    }
 }