提交: b9ad10af01ca9d1a3590bf0a634fdd5447138c23 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• 修訂: b9ad10af01ca9d1a3590bf0a634fdd5447138c23 (tree)
• 時間: 2023-04-04 15:08:37
• 作者: mio <stigma@disr...>
• Commiter: mio

Log Message

Change ml_open_list (nothrow) to call ml_open_list (throw).
Change mentions of version 0.2.0/0.4.0 to 0.4.0 to match medialist-cli.

FossilOrigin-Name: edaab5e4722276e835dc261bb380bd3ef5032450316cd30ee68b48bcd957675d

Change Summary

• modified: medialist.d

差異

--- a/medialist.d
+++ b/medialist.d
@@ -32,9 +32,9 @@ import std.string;
 /// 
 /// Enumeration string containing the verison of MediaList.
 /// 
-/// Since: 0.2.0
+/// Since: 0.4.0
 /// 
-enum string MediaListVersion = "0.2.0-dev";
+enum string MediaListVersion = "0.4.0-dev";
 
 ///
 /// Enumeration array of int containing the version of MediaList.
@@ -45,9 +45,9 @@ enum string MediaListVersion = "0.2.0-dev";
 /// API.  Patch versions represent compile-time fixes.  Minor versions represent
 /// all other changes.
 ///
-/// Since: 0.2.0
+/// Since: 0.4.0
 ////
-enum int[3] MediaListVersionA = [0, 2, 0];
+enum int[3] MediaListVersionA = [0, 4, 0];
 
 ///
 /// The main structure for interacting with a list in `medialist`.
@@ -380,70 +380,30 @@ MediaList* ml_open_list(string filePath)
 ///
 /// Returns: A GC-allocated MediaList structure.
 ///
-/// Throws:
-///  - ErrnoException if the file could not be opened, there was an
-///    error writing to file, or if there was an error closing the
-///    file.
-///
 MediaList* ml_open_list(string filePath, out MLError error) nothrow
 {
     import std.exception : ErrnoException;
     import core.stdc.errno;
 
-    string listName = stripExtension(baseName(filePath));
-    MediaList* ml = new MediaList(filePath, listName);
+    MediaList* list;
 
-    if (false == exists(filePath))
-    {
-        ml.isOpen = true;
-        scope (exit)
-            ml.isOpen = false;
-
-        try
-        {
-            File f = File(filePath, "w+");
-
-            f.writeln("# This file is in the mTSV format.");
-            f.writeln("# For more information about this format,");
-            f.writeln("# please view the website:");
-            f.writeln("# http://yume-neru.neocities.org/p/mtsv.html");
-            f.writeln("title\tprogress\tstatus\tstart_date\tend_date\tlast_updated");
-        }
-        catch (ErrnoException ee)
-        {
-            static if (__VERSION__ < 2088L)
-            {
-                switch (errno)
-                {
-                case EACCES:
-                    error = MLError.permissionError;
-                    return null;
-                default:
-                    error = MLError.unspecifiedError;
-                    return null;
-                }
-            }
-            else
-            {
-                switch (ee.errno())
-                {
-                case EACCES:
-                    error = MLError.permissionError;
-                    return null;
-                default:
-                    error = MLError.unspecifiedError;
-                    return null;
-                }
-            }
-        }
-        catch (Exception e)
+    try {
+        list = ml_open_list(filePath);
+    } catch (ErrnoException ee) {
+        switch (errno)
         {
+        case EACCES:
+            error = MLError.permissionError;
+            break;
+        default:
             error = MLError.unspecifiedError;
-            return null;
+            break;
         }
+    } catch (Exception e) {
+        error = MLError.unspecifiedError;
     }
 
-    return ml;
+    return list;
 }
 
 ///
@@ -1367,7 +1327,7 @@ private void _ml_delete(MediaList* list, string[] args)
         throw new MLException(MLError.fileAlreadyOpen);
 
     if (0 == args.length) {
-        // NOTE: This will be removed in a version after 0.2.0.
+        // NOTE: This will be removed in a version after 0.4.0.
         remove(list.filePath);
         return;
     }