提交: bc4b0d898957d1591387d00c295d52a91e9d40e3 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• 修訂: bc4b0d898957d1591387d00c295d52a91e9d40e3 (tree)
• 時間: 2023-03-11 19:04:34
• 作者: mio <stigma@disr...>
• Commiter: mio

Log Message

change _ml_get_header_positions return type to size_t[2][6] to address deprecation

FossilOrigin-Name: bec009a226c8297fc7ffb05cb0f149d26fd34953f3ee4961658ba25248fc32b0

Change Summary

• modified: medialist.d

差異

--- a/medialist.d
+++ b/medialist.d
@@ -797,7 +797,7 @@ MediaListItem ml_fetch_item(MediaList* list, size_t id)
     if (false == found)
         throw new MLException(MLError.itemNotFound);
 
-    int[2][6] headerPositions = _ml_get_header_positions(list);
+    size_t[2][6] headerPositions = _ml_get_header_positions(list);
 
     string[] sections = line.strip().split("\t");
     size_t titleIndex = 0;
@@ -807,7 +807,7 @@ MediaListItem ml_fetch_item(MediaList* list, size_t id)
     size_t endIndex = 0;
     size_t lastIndex = 0;
 
-    foreach(int[2] header; headerPositions) {
+    foreach(const ref header; headerPositions) {
         switch(header[0]) {
         case MLHeaders.title:
             titleIndex = header[1];
@@ -944,7 +944,7 @@ MediaListItem[] ml_fetch_items(MediaList* list, size_t[] ids ...)
     bool pastHeader = false;
     MediaListItem[] items;
 
-    int[2][6] headerPositions = _ml_get_header_positions(list);
+    size_t[2][6] headerPositions = _ml_get_header_positions(list);
     size_t titleIndex = 0;
     size_t progressIndex = 0;
     size_t statusIndex = 0;
@@ -952,7 +952,7 @@ MediaListItem[] ml_fetch_items(MediaList* list, size_t[] ids ...)
     size_t endIndex = 0;
     size_t lastIndex = 0;
 
-    foreach(size_t idx, int[2] header; headerPositions) {
+    foreach(const ref header; headerPositions) {
         switch(header[0]) {
         case MLHeaders.title:
             titleIndex = header[1];
@@ -1017,7 +1017,8 @@ MediaListItem[] ml_fetch_items(MediaList* list, size_t[] ids ...)
 /// See_Also:
 ///  ml_fetch_item, ml_fetch_all
 ///
-MediaListItem[] ml_fetch_items(MediaList* list, out MLError err, size_t[] ids ...) nothrow
+MediaListItem[] ml_fetch_items(MediaList* list, out MLError err,
+			       size_t[] ids ...) nothrow
 {
     import core.stdc.errno : errno, EACCES;
 
@@ -1069,7 +1070,7 @@ MediaListItem[] ml_fetch_all(MediaList* list)
     bool pastHeader = false;
     MediaListItem[] items;
 
-    int[2][6] headerPositions = _ml_get_header_positions(list);
+    size_t[2][6] headerPositions = _ml_get_header_positions(list);
     size_t titleIndex = 0;
     size_t progressIndex = 0;
     size_t statusIndex = 0;
@@ -1077,7 +1078,7 @@ MediaListItem[] ml_fetch_all(MediaList* list)
     size_t endIndex = 0;
     size_t lastIndex = 0;
 
-    foreach (int[2] header; headerPositions)
+    foreach (const ref header; headerPositions)
     {
         switch (header[0])
         {
@@ -1248,7 +1249,7 @@ private MLError _ml_add(MediaList* list, string[] args)
     if (true == list.isOpen)
         return MLError.fileAlreadyOpen;
 
-    int[2][6] headerPositions = _ml_get_header_positions(list);
+    size_t[2][6] headerPositions = _ml_get_header_positions(list);
     int currentIndent = 0;
 
     list.isOpen = true;
@@ -1256,7 +1257,7 @@ private MLError _ml_add(MediaList* list, string[] args)
 
     File listFile = File(list.filePath, "a");
 
-    foreach(const ref int[2] headerPosition; headerPositions) {
+    foreach(const ref headerPosition; headerPositions) {
         while (currentIndent < headerPosition[1]) {
             listFile.write("\t");
             currentIndent += 1;
@@ -1442,7 +1443,7 @@ private MLError _ml_update(MediaList* list, string[] args)
     File tempFile = File(tempFilePath, "w+");
     scope(exit) remove(tempFilePath);
 
-    int[2][6] headerPositions = _ml_get_header_positions(list);
+    size_t[2][6] headerPositions = _ml_get_header_positions(list);
     size_t titleIndex = 0;
     size_t progressIndex = 0;
     size_t statusIndex = 0;
@@ -1450,7 +1451,7 @@ private MLError _ml_update(MediaList* list, string[] args)
     size_t endDateIndex = 0;
     size_t lastUpdatedIndex = 0;
 
-    foreach (ref header; headerPositions) {
+    foreach (const ref header; headerPositions) {
         switch (header[0]) {
             case MLHeaders.title:
                 titleIndex = header[1];
@@ -1582,7 +1583,7 @@ private enum MLHeaders
     lastUpdated = 5
 }
 
-private int[2][6] _ml_get_header_positions(MediaList* list)
+private size_t[2][6] _ml_get_header_positions(MediaList* list)
 {
     list.isOpen = true;
     scope(exit) list.isOpen = false;
@@ -1601,7 +1602,7 @@ private int[2][6] _ml_get_header_positions(MediaList* list)
      * We keep the tab indent so we don't mess up any other programs or custom
      * configurations.
      */
-    int[2][6] headerPositions = -1;
+    size_t[2][6] headerPositions = -1;
     int arrayPosition = 0;
 
     while ((line = f.readln) !is null) {
@@ -1612,7 +1613,7 @@ private int[2][6] _ml_get_header_positions(MediaList* list)
         /* first non-comment/non-configuration line is the header */
         string[] sections = line.strip().split("\t");
 
-        foreach(int idx, ref string section; sections) {
+        foreach(idx, ref string section; sections) {
             switch(section.toLower)
             {
             case "title":