[files] auto rename file if there is a duplicated one (#56)
This commit is contained in:
parent
884f255e2d
commit
10c13f5ad8
2 changed files with 73 additions and 4 deletions
|
@ -296,7 +296,12 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
|
|||
|
||||
// move the file from uploading dir to uploaded dir
|
||||
if uploaded+int64(wrote) == fileSize {
|
||||
fsFilePath := h.FsPath(req.Path)
|
||||
fsFilePath, err := h.getFSFilePath(req.Path)
|
||||
if err != nil {
|
||||
c.JSON(q.ErrResp(c, 500, err))
|
||||
return
|
||||
}
|
||||
|
||||
err = h.deps.FS().Rename(tmpFilePath, fsFilePath)
|
||||
if err != nil {
|
||||
c.JSON(q.ErrResp(c, 500, fmt.Errorf("%s error: %w", req.Path, err)))
|
||||
|
@ -318,6 +323,38 @@ func (h *FileHandlers) UploadChunk(c *gin.Context) {
|
|||
})
|
||||
}
|
||||
|
||||
func (h *FileHandlers) getFSFilePath(reqPath string) (string, error) {
|
||||
fsFilePath := h.FsPath(reqPath)
|
||||
_, err := h.deps.FS().Stat(fsFilePath)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return fsFilePath, nil
|
||||
}
|
||||
return "", err
|
||||
}
|
||||
|
||||
// this file exists
|
||||
maxDetect := 1024
|
||||
for i := 1; i < maxDetect; i++ {
|
||||
dir := path.Dir(fsFilePath)
|
||||
nameAndExt := path.Base(fsFilePath)
|
||||
ext := path.Ext(nameAndExt)
|
||||
fileName := nameAndExt[:len(nameAndExt)-len(ext)]
|
||||
|
||||
detectPath := path.Join(dir, fmt.Sprintf("%s_%d%s", fileName, i, ext))
|
||||
_, err := h.deps.FS().Stat(detectPath)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return detectPath, nil
|
||||
} else {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return "", fmt.Errorf("found more than %d duplicated files", maxDetect)
|
||||
}
|
||||
|
||||
type UploadStatusResp struct {
|
||||
Path string `json:"path"`
|
||||
IsDir bool `json:"isDir"`
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue