Commit: 36e852a57da77146d3d17bb95234975cebd50e8c - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: 36e852a57da77146d3d17bb95234975cebd50e8c (tree)
• l'heure: 2023-03-28 16:28:12
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

Update main.d to remove deprecation warnings from mlib

FossilOrigin-Name: 6a812b90dbb08dae2a99418d2482fd41bef0bb6be8fa09254b52620d8bc527a0

Change Summary

• modified: .fossil-settings/ignore-glob
• modified: main.d

Modification

--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -1,7 +1,10 @@
 *.o
+*.a
 *.html
 *.txt
 *.json
 *.pdf
 *.aux
 *~
+
+medialist-cli

--- a/main.d
+++ b/main.d
@@ -1048,10 +1048,9 @@ private bool importList(string data_dir, string[] args) {
 ///
 /// Setup the logger for medialist-cli.
 ///
-void setupLogger()
+void setupLogger(in ref ProjectDirectories projectDirs)
 {
-    DirEntry stateEntry = open(Directory.state);
-    string logDirPath = buildPath(stateEntry.name, "medialist-cli");
+    string logDirPath = projectDirs.cacheDir;
 
     if (false == exists(logDirPath)) {
         mkdirRecurse(logDirPath);
@@ -1076,11 +1075,10 @@ void setupLogger()
 }
 
 int main(string[] args) {
-    DirEntry configEntry = open(Directory.config);
-    DirEntry dataEntry = open(Directory.data);
+                                                              // idk? will think of something
+    ProjectDirectories projectDirs = getProjectDirectories(null, "YumeNeru Productions", "medialist");
+    string dataDirectory = projectDirs.dataDir; // default directory.
 
-    string config_dir = buildPath(configEntry.name, "medialist");
-    string data_dir = buildPath(dataEntry.name, "medialist");
     string command = "help";
 
 version(appimage) {
@@ -1089,7 +1087,7 @@ version(appimage) {
     string program_name = args[0];
 }
 
-    setupLogger();
+    setupLogger(projectDirs);
 
     bool success = true;
     /* Default behaviour since 0.3 */
@@ -1125,15 +1123,15 @@ version(appimage) {
     }
 
     command = args[1];
-    mkdirRecurse(config_dir);
+    mkdirRecurse(projectDirs.configDir);
 
-    if (buildPath(config_dir, "medialist.conf").exists) {
-        scope contents = readText(buildPath(config_dir, "medialist.conf"));
+    if (buildPath(projectDirs.configDir, "medialist.conf").exists) {
+        scope contents = readText(buildPath(projectDirs.configDir, "medialist.conf"));
         auto conf = CniParser.fromString(contents, CniOptions(false, true));
 
         if ("general.directory" in conf) {
             trace("Using >=0.3 configuration section");
-            data_dir = conf["general.directory"];
+            dataDirectory = conf["general.directory"];
         } else if ("Lists.directory" in conf) {
             /*
              * COMPAT: For pre-0.2 versions of medialist.  No need to remove,
@@ -1143,10 +1141,10 @@ version(appimage) {
             stderr.writeln(`WARNING: Using the "Lists" section in your configuration is deprecated.`);
             stderr.writeln(`         Please change to using the "general" section.`);
             stderr.writeln(`         This warning (along with support for "Lists") will be removed v0.5`);
-            data_dir = conf["Lists.directory"];
+            dataDirectory = conf["Lists.directory"];
         }
 
-        data_dir = expandEnvironmentVariables(expandTilde(data_dir));
+        dataDirectory = expandEnvironmentVariables(expandTilde(dataDirectory));
 
         string shouldVerifyDeleteRaw;
 
@@ -1163,16 +1161,16 @@ version(appimage) {
         }
     }
 
-    mkdirRecurse(data_dir);
+    mkdirRecurse(dataDirectory);
 
     if ("import" == command) {
         trace(`Command: import`);
-        success = importList(data_dir, args[2..$]);
+        success = importList(dataDirectory, args[2..$]);
         return success ? EXIT_SUCCESS : EXIT_FAILURE;
     }
 
     /* temporary mess while changing to the library format */
-    string filePath = buildPath(data_dir, args[2] ~ ".tsv");
+    string filePath = buildPath(dataDirectory, args[2] ~ ".tsv");
     MediaList *ml = null;
 
     if (false == exists(filePath)) {