Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

fix: cannot upload file to onedrive because file info not match (fix #1215)

Browse source 
Path in onedrive is not case-sensitive while Cloudreve cares, thus file size is not matching when finishing upload.
This commit is contained in:
HFO4 2022-04-21 13:58:54 +08:00
parent 71df067a76
commit 2ab2662fcd
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 335880b776326f9f0fcf1c4b3d99d4cfb82303b3 Subproject commit f2e11958738434c5a14547f21b6e78d7f3aec6fe

6
pkg/filesystem/manage.go
View file

@ -379,10 +379,14 @@ func (fs *FileSystem) listObjects(ctx context.Context, parent string, files []mo
// CreateDirectory 根据给定的完整创建目录，支持递归创建。如果目录已存在，则直接 // CreateDirectory 根据给定的完整创建目录，支持递归创建。如果目录已存在，则直接
// 返回已存在的目录。 // 返回已存在的目录。
func (fs *FileSystem) CreateDirectory(ctx context.Context, fullPath string) (*model.Folder, error) { func (fs *FileSystem) CreateDirectory(ctx context.Context, fullPath string) (*model.Folder, error) {
if fullPath == "/" || fullPath == "." || fullPath == "" { if fullPath == "." || fullPath == "" {
return nil, ErrRootProtected return nil, ErrRootProtected
} }
if fullPath == "/" {
return fs.User.Root()
}
// 获取要创建目录的父路径和目录名 // 获取要创建目录的父路径和目录名
fullPath = path.Clean(fullPath) fullPath = path.Clean(fullPath)
base := path.Dir(fullPath) base := path.Dir(fullPath)

2
service/callback/upload.go
View file

@ -179,7 +179,7 @@ func (service *OneDriveCallback) PreProcess(c *gin.Context) serializer.Response
isSizeCheckFailed = false isSizeCheckFailed = false
} }
if isSizeCheckFailed || info.GetSourcePath() != actualPath { if isSizeCheckFailed || !strings.EqualFold(info.GetSourcePath(), actualPath) {
fs.Handler.(onedrive.Driver).Client.Delete(context.Background(), []string{info.GetSourcePath()}) fs.Handler.(onedrive.Driver).Client.Delete(context.Background(), []string{info.GetSourcePath()})
return serializer.Err(serializer.CodeUploadFailed, "文件信息不一致", err) return serializer.Err(serializer.CodeUploadFailed, "文件信息不一致", err)
} }