Commit: 661580821ec177b0aecf3ea679e15ba54952f689 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Révision: 661580821ec177b0aecf3ea679e15ba54952f689 (tree)
• l'heure: 2022-01-25 10:24:14
• Auteur: mio <stigma@disr...>
• Commiter: mio

Message de Log

add MLError.fileReadError and replace throwing exceptions.

FossilOrigin-Name: a1972972f4e100c9f0f54762592ae77234c2478a86ad8dfe855d05b4005f073f

Change Summary

• modified: medialist.d

Modification

--- a/medialist.d
+++ b/medialist.d
@@ -90,6 +90,7 @@ enum MLError
     invalidArgs,
     fileDoesNotExist,
     fileAlreadyOpen,
+    fileReadError,
     itemNotFound,
 }
 
@@ -131,10 +132,14 @@ void ml_free_list(MediaList* list)
     GC.free(list);
 }
 
-MediaListHeader[] ml_fetch_headers(MediaList* list)
+MediaListHeader[] ml_fetch_headers(MediaList* list, MLError* err = null)
 {
-    if (true == list.isOpen)
-        throw new Exception("List '" ~ list.listName ~ "' is already open for modification");
+    if (true == list.isOpen) {
+        if (null !is err)
+            *err = MLError.fileAlreadyOpen;
+
+        return null;
+    }
 
     File listFile = File(list.filePath);
 
@@ -174,8 +179,12 @@ MediaListHeader[] ml_fetch_headers(MediaList* list)
         configurations[sections[0]] = sections[1];
     }
 
-    if (line is null)
-        throw new Exception("No header line found");
+    if (line is null) {
+        if (null !is err)
+            *err = MLError.fileReadError;
+
+        return null;
+    }
 
     string[] sections = line.strip().split("\t");
     foreach(size_t idx, ref string section; sections) {