fix: flutter downgrade to v3.7.12

.github/workflows/build.yml

@@ -3,6 +3,10 @@ name: build
 on:
   workflow_dispatch:
 
+env:
+  GO_VERSION: 1.19
+  FLUTTER_VERSION: 3.7.12
+
 permissions:
   contents: write
 
@@ -24,11 +28,12 @@ jobs:
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
@@ -123,10 +128,9 @@ jobs:
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - name: Build
         run: |
           docker pull techknowlogick/xgo:go-1.19.x
@@ -142,14 +146,15 @@ jobs:
     needs: [get-release, build-macos-arm64-lib]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: actions/setup-node@v3
         with:
           node-version: 16
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Install appdmg
         run: npm install -g appdmg
       - uses: actions/download-artifact@v3
@@ -197,11 +202,12 @@ jobs:
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: |
           sudo apt-get update -y
           sudo apt-get install -y ninja-build libgtk-3-dev
@@ -256,15 +262,16 @@ jobs:
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: "11"
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
@@ -292,11 +299,12 @@ jobs:
     needs: [get-release]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}

.github/workflows/release.yml

@@ -16,6 +16,9 @@ on:
       - "go.sum"
       - "Dockerfile"
 
+env:
+  GO_VERSION: 1.19
+
 permissions:
   contents: write
 
@@ -28,9 +31,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
       - uses: release-drafter/release-drafter@v5
         id: create_release
         env:

.github/workflows/test.yml

@@ -26,6 +26,10 @@ on:
       - "go.mod"
       - "go.sum"
 
+env:
+  GO_VERSION: 1.19
+  FLUTTER_VERSION: 3.7.12
+
 jobs:
   #  lint:
   #    name: Lint
@@ -45,10 +49,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - name: Run Unit tests.
         run: go test $(go list ./... | grep -v /cmd/ | grep -v /bind/ ) -v -covermode=count -coverprofile=coverage.txt
       - uses: codecov/codecov-action@v3
@@ -61,11 +64,12 @@ jobs:
     needs: [test]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "^1.19"
+          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: |
           sudo apt-get update -y
           sudo apt-get install -y ninja-build libgtk-3-dev

_examples/basic/main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/GopeedLab/gopeed/pkg/base"
 	"github.com/GopeedLab/gopeed/pkg/download"
+	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 )
 
 func main() {
@@ -16,7 +17,9 @@ func main() {
 			}
 		}).
 		Create(&base.Options{
-			Connections: 8,
+			Extra: http.OptsExtra{
+				Connections: 8,
+			},
 		})
 	if err != nil {
 		panic(err)

cmd/gopeed/main.go

@@ -13,9 +13,17 @@ import (
 const progressWidth = 20
 
 func main() {
-	args := parse()
+	//args := parse()
+	var dir = "./"
+	var connections = 8
+	args := &args{
+		url:         "https://sel-kor-ping.vultr.com/vultr.com.100MB.bin",
+		dir:         &dir,
+		connections: &connections,
+	}
 
 	var wg sync.WaitGroup
+	wg.Add(1)
 	_, err := download.Boot().
 		URL(args.url).
 		Listener(func(event *download.Event) {
@@ -46,7 +54,6 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	wg.Add(1)
 	wg.Wait()
 }
 

cmd/server.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	_ "embed"
 	"fmt"
-	"github.com/GopeedLab/gopeed/pkg/download"
 	"github.com/GopeedLab/gopeed/pkg/rest"
 	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"net/http"
@@ -20,18 +19,17 @@ func Start(cfg *model.StartConfig) {
 	if err != nil {
 		panic(err)
 	}
-	exist, _, err := rest.Downloader.GetConfig()
+	downloadCfg, err := rest.Downloader.GetConfig()
 	if err != nil {
 		panic(err)
 	}
-	if !exist {
+	if downloadCfg.FirstLoad {
 		// Set default download dir to user download dir
 		userDir, err := os.UserHomeDir()
 		if err == nil {
 			downloadDir := filepath.Join(userDir, "Downloads")
-			rest.Downloader.PutConfig(&download.DownloaderStoreConfig{
+			downloadCfg.DownloadDir = downloadDir
-				DownloadDir: downloadDir,
+			rest.Downloader.PutConfig(downloadCfg)
-			})
 		}
 
 	}

pkg/base/constants.go

@@ -3,9 +3,10 @@ package base
 type Status string
 
 const (
-	DownloadStatusReady   Status = "ready"
+	DownloadStatusReady   Status = "ready" // task create but not start
 	DownloadStatusRunning Status = "running"
 	DownloadStatusPause   Status = "pause"
+	DownloadStatusWait    Status = "wait" // task is wait for running
 	DownloadStatusError   Status = "error"
 	DownloadStatusDone    Status = "done"
 )

pkg/download/downloader.go

@@ -9,6 +9,7 @@ import (
 	gonanoid "github.com/matoous/go-nanoid/v2"
 	"os"
 	"path"
+	"sort"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -36,15 +37,15 @@ type Progress struct {
 }
 
 type Downloader struct {
+	cfg           *DownloaderConfig
 	fetchBuilders map[string]fetcher.FetcherBuilder
 	fetcherMap    map[string]fetcher.Fetcher
 	storage       Storage
 	tasks         []*Task
 	listener      Listener
 
-	refreshInterval int
+	lock   *sync.Mutex
-	lock            *sync.Mutex
+	closed atomic.Bool
-	closed          atomic.Bool
 }
 
 func NewDownloader(cfg *DownloaderConfig) *Downloader {
@@ -54,12 +55,13 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
 	cfg.Init()
 
 	d := &Downloader{
+		cfg: cfg,
+
 		fetchBuilders: make(map[string]fetcher.FetcherBuilder),
 		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 _, p := range f.Schemes() {
@@ -74,6 +76,21 @@ func (d *Downloader) Setup() error {
 	if err := d.storage.Setup([]string{bucketTask, bucketSave, bucketConfig}); err != nil {
 		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
 	var tasks []*Task
 	if err := d.storage.List(bucketTask, &tasks); err != nil {
@@ -94,6 +111,10 @@ func (d *Downloader) Setup() error {
 				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
 
@@ -106,9 +127,7 @@ func (d *Downloader) Setup() error {
 					func() {
 						task.lock.Lock()
 						defer task.lock.Unlock()
-						if task.Status == base.DownloadStatusDone ||
+						if task.Status != base.DownloadStatusRunning {
-							task.Status == base.DownloadStatusError ||
-							task.Status == base.DownloadStatusPause {
 							return
 						}
 						// check if task is deleted
@@ -118,7 +137,7 @@ func (d *Downloader) Setup() error {
 
 						current := task.fetcher.Progress().TotalDownloaded()
 						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
 						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
@@ -185,7 +204,7 @@ func (d *Downloader) Resolve(req *base.Request) (rr *ResolveResult, err error) {
 	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)
 	if err != nil {
 		return
@@ -201,6 +220,8 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
 	if !ok {
 		return "", errors.New("invalid resource id")
 	}
+	defer delete(d.fetcherMap, rrId)
+
 	meta := fetcher.Meta()
 	meta.Opts = opts
 	res := meta.Res
@@ -211,13 +232,11 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
 		}
 	}
 	if opts.Path == "" {
-		exist, storeConfig, err := d.GetConfig()
+		storeConfig, err := d.GetConfig()
 		if err != nil {
 			return "", err
 		}
-		if exist {
+		opts.Path = storeConfig.DownloadDir
-			opts.Path = storeConfig.DownloadDir
-		}
 	}
 
 	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.Meta = fetcher.Meta()
 	task.Progress = &Progress{}
-	task.Status = base.DownloadStatusRunning
+	task.Status = base.DownloadStatusReady
 	// calculate select files size
 	for _, selectIndex := range opts.SelectFiles {
 		task.Size += res.Files[selectIndex].Size
 	}
 	initTask(task)
-	task.timer.Start()
 	err = func() error {
 		d.lock.Lock()
 		defer d.lock.Unlock()
-		if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
-			return err
-		}
 		d.tasks = append(d.tasks, task)
-		return nil
+		return d.storage.Put(bucketTask, task.ID, task.clone())
 	}()
 	if err != nil {
 		return
 	}
-	d.emit(EventKeyStart, task)
 	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
 }
 
@@ -291,16 +301,10 @@ func (d *Downloader) Pause(id string) (err error) {
 	if task == nil {
 		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) {
@@ -308,24 +312,24 @@ func (d *Downloader) Continue(id string) (err error) {
 	if task == nil {
 		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 {
 			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) {
@@ -371,6 +375,11 @@ func (d *Downloader) Delete(id string, force bool) (err error) {
 		}
 	}
 	d.emit(EventKeyDelete, task)
+	if task.Status == base.DownloadStatusRunning {
+		if err = d.doNotifyRunning(); err != nil {
+			return err
+		}
+	}
 	task = nil
 	return
 }
@@ -380,7 +389,7 @@ func (d *Downloader) Close() error {
 	defer d.lock.Unlock()
 	d.closed.Store(true)
 	for _, task := range d.tasks {
-		d.Pause(task.ID)
+		d.doPause(task, base.DownloadStatusPause)
 	}
 	return d.storage.Close()
 }
@@ -426,27 +435,20 @@ func (d *Downloader) GetTasks() []*Task {
 	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 {
+	d.cfg.DownloaderStoreConfig = v
 	return d.storage.Put(bucketConfig, "config", v)
 }
 
 func (d *Downloader) getProtocolConfig(name string, v any) (bool, error) {
-	exist, cfg, err := d.GetConfig()
+	cfg, err := d.GetConfig()
 	if err != nil {
 		return false, err
 	}
-	if !exist {
-		return false, nil
-	}
 	if cfg.ProtocolConfig == nil || cfg.ProtocolConfig[name] == nil {
 		return false, nil
 	}
@@ -479,6 +481,7 @@ func (d *Downloader) watch(task *Task) {
 		d.emit(EventKeyDone, task)
 	}
 	d.emit(EventKeyFinally, task, err)
+	d.notifyRunning()
 }
 
 func (d *Downloader) restoreFetcher(task *Task) error {
@@ -507,13 +510,96 @@ func (d *Downloader) restoreFetcher(task *Task) error {
 		}
 		d.setupFetcher(task.fetcher)
 		task.fetcher.Create(task.Meta.Opts)
-		go d.watch(task)
 	}
 	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) {
-	task.timer = &util.Timer{}
+	task.timer = util.NewTimer(task.Progress.Used)
 	task.lock = &sync.Mutex{}
 	task.speedArr = make([]int64, 0)
 }

pkg/download/downloader_test.go

@@ -170,8 +170,7 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 	}
 
 	storeCfg := &DownloaderStoreConfig{
-		RefreshInterval: 500,
+		DownloadDir: "./downloads",
-		DownloadDir:     "./downloads",
 		ProtocolConfig: map[string]any{
 			"http": map[string]any{
 				"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)
 	}
 
-	exits, newStoreCfg, err := downloader.GetConfig()
+	newStoreCfg, err := downloader.GetConfig()
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !exits {
-		t.Errorf("GetConfig() got = %v, want %v", exits, true)
-	}
 
 	if !test.JsonEqual(storeCfg, newStoreCfg) {
 		t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg))

pkg/download/model.go

@@ -70,7 +70,9 @@ func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 {
 type DownloaderConfig struct {
 	Controller    *controller.Controller
 	FetchBuilders []fetcher.FetcherBuilder
-	Storage       Storage
+
+	RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
+	Storage         Storage
 
 	*DownloaderStoreConfig
 }
@@ -85,24 +87,28 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
 			new(bt.FetcherBuilder),
 		}
 	}
-	if cfg.Storage == nil {
-		cfg.Storage = NewMemStorage()
-	}
-
-	if cfg.DownloaderStoreConfig == nil {
-		cfg.DownloaderStoreConfig = &DownloaderStoreConfig{}
-	}
-
 	if cfg.RefreshInterval == 0 {
 		cfg.RefreshInterval = 350
 	}
+	if cfg.Storage == nil {
+		cfg.Storage = NewMemStorage()
+	}
 	return cfg
 }
 
 // DownloaderStoreConfig is the config that can restore the downloader.
 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
 }

pkg/rest/api.go

@@ -33,7 +33,7 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
 		if req.Rid != "" {
 			taskId, err = Downloader.Create(req.Rid, req.Opts)
 		} else if req.Req != nil {
-			taskId, err = Downloader.DirectCreate(req.Req, req.Opts)
+			taskId, err = Downloader.CreateDirect(req.Req, req.Opts)
 		} else {
 			WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam))
 			return
@@ -195,6 +195,6 @@ func writeError(w http.ResponseWriter, msg string) {
 }
 
 func getServerConfig() *download.DownloaderStoreConfig {
-	_, cfg, _ := Downloader.GetConfig()
+	cfg, _ := Downloader.GetConfig()
 	return cfg
 }

pkg/rest/model/server.go

@@ -12,9 +12,9 @@ const (
 type StartConfig struct {
 	Network         string  `json:"network"`
 	Address         string  `json:"address"`
+	RefreshInterval int     `json:"refreshInterval"`
 	Storage         Storage `json:"storage"`
 	StorageDir      string  `json:"storageDir"`
-	RefreshInterval int     `json:"refreshInterval"`
 	ApiToken        string  `json:"apiToken"`
 
 	WebEnable bool
@@ -28,6 +28,9 @@ func (cfg *StartConfig) Init() *StartConfig {
 	if cfg.Address == "" {
 		cfg.Address = "127.0.0.1:0"
 	}
+	if cfg.RefreshInterval == 0 {
+		cfg.RefreshInterval = 350
+	}
 	if cfg.Storage == "" {
 		cfg.Storage = StorageBolt
 	}

pkg/rest/server.go

@@ -57,14 +57,15 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	}
 	startCfg.Init()
 
-	downloadCfg := &download.DownloaderConfig{}
+	downloadCfg := &download.DownloaderConfig{
+		RefreshInterval: startCfg.RefreshInterval,
+	}
 	if startCfg.Storage == model.StorageBolt {
 		downloadCfg.Storage = download.NewBoltStorage(startCfg.StorageDir)
 	} else {
 		downloadCfg.Storage = download.NewMemStorage()
 	}
 	downloadCfg.Init()
-	downloadCfg.RefreshInterval = startCfg.RefreshInterval
 	Downloader = download.NewDownloader(downloadCfg)
 	if err := Downloader.Setup(); err != nil {
 		return nil, nil, err

pkg/util/timer.go

@@ -2,12 +2,17 @@ package util
 
 import "time"
 
-// 计时器
 type Timer struct {
 	t    int64
 	used int64
 }
 
+func NewTimer(used int64) *Timer {
+	return &Timer{
+		used: used,
+	}
+}
+
 func (t *Timer) Start() {
 	t.t = time.Now().UnixNano()
 }

ui/flutter/assets/locales/en_US.json

@@ -24,6 +24,7 @@
   "downloadDir": "Download Directory",
   "downloadDirValid": "Please select the download directory",
   "connections": "Connections",
+  "maxRunning": "Max Running Tasks",
   "items": "@count items",
   "subscribeTracker": "Subscribe Tracker",
   "subscribeFail": "Subscribe failed, please check network or try again later",

ui/flutter/assets/locales/ru_RU.json

@@ -24,6 +24,7 @@
   "downloadDir": "Папка загрузки",
   "downloadDirValid": "Пожалуйста, выберите папку для загрузки",
   "connections": "Соединений",
+  "maxRunning": "Максимальное количество активных задач",
   "items": "@подсчет элементов",
   "subscribeTracker": "Подпись трекера",
   "subscribeFail": "Подписка не удалась, пожалуйста, проверьте сеть или повторите попытку позже",

ui/flutter/assets/locales/zh_CN.json

@@ -24,6 +24,7 @@
   "downloadDir": "下载目录",
   "downloadDirValid": "请选择下载目录",
   "connections": "连接数",
+  "maxRunning": "最大下载数",
   "items": "@count 条",
   "subscribeTracker": "订阅 Tracker",
   "subscribeFail": "订阅失败，请检查网络或稍后重试",

ui/flutter/lib/api/api.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
@@ -73,15 +72,12 @@ Future<T> _parse<T>(
 ) async {
   try {
     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 {
-      return null as T;
+      throw Exception(result);
     }
   } on DioError catch (e) {
     throw Exception(Result(code: 1000, msg: e.message));

ui/flutter/lib/api/model/downloader_config.dart

@@ -5,6 +5,7 @@ part 'downloader_config.g.dart';
 @JsonSerializable(explicitToJson: true)
 class DownloaderConfig {
   String downloadDir = '';
+  int maxRunning = 0;
   ProtocolConfig protocolConfig = ProtocolConfig();
   ExtraConfig extra = ExtraConfig();
 

ui/flutter/lib/api/model/downloader_config.g.dart

@@ -9,6 +9,7 @@ part of 'downloader_config.dart';
 DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) =>
     DownloaderConfig()
       ..downloadDir = json['downloadDir'] as String
+      ..maxRunning = json['maxRunning'] as int
       ..protocolConfig = ProtocolConfig.fromJson(
           json['protocolConfig'] 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) =>
     <String, dynamic>{
       'downloadDir': instance.downloadDir,
+      'maxRunning': instance.maxRunning,
       'protocolConfig': instance.protocolConfig.toJson(),
       'extra': instance.extra.toJson(),
     };

ui/flutter/lib/api/model/task.dart

@@ -1,12 +1,10 @@
 import 'package:json_annotation/json_annotation.dart';
 
 import 'meta.dart';
-import 'options.dart';
-import 'resource.dart';
 
 part 'task.g.dart';
 
-enum Status { ready, running, pause, error, done }
+enum Status { ready, running, pause, wait, error, done }
 
 @JsonSerializable(explicitToJson: true)
 class Task {

ui/flutter/lib/api/model/task.g.dart

@@ -28,6 +28,7 @@ const _$StatusEnumMap = {
   Status.ready: 'ready',
   Status.running: 'running',
   Status.pause: 'pause',
+  Status.wait: 'wait',
   Status.error: 'error',
   Status.done: 'done',
 };

ui/flutter/lib/app/modules/create/views/create_view.dart

@@ -2,7 +2,6 @@ import 'package:desktop_drop/desktop_drop.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import '../../../../api/model/resolve_result.dart';
-import '../../../../api/model/result.dart';
 import 'package:rounded_loading_button/rounded_loading_button.dart';
 
 import '../../../../api/api.dart';

ui/flutter/lib/app/modules/setting/views/setting_view.dart

@@ -67,11 +67,37 @@ class SettingView extends GetView<SettingController> {
         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
     final httpConfig = downloaderCfg.value.protocolConfig.http;
     final buildHttpConnections = _buildConfigItem(
-        'connections'.tr, () => httpConfig.connections.toString(), (Key key) {
+        'connections', () => httpConfig.connections.toString(), (Key key) {
       final connectionsController =
           TextEditingController(text: httpConfig.connections.toString());
       connectionsController.addListener(() async {
@@ -99,7 +125,7 @@ class SettingView extends GetView<SettingController> {
     final btExtConfig = downloaderCfg.value.extra.bt;
 
     final buildBtTrackerSubscribeUrls = _buildConfigItem(
-        'subscribeTracker'.tr,
+        'subscribeTracker',
         () => 'items'.trParams(
             {'count': btExtConfig.trackerSubscribeUrls.length.toString()}),
         (Key key) {
@@ -155,7 +181,7 @@ class SettingView extends GetView<SettingController> {
       );
     });
     final buildBtTrackers = _buildConfigItem(
-        'addTracker'.tr,
+        'addTracker',
         () => 'items'
             .trParams({'count': btExtConfig.customTrackers.length.toString()}),
         (Key key) {
@@ -298,7 +324,7 @@ class SettingView extends GetView<SettingController> {
 
     // advanced config items start
     final buildApiProtocol = _buildConfigItem(
-      'protocol'.tr,
+      'protocol',
       () => startCfg.value.network == 'tcp'
           ? 'TCP ${startCfg.value.address}'
           : '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,
         (Key key) {
       final apiTokenController =
@@ -426,7 +452,7 @@ class SettingView extends GetView<SettingController> {
           length: 2,
           child: Scaffold(
               appBar: PreferredSize(
-                  preferredSize: Size.fromHeight(56),
+                  preferredSize: const Size.fromHeight(56),
                   child: AppBar(
                     bottom: TabBar(
                       tabs: [
@@ -448,9 +474,8 @@ class SettingView extends GetView<SettingController> {
                         Text('general'.tr),
                         Card(
                             child: Column(
-                          children: _addDivider([
+                          children: _addDivider(
-                            buildDownloadDir(),
+                              [buildDownloadDir(), buildMaxRunning()]),
-                          ]),
                         )),
                         const Text('HTTP'),
                         Card(
@@ -502,7 +527,7 @@ class SettingView extends GetView<SettingController> {
                     ],
                   ),
                 ],
-              ).paddingOnly(left: 16, right: 16, top: 16, bottom: 64)),
+              ).paddingOnly(left: 16, right: 16, top: 16, bottom: 16)),
         ),
       );
     });

ui/flutter/lib/app/modules/task/controllers/task_downloaded_controller.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 
 import 'package:gopeed/app/modules/task/controllers/task_list_controller.dart';
 

ui/flutter/lib/app/modules/task/controllers/task_downloading_controller.dart

@@ -3,5 +3,11 @@ import 'task_list_controller.dart';
 
 class TaskDownloadingController extends TaskListController {
   TaskDownloadingController()
-      : super([Status.ready, Status.running, Status.pause, Status.error]);
+      : super([
+          Status.ready,
+          Status.running,
+          Status.pause,
+          Status.wait,
+          Status.error
+        ]);
 }

ui/flutter/lib/app/views/views/buid_task_list_view.dart

@@ -1,11 +1,11 @@
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:path/path.dart' as path;
 
 import '../../../api/api.dart';
 import '../../../api/model/task.dart';
+import '../../../util/file_explorer.dart';
 import '../../../util/file_icon.dart';
 import '../../../util/icons.dart';
 import '../../../util/message.dart';
@@ -53,6 +53,18 @@ class BuildTaskListView extends GetView {
       return task.status == Status.running;
     }
 
+    String buildExplorerUrl(Task task) {
+      if (task.meta.res.rootDir.trim().isEmpty) {
+        return path.join(
+            Util.safeDir(task.meta.opts.path),
+            Util.safeDir(task.meta.res.files[0].path),
+            task.meta.res.files[0].name);
+      } else {
+        return path.join(Util.safeDir(task.meta.opts.path),
+            Util.safeDir(task.meta.res.rootDir));
+      }
+    }
+
     Future<void> showDeleteDialog(String id) {
       final keep = true.obs;
 
@@ -100,9 +112,7 @@ class BuildTaskListView extends GetView {
           list.add(IconButton(
             icon: const Icon(Icons.folder_open),
             onPressed: () async {
-              final file = File(Util.buildAbsPath(task.meta.opts.path,
+              await FileExplorer.openAndSelectFile(buildExplorerUrl(task));
-                  task.meta.res.files[0].path, task.meta.res.files[0].name));
-              await launchUrl(file.parent.uri);
             },
           ));
         }
@@ -111,14 +121,22 @@ class BuildTaskListView extends GetView {
           list.add(IconButton(
             icon: const Icon(Icons.pause),
             onPressed: () async {
-              await pauseTask(task.id);
+              try {
+                await pauseTask(task.id);
+              } catch (e) {
+                showErrorMessage(e);
+              }
             },
           ));
         } else {
           list.add(IconButton(
             icon: const Icon(Icons.play_arrow),
             onPressed: () async {
-              await continueTask(task.id);
+              try {
+                await continueTask(task.id);
+              } catch (e) {
+                showErrorMessage(e);
+              }
             },
           ));
         }
@@ -186,16 +204,14 @@ class BuildTaskListView extends GetView {
               : Icon(FaIcons.allIcons[findIcon(task.meta.res.name)]),
 
           trailing: SizedBox(
-            width: task.status == Status.done ? 80 : 180,
+            width: 180,
             child: Row(
               // crossAxisAlignment: CrossAxisAlignment.baseline,
               // textBaseline: DefaultTextStyle.of(context).style.textBaseline,
               mainAxisAlignment: MainAxisAlignment.end,
               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()
               ],
             ),

ui/flutter/lib/generated/locales.g.dart

@@ -38,6 +38,7 @@ class LocaleKeys {
   static const downloadDir = 'downloadDir';
   static const downloadDirValid = 'downloadDirValid';
   static const connections = 'connections';
+  static const maxRunning = 'maxRunning';
   static const items = 'items';
   static const subscribeTracker = 'subscribeTracker';
   static const subscribeFail = 'subscribeFail';
@@ -97,6 +98,7 @@ class Locales {
     'downloadDir': 'Download Directory',
     'downloadDirValid': 'Please select the download directory',
     'connections': 'Connections',
+    'maxRunning': 'Max Running Tasks',
     'items': '@count items',
     'subscribeTracker': 'Subscribe Tracker',
     'subscribeFail':
@@ -210,6 +212,7 @@ class Locales {
     'downloadDir': 'Папка загрузки',
     'downloadDirValid': 'Пожалуйста, выберите папку для загрузки',
     'connections': 'Соединений',
+    'maxRunning': 'Максимальное количество активных задач',
     'items': '@подсчет элементов',
     'subscribeTracker': 'Подпись трекера',
     'subscribeFail':
@@ -267,6 +270,7 @@ class Locales {
     'downloadDir': '下载目录',
     'downloadDirValid': '请选择下载目录',
     'connections': '连接数',
+    'maxRunning': '最大下载数',
     'items': '@count 条',
     'subscribeTracker': '订阅 Tracker',
     'subscribeFail': '订阅失败，请检查网络或稍后重试',

ui/flutter/lib/util/file_explorer.dart

@@ -0,0 +1,47 @@
+import 'dart:io';
+
+class FileExplorer {
+  static Future<void> openAndSelectFile(String filePath) async {
+    if (!await FileSystemEntity.isDirectory(filePath) &&
+        !await FileSystemEntity.isFile(filePath)) {
+      return;
+    }
+    if (await FileSystemEntity.isDirectory(filePath)) {
+      if (Platform.isWindows) {
+        Process.run('explorer.exe', [filePath]);
+      } else if (Platform.isMacOS || Platform.isLinux) {
+        Process.run('xdg-open', [filePath]);
+      }
+    } else if (await FileSystemEntity.isFile(filePath)) {
+      if (Platform.isWindows) {
+        Process.run('explorer.exe', ['/select,', filePath]);
+      } else if (Platform.isMacOS) {
+        Process.run('open', ['-R', filePath]);
+      } else if (Platform.isLinux) {
+        if (await _isUbuntuOrDebian()) {
+          Process.run('xdg-open', [filePath]);
+        } else if (await _isCentOS()) {
+          Process.run('nautilus', ['--select', filePath]);
+        }
+      }
+    }
+  }
+
+  static Future<bool> _isUbuntuOrDebian() async {
+    final result = await Process.run('lsb_release', ['-i']);
+    if (result.exitCode != 0) {
+      return false;
+    }
+    final output = result.stdout.toString().toLowerCase();
+    return output.contains('ubuntu') || output.contains('debian');
+  }
+
+  static Future<bool> _isCentOS() async {
+    final result = await Process.run('cat', ['/etc/os-release']);
+    if (result.exitCode != 0) {
+      return false;
+    }
+    final output = result.stdout.toString().toLowerCase();
+    return output.contains('centos');
+  }
+}

ui/flutter/lib/util/util.dart

@@ -3,12 +3,11 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 
 class Util {
-  static String buildAbsPath(String dir, String path, String name) {
+  static String safeDir(String path) {
-    return (dir == "" ? "" : "$dir/") + buildPath(path, name);
+    if (path == "." || path == "./" || path == ".\\") {
-  }
+      return "";
-
+    }
-  static String buildPath(String path, String name) {
+    return path;
-    return (path == "" ? "" : "$path/") + name;
   }
 
   static String fmtByte(int byte) {

ui/flutter/pubspec.lock

@@ -269,10 +269,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: d090ae03df98b0247b82e5928f44d1b959867049d18d73635e2e0bc3f49542b9
+      sha256: c7a8e25ca60e7f331b153b0cb3d405828f18d3e72a6fa1d9440c86556fffc877
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.2.5"
+    version: "5.3.0"
   fixnum:
     dependency: transitive
     description:
@@ -285,10 +285,10 @@ packages:
     dependency: "direct main"
     description:
       name: fluent_ui
-      sha256: "55294f8f8b1aab6ac7a2be529b1dcb4affcff3e3176e5e50e5f1918a40050df7"
+      sha256: "334144996f2699bb9dd678a9fe9a8e65a2e0b89bda9328ed4f0d49a8768f1416"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -320,10 +320,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.14"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -399,7 +399,7 @@ packages:
     source: hosted
     version: "3.2.2"
   intl:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: intl
       sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
@@ -510,6 +510,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0"
+  math_expressions:
+    dependency: transitive
+    description:
+      name: math_expressions
+      sha256: "3576593617c3870d75728a751f6ec6e606706d44e363f088ac394b5a28a98064"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.4.0"
   meta:
     dependency: transitive
     description:
@@ -538,10 +546,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: f619162573096d428ccde2e33f92e05b5a179cd6f0e3120c1005f181bee8ed16
+      sha256: d39e8fbff4c5aef4592737e25ad6ac500df006ce7a7a8e1f838ce1256e167542
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -610,10 +618,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.6"
   petitparser:
     dependency: transitive
     description:
@@ -634,10 +642,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pool:
     dependency: transitive
     description:
@@ -983,10 +991,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "1952a663c0e34fbde55916010d54bbb249bf5f2583113c497602f0ee01c6faa4"
+      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.0"
+    version: "4.1.4"
   xdg_directories:
     dependency: transitive
     description:

ui/flutter/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.3.0+1
+version: 1.3.1+1
 
 environment:
   sdk: ">=2.17.6 <3.0.0"
@@ -49,8 +49,7 @@ dependencies:
   shared_preferences: ^2.0.15
   logger: ^1.3.0
   desktop_drop: ^0.3.3
-  intl: ^0.17.0
+  package_info_plus: ^4.0.0
-  package_info_plus: ^3.0.2
   fluent_ui: ^4.4.0
   path: any
   badges: ^3.0.3
@@ -65,6 +64,7 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^2.0.0
   ffigen: ^6.1.2
+  # build json model: flutter pub run build_runner build --delete-conflicting-outputs
   build_runner: ^2.2.1
   json_serializable: ^6.3.2
   flutter_launcher_icons:

ui/flutter/test/widget_test.dart

@@ -5,10 +5,8 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:gopeed/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {});