From 8bdfc7ac8e0ef07897ee5e72069f4659e2a1c6be Mon Sep 17 00:00:00 2001
From: Andy Hsu <i@nn.ci>
Date: Sun, 3 Dec 2023 14:20:01 +0800
Subject: [PATCH] fix(offline_download): don't wait for transfer task (close
 #5595)

---
 internal/offline_download/tool/download.go | 15 +--------------
 internal/offline_download/tool/transfer.go |  3 ---
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/internal/offline_download/tool/download.go b/internal/offline_download/tool/download.go
index fd91df03be7..0e1a9ca8335 100644
--- a/internal/offline_download/tool/download.go
+++ b/internal/offline_download/tool/download.go
@@ -6,7 +6,6 @@ import (
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/xhofe/tache"
-	"sync"
 	"time"
 )
 
@@ -20,7 +19,6 @@ type DownloadTask struct {
 	Status            string   `json:"status"`
 	Signal            chan int `json:"-"`
 	GID               string   `json:"-"`
-	finish            chan struct{}
 	tool              Tool
 	callStatusRetried int
 }
@@ -33,10 +31,8 @@ func (t *DownloadTask) Run() error {
 		return err
 	}
 	t.Signal = make(chan int)
-	t.finish = make(chan struct{})
 	defer func() {
 		t.Signal = nil
-		t.finish = nil
 	}()
 	gid, err := t.tool.AddURL(&AddUrlArgs{
 		Url:     t.Url,
@@ -72,9 +68,7 @@ outer:
 	if err != nil {
 		return err
 	}
-	t.Status = "aria2 download completed, maybe transferring"
-	t.finish <- struct{}{}
-	t.Status = "offline download completed"
+	t.Status = "offline download completed, maybe transferring"
 	return nil
 }
 
@@ -123,18 +117,11 @@ func (t *DownloadTask) Complete() error {
 		}
 	}
 	// upload files
-	var wg sync.WaitGroup
-	wg.Add(len(files))
-	go func() {
-		wg.Wait()
-		t.finish <- struct{}{}
-	}()
 	for i, _ := range files {
 		file := files[i]
 		TransferTaskManager.Add(&TransferTask{
 			file:         file,
 			dstDirPath:   t.DstDirPath,
-			wg:           &wg,
 			tempDir:      t.TempDir,
 			deletePolicy: t.DeletePolicy,
 		})
diff --git a/internal/offline_download/tool/transfer.go b/internal/offline_download/tool/transfer.go
index 0744b333089..0ef58df5019 100644
--- a/internal/offline_download/tool/transfer.go
+++ b/internal/offline_download/tool/transfer.go
@@ -11,20 +11,17 @@ import (
 	"github.com/xhofe/tache"
 	"os"
 	"path/filepath"
-	"sync"
 )
 
 type TransferTask struct {
 	tache.Base
 	file         File
 	dstDirPath   string
-	wg           *sync.WaitGroup
 	tempDir      string
 	deletePolicy DeletePolicy
 }
 
 func (t *TransferTask) Run() error {
-	defer t.wg.Done()
 	// check dstDir again
 	storage, dstDirActualPath, err := op.GetStorageAndActualPath(t.dstDirPath)
 	if err != nil {