- 移除无需提示直接清空文件的功能,统一通过用户确认处理 - 修正条件判断逻辑,将 ClearFilesNoPrompt 的取反操作改为显式比较 - 调整代码结构,将文件复制到tmp目录的逻辑移到确认处理之后 - 更新取消上传的处理方式,当用户未确认时直接返回并提示等待 - 简化文件复制和清空的执行流程,提高代码可读性
This commit is contained in:
@@ -121,28 +121,8 @@ func uploadData(ctx context.Context, logChan *chan string) {
|
||||
return
|
||||
}
|
||||
|
||||
//是否向用户提示清空文件,并复制文件到tmp
|
||||
if config.APPConfig.ClearFilesNoPrompt {
|
||||
//不用提示直接复制文件到tmp
|
||||
for _, p := range f {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
default:
|
||||
}
|
||||
|
||||
err := copyFile(p, "./tmp/"+filepath.Base(p))
|
||||
if err != nil {
|
||||
AddLog(logChan, "复制文件失败:"+err.Error())
|
||||
} else {
|
||||
files = append(files, "./tmp/"+filepath.Base(p))
|
||||
err := os.Truncate(p, 0)
|
||||
if err != nil {
|
||||
AddLog(logChan, "清空文件失败:"+err.Error())
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//向用户提示要清空文件,获取确认
|
||||
if config.APPConfig.ClearFilesNoPrompt == false {
|
||||
//提示用户
|
||||
wailsruntime.EventsEmit(ctx, "clear-files", f)
|
||||
|
||||
@@ -152,7 +132,14 @@ func uploadData(ctx context.Context, logChan *chan string) {
|
||||
confirm <- optionalData[0].(bool)
|
||||
})
|
||||
|
||||
if <-confirm {
|
||||
if <-confirm == false {
|
||||
//取消上传
|
||||
AddLog(logChan, "已取消上传,1分钟后再运行")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
//复制文件到tmp目录
|
||||
for _, p := range f {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
@@ -171,11 +158,6 @@ func uploadData(ctx context.Context, logChan *chan string) {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
AddLog(logChan, "已取消上传,1分钟后再运行")
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//检测到文件
|
||||
|
||||
Reference in New Issue
Block a user