From b39544b43b36ad3d53d723f50f1daa1572b342ee Mon Sep 17 00:00:00 2001
From: fyears <1142836+fyears@users.noreply.github.com>
Date: Tue, 5 Apr 2022 13:26:46 +0800
Subject: [PATCH] add human readable time

---
 src/baseTypes.ts |  5 +++++
 src/localdb.ts   |  1 +
 src/misc.ts      | 16 ++++++++++++++++
 src/sync.ts      | 32 +++++++++++++++++++++++++++-----
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/baseTypes.ts b/src/baseTypes.ts
index 5f10059..1d2e9a2 100644
--- a/src/baseTypes.ts
+++ b/src/baseTypes.ts
@@ -145,6 +145,11 @@ export interface FileOrFolderMixedState {
   decisionBranch?: number;
   syncDone?: "done";
   remoteEncryptedKey?: string;
+
+  mtimeLocalFmt?: string;
+  mtimeRemoteFmt?: string;
+  deltimeLocalFmt?: string;
+  deltimeRemoteFmt?: string;
 }
 
 export const API_VER_STAT_FOLDER = "0.13.27";
diff --git a/src/localdb.ts b/src/localdb.ts
index 315d266..fe75bb6 100644
--- a/src/localdb.ts
+++ b/src/localdb.ts
@@ -516,6 +516,7 @@ export const insertSyncPlanRecordByVault = async (
 ) => {
   const record = {
     ts: syncPlan.ts,
+    tsFmt: syncPlan.tsFmt,
     vaultRandomID: vaultRandomID,
     remoteType: syncPlan.remoteType,
     syncPlan: JSON.stringify(syncPlan /* directly stringify */, null, 2),
diff --git a/src/misc.ts b/src/misc.ts
index 460ea17..61839b8 100644
--- a/src/misc.ts
+++ b/src/misc.ts
@@ -7,6 +7,12 @@ import XRegExp from "xregexp";
 import * as origLog from "loglevel";
 const log = origLog.getLogger("rs-default");
 
+declare global {
+  interface Window {
+    moment: (...data: any) => any;
+  }
+}
+
 /**
  * If any part of the file starts with '.' or '_' then it's a hidden file.
  * @param item
@@ -303,3 +309,13 @@ export const atWhichLevel = (x: string) => {
 export const checkHasSpecialCharForDir = (x: string) => {
   return /[?/\\]/.test(x);
 };
+
+export const unixTimeToStr = (x: number | undefined | null) => {
+  if (x === undefined) {
+    return undefined;
+  }
+  if (x === null) {
+    return null;
+  }
+  return window.moment(x).format() as string;
+};
diff --git a/src/sync.ts b/src/sync.ts
index ec424c0..56c564d 100644
--- a/src/sync.ts
+++ b/src/sync.ts
@@ -33,6 +33,7 @@ import {
   getFolderLevels,
   getParentFolder,
   atWhichLevel,
+  unixTimeToStr,
 } from "./misc";
 import { RemoteClient } from "./remote";
 import {
@@ -63,6 +64,7 @@ export type SyncStatusType =
 
 export interface SyncPlanType {
   ts: number;
+  tsFmt?: string;
   remoteType: SUPPORTED_SERVICES_TYPE;
   mixedStates: Record<string, FileOrFolderMixedState>;
 }
@@ -212,10 +214,12 @@ export const parseRemoteItems = async (
     let r = {} as FileOrFolderMixedState;
     if (backwardMapping !== undefined) {
       key = backwardMapping.localKey;
+      const mtimeRemote = backwardMapping.localMtime || entry.lastModified;
       r = {
         key: key,
         existRemote: true,
-        mtimeRemote: backwardMapping.localMtime || entry.lastModified,
+        mtimeRemote: mtimeRemote,
+        mtimeRemoteFmt: unixTimeToStr(mtimeRemote),
         sizeRemote: backwardMapping.localSize || entry.size,
         remoteEncryptedKey: remoteEncryptedKey,
         changeRemoteMtimeUsingMapping: true,
@@ -225,6 +229,7 @@ export const parseRemoteItems = async (
         key: key,
         existRemote: true,
         mtimeRemote: entry.lastModified,
+        mtimeRemoteFmt: unixTimeToStr(entry.lastModified),
         sizeRemote: entry.size,
         remoteEncryptedKey: remoteEncryptedKey,
         changeRemoteMtimeUsingMapping: false,
@@ -320,10 +325,12 @@ const ensembleMixedStates = async (
       // ignore
       continue;
     } else if (entry instanceof TFile) {
+      const mtimeLocal = Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0);
       r = {
         key: entry.path,
         existLocal: true,
-        mtimeLocal: Math.max(entry.stat.mtime || 0, entry.stat.ctime || 0),
+        mtimeLocal: mtimeLocal,
+        mtimeLocalFmt: unixTimeToStr(mtimeLocal),
         sizeLocal: entry.stat.size,
       };
     } else if (entry instanceof TFolder) {
@@ -332,6 +339,7 @@ const ensembleMixedStates = async (
         key: key,
         existLocal: true,
         mtimeLocal: undefined,
+        mtimeLocalFmt: undefined,
         sizeLocal: 0,
       };
     } else {
@@ -346,6 +354,7 @@ const ensembleMixedStates = async (
       results[key].key = r.key;
       results[key].existLocal = r.existLocal;
       results[key].mtimeLocal = r.mtimeLocal;
+      results[key].mtimeLocalFmt = r.mtimeLocalFmt;
       results[key].sizeLocal = r.sizeLocal;
     } else {
       results[key] = r;
@@ -356,10 +365,12 @@ const ensembleMixedStates = async (
   if (syncConfigDir && localConfigDirContents !== undefined) {
     for (const entry of localConfigDirContents) {
       const key = entry.key;
+      const mtimeLocal = Math.max(entry.mtime, entry.ctime);
       const r: FileOrFolderMixedState = {
         key: key,
         existLocal: true,
-        mtimeLocal: Math.max(entry.mtime, entry.ctime),
+        mtimeLocal: mtimeLocal,
+        mtimeLocalFmt: unixTimeToStr(mtimeLocal),
         sizeLocal: entry.size,
       };
 
@@ -367,6 +378,7 @@ const ensembleMixedStates = async (
         results[key].key = r.key;
         results[key].existLocal = r.existLocal;
         results[key].mtimeLocal = r.mtimeLocal;
+        results[key].mtimeLocalFmt = r.mtimeLocalFmt;
         results[key].sizeLocal = r.sizeLocal;
       } else {
         results[key] = r;
@@ -380,6 +392,7 @@ const ensembleMixedStates = async (
     const r = {
       key: key,
       deltimeRemote: entry.actionWhen,
+      deltimeRemoteFmt: unixTimeToStr(entry.actionWhen),
     } as FileOrFolderMixedState;
 
     if (isSkipItem(key, syncConfigDir, syncUnderscoreItems, configDir)) {
@@ -389,6 +402,7 @@ const ensembleMixedStates = async (
     if (results.hasOwnProperty(key)) {
       results[key].key = r.key;
       results[key].deltimeRemote = r.deltimeRemote;
+      results[key].deltimeRemoteFmt = r.deltimeRemoteFmt;
     } else {
       results[key] = r;
 
@@ -417,10 +431,12 @@ const ensembleMixedStates = async (
       const r = {
         key: key,
         deltimeLocal: entry.actionWhen,
+        deltimeLocalFmt: unixTimeToStr(entry.actionWhen),
       } as FileOrFolderMixedState;
 
       if (results.hasOwnProperty(key)) {
         results[key].deltimeLocal = r.deltimeLocal;
+        results[key].deltimeLocalFmt = r.deltimeLocalFmt;
       } else {
         results[key] = r;
         results[key].existLocal = false; // we have already checked local
@@ -430,13 +446,16 @@ const ensembleMixedStates = async (
       const r = {
         key: key,
         mtimeLocal: entry.actionWhen,
+        mtimeLocalFmt: unixTimeToStr(entry.actionWhen),
         changeLocalMtimeUsingMapping: true,
       };
       if (results.hasOwnProperty(key)) {
-        results[key].mtimeLocal = Math.max(
+        const mtimeLocal = Math.max(
           r.mtimeLocal || 0,
           results[key].mtimeLocal || 0
         );
+        results[key].mtimeLocal = mtimeLocal;
+        results[key].mtimeLocalFmt = unixTimeToStr(mtimeLocal);
         results[key].changeLocalMtimeUsingMapping =
           r.changeLocalMtimeUsingMapping;
       } else {
@@ -793,8 +812,11 @@ export const getSyncPlan = async (
     }
   }
 
+  const currTs = Date.now();
+  const currTsFmt = unixTimeToStr(currTs);
   const plan = {
-    ts: Date.now(),
+    ts: currTs,
+    tsFmt: currTsFmt,
     remoteType: remoteType,
     mixedStates: mixedStates,
   } as SyncPlanType;