提交: 849578ee4087d19282c14accae76eae71b02594c - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• 修订版: 849578ee4087d19282c14accae76eae71b02594c (tree)
• 时间: 2023-03-14 10:19:18
• 作者: mio <stigma@disr...>
• Commiter: mio

Log Message

Update main.d to use nothrow ml_send_command

FossilOrigin-Name: f5886103bae1f0aff14431a56cc08af9b49b5b4648da9321f5615bb8994ee7c8

更改概述

• modified: main.d

差异

--- a/main.d
+++ b/main.d
@@ -36,7 +36,7 @@ import mlib.trash : trash;
 import medialist;
 import util : expandEnvironmentVariables;
 
-enum MediaListCLIVersion = "0.4-pre (2023-02-23)";
+enum MediaListCLIVersion = "0.4-dev";
 
 @trusted void display_usage(string name)
 {
@@ -101,7 +101,7 @@ Commands:
 Report bugs to <[e-mail]>.
 View current bugs: <https://rocketgit.com/user/dawning/medialist-cli/bug>
 medialist-cli web page: <https://yume-neru.neocities.org/p/medialist.html>",
-	   name);
+        name);
 }
 
 /**
@@ -278,9 +278,10 @@ private bool addToList(MediaList* list, string[] args)
         }
     }
 
-    MLError err = ml_send_command(list, MLCommand.add, [title, progress, status]);
+    MLError error;
+    ml_send_command(list, MLCommand.add, [title, progress, status], error);
 
-    if (MLError.success != err) {
+    if (MLError.success != error) {
         stderr.writefln("ERROR: Failed to add %s to %s.", title, list.listName);
         stderr.writeln("ISSUE: List is already open for editing.");
         return false;
@@ -347,19 +348,20 @@ private bool updateListItem(MediaList* list, string[] args)
         }
     }
 
-    MLError res = ml_send_command(list, MLCommand.update, commandArgs);
+    MLError error;
+    ml_send_command(list, MLCommand.update, commandArgs, error);
 
-    if (MLError.success != res) {
+    if (MLError.success != error) {
         /* This can only be because the list is open. */
         stderr.writefln("ERROR: Failed to update list %s.", list.listName);
         stderr.writeln("ISSUE: List is already open for editing.");
         return false;
     }
 
-    MediaListItem item = ml_fetch_item(list, id, res);
+    MediaListItem item = ml_fetch_item(list, id, error);
 
-    if (MLError.success != res) {
-        switch (res) {
+    if (MLError.success != error) {
+        switch (error) {
         case MLError.itemNotFound:
             /* id doesn't exist. no item was updated. */
             stderr.writefln("ERROR: Failed to update list %s.", list.listName);
@@ -463,11 +465,11 @@ private bool deleteFromList(MediaList* list, bool shouldVerifyDelete, string[] a
             }
             idx += 1;
         }
-        err = ml_send_command(list, MLCommand.delete_, cmdArgs);
+        ml_send_command(list, MLCommand.delete_, cmdArgs, err);
     }
     else
     {
-        err = ml_send_command(list, MLCommand.delete_, args);
+        ml_send_command(list, MLCommand.delete_, args, err);
     }
 
     if (MLError.success == err)
@@ -823,7 +825,7 @@ private bool updateFileItems(MediaListItem[] imported, string listPath, bool ove
             "start_date::" ~ item.startDate,
             "end_date::" ~ item.endDate
         ];
-        error = ml_send_command(list, MLCommand.update, commandArguments);
+        ml_send_command(list, MLCommand.update, commandArguments, error);
 
         if (MLError.invalidArgs == error) {
             logf("import: failed %sItems", overwrite ? "overwrite" : "update");
@@ -839,22 +841,22 @@ private bool updateFileItems(MediaListItem[] imported, string listPath, bool ove
     }
 
     foreach(index, item; newItems) {
-        error = ml_send_command(list, MLCommand.add, [
+        ml_send_command(list, MLCommand.add, [
             item.title,
             item.progress,
             item.status
-        ]);
+        ], error);
 
         if (MLError.invalidArgs == error) {
             stderr.writefln("Failed to add new '%s'", item.title);
             continue;
         }
 
-        error = ml_send_command(list, MLCommand.update,[
+        ml_send_command(list, MLCommand.update,[
             to!string(existing.length + index + 1),
             "start_date::" ~ item.startDate,
             "end_date::" ~ item.endDate
-        ]);
+        ], error);
 
         if (MLError.invalidArgs == error) {
             stderr.writefln("Failed to finish adding '%s'", item.title);