Modified datetime parse

sapporo-wes · Sep 17, 2022 · 95de1ae · 95de1ae
1 parent 32890d4
commit 95de1ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/crate.ts b/src/crate.ts
@@ -147,7 +147,7 @@ export class Crate {
       }`;
       let startTime: Date;
       try {
-        startTime = datetime.parse(startTimeStr, "yyyy-MM-dd'T'HH:mm:ss");
+        startTime = utils.parseDatetime(startTimeStr);
       } catch (_) {
         throw new Error(`Invalid start time ${startTimeStr}`);
       }
@@ -158,7 +158,7 @@ export class Crate {
       }`;
       let endTime: Date;
       try {
-        endTime = datetime.parse(endTimeStr, "yyyy-MM-dd'T'HH:mm:ss");
+        endTime = utils.parseDatetime(endTimeStr);
       } catch (_) {
         throw new Error(`Invalid end time ${endTimeStr}`);
       }
@@ -328,10 +328,7 @@ export class Entity {
     if (dateModified == undefined) {
       throw new Error(`Entity ${this.id} has no dateModified`);
     }
-    const dateModifiedDate = datetime.parse(
-      dateModified,
-      "yyyy-MM-dd'T'HH:mm:ss.SSSSSS",
-    );
+    const dateModifiedDate = utils.parseDatetime(dateModified);
     const duration = datetime.difference(
       this.crate.summary.startTime,
       dateModifiedDate,

diff --git a/src/utils.ts b/src/utils.ts
@@ -110,3 +110,11 @@ export function warningColor(pair: string[]): string[] {
     ? [color.yellow(pair[0]), color.yellow(pair[1])]
     : pair;
 }
+
+export function parseDatetime(datetimeStr: string): Date {
+  const datetime = new Date(datetimeStr);
+  if (isNaN(datetime.getTime())) {
+    throw new Error(`Invalid datetime: ${datetimeStr}`);
+  }
+  return datetime;
+}