Commit: 4834f05a1af7763170476aab0d60231569fa3fdd - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: 4834f05a1af7763170476aab0d60231569fa3fdd (tree)
• l'heure: 2022-01-20 15:39:41
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

fix startDate being erroneously changed.

FossilOrigin-Name: 932a14e1c296859ed00552eb0498f9e47220def2e2ccde9adb902721cf1748db

Change Summary

• modified: medialist.d

Modification

--- a/medialist.d
+++ b/medialist.d
@@ -70,13 +70,13 @@ enum MLCommand
     delete_,
     /**
      * Update an item on a list.
-     * 
+     *
      * Args: ["Item ID", "field::value", "field::value", ...]
-     * 
+     *
      * For example: ml_send_command(list, MLCommand.update, ["1", "status:READING"]);
      * The "field" is automatically converted to lowercase, while the value is kept
      * as-is.
-     * 
+     *
      * To update the start and end date of an item, use "start_date" and
      * "end_date" respectively.
      */
@@ -592,30 +592,30 @@ private MLError _ml_update(MediaList* list, string[] args)
 
     if (2 > args.length)
         return MLError.invalidArgs;
-    
+
     string title = null;
     string progress = null;
     string status = null;
     string startDate = "";
     string endDate = "";
-    
+
     size_t id;
-    
+
     try {
         id = to!size_t(args[0]);
     } catch (Exception e) {
         return MLError.invalidArgs;
     }
-    
+
     foreach(string arg; args) {
         string[] kv = arg.split("::");
 
         if (2 > kv.length)
             continue;
-        
+
         string k = kv[0].toLower();
         string v = kv[1];
-        
+
         switch (k) {
         case "title":
             title = v;
@@ -636,11 +636,11 @@ private MLError _ml_update(MediaList* list, string[] args)
             break;
         }
     }
-    
+
     string tempFilePath = buildPath(tempDir, "ml_temp.tsv");
     File tempFile = File(tempFilePath, "w+");
     scope(exit) remove(tempFilePath);
-    
+
     int[2][6] headerPositions = _ml_get_header_positions(list);
     size_t titleIndex = 0;
     size_t progressIndex = 0;
@@ -648,7 +648,7 @@ private MLError _ml_update(MediaList* list, string[] args)
     size_t startDateIndex = 0;
     size_t endDateIndex = 0;
     size_t lastUpdatedIndex = 0;
-    
+
     foreach (ref header; headerPositions) {
         switch (header[0]) {
             case MLHeaders.title:
@@ -673,29 +673,29 @@ private MLError _ml_update(MediaList* list, string[] args)
                 break;
         }
     }
-    
+
     File listFile = File(list.filePath, "r");
     list.isOpen = true;
-    
+
     string line;
     bool pastHeader;
     size_t currentIndex = 1;
-    
+
     while ((line = listFile.readln()) !is null) {
         if (line.length == 0)
             continue;
-        
+
         if (line[0] == '#') {
             tempFile.write(line);
             continue;
         }
-        
+
         if (false == pastHeader) {
             pastHeader = true;
             tempFile.write(line);
             continue;
         }
-        
+
         if (currentIndex == id) {
             string[] sections = line.strip().split("\t");
             if (title !is null)
@@ -705,20 +705,20 @@ private MLError _ml_update(MediaList* list, string[] args)
 
             if (status !is null) {
                 string oldStatus = sections[statusIndex];
-                
+
                 if ((oldStatus.toLower == "plan-to-read" && status == "reading") ||
                     (oldStatus.toLower == "plan-to-watch" && status == "watching")) {
-                    
+
                     if (startDate == "") {
                         Date date = cast(Date)Clock.currTime;
                         startDate = format!"%d-%02d-%02d"(date.year, date.month, date.day);
                         sections[startDateIndex] = startDate;
                     }
                 }
-                
+
                 if ((oldStatus.toLower == "reading" && status == "complete") ||
                     (oldStatus.toLower == "watching" && status == "complete")) {
-                    
+
                     if (endDate == "") {
                         Date date = cast(Date)Clock.currTime;
                         endDate = format!"%d-%02d-%02d"(date.year, date.month, date.day);
@@ -729,33 +729,33 @@ private MLError _ml_update(MediaList* list, string[] args)
                 sections[statusIndex] = status;
             }
 
-            if (startDate !is null)
+            if (startDate != "")
                 sections[startDateIndex] = startDate;
-            if (endDate !is null)
+            if (endDate != "")
                 sections[endDateIndex] = endDate;
-            
+
             Date date = cast(Date)Clock.currTime();
             sections[lastUpdatedIndex] = format!"%d-%02d-%02d"(date.year, date.month, date.day);
             tempFile.writeln(join(sections, "\t"));
         } else {
             tempFile.write(line);
         }
-        
+
         currentIndex += 1;
     }
-    
+
     listFile.close();
     tempFile.flush();
     tempFile.close();
-    
+
     tempFile = File(tempFilePath, "r");
     listFile = File(list.filePath, "w+");
-    
+
     while ((line = tempFile.readln()) !is null) {
         listFile.write(line);
     }
     listFile.flush();
-    
+
     list.isOpen = false;
 
     return MLError.success;
@@ -1392,39 +1392,39 @@ private bool unittest_updateItemTitle()
 {
     enum listName = __FUNCTION__;
     enum fileName = listName ~ ".tsv";
-    
+
     MediaList* list = ml_open_list(fileName);
     if (list is null) {
         diag("ml_open_list returned null.");
         return false;
     }
-    
+
     scope(exit) {
         ml_send_command(list, MLCommand.delete_, []);
         ml_free_list(list);
     }
-    
+
     MLError res;
-    
+
     res = ml_send_command(list, MLCommand.add, ["Ietm 1"]);
     if (MLError.success != res) {
         diag("ml_send_command(list, add, [Ietm 1]) failed.");
         return false;
     }
-    
+
     res = ml_send_command(list, MLCommand.update, ["1", "title::Item 1"]);
     if (MLError.success != res) {
         diag("Failed to send UPDATE command [1, title::Item 1].");
         return false;
     }
-    
+
     MediaListItem item;
     res = ml_fetch_item(list, 1, &item);
     if (MLError.success != res) {
         diag("Failed to fetch item 1 from list.");
         return false;
     }
-    
+
     if ("Item 1" != item.title) {
         diag("Failed to update title from 'Ietm 1' to 'Item 1'.");
         return false;
@@ -1437,39 +1437,39 @@ private bool unittest_updateItemStatus()
 {
     enum listName = __FUNCTION__;
     enum fileName = listName ~ ".tsv";
-    
+
     MediaList* list = ml_open_list(fileName);
     if (list is null) {
         diag("ml_open_list returned null.");
         return false;
     }
-    
+
     scope(exit) {
         ml_send_command(list, MLCommand.delete_, []);
         ml_free_list(list);
     }
-    
+
     MLError res;
-    
+
     res = ml_send_command(list, MLCommand.add, ["Item 1", null, "PLAN-TO-READ"]);
     if (MLError.success != res) {
         diag("ml_send_command(list, add, [Item 1, null, PLAN-TO-READ]) failed.");
         return false;
     }
-    
+
     res = ml_send_command(list, MLCommand.update, ["1", "status::READING"]);
     if (MLError.success != res) {
         diag("Failed to send UPDATE command [1, status::READING].");
         return false;
     }
-    
+
     MediaListItem item;
     res = ml_fetch_item(list, 1, &item);
     if (MLError.success != res) {
         diag("Failed to fetch item 1 from list.");
         return false;
     }
-    
+
     if ("READING" != item.status) {
         diag("Failed to update status from 'PLAN-TO-READ' to 'READING'.");
         return false;
@@ -1482,39 +1482,39 @@ private bool unittest_updateItemProgress()
 {
     enum listName = __FUNCTION__;
     enum fileName = listName ~ ".tsv";
-    
+
     MediaList* list = ml_open_list(fileName);
     if (list is null) {
         diag("ml_open_list returned null.");
         return false;
     }
-    
+
     scope(exit) {
         ml_send_command(list, MLCommand.delete_, []);
         ml_free_list(list);
     }
-    
+
     MLError res;
-    
+
     res = ml_send_command(list, MLCommand.add, ["Item 1"]);
     if (MLError.success != res) {
         diag("ml_send_command(list, add, [Item 1]) failed.");
         return false;
     }
-    
+
     res = ml_send_command(list, MLCommand.update, ["1", "progress::10/10"]);
     if (MLError.success != res) {
         diag("Failed to send UPDATE command [1, progress::10/10].");
         return false;
     }
-    
+
     MediaListItem item;
     res = ml_fetch_item(list, 1, &item);
     if (MLError.success != res) {
         diag("Failed to fetch item 1 from list.");
         return false;
     }
-    
+
     if ("10/10" != item.progress) {
         diag("Failed to update progress from '-/-' to '10/10'.");
         return false;
@@ -1527,26 +1527,26 @@ private bool unittest_updateItemAll()
 {
     enum listName = __FUNCTION__;
     enum fileName = listName ~ ".tsv";
-    
+
     MediaList* list = ml_open_list(fileName);
     if (list is null) {
         diag("ml_open_list returned null.");
         return false;
     }
-    
+
     scope(exit) {
         ml_send_command(list, MLCommand.delete_, []);
         ml_free_list(list);
     }
-    
+
     MLError res;
-    
+
     res = ml_send_command(list, MLCommand.add, ["Ietm 1"]);
     if (MLError.success != res) {
         diag("ml_send_command(list, add, [Ietm 1]) failed.");
         return false;
     }
-    
+
     res = ml_send_command(list, MLCommand.update,
         ["1",
         "start_date::2021-02-16",
@@ -1559,24 +1559,24 @@ private bool unittest_updateItemAll()
         diag("Failed to send UPDATE command.");
         return false;
     }
-    
+
     MediaListItem item;
     res = ml_fetch_item(list, 1, &item);
     if (MLError.success != res) {
         diag("Failed to fetch item 1 from list.");
         return false;
     }
-    
+
     if ("MediaList" != item.title) {
         diag("Failed to update item title from 'Ietm 1' to 'MediaList'.");
         return false;
     }
-    
+
     if ("60/100" != item.progress) {
         diag("Failed to update progress from '-/-' to '60/100'.");
         return false;
     }
-    
+
     if ("READING" != item.status) {
         diag("Failed to update status from 'UNKNOWN' to 'READING'.");
         return false;
@@ -1586,12 +1586,12 @@ private bool unittest_updateItemAll()
         diag("Failed to update start_date from '' to '2021-02-16'.");
         return false;
     }
-    
+
     if ("2022-01-20" != item.endDate) {
         diag("Failed to update end_date from '' to '2022-01-20'.");
         return false;
     }
-    
+
     Date date = cast(Date)Clock.currTime;
     string currentDate = format!"%d-%02d-%02d"(date.year, date.month, date.day);
     if (currentDate != item.lastUpdated) {