提交: 58bc3c1acfa3a165d99cb0c4775eebefaace310a - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• 修訂: 58bc3c1acfa3a165d99cb0c4775eebefaace310a (tree)
• 時間: 2023-06-17 11:04:53
• 作者: mio <stigma@disr...>
• Commiter: mio

Log Message

Move loading of GraphicsMagick out of main

Change Summary

• modified: source/app.d

差異

--- a/source/app.d
+++ b/source/app.d
@@ -768,6 +768,73 @@ displayArtistHelp(string programName)
 // Don't compile in |main| when building unittests.
 version(unittest) {} else:
 
+version(GMagick_Dynamic)
+{
+
+///
+/// Load the GraphicsMagick library.
+///
+bool
+loadLibGM(string programName)
+{
+   import graphicsmagick_c.config;
+
+   bool  success;
+   void* libgm;
+
+   success = loadGraphicsMagick(libgm);
+   if (null !is libgm) {
+      stderr.writefln("%s: Failed to find the GraphicsMagick library.",
+         programName);
+
+version(appimage) {
+      stderr.writeln("\tThis shouldn't normally happen in an AppImage.");
+      stderr.writefln("\tPlease visit %s\nand let me know.",
+         "https://codeberg.org/supercell/pixiv_down/issues");
+} else version(linux) {
+      stderr.writeln("\tPlease make sure GraphicsMagick is installed.");
+      stderr.writeln("\tYou should be able to determine this by running " ~
+         "`gm version` in your terminal.");
+      stderr.writefln("\tIf it is installed, please let me know at %s",
+         "https://codeberg.org/supercell/pixiv_down/issues");
+} else {
+      stderr.writeln("\tpixiv_down hasn't been tested on your OS.");
+      stderr.writefln("\tVisit %s and let me know the details!",
+         "https://codeberg.org/supercell/pixiv_down/issues");
+}
+      return false;
+   } // if (null is libgm)
+
+   if (false == success) {
+      stderr.writefln("%s: There were some issues loading GraphicsMagick.",
+         programName);
+      stderr.writeln(
+         "\tIt's unlikely that there will be any issues running pixiv_down,\n" ~
+         "\tbut please include the above ERROR messages when reporting\n" ~
+         "\tany issues.");
+   }
+
+   return success;
+}
+
+} // version(GMagick_Dynamic)
+
+///
+/// Print GraphicsMagick version information to the pixiv_down log file.
+///
+void
+logLibGMVersion()
+{
+   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);
+}
+
 int
 main(string[] args)
 {
@@ -823,58 +890,13 @@ version(appimage) {
    log = new Logger("pixiv_down.log");
 
 version (GMagick_Dynamic) {
-   {
-      // This is the default build option, but I don't want
-      // it to cause problems if people try to build static.
-
-      import graphicsmagick_c.config;
-
-      void *libgm;
-
-      bool success = loadGraphicsMagick(libgm);
-      if (null is libgm) {
-         stderr.writefln("%s: Failed to find the GraphicsMagick library.",
-            args[0]);
-
-version(appimage) {
-         stderr.writeln("This shouldn't normally happen in an AppImage.");
-         // NOTE(mio): Should have some other place that doesn't require
-         //            registration...
-         stderr.writefln("Please visit %s\nand let me know.",
-            "https://codeberg.org/supercell/pixiv_down/issues");
-} else version(Linux) {
-         stderr.writeln("Please make sure GraphicsMagick is installed.");
-         stderr.writefln("If it is installed, please let me know at\n%s",
-            "https://codeberg.org/supercell/pixiv_down/issues");
-} else {
-         stderr.writeln("pixiv_down hasn't been tested on your OS.");
-         stderr.writefln("Visit %s and let me know the details!",
-            "https://codeberg.org/supercell/pixiv_down/issues");
+   bool loadedGM = loadLibGM(args[0]);
+   if (!loadedGM) {
+      return 1;
+   }
 }
-      } // if (null is libgm)
-
-      if (false == success) {
-         stderr.writeln("There were some issues loading GraphicsMagick.");
-         stderr.writeln("It's unlikely that there will be any issues, but" ~
-            " please include the above when reporting issues");
-      }
 
-   } // end of scope
-} // GMagick_Dynamic
-
-   {
-      /*
-       * Log Configuration Settings.
-       */
-      import graphicsmagick_c.magick.version_ : GetMagickVersion,
-         MagickQuantumDepth, MagickLibVersionText;
-      import std.string : fromStringz;
-
-      log.infof("GraphicsMagick Version D: %s",
-         GetMagickVersion(null).fromStringz);
-      log.infof("GraphicsMagick Version S: %s", MagickLibVersionText);
-      log.infof("GraphicsMagick Depth   S: %s", MagickQuantumDepth);
-   }
+   logLibGMVersion();
 
    Config config;
    DirEntry homeDir = open(Directory.home);