bump to beta 0.4.3

manifest-beta.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remotely-save",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
     "dev2": "node esbuild.config.mjs --watch",

src/main.ts

@@ -304,7 +304,8 @@ export default class RemotelySavePlugin extends Plugin {
         this.app.vault.configDir,
         this.settings.syncUnderscoreItems ?? false,
         this.settings.ignorePaths ?? [],
-        this.settings.password
+        this.settings.password,
+        this.settings.serviceType
       );
       mixedEntityMappings = await getSyncPlanInplace(
         mixedEntityMappings,

src/remoteForS3.ts

@@ -257,7 +257,7 @@ const fromS3HeadObjectToEntity = (
   const mtimeSvr = Math.floor(x.LastModified!.valueOf() / 1000.0) * 1000;
   let mtimeCli = mtimeSvr;
   if (x.Metadata !== undefined) {
-    const m2 = Math.round(
+    const m2 = Math.floor(
       parseFloat(x.Metadata.mtime || x.Metadata.MTime || "0")
     );
     if (m2 !== 0) {
@@ -539,12 +539,12 @@ const listFromRemoteRaw = async (
           if (rspHead.Metadata === undefined) {
             // pass
           } else {
-            mtimeRecords[content.Key!] = Math.round(
+            mtimeRecords[content.Key!] = Math.floor(
               parseFloat(
                 rspHead.Metadata.mtime || rspHead.Metadata.MTime || "0"
               )
             );
-            ctimeRecords[content.Key!] = Math.round(
+            ctimeRecords[content.Key!] = Math.floor(
               parseFloat(
                 rspHead.Metadata.ctime || rspHead.Metadata.CTime || "0"
               )

src/sync.ts

@@ -5,6 +5,7 @@ import type {
   EmptyFolderCleanType,
   Entity,
   MixedEntity,
+  SUPPORTED_SERVICES_TYPE,
   SyncDirectionType,
 } from "./baseTypes";
 import { isInsideObsFolder } from "./obsFolderLister";
@@ -186,12 +187,19 @@ const isSkipItemByName = (
   );
 };
 
-const copyEntityAndFixTimeFormat = (src: Entity) => {
+const copyEntityAndFixTimeFormat = (
+  src: Entity,
+  serviceType: SUPPORTED_SERVICES_TYPE
+) => {
   const result = Object.assign({}, src);
   if (result.mtimeCli !== undefined) {
     if (result.mtimeCli === 0) {
       result.mtimeCli = undefined;
     } else {
+      if (serviceType === "s3") {
+        // round to second instead of millisecond
+        result.mtimeCli = Math.floor(result.mtimeCli / 1000.0) * 1000;
+      }
       result.mtimeCliFmt = unixTimeToStr(result.mtimeCli);
     }
   }
@@ -199,6 +207,10 @@ const copyEntityAndFixTimeFormat = (src: Entity) => {
     if (result.mtimeSvr === 0) {
       result.mtimeSvr = undefined;
     } else {
+      if (serviceType === "s3") {
+        // round to second instead of millisecond
+        result.mtimeSvr = Math.floor(result.mtimeSvr / 1000.0) * 1000;
+      }
       result.mtimeSvrFmt = unixTimeToStr(result.mtimeSvr);
     }
   }
@@ -206,6 +218,10 @@ const copyEntityAndFixTimeFormat = (src: Entity) => {
     if (result.prevSyncTime === 0) {
       result.prevSyncTime = undefined;
     } else {
+      if (serviceType === "s3") {
+        // round to second instead of millisecond
+        result.prevSyncTime = Math.floor(result.prevSyncTime / 1000.0) * 1000;
+      }
       result.prevSyncTimeFmt = unixTimeToStr(result.prevSyncTime);
     }
   }
@@ -361,7 +377,8 @@ export const ensembleMixedEnties = async (
   configDir: string,
   syncUnderscoreItems: boolean,
   ignorePaths: string[],
-  password: string
+  password: string,
+  serviceType: SUPPORTED_SERVICES_TYPE
 ): Promise<SyncPlanType> => {
   const finalMappings: SyncPlanType = {};
 
@@ -369,7 +386,7 @@ export const ensembleMixedEnties = async (
   for (const remote of remoteEntityList) {
     const remoteCopied = ensureMTimeOfRemoteEntityValid(
       await decryptRemoteEntityInplace(
-        copyEntityAndFixTimeFormat(remote),
+        copyEntityAndFixTimeFormat(remote, serviceType),
         password
       )
     );
@@ -418,14 +435,14 @@ export const ensembleMixedEnties = async (
 
       if (finalMappings.hasOwnProperty(key)) {
         const prevSyncCopied = await encryptLocalEntityInplace(
-          copyEntityAndFixTimeFormat(prevSync),
+          copyEntityAndFixTimeFormat(prevSync, serviceType),
           password,
           finalMappings[key].remote?.keyEnc
         );
         finalMappings[key].prevSync = prevSyncCopied;
       } else {
         const prevSyncCopied = await encryptLocalEntityInplace(
-          copyEntityAndFixTimeFormat(prevSync),
+          copyEntityAndFixTimeFormat(prevSync, serviceType),
           password,
           undefined
         );
@@ -456,14 +473,14 @@ export const ensembleMixedEnties = async (
 
     if (finalMappings.hasOwnProperty(key)) {
       const localCopied = await encryptLocalEntityInplace(
-        copyEntityAndFixTimeFormat(local),
+        copyEntityAndFixTimeFormat(local, serviceType),
         password,
         finalMappings[key].remote?.keyEnc
       );
       finalMappings[key].local = localCopied;
     } else {
       const localCopied = await encryptLocalEntityInplace(
-        copyEntityAndFixTimeFormat(local),
+        copyEntityAndFixTimeFormat(local, serviceType),
         password,
         undefined
       );