Commit: 1e158176c27abba819f2a3ccc384f80f526079d4 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: 1e158176c27abba819f2a3ccc384f80f526079d4 (tree)
• l'heure: 2022-01-10 15:09:22
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

add an implementation for the MLCommand.delete_ command. This also changes the MediaList structure to use public members instead of package.

FossilOrigin-Name: 873d7974aad4307a8b86764ff3ae7b5e6439173eca595b54838a9c8a6b0c79c5

Change Summary

• modified: medialist.d

Modification

--- a/medialist.d
+++ b/medialist.d
@@ -18,25 +18,37 @@
  */
 module medialist;
 
+import std.algorithm.sorting;
+import std.conv;
 import std.datetime.date;
 import std.datetime.systime;
 import std.file;
+import std.path;
 import std.stdio;
 import std.string;
 
 struct MediaList
 {
-package:
-    string filePath;
+    immutable string filePath;
+    immutable string listName;
     bool isOpen = false;
 }
 
 enum MLCommand
 {
     /**
-     * Args: ["Item Name", "(Optional) Progress", "(Optional) Status".
+     * Add a new item to a list.
+     *
+     * Args: ["Item Name", "(Optional) Progress", "(Optional) Status"]
      */
     add,
+    /**
+     * Delete items from a list.
+     *
+     * If no "Item ID"s are provided, this will delete the entire list.
+     *
+     * Args: ["(Optional) Item ID", ...(repeat for the amount of ids needed)]
+     */
     delete_,
     update,
 }
@@ -51,7 +63,8 @@ enum MLError
 
 MediaList* ml_open_list(string filePath)
 {
-    MediaList* ml = new MediaList(filePath);
+    string listName = stripExtension(baseName(filePath));
+    MediaList* ml = new MediaList(filePath, listName);
 
     if (false == exists(filePath)) {
         File f = File(filePath, "w+");
@@ -96,6 +109,7 @@ MLError ml_send_command(MediaList* list, MLCommand command, string[] args)
         res = _ml_add(list, args);
         break;
     case MLCommand.delete_:
+        res = _ml_delete(list, args);
         break;
     case MLCommand.update:
         break;
@@ -167,6 +181,105 @@ private MLError _ml_add(MediaList* list, string[] args)
     return MLError.success;
 }
 
+/**
+ * Convert and sort an array of strings to "size_t".
+ *
+ * This assumes all elements in the array can be converted. If any fail,
+ * then "null" is returned from the function.
+ */
+private size_t[] _ml_conv_sort_num_list(const string[] args)
+{
+    size_t[] ids = new size_t[args.length];
+
+    foreach(size_t idx, const ref string arg; args) {
+        try {
+            ids[idx] = to!size_t(arg);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    sort(ids);
+
+    return ids;
+}
+
+private MLError _ml_delete(MediaList* list, string[] args)
+{
+    if (true == list.isOpen)
+        return MLError.fileAlreadyOpen;
+
+    if (0 == args.length) {
+        remove(list.filePath);
+        return MLError.success;
+    }
+
+    size_t[] ids = _ml_conv_sort_num_list(args);
+
+    if (null is ids)
+        return MLError.invalidArgs;
+
+    File listFile = File(list.filePath);
+    list.isOpen = true;
+
+    /*
+     * To avoid storing all lines in memory, we create a temporary file with
+     * which we write all lines that we are keeping.  Once we're done writing,
+     * we then overwrite the actual list file with the contents of the temporary
+     * file.
+     *
+     * If someone knows of a better way to go about this, I wouldn't mind
+     * knowing.
+     */
+    string tempFilePath = buildPath(tempDir(),
+        "temp" ~ baseName(list.filePath));
+    File tempFile = File(tempFilePath, "w+");
+
+    size_t currentID = 1;
+    size_t idsIndex = 0;
+    string line;
+    bool pastHeader = false;
+
+    while ((line = listFile.readln()) !is null) {
+        if (line[0] == '#') {
+            tempFile.write(line);
+            continue;
+        }
+
+        if (false == pastHeader) {
+            tempFile.write(line);
+            pastHeader = true;
+            continue;
+        }
+
+        if (ids[idsIndex] != currentID)
+            tempFile.write(line);
+        else
+            idsIndex += 1;
+
+        currentID += 1;
+    }
+
+    listFile.close();
+    tempFile.close();
+
+    listFile = File(list.filePath, "w+");
+    tempFile = File(tempFilePath);
+
+    while ((line = tempFile.readln) !is null) {
+        listFile.write(line);
+    }
+
+    listFile.close();
+    tempFile.close();
+
+    remove(tempFilePath);
+
+    list.isOpen = false;
+
+    return MLError.success;
+}
+
 private enum MLHeaders
 {
     title = 0,
@@ -294,7 +407,6 @@ void main()
 @("Create a new list")
 unittest
 {
-    import std.conv : to;
     import std.path : buildPath;
 
     const listPath = buildPath(tempDir(), "unittest1.tsv");