nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete bugs on windows fix

Browse Source
This commit is contained in:
evanpeng 2020-12-21 16:59:29 +08:00
parent d0f6ed02c2
commit 365804a255
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
http/resource.go
View File

@ -145,20 +145,19 @@ var resourcePostPutHandler = withUser(func(w http.ResponseWriter, r *http.Reques
} }
} }
} }
var file afero.File
if isPieceHasUpload == false { if isPieceHasUpload == false {
err := d.user.Fs.MkdirAll(dir, 0775) err := d.user.Fs.MkdirAll(dir, 0775)
if err != nil { if err != nil {
return err return err
} }
file, err = d.user.Fs.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775) file, err := d.user.Fs.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775)
if err != nil { if err != nil {
return err return err
} }
defer file.Close()
_, err = io.Copy(file, r.Body) _, err = io.Copy(file, r.Body)
file.Close() //close here ,for the last piece will stop delete operater
if err != nil { if err != nil {
if isPieceUpload { if isPieceUpload {
d.user.Fs.Remove(filePath) d.user.Fs.Remove(filePath)
@ -172,13 +171,11 @@ var resourcePostPutHandler = withUser(func(w http.ResponseWriter, r *http.Reques
if chunckIndex == totalChunck && totalChunckInt > 1 { if chunckIndex == totalChunck && totalChunckInt > 1 {
//merge all spiece files //merge all spiece files
itemPath := "" itemPath := ""
var err error
//create original file //create original file
file, err = d.user.Fs.OpenFile(r.URL.Path, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0777) file, err := d.user.Fs.OpenFile(r.URL.Path, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0777)
if err != nil { if err != nil {
return err return err
} }
defer file.Close()
for i := 1; i <= totalChunckInt; i++ { for i := 1; i <= totalChunckInt; i++ {
piecefileName := strconv.Itoa(i) + "_" + fileName piecefileName := strconv.Itoa(i) + "_" + fileName
@ -187,25 +184,37 @@ var resourcePostPutHandler = withUser(func(w http.ResponseWriter, r *http.Reques
if err != nil { if err != nil {
return err return err
} }
contents, err := ioutil.ReadAll(spieceFile) if _, err = io.Copy(file, spieceFile); err != nil {
if err != nil {
return err return err
} }
file.Write(contents) if err = spieceFile.Close(); err != nil {
return err
}
}
if err = file.Close(); err != nil {
return err
} }
//deltet temp folder //deltet temp folder
d.user.Fs.RemoveAll(dir) err = d.user.Fs.RemoveAll(dir)
if err != nil {
fmt.Println(err)
return err
}
} }
if (chunckIndex == totalChunck && totalChunckInt > 1) || totalChunckInt == 1 { if (chunckIndex == totalChunck && totalChunckInt > 1) || totalChunckInt == 1 {
// Gets the info about the file. // Gets the info about the file.
file, err := d.user.Fs.Open(r.URL.Path)
if err != nil {
return err
}
info, err := file.Stat() info, err := file.Stat()
if err != nil { if err != nil {
return err return err
} }
etag := fmt.Sprintf(`"%x%x"`, info.ModTime().UnixNano(), info.Size()) etag := fmt.Sprintf(`"%x%x"`, info.ModTime().UnixNano(), info.Size())
w.Header().Set("ETag", etag) w.Header().Set("ETag", etag)
file.Close()
} }
return nil return nil
}, action, r.URL.Path, "", d.user) }, action, r.URL.Path, "", d.user)