mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-15 04:43:41 +00:00
fix: torrent redundant directory (#649)
This commit is contained in:
13 files changed
+300
-92
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user