Commit: b46c11540238dd3d5f96bf21e66d0cdb9d5ff6d6 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: b46c11540238dd3d5f96bf21e66d0cdb9d5ff6d6 (tree)
• l'heure: 2023-02-23 15:59:40
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

'Trash' list when calling "delete" with no arguments making it, in theory, possible to restore a previously 'trashed' list.

FossilOrigin-Name: 1fc03d810699338baf854c04acfcfce50270dc79f2f6251118988b826d27629a

Change Summary

• modified: main.d

Modification

--- a/main.d
+++ b/main.d
@@ -383,40 +383,41 @@ private bool deleteFromList(MediaList* list, bool shouldVerifyDelete, string[] a
 {
     trace("Command: delete");
 
-    if (true == shouldVerifyDelete && args.length == 0) {
-        writef("Are you sure you want to delete the list \"%s\"? ([yes]/no) ",
-            list.listName);
-        string res = readln().strip().toLower();
-
-        if ("" == res || "yes" == res) {
-            MLError response = ml_send_command(list, MLCommand.delete_, []);
+    if (args.length == 0)
+    {
+        if (shouldVerifyDelete)
+        {
+            writef("Are you sure you want to delete the %s list? (yes/[no]) ", list.listName);
+            string res = readln().strip().toLower();
 
-            if (MLError.success == response)
-                writefln("Successfully deleted the list \"%s\".", list.listName);
+            if ("y" != res && "yes" != res)
+            {
+                writefln("Cancelled: No longer deleting the %s list.", list.listName);
+                return true;
+            }
         }
 
+        trash(list.filePath);
+        writefln("Successfully deleted the %s list.", list.listName);
         return true;
-    } else if (args.length == 0) {
-        MLError response = ml_send_command(list, MLCommand.delete_, []);
-        if (MLError.success == response)
-            writefln("Successfully deleted the list \"%s\".", list.listName);
-
-        return (MLError.success == response);
     }
 
     size_t[] ids = new size_t[args.length];
 
     /* Keep the id separate from the loop so we don't delete the list. */
     size_t id;
-    foreach(const ref string arg; args) {
-        try {
+    foreach (const ref string arg; args)
+    {
+        try
+        {
             ids[id] = to!size_t(arg);
             id += 1;
-        } catch (ConvException ce) {
-            stderr.writefln("ERROR: Failed to delete %s from %s.", arg,
-                list.listName);
-            stderr.writeln("ISSUE: Couldn't convert %s to an unsigned number.",
-                arg);
+        }
+        catch (ConvException ce)
+        {
+            stderr.writefln("ERROR: Failed to delete %s from %s.", arg, list.listName);
+            stderr.writeln ("ISSUE: Couldn't convert %s to an unsigned number.", arg);
+            stderr.writeln (" NOTE: No items have been removed from the list.");
             return false;
         }
     }
@@ -426,13 +427,16 @@ private bool deleteFromList(MediaList* list, bool shouldVerifyDelete, string[] a
 
     MLError err;
     MediaListItem[] items = ml_fetch_items(list, &err, ids);
-    if (MLError.success != err) {
+    if (MLError.success != err)
+    {
         stderr.writefln("ERROR: Failed to fetch items from %s.", list.listName);
         stderr.writefln("ISSUE: MLError.%s", err);
+        stderr.writeln (" NOTE: No items have been removed from the list.");
         return false;
     }
 
-    if (shouldVerifyDelete) {
+    if (shouldVerifyDelete)
+    {
         /*
          * Both "ids" and "items" are sorted. "args" is not sorted.
          * Since the order can be different, we convert each id to a string and
@@ -441,23 +445,34 @@ private bool deleteFromList(MediaList* list, bool shouldVerifyDelete, string[] a
         string[] cmdArgs;
 
         size_t idx = 0;
-        foreach (ref item; items) {
-            writef("Are you sure you want to delete %s ([yes]/no) ", item.title);
+        foreach (ref item; items)
+        {
+            writef("Are you sure you want to delete %s (yes/[no]) ", item.title);
             string res = readln().strip().toLower();
 
-            if ("" == res || "yes" == res) {
+            if ("yes" == res)
+            {
+                writeln("  Will delete %s.", item.title);
                 cmdArgs ~= to!string(ids[idx]);
                 item.valid = false;
             }
+            else
+            {
+                writeln("  Will not delete %s.", item.title);
+            }
             idx += 1;
         }
         err = ml_send_command(list, MLCommand.delete_, cmdArgs);
-    } else {
+    }
+    else
+    {
         err = ml_send_command(list, MLCommand.delete_, args);
     }
 
-    if (MLError.success == err) {
-        foreach (const ref MediaListItem item; items) {
+    if (MLError.success == err)
+    {
+        foreach (const ref MediaListItem item; items)
+        {
             if (false == item.valid)
                 writefln("Successfully deleted %s from %s.", item.title,
                     list.listName);