Skip to content

Commit

Permalink
🔥 Revert #4
Browse files Browse the repository at this point in the history
  • Loading branch information
88250 committed Aug 9, 2024
1 parent 4d152d9 commit f563b9b
Showing 1 changed file with 0 additions and 28 deletions.
28 changes: 0 additions & 28 deletions sync_lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,34 +166,6 @@ func (repo *Repo) lockCloud0(currentDeviceID string) (err error) {
err = ErrLockCloudFailed
return
}

// 确认是否锁成功
data, err = repo.cloud.DownloadObject(lockSyncKey)
if nil != err {
// 如果锁文件已经被删除了,说明其他设备已经拿到锁后释放锁了,此时可以留待下一次尝试
if errors.Is(err, cloud.ErrCloudObjectNotFound) {
return ErrCloudLocked
}

logging.LogErrorf("get lock sync failed: %s", err)
return err
}

content = map[string]interface{}{}
err = gulu.JSON.UnmarshalJSON(data, &content)
if nil != err {
// 解码失败可能是用户手动修改了该文件,需要删除后重新锁定
logging.LogErrorf("unmarshal lock sync failed: %s", err)
if removeErr := repo.cloud.RemoveObject(lockSyncKey); nil != removeErr {
logging.LogErrorf("remove unmarshalled lock sync failed: %s", removeErr)
}
return ErrCloudLocked
}

deviceID := content["deviceID"].(string)
if deviceID != currentDeviceID {
return ErrCloudLocked
}
return
}

Expand Down

0 comments on commit f563b9b

Please sign in to comment.