Commit: 7721ee127a50cfb8b6316270eb312d6d221e4444 - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• Révision: 7721ee127a50cfb8b6316270eb312d6d221e4444 (tree)
• l'heure: 2023-12-10 14:54:59
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

Use custom logging for 'compact' command

Change Summary

• modified: source/cmds/compact.d
• modified: source/logger.d

Modification

--- a/source/cmds/compact.d
+++ b/source/cmds/compact.d
@@ -94,15 +94,34 @@ void compactAccounts(ref Config config, const ref Options options)
    import std.stdio : stderr;
    import std.random : Random, uniform, unpredictableSeed;
 
+   import pixivd.types : PixivJSONException;
+   import logger;
+
    auto duplicatedAccounts = findDuplicateDirectories(config.outputDirectory);
    duplicatedAccounts.each!((PairType pair) {
-      checkAndRemove(pair, config, options);
+
+      try {
+         checkAndRemove(pair, config, options);
+      } catch (PixivJSONException pje) {
+         // TODO: Just because the user may have left, doesn't mean
+         //       that we can't condense their directories.
+         stderr.writefln("ERROR: Failed to compact account for ID %s", pair[0]);
+         stderr.writefln("       %s", pje.msg);
+         log(LogLevel.ERROR, "checkAndRemove for ID %s: %s", pair[0],
+            pje.msg);
+      }
 
       scope rnd = Random(unpredictableSeed);
       auto sleepDuration = uniform(3, 10, rnd);
       stderr.writefln("Sleeping for %d seconds...", sleepDuration);
       Thread.sleep(sleepDuration.seconds);
    });
+
+   if (options.dryRun)
+   {
+      import std.stdio : writeln;
+      writeln("    No files or directories were moved.");
+   }
 }
 
 auto findDuplicateDirectories(string outputDirectory)
@@ -138,7 +157,7 @@ void checkAndRemove(PairType pair, ref Config config,
    import std.string : strip;
 
    import mlib.trash : trash;
-
+   import logger;
    import util : makeSafe;
 
    // Default to the current name
@@ -150,6 +169,8 @@ void checkAndRemove(PairType pair, ref Config config,
       newName = getChoice(newName, pair[1]);
    }
 
+   log(LogLevel.INFO, "newName = %s", newName);
+
    const newDirName = buildPath(config.outputDirectory,
       user.userId ~ "_" ~ newName);
 
@@ -186,18 +207,16 @@ void checkAndRemove(PairType pair, ref Config config,
 
       if (false == options.dryRun) {
          trash(oldDirName);
+         log(LogLevel.INFO, "Trashed %s", oldDirName);
+
+         writefln("Moved all files and directories:\n\tFrom: %s\n\tTo:   %s",
+            oldDirName, newDirName);
       } else {
          import std.range : repeat;
          import util : getTerminalColumns;
          writefln("    %s", '-'.repeat(getTerminalColumns() - 4));
       }
    }
-
-   // TODO: Access to logging functions
-   {
-      writefln("INFO: Completed : %s", user.userName);
-      writefln("INFO: Used      : %s", newName);
-   }
 }
 
 

--- a/source/logger.d
+++ b/source/logger.d
@@ -28,3 +28,70 @@ private:
         this.file.reopen(logFile, "w+");
     }
 }
+
+// New API (will replace above class-based API)
+private:
+
+immutable kLogFileName = "pixiv_down.log";
+shared int gMinLogLevel = LogLevel.INFO;
+
+public enum LogLevel
+{
+   ALL,
+   TRACE,
+   DEBUG,
+   INFO,
+   WARNING,
+   ERROR,
+   FATAL
+}
+
+public void setLogLevel(LogLevel level)
+{
+   gMinLogLevel = level;
+}
+
+public void log(Args...)(LogLevel logLevel, const(char)[] msg, Args args)
+{
+   import std.stdio : File;
+
+   if (logLevel < gMinLogLevel)
+      return;
+
+   // TODO: Need some way to reset the log file
+   //    -- could just be in main?
+   File file = File(kLogFileName, "a+");
+
+   switch (logLevel)
+   {
+   case LogLevel.TRACE:
+      file.write("TRACE: ");
+      break;
+   case LogLevel.DEBUG:
+      file.write("DEBUG: ");
+      break;
+   case LogLevel.INFO:
+      file.write("INFO: ");
+      break;
+   case LogLevel.WARNING:
+      file.write("WARNING: ");
+      break;
+   case LogLevel.ERROR:
+      file.write("ERROR: ");
+      break;
+   case LogLevel.FATAL:
+      file.write("FATAL: ");
+      break;
+   default:
+      break;
+   }
+
+   file.writefln(msg, args);
+
+   if (logLevel == LogLevel.FATAL)
+   {
+      import core.stdc.stdlib : EXIT_FAILURE, exit;
+      exit(EXIT_FAILURE);
+   }
+}
+