Merge branch 'main' into copilot/add-auto-move-file-on-download

Author: monkeyWie

.github/workflows/build.yml

@@ -44,15 +44,17 @@ jobs:
           - arch: arm64
             os: windows-11-arm
             llvm_ver: "20251202" # Only ARM64
-            flutter_channel: "master"
-            flutter_version: "8817d45220d" # Only ARM64
+            flutter_channel: "main"
+            flutter_version: "7e1c8868"
           - arch: amd64
             os: windows-2022
-            flutter_channel: "stable"
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
+      - name: Enable long paths for flutter main branch checks
+        run: |
+          git config --global core.longpaths true
 
       # Install LLVM environment only on ARM64
       - name: Install llvm-mingw-ucrt-aarch64 (ARM64 only)
@@ -84,7 +86,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - uses: subosito/flutter-action@v2
         with:
-          channel: ${{ matrix.flutter_channel }}
+          channel: ${{ matrix.flutter_channel || 'stable' }}
           flutter-version: ${{ matrix.flutter_version || env.FLUTTER_VERSION }}
       - name: Build
         env:
@@ -112,6 +114,7 @@ jobs:
               $release = "build\windows\arm64\runner\Release\"
               $mingw = "$env:CLANGARM64_ROOT\aarch64-w64-mingw32\bin"
               cp $mingw\libc++.dll $release
+              cp $mingw\libunwind.dll $release
           }
           cp $mingw\libwinpthread-1.dll $release
           cp $system\msvcp140.dll $release

.github/workflows/test.yml

@@ -66,21 +66,56 @@ jobs:
           files: ./coverage.txt
           token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
   build-desktop:
-    name: Build desktop check
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022, macos-latest, ubuntu-22.04, ubuntu-22.04-arm]
+        include:
+          - os: windows-2022
+          - os: windows-11-arm
+            llvm_ver: "20251202" # Only ARM64
+            flutter_channel: "main"
+            flutter_version: "7e1c8868"
+          - os: macos-latest
+          - os: ubuntu-22.04
+          - os: ubuntu-22.04-arm
+            flutter_channel: "main"
+    name: Build desktop check (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
     needs: [test]
     steps:
       - uses: actions/checkout@v3
+      - name: Enable long paths for flutter main branch checks
+        run: |
+          git config --global core.longpaths true
+      - name: Install llvm-mingw-ucrt-aarch64 (ARM64 only)
+        if: matrix.os == 'windows-11-arm'
+        run: |
+          $ver = "${{ matrix.llvm_ver }}"
+          $url = "https://github.com/mstorsjo/llvm-mingw/releases/download/$ver/llvm-mingw-$ver-ucrt-aarch64.zip"
+          $zip = "$env:RUNNER_TEMP\\llvm.zip"
+          $extract = "$env:RUNNER_TEMP\\extract"
+          $target = "C:\\clangarm64"
+
+          curl -L $url -o $zip
+          rm -r -fo $extract,$target -ea Ignore
+          mkdir $extract | Out-Null
+
+          tar -xf $zip -C $extract
+          mv (Get-ChildItem $extract)[0].FullName $target
+
+          $b = "$target\\bin"
+          "CC=$b\\clang.exe"        >> $env:GITHUB_ENV
+          "CXX=$b\\clang++.exe"     >> $env:GITHUB_ENV
+          "CLANGARM64_BIN=$b"       >> $env:GITHUB_ENV
+          "CGO_ENABLED=1"           >> $env:GITHUB_ENV
+          "CLANGARM64_ROOT=$target" >> $env:GITHUB_ENV
+          $b >> $env:GITHUB_PATH
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: master
+          channel: ${{ matrix.flutter_channel || 'stable' }}
+          flutter-version: ${{ matrix.flutter_version || env.FLUTTER_VERSION }}
       - 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

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24.11 AS go
+FROM golang:1.24.11-alpine3.23 AS go
 WORKDIR /app
 COPY ./go.mod ./go.sum ./
 RUN go mod download
@@ -8,7 +8,7 @@ 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.18
+FROM alpine:3.23
 LABEL maintainer="monkeyWie"
 WORKDIR /app
 COPY --from=go /app/dist/gopeed ./

internal/fetcher/fetcher.go

@@ -14,6 +14,10 @@ type Fetcher interface {
 	Setup(ctl *controller.Controller)
 	Resolve(req *base.Request, opts *base.Options) error
 	Start() error
+	// Patch modifies task-specific data based on the protocol.
+	// For HTTP: can modify Request info (URL, headers, etc.)
+	// For BT: can modify SelectFiles (via opts.SelectFiles)
+	Patch(req *base.Request, opts *base.Options) error
 	Pause() error
 	Close() error
 

internal/protocol/bt/fetcher.go

@@ -232,6 +232,59 @@ func (f *Fetcher) isDone() bool {
 	return true
 }
 
+// Patch modifies the BT task settings.
+// Invalid file indices are silently ignored.
+func (f *Fetcher) Patch(req *base.Request, opts *base.Options) error {
+	if opts == nil {
+		return nil
+	}
+
+	if opts.SelectFiles != nil {
+		selectFiles := opts.SelectFiles
+
+		// Get file count from resource metadata
+		fileCount := 0
+		if f.meta.Res != nil {
+			fileCount = len(f.meta.Res.Files)
+		}
+
+		// Filter out invalid indices (silently ignore)
+		validSelectFiles := make([]int, 0, len(selectFiles))
+		for _, idx := range selectFiles {
+			if idx >= 0 && idx < fileCount {
+				validSelectFiles = append(validSelectFiles, idx)
+			}
+		}
+
+		if f.torrent != nil {
+			files := f.torrent.Files()
+
+			// Cancel all current file downloads first
+			f.torrent.CancelPieces(0, f.torrent.NumPieces())
+
+			// Apply new file selection
+			if len(validSelectFiles) == len(files) {
+				f.torrent.DownloadAll()
+			} else {
+				for _, selectIndex := range validSelectFiles {
+					file := files[selectIndex]
+					file.Download()
+				}
+			}
+		}
+
+		f.meta.Opts.SelectFiles = validSelectFiles
+		// Recalculate the resource size based on new selection
+		if f.meta.Res != nil {
+			f.meta.Res.CalcSize(validSelectFiles)
+		}
+		// Reset progress tracking for new file selection
+		f.data.Progress = make(fetcher.Progress, len(validSelectFiles))
+	}
+
+	return nil
+}
+
 func (f *Fetcher) updateRes() {
 	res := &base.Resource{
 		Range: true,

internal/protocol/bt/fetcher_test.go

@@ -239,3 +239,130 @@ func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher
 	fetcher.Setup(newController)
 	return fetcher
 }
+
+// TestFetcher_Patch tests the Patch functionality for BT fetcher.
+// It tests modifying selected files after Resolve (without downloading).
+func TestFetcher_Patch(t *testing.T) {
+	f := buildFetcher()
+
+	// Resolve a multi-file torrent
+	err := f.Resolve(&base.Request{
+		URL: "./testdata/test.torrent",
+	}, nil)
+	if err != nil {
+		t.Fatalf("Resolve failed: %v", err)
+	}
+
+	// Verify initial state: 3 files, all selected by default
+	meta := f.Meta()
+	if len(meta.Res.Files) != 3 {
+		t.Fatalf("Expected 3 files, got %d", len(meta.Res.Files))
+	}
+	if len(meta.Opts.SelectFiles) != 3 {
+		t.Fatalf("Expected 3 selected files, got %d", len(meta.Opts.SelectFiles))
+	}
+
+	// Total size of all files: 107484864
+	totalSize := int64(107484864)
+	if meta.Res.Size != totalSize {
+		t.Fatalf("Expected total size %d, got %d", totalSize, meta.Res.Size)
+	}
+
+	t.Run("Patch with valid indices", func(t *testing.T) {
+		// Select only file 0 and 2 (c.txt and a.txt)
+		err := f.Patch(nil, &base.Options{
+			SelectFiles: []int{0, 2},
+		})
+		if err != nil {
+			t.Fatalf("Patch failed: %v", err)
+		}
+
+		meta := f.Meta()
+		if !reflect.DeepEqual(meta.Opts.SelectFiles, []int{0, 2}) {
+			t.Errorf("Expected SelectFiles [0, 2], got %v", meta.Opts.SelectFiles)
+		}
+
+		// Size should be recalculated: c.txt (98501754) + a.txt (78114) = 98579868
+		expectedSize := int64(98501754 + 78114)
+		if meta.Res.Size != expectedSize {
+			t.Errorf("Expected size %d, got %d", expectedSize, meta.Res.Size)
+		}
+	})
+
+	t.Run("Patch with invalid indices are silently ignored", func(t *testing.T) {
+		// Mix of valid (0, 1) and invalid (-1, 5, 100) indices
+		err := f.Patch(nil, &base.Options{
+			SelectFiles: []int{-1, 0, 5, 1, 100},
+		})
+		if err != nil {
+			t.Fatalf("Patch should not return error for invalid indices: %v", err)
+		}
+
+		meta := f.Meta()
+		// Only valid indices 0 and 1 should remain
+		if !reflect.DeepEqual(meta.Opts.SelectFiles, []int{0, 1}) {
+			t.Errorf("Expected SelectFiles [0, 1], got %v", meta.Opts.SelectFiles)
+		}
+
+		// Size should be: c.txt (98501754) + b.txt (8904996) = 107406750
+		expectedSize := int64(98501754 + 8904996)
+		if meta.Res.Size != expectedSize {
+			t.Errorf("Expected size %d, got %d", expectedSize, meta.Res.Size)
+		}
+	})
+
+	t.Run("Patch with all invalid indices results in empty selection", func(t *testing.T) {
+		err := f.Patch(nil, &base.Options{
+			SelectFiles: []int{-5, 10, 999},
+		})
+		if err != nil {
+			t.Fatalf("Patch should not return error: %v", err)
+		}
+
+		meta := f.Meta()
+		if len(meta.Opts.SelectFiles) != 0 {
+			t.Errorf("Expected empty SelectFiles, got %v", meta.Opts.SelectFiles)
+		}
+
+		// Note: CalcSize with empty selectFiles calculates total size of all files
+		// This is by design - empty selection in CalcSize means "all files"
+		// But SelectFiles being empty means no files are selected for download
+		if meta.Res.Size != totalSize {
+			t.Errorf("Expected size %d (CalcSize with empty slice = all files), got %d", totalSize, meta.Res.Size)
+		}
+	})
+
+	t.Run("Patch with nil opts does nothing", func(t *testing.T) {
+		// First set a known state
+		f.Patch(nil, &base.Options{SelectFiles: []int{1}})
+		prevSelectFiles := f.Meta().Opts.SelectFiles
+
+		// Patch with nil opts
+		err := f.Patch(nil, nil)
+		if err != nil {
+			t.Fatalf("Patch with nil opts should not fail: %v", err)
+		}
+
+		// Should remain unchanged
+		if !reflect.DeepEqual(f.Meta().Opts.SelectFiles, prevSelectFiles) {
+			t.Errorf("SelectFiles should remain unchanged after nil opts Patch")
+		}
+	})
+
+	t.Run("Patch progress array is resized", func(t *testing.T) {
+		btFetcher := f.(*Fetcher)
+		// Initialize progress array
+		btFetcher.data.Progress = make(fetcher.Progress, 3)
+
+		err := f.Patch(nil, &base.Options{
+			SelectFiles: []int{0, 2},
+		})
+		if err != nil {
+			t.Fatalf("Patch failed: %v", err)
+		}
+
+		if len(btFetcher.data.Progress) != 2 {
+			t.Errorf("Expected Progress length 2, got %d", len(btFetcher.data.Progress))
+		}
+	})
+}

internal/protocol/http/fetcher.go

@@ -1021,7 +1021,9 @@ func (f *Fetcher) downloadChunkOnce(conn *connection, client *http.Client, buf [
 				// Fallback succeeded, use this response instead
 				resp = fallbackResp
 				// Update the redirect URL from the response
-				f.updateRedirectURL(resp)
+				if resp.Request != nil && resp.Request.URL != nil {
+					f.updateRedirectURL(resp.Request.URL.String())
+				}
 			} else {
 				// Fallback also failed, return the original error
 				if fallbackResp != nil {
@@ -1571,6 +1573,60 @@ func (f *Fetcher) checkCompletion() bool {
 	return false
 }
 
+// Patch modifies the HTTP request information.
+func (f *Fetcher) Patch(req *base.Request, opts *base.Options) error {
+	// Patch request info
+	if req != nil {
+		if req.URL != "" {
+			f.meta.Req.URL = req.URL
+			// Clear redirect URL when URL is changed, so new requests use the new URL
+			f.updateRedirectURL("")
+		}
+		if req.Extra != nil {
+			if err := base.ParseReqExtra[fhttp.ReqExtra](req); err != nil {
+				return err
+			}
+			patchExtra := req.Extra.(*fhttp.ReqExtra)
+			// Merge Extra fields instead of replacing entirely
+			if f.meta.Req.Extra == nil {
+				f.meta.Req.Extra = &fhttp.ReqExtra{}
+			}
+			existingExtra := f.meta.Req.Extra.(*fhttp.ReqExtra)
+			// Update Method only if non-empty
+			if patchExtra.Method != "" {
+				existingExtra.Method = patchExtra.Method
+			}
+			// Update Body only if non-empty
+			if patchExtra.Body != "" {
+				existingExtra.Body = patchExtra.Body
+			}
+			// Merge Headers: existing keys are overwritten, new keys are added
+			if patchExtra.Header != nil {
+				if existingExtra.Header == nil {
+					existingExtra.Header = make(map[string]string)
+				}
+				for k, v := range patchExtra.Header {
+					existingExtra.Header[k] = v
+				}
+			}
+		}
+		// Merge Labels: existing keys are overwritten, new keys are added
+		if req.Labels != nil {
+			if f.meta.Req.Labels == nil {
+				f.meta.Req.Labels = make(map[string]string)
+			}
+			for k, v := range req.Labels {
+				f.meta.Req.Labels[k] = v
+			}
+		}
+		if req.Proxy != nil {
+			f.meta.Req.Proxy = req.Proxy
+		}
+	}
+
+	return nil
+}
+
 func (f *Fetcher) Pause() error {
 	if f.cancel != nil {
 		f.cancel()