diff --git a/internal/uploader/uploader.go b/internal/uploader/uploader.go index ac7cbf5..b9f8f8f 100644 --- a/internal/uploader/uploader.go +++ b/internal/uploader/uploader.go @@ -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,30 +132,32 @@ func uploadData(ctx context.Context, logChan *chan string) { confirm <- optionalData[0].(bool) }) - if <-confirm { - 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 <-confirm == false { + //取消上传 AddLog(logChan, "已取消上传,1分钟后再运行") return } } + + //复制文件到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()) + } + } + } } //检测到文件