release: v1.6.4

.github/workflows/build.yml

@@ -4,17 +4,17 @@ on:
   workflow_dispatch:
     inputs:
       platform:
-        description: "Build platform"
+        description: 'Build platform'
         required: true
-        default: "all"
+        default: 'all'
       test:
-        description: "Test mode"
+        description: 'Test mode'
         required: true
         default: "false"
 
 env:
   GO_VERSION: "1.23"
-  FLUTTER_VERSION: "3.24.3"
+  FLUTTER_VERSION: "3.16.8"
 
 permissions:
   contents: write
@@ -366,7 +366,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: "17"
+          java-version: "11"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -441,6 +441,7 @@ jobs:
         env:
           VERSION: ${{ needs.get-release.outputs.version }}
         run: |
+          VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
           cd ui/flutter
           flutter build web --web-renderer html
           cd ../../
@@ -468,6 +469,39 @@ jobs:
               || true
             done
           done
+          sudo apt update -y
+          sudo apt install -y pv python2 bsdmainutils
+          wget -O qdk2_0.32.bionic_amd64.deb "https://github.com/qnap-dev/qdk2/releases/download/v0.32/qdk2_0.32.bionic_amd64.deb"
+          dpkg -X qdk2_0.32.bionic_amd64.deb qdk2 # Direct installs will fail due to missing dependencies!
+          [[ -d qdk2 ]] || exit 1
+          export PATH=$(pwd)/qdk2/usr/bin:$(pwd)/qdk2/usr/share/qdk2/QDK/bin:${PATH}
+          wget -O Gopeed.template.tar.gz "https://github.com/GopeedLab/QpkgBuild/raw/refs/heads/master/template/Gopeed.template.tar.gz"
+          tar -zxf Gopeed.template.tar.gz
+          [[ -d Gopeed ]] || exit 1
+          goos=linux
+          goarch_arr=(amd64 arm64)
+          for goarch in "${goarch_arr[@]}"; do
+            qarch=x86_64
+            [[ "${goarch}" == "arm64" ]] && qarch=arm_64
+            name=gopeed-web-v${VERSION}-${goos}-${goarch}
+            cp dist/${name}/${name}/* Gopeed/${qarch}/
+          done
+          cd Gopeed
+          sed -i -e 's/__QPKG_VER__/${VERSION}/g' qpkg.cfg
+          qbuild || exit 1
+          for f in build/*; do echo ">>> build=[${f}]"; done
+          goos=qnap
+          goarch_arr=(amd64 arm64)
+          for goarch in "${goarch_arr[@]}"; do
+            qarch=x86_64
+            [[ "${goarch}" == "arm64" ]] && qarch=arm_64
+            sname=Gopeed_${VERSION}_${qarch}.qpkg
+            dname=gopeed-${goos}-v${VERSION}-${goarch}.qpkg
+            echo "sname=${sname}, dname=${dname}"
+            [[ -f build/${sname} ]] && cp -ra build/${sname} ../dist/zip/${dname}
+          done
+          for f in ../dist/zip/*; do echo ">>> dist=[${f}]"; done
+          cd ..
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:

.github/workflows/test.yml

@@ -28,7 +28,7 @@ on:
 
 env:
   GO_VERSION: "1.23"
-  FLUTTER_VERSION: "3.24.3"
+  FLUTTER_VERSION: "3.16.8"
 
 jobs:
   #  lint:
@@ -73,17 +73,17 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-      - if: runner.os == 'windows-latest'
+      - if: runner.os == 'windows'
         run: |
           go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
           flutter build windows
-      - if: runner.os == 'macos-latest'
+      - if: runner.os == 'macOS'
         run: |
           go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
           flutter build macos
-      - if: runner.os == 'ubuntu-latest'
+      - if: runner.os == 'Linux'
         run: |
           sudo apt-get update -y
           sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev

Dockerfile

@@ -8,14 +8,13 @@ RUN CGO_ENABLED=0 go build -tags nosqlite,web \
       -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION -X github.com/GopeedLab/gopeed/pkg/base.InDocker=true" \
       -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
 
-FROM alpine:3.14.2
+FROM alpine:3.18
 LABEL maintainer="monkeyWie"
 WORKDIR /app
 COPY --from=go /app/dist/gopeed ./
 COPY entrypoint.sh ./entrypoint.sh
 RUN apk update && \
-    apk upgrade --no-cache && \
+    apk add --no-cache su-exec ; \
-    apk add --no-cache bash su-exec; \
     chmod +x ./entrypoint.sh && \
     rm -rf /var/cache/apk/*
 VOLUME ["/app/storage"]

README.md

@@ -115,7 +115,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 ### Environment
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### Clone
 

README_ja-JP.md

@@ -103,7 +103,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
 ### 環境
 
 1. Go 言語 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### クローン
 

README_vi-VN.md

@@ -111,7 +111,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
 ### Environment
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### Clone
 

README_zh-CN.md

@@ -115,7 +115,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载，支持 Chrome、
 ### 环境要求
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### 克隆项目
 

README_zh-TW.md

@@ -111,7 +111,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ### 開發環境
 
 1. Golang 1.23+
-2. Flutter 3.24+
+2. Flutter 3.16+
 
 ### 克隆項目
 

docker-compose.yml

@@ -1,12 +1,15 @@
-version: '3'
-
 services:
     gopeed:
       container_name: gopeed
       ports:
-      - "9999:9999" # HTTP port (host:container)
+        - 9999:9999 # HTTP port (host:container)
-    image: liwei2633/gopeed
+      environment:
+        - PUID=0
+        - PGID=0
+        - UMASK=022
       volumes:
         - ~/gopeed/Downloads:/app/Downloads # mount download path
         #- ~/gopeed/storage:/app/storage # if you need to mount storage path, uncomment this line
       restart: unless-stopped
+      image: liwei2633/gopeed
+      # command: -u Username -p Password # optional authentication

internal/protocol/http/fetcher.go

@@ -162,9 +162,6 @@ func (f *Fetcher) Resolve(req *base.Request) error {
 func (f *Fetcher) Create(opts *base.Options) error {
 	f.meta.Opts = opts
 
-	if err := base.ParseReqExtra[fhttp.ReqExtra](f.meta.Req); err != nil {
-		return err
-	}
 	if err := base.ParseOptsExtra[fhttp.OptsExtra](f.meta.Opts); err != nil {
 		return err
 	}
@@ -198,6 +195,12 @@ func (f *Fetcher) Start() (err error) {
 	if err != nil {
 		return err
 	}
+
+	// Avoid request extra modified by extension
+	if err = base.ParseReqExtra[fhttp.ReqExtra](f.meta.Req); err != nil {
+		return err
+	}
+
 	if f.chunks == nil {
 		f.chunks = f.splitChunk()
 	}

pkg/download/downloader.go

@@ -204,33 +204,29 @@ func (d *Downloader) Setup() error {
 
 						current := task.fetcher.Progress().TotalDownloaded()
 						tick := float64(d.cfg.RefreshInterval) / 1000
+						downloadDataChanged := false
 						if task.Status == base.DownloadStatusRunning {
+							downloadDataChanged = current != task.Progress.Downloaded
 							task.Progress.Used = task.timer.Used()
 							task.Progress.Speed = task.calcSpeed(task.speedArr, current-task.Progress.Downloaded, tick)
 							task.Progress.Downloaded = current
 						}
+
+						uploadDataChanged := false
 						if task.Uploading {
 							uploader := task.fetcher.(fetcher.Uploader)
 							currentUploaded := uploader.UploadedBytes()
+							uploadDataChanged = currentUploaded != task.Progress.Uploaded
 							task.Progress.UploadSpeed = task.calcSpeed(task.uploadSpeedArr, currentUploaded-task.Progress.Uploaded, tick)
 							task.Progress.Uploaded = currentUploaded
 						}
 						d.emit(EventKeyProgress, task)
 
-						// store fetcher progress
+						// store fetcher progress when download/upload data changed
-						data, err := task.fetcherManager.Store(task.fetcher)
+						if !downloadDataChanged && !uploadDataChanged {
-						if err != nil {
-							d.Logger.Error().Stack().Err(err).Msgf("serialize fetcher failed: %s", task.ID)
-							return
-						}
-						if err := d.storage.Put(bucketSave, task.ID, data); err != nil {
-							d.Logger.Error().Stack().Err(err).Msgf("persist fetcher failed: %s", task.ID)
-							return
-						}
-						if err := d.storage.Put(bucketTask, task.ID, task); err != nil {
-							d.Logger.Error().Stack().Err(err).Msgf("persist task failed: %s", task.ID)
 							return
 						}
+						d.saveTask(task)
 					}()
 				}
 			}
@@ -273,6 +269,23 @@ func (d *Downloader) setupFetcher(fm fetcher.FetcherManager, fetcher fetcher.Fet
 	fetcher.Setup(ctl)
 }
 
+func (d *Downloader) saveTask(task *Task) error {
+	data, err := task.fetcherManager.Store(task.fetcher)
+	if err != nil {
+		d.Logger.Error().Stack().Err(err).Msgf("serialize fetcher failed: %s", task.ID)
+		return err
+	}
+	if err := d.storage.Put(bucketSave, task.ID, data); err != nil {
+		d.Logger.Error().Stack().Err(err).Msgf("persist fetcher failed: %s", task.ID)
+		return err
+	}
+	if err := d.storage.Put(bucketTask, task.ID, task); err != nil {
+		d.Logger.Error().Stack().Err(err).Msgf("persist task failed: %s", task.ID)
+		return err
+	}
+	return nil
+}
+
 func (d *Downloader) Resolve(req *base.Request) (rr *ResolveResult, err error) {
 	rrId, err := gonanoid.New()
 	if err != nil {
@@ -1064,7 +1077,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
 		if err := task.fetcher.Start(); err != nil {
 			return err
 		}
-		if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
+		if err := d.saveTask(task); err != nil {
 			return err
 		}
 		d.emit(EventKeyStart, task)

pkg/download/extension.go

@@ -703,31 +703,37 @@ type OnDoneContext struct {
 }
 
 type ExtensionTask struct {
-	*Task
-
 	download *Downloader
+	task     *Task
+
+	Meta *ExtensionTaskMeta `json:"meta"`
+}
+
+// ExtensionTaskMeta restricts extension scripts to only modify request info
+type ExtensionTaskMeta struct {
+	Req *base.Request `json:"req"`
 }
 
 func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
 	newTask := task.clone()
-	// Assign the pointer of the properties that the extension supports modification
-	newTask.Meta = task.Meta
-	newTask.Status = task.Status
 	return &ExtensionTask{
-		Task:     newTask,
+		task:     newTask,
 		download: download,
+		Meta: &ExtensionTaskMeta{
+			Req: task.Meta.Req,
+		},
 	}
 }
 
 func (t *ExtensionTask) Continue() error {
 	return t.download.Continue(&TaskFilter{
-		IDs: []string{t.ID},
+		IDs: []string{t.task.ID},
 	})
 }
 
 func (t *ExtensionTask) Pause() error {
 	return t.download.Pause(&TaskFilter{
-		IDs: []string{t.ID},
+		IDs: []string{t.task.ID},
 	})
 }
 

ui/flutter/lib/app/modules/app/controllers/app_controller.dart

@@ -173,7 +173,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
     });
 
     // Check initial link if app was in cold state (terminated)
-    final uri = await _appLinks.getInitialLink();
+    final uri = await _appLinks.getInitialAppLink();
     if (uri != null) {
       await _toCreate(uri);
     }

ui/flutter/macos/Podfile.lock

@@ -3,8 +3,6 @@ PODS:
     - FlutterMacOS
   - desktop_drop (0.0.1):
     - FlutterMacOS
-  - device_info_plus (0.0.1):
-    - FlutterMacOS
   - FlutterMacOS (1.0.0)
   - macos_secure_bookmarks (0.0.3):
     - FlutterMacOS
@@ -30,7 +28,6 @@ PODS:
 DEPENDENCIES:
   - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
   - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
-  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - macos_secure_bookmarks (from `Flutter/ephemeral/.symlinks/plugins/macos_secure_bookmarks/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
@@ -47,8 +44,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
   desktop_drop:
     :path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
-  device_info_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
   macos_secure_bookmarks:
@@ -73,16 +68,15 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
   desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
-  device_info_plus: 74e614483d05c89290d30a4c8feae15d555f7427
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   macos_secure_bookmarks: cff041c4b377fa00941bb901aaec4d27fac5edf2
-  package_info_plus: f5790acc797bf17c3e959e9d6cf162cc68ff7523
+  package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
-  share_plus: fd717ef89a2801d3491e737630112b80c310640e
+  share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
   tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
-  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
+  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7

ui/flutter/macos/Runner.xcodeproj/project.pbxproj

@@ -206,7 +206,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

ui/flutter/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ui/flutter/macos/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@main
+@NSApplicationMain
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return false

ui/flutter/pubspec.yaml

@@ -15,10 +15,10 @@ 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.6.2+1
+version: 1.6.4+1
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: '>=3.0.0 <4.0.0'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -36,43 +36,45 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
   get: ^4.6.5
-  # lottie: ^1.4.2
+  lottie: ^1.4.2
   styled_widget: ^0.4.0+3
-  context_menus: ^1.2.0
+  context_menus: ^1.0.2
   json_annotation: ^4.8.1
   dio: ^5.2.1
-  path_provider: ^2.1.4
+  path_provider: ^2.1.1
-  file_picker: ^8.1.2
+  file_picker: 5.3.1
   macos_secure_bookmarks: ^0.2.1
   rounded_loading_button_plus: ^3.0.1
-  url_launcher: ^6.3.1
+  url_launcher: ^6.1.6
-  logger: ^1.4.0
+  logger: ^1.3.0
-  desktop_drop: ^0.4.4
+  desktop_drop: ^0.4.3
-  package_info_plus: ^8.1.0
+  package_info_plus: ^4.0.0
-  fluent_ui: ^4.9.2
+  fluent_ui: ^4.4.0
-  path: ^1.9.0
+  path: any
   badges: ^3.0.3
-  app_links: ^6.3.2
+  app_links: ^3.4.2
-  uri_to_file: ^1.0.0
+  uri_to_file: ^0.2.0
-  window_manager: ^0.4.2
+  window_manager: ^0.3.4
   autoscale_tabbarview: ^1.0.2
-  share_plus: ^10.1.0
+  share_plus: ^7.1.0
-  flutter_form_builder: ^9.5.0
+  flutter_form_builder: ^9.1.1
-  form_builder_validators: ^11.0.0
+  form_builder_validators: ^9.0.0
   flutter_foreground_task: ^8.2.0
-  open_filex: ^4.5.0
+  open_filex: ^4.3.4
-  tray_manager: ^0.2.4
+  tray_manager: ^0.2.3
   lecle_downloads_path_provider: ^0.0.2+8
   hive: ^2.2.3
-  launch_at_startup: ^0.3.1
+  launch_at_startup: ^0.2.2
   args: ^2.5.0
   toggle_switch: ^2.3.0
-  permission_handler:
+  permission_handler: ^11.3.1
+  device_info_plus: ^9.1.2
+dependency_overrides:
+  permission_handler_windows:
     git:
       url: https://github.com/monkeyWie/flutter-permission-handler.git
       ref: 35fc72c30262b9b49e1965b48a7524b44ba9daa7
-      path: permission_handler
+      path: permission_handler_windows
-  device_info_plus: ^11.1.0
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -148,7 +150,7 @@ flutter_icons:
 ffigen:
   name: LibgopeedBind
   description: Bindings to gopeed library.
-  output: "lib/core/ffi/libgopeed_bind.dart"
+  output: 'lib/core/ffi/libgopeed_bind.dart'
   headers:
     entry-points:
-      - "include/libgopeed.h"
+      - 'include/libgopeed.h'