🎨 数据同步支持接入第三方对象存储服务 siyuan-note/siyuan#6426

siyuan-note · Nov 9, 2022 · ea95e77 · ea95e77
1 parent bdce221
commit ea95e77
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 290 deletions.
diff --git a/cloud/cloud.go b/cloud/cloud.go
@@ -246,15 +246,8 @@ func init() {
 	}
 }
 
-// Index 描述了索引信息，主要用于内部处理。
-type Index struct {
-	Hash    string `json:"hash"`
-	Size    int64  `json:"size"`
-	Updated int64  `json:"updated"` // Unix timestamp 秒
-}
-
-// ObjectInfo 描述了对象信息，主要用于内部处理。
-type ObjectInfo struct {
+// objectInfo 描述了对象信息，用于内部处理。
+type objectInfo struct {
 	Key     string `json:"key"`
 	Size    int64  `json:"size"`
 	Updated string `json:"updated"`

diff --git a/cloud/oss.go b/cloud/oss.go
@@ -343,7 +343,7 @@ func (oss *OSS) listRepoRefs(userId, repo, refPrefix string) (ret []*Ref, err er
 			})
 		}
 
-		if listObjectResult.IsTruncated {
+		if !listObjectResult.IsTruncated {
 			break
 		}
 	}
@@ -405,7 +405,7 @@ func (oss *OSS) repoLatest(repoDir string) (id string, err error) {
 	return
 }
 
-func (oss *OSS) statFile(key string) (info *ObjectInfo, err error) {
+func (oss *OSS) statFile(key string) (info *objectInfo, err error) {
 	accessKey := oss.Conf.AccessKey
 	secretKey := oss.Conf.SecretKey
 	endpoint := oss.Conf.Endpoint
@@ -430,7 +430,7 @@ func (oss *OSS) statFile(key string) (info *ObjectInfo, err error) {
 	updated := t.Format("2006-01-02 15:04:05")
 	contentLen := header.Get("Content-Length")
 	size, _ := strconv.ParseInt(contentLen, 10, 64)
-	info = &ObjectInfo{
+	info = &objectInfo{
 		Key:     key,
 		Updated: updated,
 		Size:    size,