fix: torrent redundant directory (#649)

pkg/download/downloader.go

@@ -930,26 +930,28 @@ func (d *Downloader) doStart(task *Task) (err error) {
 		}
 
 		if isCreate {
-			d.checkDuplicateLock.Lock()
-			defer d.checkDuplicateLock.Unlock()
-			task.Meta.Opts.Name = util.ReplaceInvalidFilename(task.Meta.Opts.Name)
-			// check if the download file is duplicated and rename it automatically.
-			if task.Meta.Res.Name != "" {
-				task.Meta.Res.Name = util.ReplaceInvalidFilename(task.Meta.Res.Name)
-				fullDirPath := task.Meta.FolderPath()
-				newName, err := util.CheckDuplicateAndRename(fullDirPath)
-				if err != nil {
-					return err
+			if task.fetcherManager.AutoRename() {
+				d.checkDuplicateLock.Lock()
+				defer d.checkDuplicateLock.Unlock()
+				task.Meta.Opts.Name = util.ReplaceInvalidFilename(task.Meta.Opts.Name)
+				// check if the download file is duplicated and rename it automatically.
+				if task.Meta.Res.Name != "" {
+					task.Meta.Res.Name = util.ReplaceInvalidFilename(task.Meta.Res.Name)
+					fullDirPath := task.Meta.FolderPath()
+					newName, err := util.CheckDuplicateAndRename(fullDirPath)
+					if err != nil {
+						return err
+					}
+					task.Meta.Opts.Name = newName
+				} else {
+					task.Meta.Res.Files[0].Name = util.ReplaceInvalidFilename(task.Meta.Res.Files[0].Name)
+					fullFilePath := task.Meta.SingleFilepath()
+					newName, err := util.CheckDuplicateAndRename(fullFilePath)
+					if err != nil {
+						return err
+					}
+					task.Meta.Opts.Name = newName
 				}
-				task.Meta.Opts.Name = newName
-			} else {
-				task.Meta.Res.Files[0].Name = util.ReplaceInvalidFilename(task.Meta.Res.Files[0].Name)
-				fullFilePath := task.Meta.SingleFilepath()
-				newName, err := util.CheckDuplicateAndRename(fullFilePath)
-				if err != nil {
-					return err
-				}
-				task.Meta.Opts.Name = newName
 			}
 
 			task.Meta.Res.CalcSize(task.Meta.Opts.SelectFiles)

pkg/download/model.go

@@ -1,6 +1,7 @@
 package download
 
 import (
+	"encoding/json"
 	"github.com/GopeedLab/gopeed/internal/controller"
 	"github.com/GopeedLab/gopeed/internal/fetcher"
 	"github.com/GopeedLab/gopeed/internal/protocol/bt"
@@ -49,6 +50,47 @@ func NewTask() *Task {
 	}
 }
 
+// Name returns the display name of the task.
+func (t *Task) Name() string {
+	// Custom name first
+	if t.Meta.Opts.Name != "" {
+		return t.Meta.Opts.Name
+	}
+
+	// Task is not resolved, parse the name from the URL
+	if t.Meta.Res == nil {
+		fallbackName := "unknown"
+		if t.fetcherManager == nil {
+			return fallbackName
+		}
+		parseName := t.fetcherManager.ParseName(t.Meta.Req.URL)
+		if parseName == "" {
+			return fallbackName
+		}
+		return parseName
+	}
+
+	// Task is a folder
+	if t.Meta.Res.Name != "" {
+		return t.Meta.Res.Name
+	}
+
+	// Get the name of the first file
+	return t.Meta.Res.Files[0].Name
+}
+
+func (t *Task) MarshalJSON() ([]byte, error) {
+	type rawTaskType Task
+	jsonTask := struct {
+		rawTaskType
+		Name string `json:"name"`
+	}{
+		rawTaskType(*t),
+		t.Name(),
+	}
+	return json.Marshal(jsonTask)
+}
+
 func (t *Task) updateStatus(status base.Status) {
 	t.UpdatedAt = time.Now()
 	t.Status = status