ThePain/CasaOS
1
0
Fork 0
mirror of https://github.com/IceWhaleTech/CasaOS.git synced 2025-11-07 07:09:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
a624669980@163.com 2022-06-10 13:33:09 +08:00
commit 9d892a927e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
route/v1/file.go
View File

@ -199,6 +199,7 @@ func GetDownloadFile(c *gin.Context) {
defer ar.Close() defer ar.Close()
commonDir := file.CommonPrefix(filepath.Separator, list...) commonDir := file.CommonPrefix(filepath.Separator, list...)
currentPath := filepath.Base(commonDir) currentPath := filepath.Base(commonDir)
name := "_" + currentPath name := "_" + currentPath

2
service/notify.go
View File

@ -122,6 +122,7 @@ func (i *notifyServer) SendFileOperateNotify(nowSend bool) {
} }
if temp.Finished || temp.ProcessedSize >= temp.TotalSize { if temp.Finished || temp.ProcessedSize >= temp.TotalSize {
task.Finished = true task.Finished = true
task.Status = "FINISHED" task.Status = "FINISHED"
FileQueue.Delete(v) FileQueue.Delete(v)
@ -187,6 +188,7 @@ func (i *notifyServer) SendFileOperateNotify(nowSend bool) {
task.Status = "PROCESSING" task.Status = "PROCESSING"
} }
if temp.Finished || temp.ProcessedSize >= temp.TotalSize { if temp.Finished || temp.ProcessedSize >= temp.TotalSize {
task.Finished = true task.Finished = true
task.Status = "FINISHED" task.Status = "FINISHED"
FileQueue.Delete(v) FileQueue.Delete(v)