Commit: 02fbb03cffc415f6ce44968d65646761afea14d2 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Revision: 02fbb03cffc415f6ce44968d65646761afea14d2 (tree)
• Zeit: 2023-03-09 14:50:21
• Autor: mio <stigma@disr...>
• Commiter: mio

Log Message

Fix ml_fetch_item with index 0 "finding" an item when it's not a valid item ID (d247886e46)

FossilOrigin-Name: 8494404e36d073561578a3ca7ddddee6c7bf7aea3d9b707940abf0e08a158611

Ändern Zusammenfassung

• modified: medialist.d
• modified: unittests.d

Diff

--- a/medialist.d
+++ b/medialist.d
@@ -747,6 +747,7 @@ MediaListItem ml_fetch_item(MediaList* list, size_t id)
     string line;
     size_t currentLine = 0;
     bool found = false;
+    bool pastHeader = false;
 
     while ((line = listFile.readln()) !is null) {
         if (0 >= line.length)
@@ -755,6 +756,13 @@ MediaListItem ml_fetch_item(MediaList* list, size_t id)
         if ('#' == line[0])
             continue;
 
+        /* First non-comment line in medialist mTSV file is header */
+        if (false == pastHeader) {
+            pastHeader = true;
+            currentLine += 1;
+            continue;
+        }
+
         if (id == currentLine) {
             found = true;
             break;

--- a/unittests.d
+++ b/unittests.d
@@ -947,3 +947,40 @@ unittest
     assert(items.length == 1, "Returned item array doesn't contain one item");
     assert(items[0].title == "Item 2", "First (idx:1 was idx:2) item title doesn't match.");
 }
+
+
+/*
+ * Ticket d247886e46
+ *
+ * Since all the commands expect a 1-based index (with medialist
+ * automatically adjusting) passing an index of 0 should either set the
+ * error to MLError.itemNotFound or throw an MLException -- depending
+ * on whether it's the nothrow variant.
+ *
+ * Basically, there is an error when reading each line where we don't
+ * check if we've past the header line.
+ */
+@(`ml_fetch_item doesn't work with index 0 (d247886e46)`)
+unittest
+{
+    enum listName = __FUNCTION__;
+    enum fileName = listName ~ ".tsv";
+
+    MediaList* list = ml_open_list(fileName);
+    scope(exit) {
+        ml_send_command(list, MLCommand.delete_, []);
+        ml_free_list(list);
+    }
+
+    MediaListItem item;
+    MLError error;
+
+    item = ml_fetch_item(list, 0, error);
+    assert(MLError.success != error,
+        "ml_fetch_item with index 0 (0 items) returned \"successfully\" when expected error.");
+
+    ml_send_command(list, MLCommand.add, ["Item 1"]);
+    item = ml_fetch_item(list, 0, error);
+    assert(MLError.success != error,
+        "ml_fetch_item with index 0 (1 item) returned \"successfully\" when expected error.");
+}