feat: support max running tasks config (#112)

This commit is contained in:
Li Wei authored and GitHub committed 2023-05-10 18:00:58 +08:00
1 parent 1e08ecd8db
commit d9c5ca339f
22 files changed
+269 -129

No files matched your search

+4 -6
View File
@@ -3,7 +3,6 @@ package cmd
import ( import (
_ "embed" _ "embed"
"fmt" "fmt"
"github.com/GopeedLab/gopeed/pkg/download"
"github.com/GopeedLab/gopeed/pkg/rest" "github.com/GopeedLab/gopeed/pkg/rest"
"github.com/GopeedLab/gopeed/pkg/rest/model" "github.com/GopeedLab/gopeed/pkg/rest/model"
"net/http" "net/http"
@@ -20,18 +19,17 @@ func Start(cfg *model.StartConfig) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
exist, _, err := rest.Downloader.GetConfig() downloadCfg, err := rest.Downloader.GetConfig()
if err != nil { if err != nil {
panic(err) panic(err)
} }
if !exist { if downloadCfg.FirstLoad {
// Set default download dir to user download dir // Set default download dir to user download dir
userDir, err := os.UserHomeDir() userDir, err := os.UserHomeDir()
if err == nil { if err == nil {
downloadDir := filepath.Join(userDir, "Downloads") downloadDir := filepath.Join(userDir, "Downloads")
rest.Downloader.PutConfig(&download.DownloaderStoreConfig{ downloadCfg.DownloadDir = downloadDir
DownloadDir: downloadDir, rest.Downloader.PutConfig(downloadCfg)
})
} }
} }
+2 -1
View File
@@ -3,9 +3,10 @@ package base
type Status string type Status string
const ( const (
DownloadStatusReady Status = "ready" DownloadStatusReady Status = "ready" // task create but not start
DownloadStatusRunning Status = "running" DownloadStatusRunning Status = "running"
DownloadStatusPause Status = "pause" DownloadStatusPause Status = "pause"
DownloadStatusWait Status = "wait" // task is wait for running
DownloadStatusError Status = "error" DownloadStatusError Status = "error"
DownloadStatusDone Status = "done" DownloadStatusDone Status = "done"
) )
+154 -68
View File
@@ -9,6 +9,7 @@ import (
gonanoid "github.com/matoous/go-nanoid/v2" gonanoid "github.com/matoous/go-nanoid/v2"
"os" "os"
"path" "path"
"sort"
"strings" "strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
@@ -36,15 +37,15 @@ type Progress struct {
} }
type Downloader struct { type Downloader struct {
cfg *DownloaderConfig
fetchBuilders map[string]fetcher.FetcherBuilder fetchBuilders map[string]fetcher.FetcherBuilder
fetcherMap map[string]fetcher.Fetcher fetcherMap map[string]fetcher.Fetcher
storage Storage storage Storage
tasks []*Task tasks []*Task
listener Listener listener Listener
refreshInterval int lock *sync.Mutex
lock *sync.Mutex closed atomic.Bool
closed atomic.Bool
} }
func NewDownloader(cfg *DownloaderConfig) *Downloader { func NewDownloader(cfg *DownloaderConfig) *Downloader {
@@ -54,12 +55,13 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
cfg.Init() cfg.Init()
d := &Downloader{ d := &Downloader{
cfg: cfg,
fetchBuilders: make(map[string]fetcher.FetcherBuilder), fetchBuilders: make(map[string]fetcher.FetcherBuilder),
fetcherMap: make(map[string]fetcher.Fetcher), fetcherMap: make(map[string]fetcher.Fetcher),
refreshInterval: cfg.RefreshInterval, storage: cfg.Storage,
storage: cfg.Storage, lock: &sync.Mutex{},
lock: &sync.Mutex{},
} }
for _, f := range cfg.FetchBuilders { for _, f := range cfg.FetchBuilders {
for _, p := range f.Schemes() { for _, p := range f.Schemes() {
@@ -74,6 +76,21 @@ func (d *Downloader) Setup() error {
if err := d.storage.Setup([]string{bucketTask, bucketSave, bucketConfig}); err != nil { if err := d.storage.Setup([]string{bucketTask, bucketSave, bucketConfig}); err != nil {
return err return err
} }
// load config from storage
var cfg DownloaderStoreConfig
exist, err := d.storage.Get(bucketConfig, "config", &cfg)
if err != nil {
return err
}
if exist {
d.cfg.DownloaderStoreConfig = &cfg
} else {
d.cfg.DownloaderStoreConfig = &DownloaderStoreConfig{
FirstLoad: true,
}
}
// init default config
d.cfg.DownloaderStoreConfig.Init()
// load tasks from storage // load tasks from storage
var tasks []*Task var tasks []*Task
if err := d.storage.List(bucketTask, &tasks); err != nil { if err := d.storage.List(bucketTask, &tasks); err != nil {
@@ -94,6 +111,10 @@ func (d *Downloader) Setup() error {
task.Status = base.DownloadStatusPause task.Status = base.DownloadStatusPause
} }
} }
// sort by create time
sort.Slice(tasks, func(i, j int) bool {
return tasks[i].CreatedAt.Before(tasks[j].CreatedAt)
})
} }
d.tasks = tasks d.tasks = tasks
@@ -106,9 +127,7 @@ func (d *Downloader) Setup() error {
func() { func() {
task.lock.Lock() task.lock.Lock()
defer task.lock.Unlock() defer task.lock.Unlock()
if task.Status == base.DownloadStatusDone || if task.Status != base.DownloadStatusRunning {
task.Status == base.DownloadStatusError ||
task.Status == base.DownloadStatusPause {
return return
} }
// check if task is deleted // check if task is deleted
@@ -118,7 +137,7 @@ func (d *Downloader) Setup() error {
current := task.fetcher.Progress().TotalDownloaded() current := task.fetcher.Progress().TotalDownloaded()
task.Progress.Used = task.timer.Used() task.Progress.Used = task.timer.Used()
task.Progress.Speed = task.calcSpeed(current-task.Progress.Downloaded, float64(d.refreshInterval)/1000) task.Progress.Speed = task.calcSpeed(current-task.Progress.Downloaded, float64(d.cfg.RefreshInterval)/1000)
task.Progress.Downloaded = current task.Progress.Downloaded = current
d.emit(EventKeyProgress, task) d.emit(EventKeyProgress, task)
@@ -136,7 +155,7 @@ func (d *Downloader) Setup() error {
}() }()
} }
} }
time.Sleep(time.Millisecond * time.Duration(d.refreshInterval)) time.Sleep(time.Millisecond * time.Duration(d.cfg.RefreshInterval))
} }
}() }()
return nil return nil
@@ -185,7 +204,7 @@ func (d *Downloader) Resolve(req *base.Request) (rr *ResolveResult, err error) {
return return
} }
func (d *Downloader) DirectCreate(req *base.Request, opts *base.Options) (taskId string, err error) { func (d *Downloader) CreateDirect(req *base.Request, opts *base.Options) (taskId string, err error) {
rr, err := d.Resolve(req) rr, err := d.Resolve(req)
if err != nil { if err != nil {
return return
@@ -201,6 +220,8 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
if !ok { if !ok {
return "", errors.New("invalid resource id") return "", errors.New("invalid resource id")
} }
defer delete(d.fetcherMap, rrId)
meta := fetcher.Meta() meta := fetcher.Meta()
meta.Opts = opts meta.Opts = opts
res := meta.Res res := meta.Res
@@ -211,13 +232,11 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
} }
} }
if opts.Path == "" { if opts.Path == "" {
exist, storeConfig, err := d.GetConfig() storeConfig, err := d.GetConfig()
if err != nil { if err != nil {
return "", err return "", err
} }
if exist { opts.Path = storeConfig.DownloadDir
opts.Path = storeConfig.DownloadDir
}
} }
fb, err := d.parseFb(fetcher.Meta().Req.URL) fb, err := d.parseFb(fetcher.Meta().Req.URL)
@@ -253,36 +272,27 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
task.fetcher = fetcher task.fetcher = fetcher
task.Meta = fetcher.Meta() task.Meta = fetcher.Meta()
task.Progress = &Progress{} task.Progress = &Progress{}
task.Status = base.DownloadStatusRunning task.Status = base.DownloadStatusReady
// calculate select files size // calculate select files size
for _, selectIndex := range opts.SelectFiles { for _, selectIndex := range opts.SelectFiles {
task.Size += res.Files[selectIndex].Size task.Size += res.Files[selectIndex].Size
} }
initTask(task) initTask(task)
task.timer.Start()
err = func() error { err = func() error {
d.lock.Lock() d.lock.Lock()
defer d.lock.Unlock() defer d.lock.Unlock()
if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
return err
}
d.tasks = append(d.tasks, task) d.tasks = append(d.tasks, task)
return nil return d.storage.Put(bucketTask, task.ID, task.clone())
}() }()
if err != nil { if err != nil {
return return
} }
d.emit(EventKeyStart, task)
taskId = task.ID taskId = task.ID
go func() { d.tryRunning(func(remain int) {
err := fetcher.Start() if remain > 0 {
if err != nil { err = d.start(task)
d.emit(EventKeyError, task, err)
return
} }
d.watch(task) })
}()
delete(d.fetcherMap, rrId)
return return
} }
@@ -291,16 +301,10 @@ func (d *Downloader) Pause(id string) (err error) {
if task == nil { if task == nil {
return return
} }
task.lock.Lock() if err = d.doPause(task, base.DownloadStatusPause); err != nil {
defer task.lock.Unlock() return err
if task.Status == base.DownloadStatusRunning {
task.Status = base.DownloadStatusPause
task.timer.Pause()
task.fetcher.Pause()
d.storage.Put(bucketTask, task.ID, task.clone())
d.emit(EventKeyPause, task)
} }
return return d.notifyRunning()
} }
func (d *Downloader) Continue(id string) (err error) { func (d *Downloader) Continue(id string) (err error) {
@@ -308,24 +312,24 @@ func (d *Downloader) Continue(id string) (err error) {
if task == nil { if task == nil {
return return
} }
task.lock.Lock() d.tryRunning(func(remain int) {
defer task.lock.Unlock() if remain == 0 {
if task.Status == base.DownloadStatusPause || task.Status == base.DownloadStatusError { // no more task can be running, need to doPause a running task
task.Status = base.DownloadStatusRunning for _, t := range d.tasks {
task.Progress.Speed = 0 if t.Status == base.DownloadStatusRunning {
err = d.restoreFetcher(task) err = d.doPause(t, base.DownloadStatusWait)
break
}
}
}
if err != nil { if err != nil {
return return
} }
task.timer.Start() })
err = task.fetcher.Continue() if err != nil {
if err != nil { return
return
}
d.storage.Put(bucketTask, task.ID, task.clone())
d.emit(EventKeyContinue, task)
} }
return return d.doContinue(task)
} }
func (d *Downloader) Delete(id string, force bool) (err error) { func (d *Downloader) Delete(id string, force bool) (err error) {
@@ -371,6 +375,11 @@ func (d *Downloader) Delete(id string, force bool) (err error) {
} }
} }
d.emit(EventKeyDelete, task) d.emit(EventKeyDelete, task)
if task.Status == base.DownloadStatusRunning {
if err = d.doNotifyRunning(); err != nil {
return err
}
}
task = nil task = nil
return return
} }
@@ -380,7 +389,7 @@ func (d *Downloader) Close() error {
defer d.lock.Unlock() defer d.lock.Unlock()
d.closed.Store(true) d.closed.Store(true)
for _, task := range d.tasks { for _, task := range d.tasks {
d.Pause(task.ID) d.doPause(task, base.DownloadStatusPause)
} }
return d.storage.Close() return d.storage.Close()
} }
@@ -426,27 +435,20 @@ func (d *Downloader) GetTasks() []*Task {
return d.tasks return d.tasks
} }
func (d *Downloader) GetConfig() (bool, *DownloaderStoreConfig, error) { func (d *Downloader) GetConfig() (*DownloaderStoreConfig, error) {
var cfg DownloaderStoreConfig return d.cfg.DownloaderStoreConfig, nil
exist, err := d.storage.Get(bucketConfig, "config", &cfg)
if err != nil {
return false, nil, err
}
return exist, &cfg, nil
} }
func (d *Downloader) PutConfig(v *DownloaderStoreConfig) error { func (d *Downloader) PutConfig(v *DownloaderStoreConfig) error {
d.cfg.DownloaderStoreConfig = v
return d.storage.Put(bucketConfig, "config", v) return d.storage.Put(bucketConfig, "config", v)
} }
func (d *Downloader) getProtocolConfig(name string, v any) (bool, error) { func (d *Downloader) getProtocolConfig(name string, v any) (bool, error) {
exist, cfg, err := d.GetConfig() cfg, err := d.GetConfig()
if err != nil { if err != nil {
return false, err return false, err
} }
if !exist {
return false, nil
}
if cfg.ProtocolConfig == nil || cfg.ProtocolConfig[name] == nil { if cfg.ProtocolConfig == nil || cfg.ProtocolConfig[name] == nil {
return false, nil return false, nil
} }
@@ -479,6 +481,7 @@ func (d *Downloader) watch(task *Task) {
d.emit(EventKeyDone, task) d.emit(EventKeyDone, task)
} }
d.emit(EventKeyFinally, task, err) d.emit(EventKeyFinally, task, err)
d.notifyRunning()
} }
func (d *Downloader) restoreFetcher(task *Task) error { func (d *Downloader) restoreFetcher(task *Task) error {
@@ -507,13 +510,96 @@ func (d *Downloader) restoreFetcher(task *Task) error {
} }
d.setupFetcher(task.fetcher) d.setupFetcher(task.fetcher)
task.fetcher.Create(task.Meta.Opts) task.fetcher.Create(task.Meta.Opts)
go d.watch(task)
} }
return nil return nil
} }
func (d *Downloader) tryRunning(cb func(remain int)) {
d.lock.Lock()
defer d.lock.Unlock()
runningCount := 0
for _, task := range d.tasks {
if task.Status == base.DownloadStatusRunning {
runningCount++
}
}
cb(d.cfg.MaxRunning - runningCount)
}
func (d *Downloader) notifyRunning() error {
d.lock.Lock()
defer d.lock.Unlock()
return d.doNotifyRunning()
}
func (d *Downloader) doNotifyRunning() error {
for _, task := range d.tasks {
if task.Status == base.DownloadStatusReady || task.Status == base.DownloadStatusWait {
return d.doContinue(task)
}
}
return nil
}
func (d *Downloader) start(task *Task) error {
var event EventKey
if task.Status == base.DownloadStatusReady {
event = EventKeyStart
} else {
event = EventKeyContinue
}
task.Status = base.DownloadStatusRunning
task.Progress.Speed = 0
task.timer.Start()
if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
return err
}
var err error
if event == EventKeyStart {
err = task.fetcher.Start()
}
if event == EventKeyContinue {
err = task.fetcher.Continue()
}
if err != nil {
return err
}
go d.watch(task)
d.emit(event, task)
return nil
}
func (d *Downloader) doPause(task *Task, status base.Status) (err error) {
task.lock.Lock()
defer task.lock.Unlock()
if task.Status == base.DownloadStatusRunning {
task.Status = status
task.timer.Pause()
task.fetcher.Pause()
d.storage.Put(bucketTask, task.ID, task.clone())
d.emit(EventKeyPause, task)
}
return
}
func (d *Downloader) doContinue(task *Task) (err error) {
task.lock.Lock()
defer task.lock.Unlock()
if task.Status != base.DownloadStatusRunning && task.Status != base.DownloadStatusDone {
err = d.restoreFetcher(task)
if err != nil {
return
}
err = d.start(task)
}
return
}
func initTask(task *Task) { func initTask(task *Task) {
task.timer = &util.Timer{} task.timer = util.NewTimer(task.Progress.Used)
task.lock = &sync.Mutex{} task.lock = &sync.Mutex{}
task.speedArr = make([]int64, 0) task.speedArr = make([]int64, 0)
} }
+3 -7
View File
@@ -170,8 +170,7 @@ func TestDownloader_Protocol_Config(t *testing.T) {
} }
storeCfg := &DownloaderStoreConfig{ storeCfg := &DownloaderStoreConfig{
RefreshInterval: 500, DownloadDir: "./downloads",
DownloadDir: "./downloads",
ProtocolConfig: map[string]any{ ProtocolConfig: map[string]any{
"http": map[string]any{ "http": map[string]any{
"connections": 4, "connections": 4,
@@ -191,17 +190,14 @@ func TestDownloader_Protocol_Config(t *testing.T) {
}, },
} }
if err := downloader.PutConfig(storeCfg); err != nil { if err = downloader.PutConfig(storeCfg); err != nil {
t.Fatal(err) t.Fatal(err)
} }
exits, newStoreCfg, err := downloader.GetConfig() newStoreCfg, err := downloader.GetConfig()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !exits {
t.Errorf("GetConfig() got = %v, want %v", exits, true)
}
if !test.JsonEqual(storeCfg, newStoreCfg) { if !test.JsonEqual(storeCfg, newStoreCfg) {
t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg)) t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg))
+19 -13
View File
@@ -70,7 +70,9 @@ func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 {
type DownloaderConfig struct { type DownloaderConfig struct {
Controller *controller.Controller Controller *controller.Controller
FetchBuilders []fetcher.FetcherBuilder FetchBuilders []fetcher.FetcherBuilder
Storage Storage
RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
Storage Storage
*DownloaderStoreConfig *DownloaderStoreConfig
} }
@@ -85,24 +87,28 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
new(bt.FetcherBuilder), new(bt.FetcherBuilder),
} }
} }
if cfg.Storage == nil {
cfg.Storage = NewMemStorage()
}
if cfg.DownloaderStoreConfig == nil {
cfg.DownloaderStoreConfig = &DownloaderStoreConfig{}
}
if cfg.RefreshInterval == 0 { if cfg.RefreshInterval == 0 {
cfg.RefreshInterval = 350 cfg.RefreshInterval = 350
} }
if cfg.Storage == nil {
cfg.Storage = NewMemStorage()
}
return cfg return cfg
} }
// DownloaderStoreConfig is the config that can restore the downloader. // DownloaderStoreConfig is the config that can restore the downloader.
type DownloaderStoreConfig struct { type DownloaderStoreConfig struct {
RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms) FirstLoad bool `json:"-"` // fromNoStore is the flag that the config is first time init and not from store
DownloadDir string `json:"downloadDir"` // DownloadDir is the directory to save the downloaded files
ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol DownloadDir string `json:"downloadDir"` // DownloadDir is the default directory to save the downloaded files
Extra map[string]any `json:"extra"` // Extra is the extra config MaxRunning int `json:"maxRunning"` // MaxRunning is the max running download count
ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
Extra map[string]any `json:"extra"` // Extra is the extra config
}
func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
if cfg.MaxRunning == 0 {
cfg.MaxRunning = 3
}
return cfg
} }
+2 -2
View File
@@ -33,7 +33,7 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
if req.Rid != "" { if req.Rid != "" {
taskId, err = Downloader.Create(req.Rid, req.Opts) taskId, err = Downloader.Create(req.Rid, req.Opts)
} else if req.Req != nil { } else if req.Req != nil {
taskId, err = Downloader.DirectCreate(req.Req, req.Opts) taskId, err = Downloader.CreateDirect(req.Req, req.Opts)
} else { } else {
WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam)) WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam))
return return
@@ -195,6 +195,6 @@ func writeError(w http.ResponseWriter, msg string) {
} }
func getServerConfig() *download.DownloaderStoreConfig { func getServerConfig() *download.DownloaderStoreConfig {
_, cfg, _ := Downloader.GetConfig() cfg, _ := Downloader.GetConfig()
return cfg return cfg
} }
+4 -1
View File
@@ -12,9 +12,9 @@ const (
type StartConfig struct { type StartConfig struct {
Network string `json:"network"` Network string `json:"network"`
Address string `json:"address"` Address string `json:"address"`
RefreshInterval int `json:"refreshInterval"`
Storage Storage `json:"storage"` Storage Storage `json:"storage"`
StorageDir string `json:"storageDir"` StorageDir string `json:"storageDir"`
RefreshInterval int `json:"refreshInterval"`
ApiToken string `json:"apiToken"` ApiToken string `json:"apiToken"`
WebEnable bool WebEnable bool
@@ -28,6 +28,9 @@ func (cfg *StartConfig) Init() *StartConfig {
if cfg.Address == "" { if cfg.Address == "" {
cfg.Address = "127.0.0.1:0" cfg.Address = "127.0.0.1:0"
} }
if cfg.RefreshInterval == 0 {
cfg.RefreshInterval = 350
}
if cfg.Storage == "" { if cfg.Storage == "" {
cfg.Storage = StorageBolt cfg.Storage = StorageBolt
} }
+3 -2
View File
@@ -57,14 +57,15 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
} }
startCfg.Init() startCfg.Init()
downloadCfg := &download.DownloaderConfig{} downloadCfg := &download.DownloaderConfig{
RefreshInterval: startCfg.RefreshInterval,
}
if startCfg.Storage == model.StorageBolt { if startCfg.Storage == model.StorageBolt {
downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir) downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
} else { } else {
downloadCfg.Storage = download.NewMemStorage() downloadCfg.Storage = download.NewMemStorage()
} }
downloadCfg.Init() downloadCfg.Init()
downloadCfg.RefreshInterval = startCfg.RefreshInterval
Downloader = download.NewDownloader(downloadCfg) Downloader = download.NewDownloader(downloadCfg)
if err := Downloader.Setup(); err != nil { if err := Downloader.Setup(); err != nil {
return nil, nil, err return nil, nil, err
+6 -1
View File
@@ -2,12 +2,17 @@ package util
import "time" import "time"
// 计时器
type Timer struct { type Timer struct {
t int64 t int64
used int64 used int64
} }
func NewTimer(used int64) *Timer {
return &Timer{
used: used,
}
}
func (t *Timer) Start() { func (t *Timer) Start() {
t.t = time.Now().UnixNano() t.t = time.Now().UnixNano()
} }
+1
View File
@@ -24,6 +24,7 @@
"downloadDir": "Download Directory", "downloadDir": "Download Directory",
"downloadDirValid": "Please select the download directory", "downloadDirValid": "Please select the download directory",
"connections": "Connections", "connections": "Connections",
"maxRunning": "Max Running Tasks",
"items": "@count items", "items": "@count items",
"subscribeTracker": "Subscribe Tracker", "subscribeTracker": "Subscribe Tracker",
"subscribeFail": "Subscribe failed, please check network or try again later", "subscribeFail": "Subscribe failed, please check network or try again later",
+1
View File
@@ -24,6 +24,7 @@
"downloadDir": "Папка загрузки", "downloadDir": "Папка загрузки",
"downloadDirValid": "Пожалуйста, выберите папку для загрузки", "downloadDirValid": "Пожалуйста, выберите папку для загрузки",
"connections": "Соединений", "connections": "Соединений",
"maxRunning": "Максимальное количество активных задач",
"items": "@подсчет элементов", "items": "@подсчет элементов",
"subscribeTracker": "Подпись трекера", "subscribeTracker": "Подпись трекера",
"subscribeFail": "Подписка не удалась, пожалуйста, проверьте сеть или повторите попытку позже", "subscribeFail": "Подписка не удалась, пожалуйста, проверьте сеть или повторите попытку позже",
+1
View File
@@ -24,6 +24,7 @@
"downloadDir": "下载目录", "downloadDir": "下载目录",
"downloadDirValid": "请选择下载目录", "downloadDirValid": "请选择下载目录",
"connections": "连接数", "connections": "连接数",
"maxRunning": "最大下载数",
"items": "@count 条", "items": "@count 条",
"subscribeTracker": "订阅 Tracker", "subscribeTracker": "订阅 Tracker",
"subscribeFail": "订阅失败,请检查网络或稍后重试", "subscribeFail": "订阅失败,请检查网络或稍后重试",
+5 -8
View File
@@ -73,15 +73,12 @@ Future<T> _parse<T>(
) async { ) async {
try { try {
var resp = await fetch(); var resp = await fetch();
if (fromJsonT != null) { fromJsonT ??= (json) => null as T;
final result = Result<T>.fromJson(resp.data, fromJsonT); final result = Result<T>.fromJson(resp.data, fromJsonT);
if (result.code == 0) { if (result.code == 0) {
return result.data as T; return result.data as T;
} else {
throw Exception(result);
}
} else { } else {
return null as T; throw Exception(result);
} }
} on DioError catch (e) { } on DioError catch (e) {
throw Exception(Result(code: 1000, msg: e.message)); throw Exception(Result(code: 1000, msg: e.message));
@@ -5,6 +5,7 @@ part 'downloader_config.g.dart';
@JsonSerializable(explicitToJson: true) @JsonSerializable(explicitToJson: true)
class DownloaderConfig { class DownloaderConfig {
String downloadDir = ''; String downloadDir = '';
int maxRunning = 0;
ProtocolConfig protocolConfig = ProtocolConfig(); ProtocolConfig protocolConfig = ProtocolConfig();
ExtraConfig extra = ExtraConfig(); ExtraConfig extra = ExtraConfig();
@@ -9,6 +9,7 @@ part of 'downloader_config.dart';
DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) => DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) =>
DownloaderConfig() DownloaderConfig()
..downloadDir = json['downloadDir'] as String ..downloadDir = json['downloadDir'] as String
..maxRunning = json['maxRunning'] as int
..protocolConfig = ProtocolConfig.fromJson( ..protocolConfig = ProtocolConfig.fromJson(
json['protocolConfig'] as Map<String, dynamic>?) json['protocolConfig'] as Map<String, dynamic>?)
..extra = ExtraConfig.fromJson(json['extra'] as Map<String, dynamic>?); ..extra = ExtraConfig.fromJson(json['extra'] as Map<String, dynamic>?);
@@ -16,6 +17,7 @@ DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) =>
Map<String, dynamic> _$DownloaderConfigToJson(DownloaderConfig instance) => Map<String, dynamic> _$DownloaderConfigToJson(DownloaderConfig instance) =>
<String, dynamic>{ <String, dynamic>{
'downloadDir': instance.downloadDir, 'downloadDir': instance.downloadDir,
'maxRunning': instance.maxRunning,
'protocolConfig': instance.protocolConfig.toJson(), 'protocolConfig': instance.protocolConfig.toJson(),
'extra': instance.extra.toJson(), 'extra': instance.extra.toJson(),
}; };
+1 -3
View File
@@ -1,12 +1,10 @@
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'meta.dart'; import 'meta.dart';
import 'options.dart';
import 'resource.dart';
part 'task.g.dart'; part 'task.g.dart';
enum Status { ready, running, pause, error, done } enum Status { ready, running, pause, wait, error, done }
@JsonSerializable(explicitToJson: true) @JsonSerializable(explicitToJson: true)
class Task { class Task {
+1
View File
@@ -28,6 +28,7 @@ const _$StatusEnumMap = {
Status.ready: 'ready', Status.ready: 'ready',
Status.running: 'running', Status.running: 'running',
Status.pause: 'pause', Status.pause: 'pause',
Status.wait: 'wait',
Status.error: 'error', Status.error: 'error',
Status.done: 'done', Status.done: 'done',
}; };
@@ -67,11 +67,37 @@ class SettingView extends GetView<SettingController> {
showLabel: false, showLabel: false,
); );
}); });
final buildMaxRunning = _buildConfigItem(
'maxRunning', () => downloaderCfg.value.maxRunning.toString(),
(Key key) {
final maxRunningController = TextEditingController(
text: downloaderCfg.value.maxRunning.toString());
maxRunningController.addListener(() async {
if (maxRunningController.text.isNotEmpty &&
maxRunningController.text !=
downloaderCfg.value.maxRunning.toString()) {
downloaderCfg.value.maxRunning = int.parse(maxRunningController.text);
await debounceSave();
}
});
return TextField(
key: key,
focusNode: FocusNode(),
controller: maxRunningController,
keyboardType: TextInputType.number,
inputFormatters: [
FilteringTextInputFormatter.digitsOnly,
_NumericalRangeFormatter(min: 1, max: 256),
],
);
});
// http config items start // http config items start
final httpConfig = downloaderCfg.value.protocolConfig.http; final httpConfig = downloaderCfg.value.protocolConfig.http;
final buildHttpConnections = _buildConfigItem( final buildHttpConnections = _buildConfigItem(
'connections'.tr, () => httpConfig.connections.toString(), (Key key) { 'connections', () => httpConfig.connections.toString(), (Key key) {
final connectionsController = final connectionsController =
TextEditingController(text: httpConfig.connections.toString()); TextEditingController(text: httpConfig.connections.toString());
connectionsController.addListener(() async { connectionsController.addListener(() async {
@@ -99,7 +125,7 @@ class SettingView extends GetView<SettingController> {
final btExtConfig = downloaderCfg.value.extra.bt; final btExtConfig = downloaderCfg.value.extra.bt;
final buildBtTrackerSubscribeUrls = _buildConfigItem( final buildBtTrackerSubscribeUrls = _buildConfigItem(
'subscribeTracker'.tr, 'subscribeTracker',
() => 'items'.trParams( () => 'items'.trParams(
{'count': btExtConfig.trackerSubscribeUrls.length.toString()}), {'count': btExtConfig.trackerSubscribeUrls.length.toString()}),
(Key key) { (Key key) {
@@ -155,7 +181,7 @@ class SettingView extends GetView<SettingController> {
); );
}); });
final buildBtTrackers = _buildConfigItem( final buildBtTrackers = _buildConfigItem(
'addTracker'.tr, 'addTracker',
() => 'items' () => 'items'
.trParams({'count': btExtConfig.customTrackers.length.toString()}), .trParams({'count': btExtConfig.customTrackers.length.toString()}),
(Key key) { (Key key) {
@@ -298,7 +324,7 @@ class SettingView extends GetView<SettingController> {
// advanced config items start // advanced config items start
final buildApiProtocol = _buildConfigItem( final buildApiProtocol = _buildConfigItem(
'protocol'.tr, 'protocol',
() => startCfg.value.network == 'tcp' () => startCfg.value.network == 'tcp'
? 'TCP ${startCfg.value.address}' ? 'TCP ${startCfg.value.address}'
: 'Unix', : 'Unix',
@@ -396,7 +422,7 @@ class SettingView extends GetView<SettingController> {
); );
}, },
); );
final buildApiToken = _buildConfigItem('apiToken'.tr, final buildApiToken = _buildConfigItem('apiToken',
() => startCfg.value.apiToken.isEmpty ? 'notSet'.tr : 'seted'.tr, () => startCfg.value.apiToken.isEmpty ? 'notSet'.tr : 'seted'.tr,
(Key key) { (Key key) {
final apiTokenController = final apiTokenController =
@@ -426,7 +452,7 @@ class SettingView extends GetView<SettingController> {
length: 2, length: 2,
child: Scaffold( child: Scaffold(
appBar: PreferredSize( appBar: PreferredSize(
preferredSize: Size.fromHeight(56), preferredSize: const Size.fromHeight(56),
child: AppBar( child: AppBar(
bottom: TabBar( bottom: TabBar(
tabs: [ tabs: [
@@ -448,9 +474,8 @@ class SettingView extends GetView<SettingController> {
Text('general'.tr), Text('general'.tr),
Card( Card(
child: Column( child: Column(
children: _addDivider([ children: _addDivider(
buildDownloadDir(), [buildDownloadDir(), buildMaxRunning()]),
]),
)), )),
const Text('HTTP'), const Text('HTTP'),
Card( Card(
@@ -3,5 +3,11 @@ import 'task_list_controller.dart';
class TaskDownloadingController extends TaskListController { class TaskDownloadingController extends TaskListController {
TaskDownloadingController() TaskDownloadingController()
: super([Status.ready, Status.running, Status.pause, Status.error]); : super([
Status.ready,
Status.running,
Status.pause,
Status.wait,
Status.error
]);
} }
@@ -123,14 +123,22 @@ class BuildTaskListView extends GetView {
list.add(IconButton( list.add(IconButton(
icon: const Icon(Icons.pause), icon: const Icon(Icons.pause),
onPressed: () async { onPressed: () async {
await pauseTask(task.id); try {
await pauseTask(task.id);
} catch (e) {
showErrorMessage(e);
}
}, },
)); ));
} else { } else {
list.add(IconButton( list.add(IconButton(
icon: const Icon(Icons.play_arrow), icon: const Icon(Icons.play_arrow),
onPressed: () async { onPressed: () async {
await continueTask(task.id); try {
await continueTask(task.id);
} catch (e) {
showErrorMessage(e);
}
}, },
)); ));
} }
@@ -198,16 +206,14 @@ class BuildTaskListView extends GetView {
: Icon(FaIcons.allIcons[findIcon(task.meta.res.name)]), : Icon(FaIcons.allIcons[findIcon(task.meta.res.name)]),
trailing: SizedBox( trailing: SizedBox(
width: task.status == Status.done ? 80 : 180, width: 180,
child: Row( child: Row(
// crossAxisAlignment: CrossAxisAlignment.baseline, // crossAxisAlignment: CrossAxisAlignment.baseline,
// textBaseline: DefaultTextStyle.of(context).style.textBaseline, // textBaseline: DefaultTextStyle.of(context).style.textBaseline,
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
task.status == Status.done Text("${Util.fmtByte(task.progress.speed)} / s",
? const SizedBox.shrink() style: context.textTheme.titleSmall),
: Text("${Util.fmtByte(task.progress.speed)} / s",
style: context.textTheme.titleSmall),
...buildActions() ...buildActions()
], ],
), ),
+4
View File
@@ -38,6 +38,7 @@ class LocaleKeys {
static const downloadDir = 'downloadDir'; static const downloadDir = 'downloadDir';
static const downloadDirValid = 'downloadDirValid'; static const downloadDirValid = 'downloadDirValid';
static const connections = 'connections'; static const connections = 'connections';
static const maxRunning = 'maxRunning';
static const items = 'items'; static const items = 'items';
static const subscribeTracker = 'subscribeTracker'; static const subscribeTracker = 'subscribeTracker';
static const subscribeFail = 'subscribeFail'; static const subscribeFail = 'subscribeFail';
@@ -97,6 +98,7 @@ class Locales {
'downloadDir': 'Download Directory', 'downloadDir': 'Download Directory',
'downloadDirValid': 'Please select the download directory', 'downloadDirValid': 'Please select the download directory',
'connections': 'Connections', 'connections': 'Connections',
'maxRunning': 'Max Running Tasks',
'items': '@count items', 'items': '@count items',
'subscribeTracker': 'Subscribe Tracker', 'subscribeTracker': 'Subscribe Tracker',
'subscribeFail': 'subscribeFail':
@@ -210,6 +212,7 @@ class Locales {
'downloadDir': 'Папка загрузки', 'downloadDir': 'Папка загрузки',
'downloadDirValid': 'Пожалуйста, выберите папку для загрузки', 'downloadDirValid': 'Пожалуйста, выберите папку для загрузки',
'connections': 'Соединений', 'connections': 'Соединений',
'maxRunning': 'Максимальное количество активных задач',
'items': '@подсчет элементов', 'items': '@подсчет элементов',
'subscribeTracker': 'Подпись трекера', 'subscribeTracker': 'Подпись трекера',
'subscribeFail': 'subscribeFail':
@@ -267,6 +270,7 @@ class Locales {
'downloadDir': '下载目录', 'downloadDir': '下载目录',
'downloadDirValid': '请选择下载目录', 'downloadDirValid': '请选择下载目录',
'connections': '连接数', 'connections': '连接数',
'maxRunning': '最大下载数',
'items': '@count 条', 'items': '@count 条',
'subscribeTracker': '订阅 Tracker', 'subscribeTracker': '订阅 Tracker',
'subscribeFail': '订阅失败,请检查网络或稍后重试', 'subscribeFail': '订阅失败,请检查网络或稍后重试',
+1
View File
@@ -65,6 +65,7 @@ dev_dependencies:
# rules and activating additional ones. # rules and activating additional ones.
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0
ffigen: ^6.1.2 ffigen: ^6.1.2
# build json model: flutter pub run build_runner build --delete-conflicting-outputs
build_runner: ^2.2.1 build_runner: ^2.2.1
json_serializable: ^6.3.2 json_serializable: ^6.3.2
flutter_launcher_icons: flutter_launcher_icons: