Compare commits

..

2 Commits

1 changed files with 18 additions and 13 deletions

View File

@ -11,11 +11,6 @@ import (
"strconv"
"strings"
"gitea.cdlsxd.cn/self-tools/l-export-async/attachment"
"gitea.cdlsxd.cn/self-tools/l-export-async/coroutine"
"github.com/google/uuid"
"github.com/redis/go-redis/v9"
"golang.org/x/sync/errgroup"
"io"
"os"
"path/filepath"
@ -23,6 +18,12 @@ import (
"sync"
"sync/atomic"
"time"
"gitea.cdlsxd.cn/self-tools/l-export-async/attachment"
"gitea.cdlsxd.cn/self-tools/l-export-async/coroutine"
"github.com/google/uuid"
"github.com/redis/go-redis/v9"
"golang.org/x/sync/errgroup"
)
var exportAsyncPool = &sync.Pool{
@ -142,9 +143,11 @@ func (e *ExportAsync) Run(ctx context.Context) (task_id string, cacheDir string,
e.logTool.Errorf("导出panic\n任务%s,错误原因:%s", e.task.Id, _err)
}
e.release()
if e.uploader != nil {
if e.uploader.Host != "" {
os.RemoveAll(tempDir)
}
}
cancel()
}()
@ -189,7 +192,7 @@ func (e *ExportAsync) export(ctx context.Context, tempDir string) (source string
if err = e.folderToZip(excelsDir, source); err != nil {
return
}
if e.uploader != nil {
if len(e.uploader.Host) > 0 {
e.logTool.Infof("异步导出任务:%s,开始上传", e.task.Id)
source, err = e.upload(source)
@ -197,6 +200,8 @@ func (e *ExportAsync) export(ctx context.Context, tempDir string) (source string
return
}
}
}
e.task.Source = source
e.processAdd(ctx, ATT.int())
return