ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(alidriver):fast upload file is not close

Browse Source
This commit is contained in:
foxxorcat 2022-05-10 21:54:44 +08:00
parent 732e9eb1c3
commit 67674835da
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/alidrive/driver.go
View File

@ -424,10 +424,17 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
} }
if account.Bool1 { if account.Bool1 {
buf := make([]byte, 1024) buf := bytes.NewBuffer(make([]byte, 0, 1024))
n, _ := file.Read(buf[:]) io.CopyN(buf, file, 1024)
reqBody["pre_hash"] = utils.GetSHA1Encode(string(buf[:n])) reqBody["pre_hash"] = utils.GetSHA1Encode(buf.String())
file.File = io.NopCloser(io.MultiReader(bytes.NewReader(buf[:n]), file.File)) // 把头部拼接回去
file.File = struct {
io.Reader
io.Closer
}{
Reader: io.MultiReader(buf, file.File),
Closer: file.File,
}
} else { } else {
reqBody["content_hash_name"] = "none" reqBody["content_hash_name"] = "none"
reqBody["proof_version"] = "v1" reqBody["proof_version"] = "v1"
@ -454,7 +461,7 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
return fmt.Errorf("%s", e.Message) return fmt.Errorf("%s", e.Message)
} }
if e.Code == "PreHashMatched" && account.Bool1 { if account.Bool1 && e.Code == "PreHashMatched" {
tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*") tempFile, err := ioutil.TempFile(conf.Conf.TempDir, "file-*")
if err != nil { if err != nil {
return err return err
@ -499,6 +506,7 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er
return nil return nil
} }
// 秒传失败
if _, err = tempFile.Seek(0, io.SeekStart); err != nil { if _, err = tempFile.Seek(0, io.SeekStart); err != nil {
return err return err
} }