From 7f5ddc58380f5cc06587746d841a8ab264588ef0 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Mon, 6 Jun 2022 15:06:25 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BA=91=E7=AB=AF?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E5=92=8C=E8=80=97=E6=97=B6=20https://github.com/siyua?=
 =?UTF-8?q?n-note/siyuan/issues/5093?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/osssync.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/kernel/model/osssync.go b/kernel/model/osssync.go
index c83477cb2..8393c5c15 100644
--- a/kernel/model/osssync.go
+++ b/kernel/model/osssync.go
@@ -802,21 +802,22 @@ func localUpsertRemoveListOSS(localDirPath string, cloudFileList map[string]*Clo
 			return nil
 		}
 
-		// TODO: 优化云端同步上传资源占用和耗时 https://github.com/siyuan-note/siyuan/issues/5093
+		if 0 < cloudIdx.Updated {
+			// 优先使用时间戳校验
+			if localModTime := info.ModTime().Unix(); cloudIdx.Updated == localModTime {
+				unchanged[relPath] = true
+				return nil
+			}
+		}
+
 		localHash, hashErr := util.GetEtag(path)
 		if nil != hashErr {
 			err = hashErr
 			return io.EOF
 		}
-
 		if cloudIdx.Hash == localHash {
 			unchanged[relPath] = true
 		}
-
-		//localModTime := info.ModTime().Unix()
-		//if cloudIdx.Updated == localModTime {
-		//	unchanged[relPath] = true
-		//}
 		return nil
 	})