Commit: 85e9274d4ae6cd7d5a839cf647cdf96860777643 - medialist-cli (git)

CLI interface to medialist (fossil mirror)

Commit MetaInfo

• Revision: 85e9274d4ae6cd7d5a839cf647cdf96860777643 (tree)
• Zeit: 2021-09-21 19:28:36
• Autor: mio <stigma@disr...>
• Commiter: mio

Log Message

Simplify date formats in add.d and update.d

FossilOrigin-Name: 75e01670133063769c149d4be4c1e79374bc8d46c528e3619acf04fff67266f9

Ändern Zusammenfassung

• modified: add.d
• modified: update.d

Diff

--- a/add.d
+++ b/add.d
@@ -40,7 +40,6 @@ private enum NUMBER_OF_HEADERS = 6;
   import std.file : exists, isFile;
   import std.path : buildPath;
   import std.stdio : File, stderr, writefln;
-  import std.datetime.systime : Clock;
   import std.string : strip, split, toLower;
   import std.typecons : tuple, Tuple;
 
@@ -167,13 +166,14 @@ private enum NUMBER_OF_HEADERS = 6;
   }
 
   import std.array : replicate;
-  import std.format : format;
+  import std.datetime.date : Date;
+  import std.datetime.systime : Clock;
 
   size_t previous_indent = 0;
 
-  immutable currentTime = Clock.currTime();
-  immutable currentTimeString = format("%d-%d-%d", currentTime.year,
-                                       currentTime.month, currentTime.day);
+  immutable currentDT = Clock.currTime();
+  immutable currentDateString = Date(currentDT.year, currentDT.month,
+                                     currentDT.day).toISOExtString();
 
   foreach (header_pair; header_positions)
   {
@@ -197,14 +197,14 @@ private enum NUMBER_OF_HEADERS = 6;
       break;
     case "start_date":
       if (status.toLower == "watching" || status.toLower == "reading")
-        f.write(currentTimeString);
+        f.write(currentDateString);
       break;
     case "end_date":
       if (status.toLower == "complete")
-        f.write(currentTimeString);
+        f.write(currentDateString);
       break;
     case "last_updated":
-      f.write(currentTimeString);
+      f.write(currentDateString);
       break;
     default:
       // should be impossible, unless D changes the default for string.

--- a/update.d
+++ b/update.d
@@ -36,6 +36,8 @@ import std.typecons : Tuple;
 handle_update(string program_name, string[] args, string data_dir)
 {
   import std.conv : ConvException, parse;
+  import std.datetime.date : Date;
+  import std.datetime.systime : Clock;
   import std.file : exists, isFile, readText;
   import std.format : format;
   import std.path : buildPath;
@@ -47,6 +49,9 @@ handle_update(string program_name, string[] args, string data_dir)
   string title = "";
   string status = "";
   string progress = "";
+  auto currentDateTime = Clock.currTime();
+  Date currentDate = Date(currentDateTime.year, currentDateTime.month,
+                          currentDateTime.day);
 
   if (args[0] == "-h" || args[0] == "--help") {
     display_usage(program_name);
@@ -139,12 +144,8 @@ handle_update(string program_name, string[] args, string data_dir)
   string oldStatus = "";
 
   import std.array : replicate;
-  import std.datetime.systime : Clock;
-  import std.format : format;
-
-  immutable currentTime = Clock.currTime();
-  immutable currentTimeString = format("%d-%d-%d", currentTime.year,
-                                       currentTime.month, currentTime.day);
+  
+  string currentDateString = currentDate.toISOExtString();
 
   foreach (sectionIndent, section; sections)
   {
@@ -171,13 +172,13 @@ handle_update(string program_name, string[] args, string data_dir)
           updatedLine ~= progress;
           break;
         case MLHeaders.lastUpdated:
-          updatedLine ~= currentTimeString;
+          updatedLine ~= currentDateString;
           break;
         case MLHeaders.startDate:
           if ((oldStatus == "plan-to-read" || oldStatus == "plan-to-watch")
                && (status.toLower == "reading" || status.toLower == "watching"))
           {
-            updatedLine ~= currentTimeString;
+            updatedLine ~= currentDateString;
           }
           else
           {
@@ -189,7 +190,7 @@ handle_update(string program_name, string[] args, string data_dir)
           if ((oldStatus == "reading" || oldStatus == "watching")
                && (status.toLower == "complete"))
           {
-            updatedLine ~= currentTimeString;
+            updatedLine ~= currentDateString;
           }
           else
           {