Commit: 8504b8c2880ec27af36acfe1b67d07f2ec9a3f53 - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• Révision: 8504b8c2880ec27af36acfe1b67d07f2ec9a3f53 (tree)
• l'heure: 2023-11-28 13:51:23
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

have makeSafe treat more characters as invalid

Turns out this is really dependent on the filesystem's format
(e.g. ext4, exfat, ntfs, etc.). This will assume unicode is valid, but
will restrict the possible characters to 'work characters', periods, and
hyphens.

Change Summary

• modified: source/app.d

Modification

--- a/source/app.d
+++ b/source/app.d
@@ -237,7 +237,9 @@ unittest
 /**
  * Attempt to make *path* safe for different operating systems.
  *
- * This will replace "\\:*." with the provided *replacement*.
+ * This will replace anything that is not: a hyphen ('-'), a period ('.'),
+ * an underscore ('_'), or a "word character" (includes numbers).  Any
+ * characters found will be replaced by a hypen.
  *
  * Only tested on Linux and Android.
  *
@@ -247,12 +249,23 @@ unittest
  *
  * Returns: A new string with the replacements made.
  */
-string makeSafe(string path, string replacement = "_")
+string makeSafe(string path)
 {
-    import std.regex : regex, replaceAll;
-    import std.string : strip;
+   import std.regex : regex, replaceAll;
+   import std.string : replace, strip, stripRight;
 
-    return replaceAll(path, regex("[\\:*.]"), replacement).strip;
+   enum kReplacement = "-";
+
+   auto reg = regex(`[^-\w._]`);
+   string noSpace = strip(path).replace(" ", kReplacement);
+   string almostSafe = replaceAll(noSpace, reg, kReplacement);
+
+static if (__VERSION__ < 2079L) {
+   import std.string : chomp;
+   return chomp(almostSafe, "._-");
+} else {
+   return strip(almostSafe, "._-");
+}
 }
 
 void downloadIllust(ref Illustration illust, ref Config conf,
@@ -265,12 +278,13 @@ void downloadIllust(ref Illustration illust, ref Config conf,
     import std.path : buildPath;
     import std.stdio : stderr;
 
-    const rawPath = buildPath(conf.outputDirectory,
-        illust.userId ~ "_" ~ illust.userName);
-    const subDirectory = makeSafe(rawPath);
+    const accountDirectory = makeSafe(illust.userId ~ "_" ~ illust.userName);
+    const subDirectory = buildPath(conf.outputDirectory, accountDirectory);
 
-    if (false == exists(subDirectory))
+    if (false == exists(subDirectory)) {
+        warningf("subDirectory doesn't exist. Will create: %s", subDirectory);
         mkdirRecurse(subDirectory);
+    }
 
     stderr.writefln("[%s] Downloading %s - %s", illust.type, illust.userName,
         illust.title);