Commit: cfb7b2aa29cae9cbf8bc6cb00bee4529d63ad1c0 - pixivd_tools (hg)

Auxiliary tools for users of pixiv_down

Commit MetaInfo

• Revisión: cfb7b2aa29cae9cbf8bc6cb00bee4529d63ad1c0 (tree)
• Tiempo: 2023-11-29 20:30:29
• Autor: nemophila <stigma@disr...>
• Commiter: nemophila

Log Message

Reformat combine_users

Cambiar Resumen

• modified: pixiv_combine_users.d

Diferencia incremental

diff -r 5998b942e91b -r cfb7b2aa29ca pixiv_combine_users.d
--- a/pixiv_combine_users.d	Wed Nov 29 20:12:55 2023 +1000
+++ b/pixiv_combine_users.d	Wed Nov 29 21:30:29 2023 +1000
@@ -15,17 +15,6 @@
  */
 module pixiv_combine_users;
 
-import std.file;
-import std.path : buildPath;
-import std.stdio;
-
-import mlib.configparser;
-import mlib.directories;
-import mlib.trash;
-
-import pixivd;
-import pixivd.types;
-
 struct Config
 {
     string sessid;
@@ -34,32 +23,36 @@
 
 int main(string[] args)
 {
-    import std.experimental.logger : critical;
-
-    Config config;
-
-    setupLogger();
+   import std.experimental.logger : critical;
+   import std.file : FileException;
+   import std.stdio : stderr;
 
-    try {
-        loadConfig(config);
-    } catch (FileException fe) {
-        critical(fe.msg);
-        stderr.writeln(fe.msg);
-        stderr.writeln("Have you used both pixivd and pixiv_down before?");
-        return 1;
-    } catch (NoSectionException nse) {
-        stderr.writeln("Couldn't find 'output' section in the pixiv_down config.");
-        stderr.writeln("Please see pixiv_down documentation on setting this.");
-        return 1;
-    } catch (NoOptionException noe) {
-        stderr.writeln("Couldn't find the 'base_folder' option in the pixiv_down config.");
-        stderr.writeln("Please see pixiv_down documentation on setting this.");
-        return 1;
-    }
+   import mlib.configparser : NoSectionException, NoOptionException;
 
-    string[][string] dupes = findDupes(config);
-    removeDupes(dupes, config);
-    return 0;
+   Config config;
+
+   setupLogger();
+
+   try {
+      config = loadConfig();
+   } catch (FileException fe) {
+      critical(fe.msg);
+      stderr.writeln(fe.msg);
+      stderr.writeln("Have you used both pixivd and pixiv_down before?");
+      return 1;
+   } catch (NoSectionException nse) {
+      stderr.writeln("Couldn't find 'output' section in the pixiv_down config.");
+      stderr.writeln("Please see pixiv_down documentation on setting this.");
+      return 1;
+   } catch (NoOptionException noe) {
+      stderr.writeln("Couldn't find the 'base_folder' option in the pixiv_down config.");
+      stderr.writeln("Please see pixiv_down documentation on setting this.");
+      return 1;
+   }
+
+   string[][string] dupes = findDupes(config);
+   removeDupes(dupes, config);
+   return 0;
 }
 
 private void setupLogger()
@@ -96,26 +89,28 @@
  * pixivd is used to check the current user's <displayName>, while pixiv_down's
  * settings are used to see where the pictures are stored.
  */
-void loadConfig(ref Config config)
+private Config loadConfig()
 {
-    import std.string : strip;
-
-    DirEntry configDir = open(Directory.config);
-    string pdPath = buildPath(configDir.name, "pixivd", "phpsessid.txt");
-    string pdownPath = buildPath(configDir.name, "pixiv_down", "settings.conf");
+   import std.experimental.logger : critical;
+   import std.file : DirEntry, readText;
+   import std.path : buildPath;
+   import std.string : strip;
+   import std.stdio : stderr;
 
-    if (false == exists(pdPath)) {
-        throw new FileException(pdPath, "file does not exist");
-    }
-    if (false == exists(pdownPath)) {
-        throw new FileException(pdownPath, "file does not exist");
-    }
+   import mlib.configparser : ConfigParser;
+   import mlib.directories : Directory, open;
 
-    config.sessid = File(pdPath, "r").readln().strip();
+   const configDir = open(Directory.config);
+   const pdPath = buildPath(configDir.name, "pixivd", "phpsessid.txt");
+   const pdownPath = buildPath(configDir.name, "pixiv_down", "settings.conf");
 
-    scope ConfigParser parser = new ConfigParser();
-    parser.read(pdownPath);
-    config.baseFolder = parser.get("output", "base_folder");
+   // May throw, but this is expected and caught in main.
+   const sessid = pdPath.readText.strip;
+   scope parser = new ConfigParser();
+   parser.read(pdownPath);
+   const baseDir = parser.get("output", "base_folder");
+
+   return Config(sessid, baseDir);
 }
 
 /**
@@ -131,116 +126,129 @@
  *
  * Each returned ID will have more than one <displayName>.
  */
-string[][string] findDupes(in ref Config config)
+private string[][string] findDupes(in ref Config config)
 {
-    import std.array : join, split;
-    import std.path : baseName;
-
-    const cwd = getcwd();
-    scope(exit) chdir(cwd);
-
-    chdir(config.baseFolder);
-
-    string[][string] ids;
-
-    foreach(string name; dirEntries(config.baseFolder, SpanMode.shallow)) {
-        string bname = baseName(name);
-        string[] spl = bname.split("_");
-        string id = spl[0];
+   import std.array : join, split;
+   import std.path : baseName;
+   import std.file : SpanMode, chdir, dirEntries, getcwd;
 
-        /* Don't include any non-numerical "ids" (other directories) */
-        if (id[0] < '0' && id[0] > '9')
-            continue;
-
-        ids[id] ~= spl[1..$].join("_");
-    }
+   const cwd = getcwd();
+   scope(exit) chdir(cwd);
 
-    foreach(id, names; ids) {
-        if (names.length == 1) {
-            ids.remove(id);
-        }
-    }
-    
-    return ids;
-}
+   chdir(config.baseFolder);
 
-void prettyPrint(string[] arr)
-{
-    foreach(num, elem; arr) {
-        writefln("   %d) %s", num, elem);
-    }
+   string[][string] ids;
+
+   foreach(string name; dirEntries(config.baseFolder, SpanMode.shallow)) {
+      string bname = baseName(name);
+      string[] spl = bname.split("_");
+      string id = spl[0];
+
+      /* Don't include any non-numerical "ids" (other directories) */
+      if (id[0] < '0' && id[0] > '9')
+      continue;
+
+      ids[id] ~= spl[1..$].join("_");
+   }
+
+   foreach(id, names; ids) {
+      if (names.length == 1) {
+         ids.remove(id);
+      }
+   }
+
+   return ids;
 }
 
-void removeDupes(string[][string] dupes, in ref Config config)
+private void prettyPrint(string[] arr)
 {
-    import core.thread : Thread;
-    import core.time : dur;
-    import std.experimental.logger : criticalf;
-    import std.string : empty;
+   import std.stdio : writefln;
 
-    Client client = new Client(config.sessid);
-    foreach(id, names; dupes) {
-        try {
-            FullUser user = client.fetchUser(id);
-            writefln("All names for ID %s (current: %s):", id, user.userName);
-            prettyPrint(names);
-            write("Which number should be used? ");
-            int choice;
-            readf!" %d"(choice);
-            removeDupe(id, names, choice, config);
-        } catch (PixivJSONException pje) {
-            criticalf("Fetching ID '%s': %s", id, pje.message);
-            stderr.writeln(pje.msg);
-            continue;
-        }
-
-        writeln("Sleeping for 3 seconds");
-        Thread.sleep(dur!"seconds"(3));
-    }
-    writeln("Done removing duplicates! (if any!)");
+   foreach(num, elem; arr) {
+     writefln("   %d) %s", num, elem);
+   }
 }
 
-void removeDupe(string id, string[] names, int choice, in ref Config config)
+private void removeDupes(string[][string] dupes, in ref Config config)
 {
-    import std.algorithm.mutation : remove;
-    import std.array : array, split;
-    import std.experimental.logger : tracef, infof;
-    import std.path : baseName, dirSeparator;
-
-    const newPath = buildPath(config.baseFolder, id ~ "_" ~ names[choice]);
-    writefln("Moving all files for %s to %s", names[choice], newPath);
-    names = names.remove(choice);
-
-    /* eww */
-    foreach(name; names) {
-        const baseDir = buildPath(config.baseFolder, id ~ "_" ~ name);
-        foreach(entry; dirEntries(baseDir, SpanMode.breadth)) {
+   import core.thread : Thread;
+   import core.time : dur;
+   import std.experimental.logger : criticalf;
+   import std.string : empty;
+   import std.stdio : stderr, readf, write, writefln;
 
-            // We need to account for Manga and multi-page illustrations.
-            string maybeIllustId = entry.name.split(dirSeparator)[$-2];
-            string destPath = newPath;
-            if (maybeIllustId != (id ~ "_" ~ name)) {
-                // Is Manga or multi-paged illustration.
-                destPath = buildPath(destPath, maybeIllustId);
-                tracef("Found Manga or multi-paged illust--output: %s", destPath);
-            }
+   import pixivd : Client;
+   import pixivd.types : FullUser, PixivJSONException;
 
-            if (false == exists(buildPath(destPath, baseName(entry.name)))) {
-                writefln("%s does not exist in %s... Copying.", entry.name, destPath);
-                string fname = baseName(entry.name);
-                destPath = buildPath(destPath, fname);
-                // FIXME: Why not just rename() the directory?
-                if (isDir(entry.name)) {
-                    infof("Making directory: %s", destPath);
-                    mkdir(destPath);
-                    continue;
-                }
-                infof("Copying %s to %s", entry.name, destPath);
-                copy(entry.name, destPath);
+   Client client = new Client(config.sessid);
+   foreach(id, names; dupes) {
+      try {
+         FullUser user = client.fetchUser(id);
+         writefln("All names for ID %s (current: %s):", id, user.userName);
+         prettyPrint(names);
+         write("Which number should be used? ");
+         int choice;
+         readf!" %d"(choice);
+         removeDupe(id, names, choice, config);
+      } catch (PixivJSONException pje) {
+         criticalf("Fetching ID '%s': %s", id, pje.message);
+         stderr.writeln(pje.msg);
+         continue;
+      }
+
+      write("Sleeping for 3 seconds\n");
+      Thread.sleep(dur!"seconds"(3));
+   }
+   write("Done removing duplicates! (if any!)\n");
+}
+
+private void removeDupe(string id, string[] names, int choice, in ref Config config)
+{
+   import std.file;
+
+   import std.algorithm.mutation : remove;
+   import std.array : array, split;
+   import std.experimental.logger : tracef, infof;
+   import std.path : baseName, buildPath, dirSeparator;
+   import std.stdio : writeln, writefln;
+
+   import mlib.trash : trash;
+
+   enum kReplacement = "-";
+
+   const newPath = buildPath(config.baseFolder, id ~ kReplacement ~ names[choice]);
+   writefln("Moving all files for %s to %s", names[choice], newPath);
+   names = names.remove(choice);
+
+   /* eww */
+   foreach(name; names) {
+      const baseDir = buildPath(config.baseFolder, id ~ kReplacement ~ name);
+      foreach(entry; dirEntries(baseDir, SpanMode.breadth)) {
+         // We need to account for Manga and multi-page illustrations.
+         string maybeIllustId = entry.name.split(dirSeparator)[$-2];
+         string destPath = newPath;
+         if (maybeIllustId != (id ~ kReplacement ~ name)) {
+            // Is Manga or multi-paged illustration.
+            destPath = buildPath(destPath, maybeIllustId);
+            tracef("Found Manga or multi-paged illust--output: %s", destPath);
+         }
+
+         if (false == exists(buildPath(destPath, baseName(entry.name)))) {
+            writefln("%s does not exist in %s... Copying.", entry.name, destPath);
+            string fname = baseName(entry.name);
+            destPath = buildPath(destPath, fname);
+            // FIXME: Why not just rename() the directory?
+            if (isDir(entry.name)) {
+               infof("Making directory: %s", destPath);
+               mkdir(destPath);
+               continue;
             }
-        }
-        writeln("Moved everything from ", baseDir, "... Deleting.");
-        infof("Trashing '%s'", baseDir);
-        trash(baseDir);
-    }
+            infof("Copying %s to %s", entry.name, destPath);
+            copy(entry.name, destPath);
+         }
+      }
+      writeln("Moved everything from ", baseDir, "... Deleting.");
+      infof("Trashing '%s'", baseDir);
+      trash(baseDir);
+   }
 }