ExifDateTime handles date formats without milliseconds or seconds now.

photostructure · Feb 5, 2023 · fe935ad · fe935ad
1 parent a7a15cd
commit fe935ad
Show file tree

Hide file tree

Showing 6 changed files with 319 additions and 331 deletions.
diff --git a/src/DateTime.ts b/src/DateTime.ts
@@ -19,18 +19,25 @@ export function isDateOrTime(o: any): o is DateOrTime {
     o instanceof ExifDateTime ||
     o instanceof ExifDate ||
     o instanceof ExifTime ||
-    o instanceof DateTime
+    DateTime.isDateTime(o)
   )
 }
 
-export function dateTimeToExif(d: DateTime): string {
-  return d.toFormat("y:MM:dd HH:mm:ss.u")
+export function dateTimeToExif(
+  d: DateTime,
+  opts?: { includeOffset?: boolean; includeMilliseconds?: boolean }
+): string {
+  return d.toFormat(
+    "y:MM:dd HH:mm:ss" +
+      (opts?.includeMilliseconds === true ? ".u" : "") +
+      (opts?.includeOffset === false ? "" : "ZZ")
+  )
 }
 
 export function toExifString(d: DateOrTime): Maybe<string> {
-  if (d instanceof DateTime) {
+  if (DateTime.isDateTime(d)) {
     return dateTimeToExif(d)
   } else {
-    return d.toExifString()
+    return d?.toExifString?.()
   }
 }