Commit: f2f1d3a17c9e31ff289e47ae3516b5057f9107ac - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: f2f1d3a17c9e31ff289e47ae3516b5057f9107ac (tree)
• l'heure: 2022-01-25 10:19:23
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

change error handling for ml_fetch_* functions.

FossilOrigin-Name: f02e7ff73665b75e1a87f98c34b9c1c8a0a4eee3452e996afca4b684c385645e

Change Summary

• modified: medialist.d

Modification

--- a/medialist.d
+++ b/medialist.d
@@ -43,6 +43,7 @@ struct MediaListItem
     string startDate;
     string endDate;
     string lastUpdated;
+    bool valid = false;
 }
 
 struct MediaListHeader
@@ -187,10 +188,16 @@ MediaListHeader[] ml_fetch_headers(MediaList* list)
     return headers;
 }
 
-MLError ml_fetch_item(MediaList* list, size_t id, MediaListItem* item)
+MediaListItem ml_fetch_item(MediaList* list, size_t id, MLError* err = null)
 {
-    if (true == list.isOpen)
-        return MLError.fileAlreadyOpen;
+    MediaListItem newItem;
+
+    if (true == list.isOpen) {
+        if (null !is err)
+            *err = MLError.fileAlreadyOpen;
+        
+        return newItem;
+    }
 
     list.isOpen = true;
 
@@ -214,8 +221,12 @@ MLError ml_fetch_item(MediaList* list, size_t id, MediaListItem* item)
         currentLine += 1;
     }
 
-    if (false == found)
-        return MLError.itemNotFound;
+    if (false == found) {
+        if (null !is err)
+            *err = MLError.itemNotFound;
+
+        return newItem;
+    }
 
     int[2][6] headerPositions = _ml_get_header_positions(list);
 
@@ -252,21 +263,27 @@ MLError ml_fetch_item(MediaList* list, size_t id, MediaListItem* item)
         }
     }
 
-    MediaListItem newItem = MediaListItem(sections[titleIndex],
-        sections[progressIndex], sections[statusIndex], sections[startIndex],
-        sections[endIndex], sections[lastIndex]);
-
-    *item = newItem;
+    newItem.title = sections[titleIndex];
+    newItem.progress = sections[progressIndex];
+    newItem.status = sections[statusIndex];
+    newItem.startDate = sections[startIndex];
+    newItem.endDate = sections[endIndex];
+    newItem.lastUpdated = sections[lastIndex];
+    newItem.valid = true;
 
     list.isOpen = false;
 
-    return MLError.success;
+    return newItem;
 }
 
-MediaListItem[] ml_fetch_items(MediaList* list, size_t[] ids ...)
+MediaListItem[] ml_fetch_items(MediaList* list, MLError* err, size_t[] ids ...)
 {
-    if (list.isOpen)
+    if (list.isOpen) {
+        if (null !is err)
+            *err = MLError.fileAlreadyOpen;
+
         return null;
+    }
 
     File listFile = File(list.filePath);
     list.isOpen = true;
@@ -325,7 +342,7 @@ MediaListItem[] ml_fetch_items(MediaList* list, size_t[] ids ...)
             string[] sections = line.strip().split("\t");
             items ~= MediaListItem(sections[titleIndex],
                 sections[progressIndex], sections[statusIndex], sections[startIndex],
-                sections[endIndex], sections[lastIndex]);
+                sections[endIndex], sections[lastIndex], true);
         }
 
         currentID += 1;
@@ -334,10 +351,14 @@ MediaListItem[] ml_fetch_items(MediaList* list, size_t[] ids ...)
     return items;
 }
 
-MediaListItem[] ml_fetch_all(MediaList* list)
+MediaListItem[] ml_fetch_all(MediaList* list, MLError* err = null)
 {
-    if (list.isOpen)
+    if (list.isOpen) {
+        if (null !is err)
+            *err = MLError.fileAlreadyOpen;
+
         return null;
+    }
 
     File listFile = File(list.filePath);
     list.isOpen = true;
@@ -395,7 +416,7 @@ MediaListItem[] ml_fetch_all(MediaList* list)
 
         items ~= MediaListItem(sections[titleIndex],
             sections[progressIndex], sections[statusIndex], sections[startIndex],
-            sections[endIndex], sections[lastIndex]);
+            sections[endIndex], sections[lastIndex], true);
     }
 
     list.isOpen = false;