fix delete lock scope

GopeedLab · Sep 21, 2024 · 09590b4 · 09590b4
1 parent 5589b23
commit 09590b4
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/pkg/download/downloader.go b/pkg/download/downloader.go
@@ -560,19 +560,19 @@ func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
 }
 
 func (d *Downloader) deleteAll() (err error) {
-	for _, task := range d.tasks {
-		if err = d.doDelete(task, true); err != nil {
-			return
-		}
-	}
-
 	func() {
 		d.lock.Lock()
 		defer d.lock.Unlock()
 
 		d.tasks = make([]*Task, 0)
 		d.waitTasks = make([]*Task, 0)
 	}()
+
+	for _, task := range d.tasks {
+		if err = d.doDelete(task, true); err != nil {
+			return
+		}
+	}
 	return
 }
 
@@ -598,9 +598,6 @@ func (d *Downloader) Stats(id string) (sr any, err error) {
 
 func (d *Downloader) doDelete(task *Task, force bool) (err error) {
 	err = func() error {
-		d.lock.Lock()
-		defer d.lock.Unlock()
-
 		if err := d.storage.Delete(bucketTask, task.ID); err != nil {
 			return err
 		}
@@ -628,10 +625,10 @@ func (d *Downloader) doDelete(task *Task, force bool) (err error) {
 		task = nil
 		return nil
 	}()
+
 	if err != nil {
 		d.Logger.Error().Stack().Err(err).Msgf("delete task failed, task id: %s", task.ID)
 	}
-
 	return
 }