Commit: cefcbc2e30803dd5933ae4555346e1247ec505a0 - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• Révision: cefcbc2e30803dd5933ae4555346e1247ec505a0 (tree)
• l'heure: 2023-10-29 17:08:40
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

Replace global 'log' with stdThreadLocalLog

Change Summary

• modified: source/app.d
• add: source/logger.d

Modification

--- a/source/app.d
+++ b/source/app.d
@@ -144,8 +144,6 @@ enum ExitCode
    unknownOptionError = 3,
 }
 
-FileLogger log;
-
 version(appimage) {
     enum ProgramName = "pixiv_down";
 }
@@ -308,6 +306,7 @@ void downloadIllust(ref Illustration illust, ref Config conf,
 {
     import std.algorithm.searching : canFind;
     import std.array : join, split;
+    import std.experimental.logger : tracef, warningf;
     import std.file : FileException, mkdirRecurse, exists;
     import std.path : buildPath;
     import std.stdio : stderr;
@@ -321,7 +320,7 @@ void downloadIllust(ref Illustration illust, ref Config conf,
 
     stderr.writefln("[%s] Downloading %s - %s", illust.type, illust.userName,
         illust.title);
-    log.tracef("Downloading post type %s", illust.type);
+    tracef("Post Type = %s", illust.type);
 
     scope monitor = new ProgressMonitor(illust.pages);
     conf.client.connect(&monitor.alreadyComplete);
@@ -331,8 +330,8 @@ void downloadIllust(ref Illustration illust, ref Config conf,
     try {
         conf.client.downloadIllust(illust, subDirectory, overwrite);
     } catch (FileException fe) {
-        log.warningf("FileException: %s (overwrite = %s)", fe.msg,
-            overwrite ? "true" : "false");
+      warningf("FileException: %s (overwrite = %s)", fe.msg,
+         overwrite ? "true" : "false");
         stderr.write("\r");
         stderr.writefln("[%s] %s - %s has already been downloaded", illust.type,
             illust.userName, illust.title);
@@ -344,15 +343,14 @@ void downloadIllust(ref Illustration illust, ref Config conf,
 void downloadArtist(string id, ContentType type, int offset,
         ref Config config)
 {
+   import std.experimental.logger : infof, errorf;
     import std.net.curl : CurlException;
     import std.stdio : stderr;
 
     UserBrief up = config.client.fetchUserAll(id);
 
     if (ContentType.illustration == type) {
-
-        log.infof("Total number of illustrations to download: %d",
-            up.illusts.length);
+      infof("Number of Illustrations to download = %d", up.illusts.length);
 
         foreach (elemNum, illustId; up.illusts) {
             Illustration illust = config.client.fetchIllustration(illustId);
@@ -360,7 +358,7 @@ void downloadArtist(string id, ContentType type, int offset,
             try {
                 downloadIllust(illust, config);
             } catch (CurlException ce) {
-                log.warningf("CurlException: %s", ce.msg);
+               errorf("CurlException: %s", ce.msg);
                 stderr.writefln("ERROR: Failed to download illust");
                 stderr.writefln("TRYING AGAIN");
                 sleep(20, 30);
@@ -373,8 +371,7 @@ void downloadArtist(string id, ContentType type, int offset,
                 sleep(4, 10);
         }
     } else if (ContentType.manga == type) {
-
-        log.infof("Total number of Manga to download: %d", up.manga.length);
+      infof("Number of Manga to download: %d", up.manga.length);
 
         foreach (elemNum, illustId; up.manga) {
             Illustration illust = config.client.fetchIllustration(illustId);
@@ -382,7 +379,7 @@ void downloadArtist(string id, ContentType type, int offset,
             try {
                 downloadIllust(illust, config);
             } catch (CurlException ce) {
-                log.warningf("CurlException: %s", ce.msg);
+               errorf("CurlException: %s", ce.msg);
                 stderr.writefln("ERROR: Failed to download manga.");
                 stderr.writefln("TRYING AGAIN");
                 sleep(20, 30);
@@ -405,6 +402,8 @@ void downloadArtist(string id, ContentType type, int offset,
 void downloadDaily(const ref SysTime begin, const ref SysTime end,
     string restrict, ref Config conf)
 {
+   import std.experimental.logger : info, tracef;
+
     Thumbnail[] dailyIllusts = conf.client.fetchIllustrationsFollowing();
 
     bool reachedEndDate = false;
@@ -422,7 +421,7 @@ lDownload:
         /* Only download posts uploaded before or on `end`. */
         if (end > createDate) {
             reachedEndDate = true;
-            log.info("reachedEndDate = true");
+            info("reachedEndDate = true");
             break;
         }
 
@@ -431,13 +430,13 @@ lDownload:
     }
 
     if (false == reachedEndDate) {
-        log.logf("finished downloading page %d", page);
-        log.info("reachedEndDate = false");
-        sleep(15, 20);
-        page += 1;
-        log.infof("will now download page %d", page);
-        dailyIllusts = conf.client.fetchIllustrationsFollowing(page);
-        goto lDownload;
+      tracef("Finished downloading page %d", page);
+      info("reachedEndDate = false");
+      sleep(15, 20);
+      page += 1;
+      tracef("Proceeding to download page %d", page);
+      dailyIllusts = conf.client.fetchIllustrationsFollowing(page);
+      goto lDownload;
     }
 }
 
@@ -452,6 +451,7 @@ lDownload:
 int artistHandle(string[] args, ref Config config)
 {
    import std.algorithm.searching : all;
+   import std.experimental.logger : errorf;
    import std.stdio : stderr;
 
    string enteredType;
@@ -486,7 +486,7 @@ int artistHandle(string[] args, ref Config config)
             if (all!"(a >= '0' && a <= '9')"(arg)) {
                ids ~= arg;
             } else {
-               log.errorf(`Invalid artist ID "%s"`, args);
+               errorf(`Invalid artist ID "%s"`, args);
 
                stderr.writefln("%s: Invalid artist ID provided.", args[0]);
                stderr.writeln("Artist IDs are required to be numbers.");
@@ -532,6 +532,7 @@ int artistHandle(string[] args, ref Config config)
 int artworkHandle(string[] args, ref Config config)
 {
    import std.conv : ConvException, to;
+   import std.experimental.logger : info, errorf;
    import std.stdio : stderr;
 
    // When an exception occurrs.
@@ -556,14 +557,14 @@ int artworkHandle(string[] args, ref Config config)
       }
       if ("--group-errors" == arg) {
          groupErrors = true;
-         log.info("errors will be grouped");
+         info("errors will be grouped");
          continue;
       }
 
       try {
          id = to!size_t(arg);
       } catch (ConvException ce) {
-         log.errorf("Could not convert %s to size_t", arg);
+         errorf("Could not convert %s to size_t", arg);
 
          if (groupErrors) {
             invalidArtworks ~= arg;
@@ -611,6 +612,7 @@ int dailyHandle(string[] args, ref Config config)
    import core.time : TimeException;
    import std.algorithm.searching : canFind;
    import std.datetime.systime : Clock;
+   import std.experimental.logger : infof;
    import std.stdio : stderr;
 
    string restrict = "both";
@@ -682,8 +684,7 @@ int dailyHandle(string[] args, ref Config config)
       return 1;
    }
 
-   log.infof(`PARAMS=(restrict=%s rawBeginDate=%s rawEndDate=%s)`, restrict,
-      rawBeginDate, rawEndDate);
+   infof("rawBeginDate=%s rawEndDate=%s", rawBeginDate, rawEndDate);
 
    beginDate = Clock.currTime;
 
@@ -742,6 +743,7 @@ int followingHandle(string[] args, ref Config config)
 {
    import std.container : SList;
    import std.conv : to;
+   import std.experimental.logger : infof, tracef;
    import std.stdio : stderr, writefln;
 
    bool pub = false;
@@ -813,7 +815,7 @@ int followingHandle(string[] args, ref Config config)
    // Web API uses "hide" and "show"
    string rest = prv ? "hide" : "show";
 
-   log.tracef("rest = %s, skip = %d", rest, skip);
+   infof("rest=%s skip=%d", rest, skip);
 
    // Fetch all of the accounts to download.
    //
@@ -826,7 +828,7 @@ int followingHandle(string[] args, ref Config config)
    writefln("[following]: Downloading API JSON for page %d", pageCount);
    User[] users = config.client.fetchFollowing(offset, totalNumberOfAccounts,
       pageLimit, rest);
-   log.tracef("page %d returned %d users.", pageCount, users.length);
+   infof("Page %d returned %d users.", pageCount, users.length);
    offset += users.length;
 
    auto allUsers = SList!User();
@@ -834,14 +836,14 @@ int followingHandle(string[] args, ref Config config)
    while (offset < totalNumberOfAccounts) {
       writefln("[following]: Downloading API JSON for page %d", ++pageCount);
       users = config.client.fetchFollowing(offset, pageLimit, rest);
-      log.tracef("page %d returned %d users.", pageCount, users.length);
+      infof("Page %d returned %d users.", pageCount, users.length);
       allUsers.insertAfter(allUsers[], users);
 
       // Increase offset for next page fetch
       offset += users.length;
    }
 
-   log.infof("totalNumberOfAccounts = %d", totalNumberOfAccounts);
+   infof("totalNumberOfAccounts = %d", totalNumberOfAccounts);
 
    size_t artistIndex = skip + 1;
    foreach(User user; allUsers) {
@@ -853,7 +855,7 @@ int followingHandle(string[] args, ref Config config)
 
       writefln("[following]: Downloading artist %u of %u", artistIndex,
          totalNumberOfAccounts);
-      log.tracef("user %u/%u (ID = %s)", artistIndex, totalNumberOfAccounts,
+      tracef("user %u/%u (ID = %s)", artistIndex, totalNumberOfAccounts,
          user.userId);
       artistHandle([args[0], "artist", user.userId], config);
       artistIndex += 1;
@@ -1132,14 +1134,14 @@ version(appimage) {
 void
 logLibGMVersion()
 {
+   import std.experimental.logger : infof;
    import std.string : fromStringz;
    import graphicsmagick_c.magick.version_ : GetMagickVersion,
       MagickLibVersionText, MagickQuantumDepth;
 
-   log.infof("GraphicsMagick Version D: %s",
-      fromStringz(GetMagickVersion(null)));
-   log.infof("GraphicsMagick Version S: %s", MagickLibVersionText);
-   log.infof("GraphicsMagick Depth   S: %s", MagickQuantumDepth);
+   infof("GraphicsMagick Version D: %s", fromStringz(GetMagickVersion(null)));
+   infof("GraphicsMagick Version S: %s", MagickLibVersionText);
+   infof("GraphicsMagick Depth   S: %s", MagickQuantumDepth);
 }
 
 void
@@ -1164,6 +1166,7 @@ resetSessionID()
 Config
 loadConfig()
 {
+   import std.experimental.logger : infof;
    import std.file : exists, mkdirRecurse;
    import std.path : buildPath;
    import std.string : strip;
@@ -1178,8 +1181,7 @@ loadConfig()
    ProjectDirectories dirs = getProjectDirectories(null, "YumeNeru Software",
       "pixiv_down");
    UserDirectories userDirs = getUserDirectories();
-   log.infof("dirs.configDir = %s", dirs.configDir);
-   log.infof("userDirs.pictureDir = %s", userDirs.pictureDir);
+   infof("Configuration Directory = %s", dirs.configDir);
 
    if (exists(dirs.configDir)) {
       string configFilePath = buildPath(dirs.configDir, "settings.conf");
@@ -1195,8 +1197,8 @@ loadConfig()
       // Set default values
       config.baseFolder = userDirs.pictureDir;
    }
-   log.infof("config.baseFolder = %s", config.baseFolder);
-   log.infof("data directory = %s", dirs.dataDir);
+   infof("Output Directory = %s", config.baseFolder);
+   infof("Local Data Directory = %s", dirs.dataDir);
 
    const idFilePath = buildPath(dirs.dataDir, ".phpsessid");
 
@@ -1234,6 +1236,8 @@ int
 main(string[] args)
 {
    import std.stdio : stderr, writeln, writefln;
+   import std.experimental.logger : stdThreadLocalLog;
+   import logger;
 
 version(appimage) {
    args[0] = ProgramName;
@@ -1286,9 +1290,7 @@ version(appimage) {
       return 2;
    }
 
-   log = new FileLogger("pixiv_down.log");
-   // By default, FileLogger opens in append.
-   log.file.reopen("pixiv_down.log", "w");
+   stdThreadLocalLog = new PixivLogger("pixiv_down.log");
 
 version (GMagick_Dynamic) {
    bool loadedGM = loadLibGM(args[0]);

--- /dev/null
+++ b/source/logger.d
@@ -0,0 +1,30 @@
+/*
+ * pixiv_down - CLI-based downloading tool for https://www.pixiv.net.
+ * Copyright (C) 2023  Mio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+module logger;
+
+import std.experimental.logger : FileLogger;
+
+public class PixivLogger : FileLogger
+{
+private:
+
+    public this(string logFile) @safe
+    {
+        super(logFile);
+        this.file.reopen(logFile, "w+");
+    }
+}