提交: 1338821d76a4a01f227cbfe0c4720d077a77a2e4 - pixiv_down (git)

A CLI tool for downloading from pixiv.net

Commit MetaInfo

• 修訂: 1338821d76a4a01f227cbfe0c4720d077a77a2e4 (tree)
• 時間: 2023-06-17 12:11:16
• 作者: mio <stigma@disr...>
• Commiter: mio

Log Message

Update pixiv_down to use new directories API

Change Summary

• modified: source/app.d
• modified: source/directories.d

差異

--- a/source/app.d
+++ b/source/app.d
@@ -837,29 +837,28 @@ loadConfig()
 {
    Config config;
    string sessionid;
-   DirEntry homeDir = open(Directory.home);
-   DirEntry configDir = open(Directory.config);
-   DirEntry dataDir = open(Directory.data);
 
-   string configDirPath = buildPath(configDir, "pixiv_down");
-   if (exists(configDirPath)) {
-      string configFilePath = buildPath(configDirPath, "settings.conf");
+   ProjectDirectories dirs = getProjectDirectories(null, "YumeNeru Software",
+      "pixiv_down");
+   UserDirectories userDirs = getUserDirectories();
+
+   if (exists(dirs.configDir)) {
+      string configFilePath = buildPath(dirs.configDir, "settings.conf");
       if (exists(configFilePath)) {
          scope parser = new ConfigParser();
          parser.read(configFilePath);
          config.baseFolder = parser.get("output", "base_folder",
-            buildPath(homeDir, "Pictures"));
+            userDirs.pictureDir);
       }
    } else {
       // Set default values
-      config.baseFolder = buildPath(homeDir, "Pictures");
+      config.baseFolder = userDirs.pictureDir;
    }
 
-   string dataDirPath = buildPath(dataDir, "pixiv_down");
-   string idFilePath = buildPath(dataDirPath, ".phpsessid");
+   string idFilePath = buildPath(dirs.dataDir, ".phpsessid");
 
-   if (!exists(dataDirPath)) {
-      mkdirRecurse(dataDirPath);
+   if (!exists(dirs.dataDir)) {
+      mkdirRecurse(dirs.dataDir);
       sessionid = askForSessionID();
       storeSessionID(sessionid, idFilePath);
    } else {

--- a/source/directories.d
+++ b/source/directories.d
@@ -11,6 +11,9 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/// NOTE: pixiv_down uses a *slightly* modified version: it removes all
+///       deprecations so no warnings are printed when compiling.
+
 /**
  * This module provides quick & easy access to the common directories
  * for each operating system.  Currently, only POSIX (XDG Base Directory
@@ -65,26 +68,6 @@
  */
 module directories;
 
-import std.file : DirEntry;
-
-///
-/// Deprecated: Use the new `getBaseDirectories`, `getProjectDirectories`,
-///             and `getUserDirectories` functions.  This will be removed
-///             in version 0.3.0.
-///
-deprecated("Use new get{Base,Project,User}Directories functions (remove 0.3.0)")
-public enum Directory
-{
-    home,
-    data,
-    config,
-    state,
-    //   dataDirs,   /* XDG */
-    //   configDirs, /* XDG */
-    cache,
-    runtime,
-}
-
 ///
 /// Provides paths of user-invisible standard directories, following the
 /// conventions of the operating system the library is running on.
@@ -1138,104 +1121,8 @@ unittest
     writeln(userDirs);
 }
 
-/++
- Return a DirEntry pointing to `dt`.
-
- If the folder couldn't be found, an empty DirEntry is returned.
-
- Deprecated: Use the new `getBaseDirectories`, `getProjectDirectories`,
-             and `getUserDirectories` functions.  This will be removed
-             in version 0.3.0.
-
- Examples:
- ----
- import directories;
- import std.stdio;
-
- int main()
- {
-   DirEntry userConfDir = open(Directory.config);
-   /* Handle error */
-   if (0 == userConfDir.name.length)
-     {
-       stderr.writeln("Failed to find user config directory.");
-       return 1;
-     }
-   writefln("User config directory is %s", userConfDir.name);
-   return 0;
- }
- ----
-+/
-deprecated("Use new get{Base,Project,User}Directories functions (remove 0.3.0)")
-public DirEntry open(Directory dt) nothrow// @safe
-{
-    /*
-     * The Posix version covers a few operating systems, if your uses an
-     * an alternative to XDG, let me know.
-     */
-    version (Posix) enum supported = true;
-    else version (Windows) enum supported = true;
-    else enum supported = false;
-
-    static if (false == supported) {
-        static assert(0, "Unsupported platform.");
-    }
-
-    immutable string path = getPath(dt);
-    if (path is null) return DirEntry();
-    try {
-        return DirEntry(path);
-    } catch (Exception e) {
-        return DirEntry();
-    }
-}
-
-///
-unittest
-{
-    import std.conv : to;
-    import std.stdio : stderr;
-
-    DirEntry emptyDir;
-
-    foreach(dir; Directory.min..Directory.max)
-    {
-        string dirAsString = to!string(dir);
-        DirEntry dirEntry = open(dir);
-        version (Windows)
-        {
-            // Neither of these directories are supported on Windows.
-            if (dir == Directory.state || dir == Directory.runtime)
-                continue;
-        }
-        assert(emptyDir != dirEntry, "Failed to open(Directory." ~ dirAsString ~ ")");
-        stderr.writefln("Successfully opened Directory.%s: %s", dirAsString, dirEntry.name());
-    }
-}
-
 private:
 
-immutable(string) getPath(in Directory dt) nothrow @safe
-{
-  switch (dt)
-    {
-    case Directory.home:
-      return home();
-    case Directory.data:
-      return data();
-    case Directory.config:
-      return config();
-    case Directory.cache:
-      return cache();
-    case Directory.state:
-      return state();
-    case Directory.runtime:
-      return runtime();
-    default:
-      assert(false, "Unsupported Directory");
-    }
-}
-
 immutable(string) home() nothrow @trusted
 {
     version (Posix) {