release: v1.3.2

* Fix: fluent theme mode fix

---------

Co-authored-by: wuke2022 <[email protected]>

.donate/index.md

@@ -0,0 +1,27 @@
+## Donate
+
+Thank you for your support! 🙏
+
+<div style="text-align: center;">
+  <table>
+    <tr>
+      <th>微信</th>
+      <th>支付宝</th>
+      <th>PayPal</th>
+      <th>Ko-fi</th>
+    </tr>
+    <tr>
+      <td><img src="/.donate/qr/wechatpay.jpg" alt="wechatpay" width="300" /></td>
+      <td><img src="/.donate/qr/alipay.jpg" alt="alipay" width="300" /></td>
+      <td><a href="https://paypal.me/monkeyWie" target="_blank">Click Me</a></td>
+      <td><a href="https://ko-fi.com/gopeed" target="_blank">Click Me</a></td>
+  </table>
+</div>
+
+### Crypto
+
+- **BTC**: 35jYkPN8bgkh7AWjt3B1VgMQHqtGYcvF6p
+- **ETH:** 0x928a7fd2398c941Ac6713704e606Fa414595e3A0
+- **Matic:** 0x928a7fd2398c941Ac6713704e606Fa414595e3A0
+- **BNB:** 0x928a7fd2398c941Ac6713704e606Fa414595e3A0
+- **USDT(ERC20)**: 0x928a7fd2398c941Ac6713704e606Fa414595e3A0

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+# github: monkeyWie
+ko_fi: gopeed
+custom: https://github.com/GopeedLab/gopeed/blob/main/.donate/index.md#donate

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,8 @@
 <!--
-请根据以下模版提issue
+Please use the following template to create an issue.
 -->
-### 问题描述(必要)
+### Description(required)
-### 版本号(必要)
+### App Version(required)
-### 操作系统(必要)
+### OS Version(required)
-### 相关截图
+### Snapshots
-### 相关日志
+### Log

.github/workflows/build.yml

@@ -2,8 +2,14 @@ name: build
 
 on:
   workflow_dispatch:
-  release:
+
-    types: [published]
+env:
+  GO_VERSION: 1.19
+  FLUTTER_VERSION: 3.7.12
+
+permissions:
+  contents: write
+
 jobs:
   get-release:
     runs-on: ubuntu-latest
@@ -12,24 +18,30 @@ jobs:
       upload_url: ${{ steps.get-release.outputs.upload_url }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: monkeyWie/get-latest-release@v1
-      - uses: thebritican/[email protected]
         id: get-release
+        with:
+          myToken: ${{ github.token }}
+
   build-windows:
     runs-on: windows-latest
     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 }}
         run: |
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/monkeyWie/gopeed/bind/desktop
+          Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "ChineseSimplified.isl"
+          mv ChineseSimplified.isl "C:\Program Files (x86)\Inno Setup 6\Languages\" 
+
+          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
           $mingw = "C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin"
@@ -43,7 +55,7 @@ jobs:
           cp $system\vcruntime140_1.dll $release
 
           New-Item -Path build\windows\Output -ItemType Directory
-          Compress-Archive -Path "$release*" -DestinationPath build\windows\Output\Gopeed-$env:VERSION-windows-amd64.zip
+          Compress-Archive -Path "$release*" -DestinationPath "build\windows\Output\Gopeed-$env:VERSION-windows-amd64-portable.zip"
 
           cd build/windows
           echo @"
@@ -77,9 +89,12 @@ jobs:
           Compression=lzma
           SolidCompression=yes
           WizardStyle=modern
+          LanguageDetectionMethod=uilanguage
+          ShowLanguageDialog=yes 
 
           [Languages]
           Name: "english"; MessagesFile: "compiler:Default.isl"
+          Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
 
           [Tasks]
           Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -88,6 +103,9 @@ jobs:
           Source: ".\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
           ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
+          [UninstallDelete]
+          Type: filesandordirs; Name: "{app}"
+
           [Icons]
           Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
           Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
@@ -96,7 +114,9 @@ jobs:
           Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
           "@ > setup.iss
           iscc.exe setup.iss
-          mv "Output\gopeed.exe" "Output\Gopeed-$env:VERSION-windows-amd64-install.exe"
+          mv "Output\gopeed.exe" "Output\Gopeed-$env:VERSION-windows-amd64.exe"
+          Compress-Archive -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe" -DestinationPath "Output\Gopeed-$env:VERSION-windows-amd64.zip"
+          Remove-Item -Path "Output\Gopeed-$env:VERSION-windows-amd64.exe"
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -108,24 +128,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
-      - run: mkdir -p ~/image-cache
-      - id: image-cache
-        uses: actions/cache@v3
-        with:
-          path: ~/image-cache
-          key: image-cache-xgo-v1.19
-      - if: steps.image-cache.outputs.cache-hit != 'true'
-        run: |
-          docker pull techknowlogick/xgo:go-1.19.x
-          docker save -o ~/image-cache/xgo.tar techknowlogick/xgo:go-1.19.x
-      - if: steps.image-cache.outputs.cache-hit == 'true'
-        run: docker load -i ~/image-cache/xgo.tar
       - name: Build
         run: |
+          docker pull techknowlogick/xgo:go-1.19.x
           go install src.techknowlogick.com/xgo@latest
           xgo --targets=darwin/arm64 -tags="nosqlite" -ldflags="-w -s" -buildmode=c-shared -pkg=bind/desktop -out=libgopeed .
           mv libgopeed-*.dylib libgopeed.dylib
@@ -138,27 +146,37 @@ 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
         with:
           name: macos-arm64-lib
-          path: ui/flutter/macos/Frameworks
+          path: ui/flutter/lib-arm64
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
           PROJECT_DIR=$(pwd)
           
-          cd ui/flutter
+          # amd64 lib
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/lib-amd64/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
+          # universal binary
+          mkdir -p ui/flutter/macos/Frameworks
+          cp ui/flutter/lib-amd64/libgopeed.dylib ui/flutter/macos/Frameworks/amd64-lib
+          cp ui/flutter/lib-arm64/libgopeed.dylib ui/flutter/macos/Frameworks/arm64-lib
+          cd ui/flutter/macos/Frameworks
+          lipo -create -output libgopeed.dylib amd64-lib arm64-lib
+
+          cd $PROJECT_DIR/ui/flutter
           flutter build macos
           cd build/macos/Build/Products/Release
           cat>appdmg.json<<EOF
@@ -172,14 +190,7 @@ jobs:
           }
           EOF
           mkdir dist
-          appdmg appdmg.json dist/Gopeed-$VERSION-macos-arm64.dmg
+          appdmg appdmg.json dist/Gopeed-$VERSION-macos.dmg
-
-          # amd64
-          cd $PROJECT_DIR
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o bin/libgopeed.dylib github.com/monkeyWie/gopeed/bind/desktop
-          cp bin/libgopeed.dylib ui/flutter/build/macos/Build/Products/Release/Gopeed.app/Contents/Frameworks/
-          cd ui/flutter/build/macos/Build/Products/Release
-          appdmg appdmg.json dist/Gopeed-$VERSION-macos-amd64.dmg
       - name: Upload
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -191,19 +202,20 @@ 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
+          sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
       - name: Build
         env:
           VERSION: ${{ needs.get-release.outputs.tag_name }}
         run: |
-          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/monkeyWie/gopeed/bind/desktop
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
           cd ui/flutter
           flutter build linux
           mkdir -p debian/gui
@@ -250,25 +262,29 @@ 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 }}
+          APK_KEYSTORE : ${{ secrets.APK_KEYSTORE }}
+          APK_KEY_PASSWORD : ${{ secrets.APK_KEY_PASSWORD }}
+          APK_STORE_PASSWORD : ${{ secrets.APK_STORE_PASSWORD }}
         run: |
-          mkdir ui/flutter/android/app/libs
           go install golang.org/x/mobile/cmd/gomobile@latest
+          go get golang.org/x/mobile/bind
           gomobile init
-          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/monkeyWie/gopeed/bind/mobile
+          gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
           cd ui/flutter
-          echo $APK_KEYSTORE | base64 -d > android/app/upload-keystore.jks
+          echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
           flutter build apk
           mkdir dist
           cp build/app/outputs/flutter-apk/app-release.apk dist/Gopeed-$VERSION-android.apk
@@ -283,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 }}
@@ -302,9 +319,13 @@ jobs:
           export CGO_ENABLED=0
           for goos in "${goos_arr[@]}"; do
             for goarch in "${goarch_arr[@]}"; do
-              name=gopeed-web-$VERSION-$goos-$goarch
+              goos_name=$goos
+              if [ $goos = "darwin" ]; then
+                goos_name="macos"
+              fi
+              name=gopeed-web-$VERSION-$goos_name-$goarch
               dir="dist/$name/"
-              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w" -o $dir github.com/monkeyWie/gopeed/cmd/web \
+              (GOOS=$goos GOARCH=$goarch go build -tags nosqlite,web -ldflags="-s -w" -o $dir github.com/GopeedLab/gopeed/cmd/web \
               && cd $dir \
               && file=$(ls -AU | head -1) \
               && mkdir $name \

.github/workflows/release.yml

@@ -16,6 +16,12 @@ on:
       - "go.sum"
       - "Dockerfile"
 
+env:
+  GO_VERSION: 1.19
+
+permissions:
+  contents: write
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -25,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
@@ -41,30 +45,36 @@ jobs:
   #          go get -u golang.org/x/lint/golint
   #          golint -set_exit_status ./...
   test:
-    name: Test
+    name: Test check
     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
         with:
           files: ./coverage.txt
-          fail_ci_if_error: true
   build:
-    name: Build
+    name: Build check
     runs-on: ubuntu-latest
     #    needs: [lint, test]
     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 libayatana-appindicator3-dev
       - name: Build
-        run: go build github.com/monkeyWie/gopeed/cmd/gopeed
+        run: |
+          go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
+          cd ui/flutter
+          flutter build linux

CONTRIBUTING.md

@@ -0,0 +1,54 @@
+# Gopeed contributors guide
+
+Firstly, thank you for your interest in contributing to Gopeed. This guide will help you better
+participate in the development of Gopeed.
+
+## Branch description
+
+This project only has one main branch, namely the `main` branch. If you want to participate in the
+development of Gopeed, please fork this project first, and then develop in your fork project. After
+development is completed, submit a PR to this project and merge it into the `main` branch.
+
+## Local development
+
+It is recommended to develop and debug through the web. First, start the backend service, and start
+it by the command line `go run cmd/api/main.go`, the default port of the service is `9999`, and then
+start the front-end flutter project in `debug` mode to run.
+
+## Translation
+
+The internationalization files of Gopeed are located in the `ui/flutter/assets/locales` directory.
+You only need to add the corresponding language file in this directory.
+
+
+Generate locales after you edit locales:
+
+
+```
+get generate locales 
+```
+
+Please refer to `en_us.dart` for translation.
+
+## flutter development
+
+Don't forget to run`dart format ./ui/flutter`before you commit to keep your code in standard dart format
+
+Turn on build_runner watcher if you want to edit api/models:
+
+```
+flutter pub run build_runner watch
+```
+
+
+get-cli commands usages:
+
+```
+ create:  
+    controller:  Generate controller
+    page:  Use to generate pages
+    view:  Generate view
+  generate:
+    locales:  Generate translation file from json files
+    model:  generate Class model from json
+```

CONTRIBUTING_zh-CN.md

@@ -0,0 +1,48 @@
+# Gopeed 贡献指南
+
+首先感谢您对贡献代码感兴趣，这份指南将帮助您更好的参与到 Gopeed 的开发中来。
+
+## 分支说明
+
+本项目只有一个主分支，即 `main` 分支，如果您想要参与到 Gopeed 的开发中来，请先 fork 本项目，然后在您的 fork 项目中进行开发，开发完成后再向本项目提交
+PR，合并到 `main` 分支。
+
+## 本地开发
+
+建议通过 web 端进行开发调试，首先启动后端服务，通过命令行 `go run cmd/api/main.go` 启动 ，服务启动默认端口为 `9999`，然后以 `debug` 模式启动前端
+flutter 项目即可运行。
+
+## 翻译
+ 
+Gopeed 的国际化文件位于 `ui/flutter/assets/locales` 目录下，只需要在该目录下添加对应的语言文件即可。
+
+编辑locales后请运行以下命令:
+
+```
+get generate locales 
+```
+
+请注意以 `en_US.json` 为参照进行翻译。
+
+## flutter开发
+
+每次提交前请务必`dart format ./ui/flutter`
+
+如果要编辑api/models，请打开build_runner watcher:
+
+```
+flutter pub run build_runner watch
+```
+
+适用get-cli 命令:
+
+```
+ create:  
+    controller:  Generate controller
+    page:  Use to generate pages
+    view:  Generate view
+  generate:
+    locales:  Generate translation file from json files
+    model:  generate Class model from json
+```
+

Dockerfile

@@ -1,4 +1,4 @@
-FROM cirrusci/flutter:3.3.7 AS flutter
+FROM cirrusci/flutter:3.7.7 AS flutter
 WORKDIR /app
 COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./
 RUN flutter pub get
@@ -11,7 +11,7 @@ COPY ./go.mod ./go.sum ./
 RUN go mod download
 COPY . .
 COPY --from=flutter /app/build/web ./cmd/web/dist
-RUN CGO_ENABLED=0 go build -tags nosqlite,web -ldflags="-s -w" -o dist/gopeed github.com/monkeyWie/gopeed/cmd/web
+RUN CGO_ENABLED=0 go build -tags nosqlite,web -ldflags="-s -w" -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
 
 FROM alpine:3.14.2
 LABEL maintainer="monkeyWie"

README.md

@@ -1,6 +1,7 @@
-[![Test Status](https://github.com/monkeyWie/gopeed/workflows/test/badge.svg)](https://github.com/monkeyWie/gopeed/actions?query=workflow%3Atest)
+[![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
-[![Codecov](https://codecov.io/gh/monkeyWie/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/monkeyWie/gopeed)
+[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
-[![Release](https://img.shields.io/github/release/monkeyWie/gopeed.svg?style=flat-square)](https://github.com/monkeyWie/gopeed/releases)
+[![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg?style=flat-square)](https://github.com/GopeedLab/gopeed/releases)
+[![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://github.com/GopeedLab/gopeed/blob/main/.donate/index.md#donate)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
 
 ![](_docs/img/banner.png)
@@ -9,9 +10,11 @@
 
 ## Introduction
 
-Gopeed is a high-speed downloader developed by `Golang`+`Flutter`, which supports (HTTP, BitTorrent, Magnet) protocol downloads and supports all platforms.
+Gopeed (full name Go Speed), a high-speed downloader developed by `Golang` + `Flutter`, supports (HTTP, BitTorrent, Magnet) protocol, and supports all platforms.
 
-## Installation
+Visit ✈ [Official Website](https://gopeed.com) | 📖 [Develop Docs](https://docs.gopeed.com)
+
+## Install
 
 **Supported platforms**
 
@@ -23,7 +26,7 @@ Gopeed is a high-speed downloader developed by `Golang`+`Flutter`, which support
 - [x] web
 - [x] docker
 
-[To Release](https://github.com/monkeyWie/gopeed/releases/latest)
+[Download](https://github.com/GopeedLab/gopeed/releases/latest)
 
 > Tips: If the macos open failed, please execute the `xattr -d com.apple.quarantine /Applications/Gopeed.app` command in the terminal
 
@@ -32,7 +35,7 @@ Gopeed is a high-speed downloader developed by `Golang`+`Flutter`, which support
 use `go install`:
 
 ```bash
-go install github.com/monkeyWie/gopeed/cmd/gopeed
+go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
 ### Docker
@@ -45,22 +48,6 @@ docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
 
 #### Using Docker Compose
 
-```yaml
-version: '3'
-
-services:
-  gopeed:
-    container_name: gopeed
-    ports:
-      - 9999:9999
-    image: liwei2633/gopeed
-    volumes:
-      - ~/Downloads:/download
-    restart: unless-stopped
-```
-
-Use the command below to start container:
-
 ```bash
 docker-compose up -d
 ```
@@ -68,8 +55,13 @@ docker-compose up -d
 #### Access Gopeed
 
 When the docker container is running, you can access the web page through `http://localhost:9999`.
+
 > Tip: Modify the download path to `/download` on the setting page to access the downloaded files on the host.
 
+## Donate
+
+If you like this project, please consider [donating](/.donate/index.md#donate) to support the development of this project, thank you!
+
 ## Showcase
 
 ![](_docs/img/ui-demo.png)
@@ -83,7 +75,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 ### Environment
 
 1. Golang 1.19+
-2. Flutter 3.0+
+2. Flutter 3.7+
 
 ### Clone
 
@@ -91,6 +83,10 @@ This project is divided into two parts, the front end uses `flutter`, the back e
 git clone [email protected]:monkeyWie/gopeed.git
 ```
 
+### Contributing
+
+Please refer to [CONTRIBUTING.md](/CONTRIBUTING.md)
+
 ### Build
 
 #### Desktop
@@ -102,7 +98,7 @@ command:
 - windows
 
 ```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/monkeyWie/gopeed/bind/desktop
+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
 ```
@@ -110,7 +106,7 @@ flutter build windows
 - macos
 
 ```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/monkeyWie/gopeed/bind/desktop
+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
 ```
@@ -118,7 +114,7 @@ flutter build macos
 - linux
 
 ```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/monkeyWie/gopeed/bind/desktop
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
 cd ui/flutter
 flutter build linux
 ```
@@ -129,6 +125,7 @@ Same as before, you also need to prepare the `cgo` environment, and then install
 
 ```bash
 go install golang.org/x/mobile/cmd/gomobile@latest
+go get golang.org/x/mobile/bind
 gomobile init
 ```
 
@@ -137,15 +134,13 @@ command:
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/monkeyWie/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
 
 #### Web
 
-Web platform communicates directly with the backend http server, no additional environment is required.
-
 command:
 
 ```bash
@@ -154,8 +149,21 @@ flutter build web
 cd ../../
 rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
-go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/monkeyWie/gopeed/cmd/web
+go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
-````
+go run cmd/web/main.go
+```
+
+## Thanks
+
+### Contributors
+
+<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
+</a>
+
+### JetBrains
+
+[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
 
 ## License
 

README_zh-CN.md

@@ -1,6 +1,7 @@
-[![Test Status](https://github.com/monkeyWie/gopeed/workflows/test/badge.svg)](https://github.com/monkeyWie/gopeed/actions?query=workflow%3Atest)
+[![Test Status](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
-[![Codecov](https://codecov.io/gh/monkeyWie/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/monkeyWie/gopeed)
+[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
-[![Release](https://img.shields.io/github/release/monkeyWie/gopeed.svg?style=flat-square)](https://github.com/monkeyWie/gopeed/releases)
+[![Release](https://img.shields.io/github/release/GopeedLab/gopeed.svg?style=flat-square)](https://github.com/GopeedLab/gopeed/releases)
+[![Donate](https://img.shields.io/badge/%24-donate-ff69b4.svg)](https://github.com/GopeedLab/gopeed/blob/main/.donate/index.md#donate)
 [![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
 
 ![](_docs/img/banner.png)
@@ -9,9 +10,11 @@
 
 ## 介绍
 
-Gopeed 是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。
+Gopeed（全称 Go Speed），是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、BitTorrent、Magnet）协议下载，并且支持全平台使用。
 
-## 下载
+访问 ✈ [官方网站](https://gopeed.com/zh-CN) | 📖 [开发文档](https://docs.gopeed.com/zh/)
+
+## 安装
 
 **已支持平台**
 
@@ -23,7 +26,7 @@ Gopeed 是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、
 - [x] web
 - [x] docker
 
-[点击前往](https://github.com/monkeyWie/gopeed/releases/latest)
+[前往下载](https://github.com/GopeedLab/gopeed/releases/latest)
 
 > 注：macos 版本运行如果提示损坏，请在终端执行 `xattr -d com.apple.quarantine /Applications/Gopeed.app` 命令
 
@@ -32,7 +35,7 @@ Gopeed 是一款由`Golang`+`Flutter`开发的高速下载器，支持（HTTP、
 使用`go install`安装：
 
 ```bash
-go install github.com/monkeyWie/gopeed/cmd/gopeed
+go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
 ```
 
 ### Docker
@@ -45,22 +48,6 @@ docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
 
 #### 使用 Docker Compose
 
-```yaml
-version: '3'
-
-services:
-  gopeed:
-    container_name: gopeed
-    ports:
-      - 9999:9999
-    image: liwei2633/gopeed
-    volumes:
-      - ~/Downloads:/download
-    restart: unless-stopped
-```
-
-输入以下指令启动容器:
-
 ```bash
 docker-compose up -d
 ```
@@ -70,6 +57,10 @@ docker-compose up -d
 当 docker 容器运行时，可以通过 `http://localhost:9999` 访问 web 页面。
 > 提示：在设置页面把下载路径修改为 `/download` 以便在宿主机访问下载完的文件。
 
+## 打赏
+
+如果觉得项目对你有帮助，请考虑[打赏](/.donate/index.md#donate)以支持这个项目的发展，非常感谢！
+
 ## 界面展示
 
 ![](_docs/img/ui-demo.png)
@@ -83,7 +74,7 @@ docker-compose up -d
 ### 环境要求
 
 1. Golang 1.19+
-2. Flutter 3.0+
+2. Flutter 3.7+
 
 ### 克隆项目
 
@@ -91,6 +82,10 @@ docker-compose up -d
 git clone [email protected]:monkeyWie/gopeed.git
 ```
 
+### 贡献代码
+
+请参考[贡献指南](CONTRIBUTING_zh-CN.md)
+
 ### 编译
 
 #### 桌面端
@@ -102,7 +97,7 @@ git clone [email protected]:monkeyWie/gopeed.git
 - windows
 
 ```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/monkeyWie/gopeed/bind/desktop
+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
 ```
@@ -110,7 +105,7 @@ flutter build windows
 - macos
 
 ```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/monkeyWie/gopeed/bind/desktop
+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
 ```
@@ -118,7 +113,7 @@ flutter build macos
 - linux
 
 ```bash
-go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/monkeyWie/gopeed/bind/desktop
+go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
 cd ui/flutter
 flutter build linux
 ```
@@ -129,6 +124,7 @@ flutter build linux
 
 ```bash
 go install golang.org/x/mobile/cmd/gomobile@latest
+go get golang.org/x/mobile/bind
 gomobile init
 ```
 
@@ -137,14 +133,12 @@ gomobile init
 - android
 
 ```bash
-gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/monkeyWie/gopeed/bind/mobile
+gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile
 cd ui/flutter
 flutter build apk
 ```
 
-#### Web 端（推荐本地调试使用）
+#### Web 端
-
-Web 端直接与后端 http 服务通讯，不需要额外准备环境。
 
 构建命令：
 
@@ -154,9 +148,22 @@ flutter build web
 cd ../../
 rm -rf cmd/web/dist
 cp -r ui/flutter/build/web cmd/web/dist
-go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/monkeyWie/gopeed/cmd/web
+go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
+go run cmd/web/main.go
 ```
 
+## 感谢
+
+### 贡献者
+
+<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
+</a>
+
+### JetBrains
+
+[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
+
 ## 开源许可
 
 基于 [GPLv3](LICENSE) 协议开源。

_docs/img/goland.svg

@@ -0,0 +1 @@
+<svg height="105" viewBox="0 0 105 105" width="105" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="99.03" x2="61.54" y1="59.18" y2="90.91"><stop offset="0" stop-color="#087cfa"/><stop offset=".02" stop-color="#0d7bfa"/><stop offset=".37" stop-color="#5566f9"/><stop offset=".66" stop-color="#8a57f8"/><stop offset=".88" stop-color="#ab4ef7"/><stop offset="1" stop-color="#b74af7"/></linearGradient><linearGradient id="b" x1="37.54" x2="60.33" xlink:href="#a" y1="34.26" y2="8.33"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="17.84" x2="87.09" y1="88.36" y2="43.86"><stop offset="0" stop-color="#087cfa"/><stop offset=".1" stop-color="#1598d3"/><stop offset=".22" stop-color="#23b6aa"/><stop offset=".35" stop-color="#2dcc8b"/><stop offset=".46" stop-color="#35dd74"/><stop offset=".57" stop-color="#39e767"/><stop offset=".67" stop-color="#3bea62"/></linearGradient><path d="m89.06 41.63 11.44 25.37-19.58 33.5-12.06-29.28z" fill="url(#a)"/><path d="m68.86 71.22 12.06 29.28-30.34-10.43z" fill="#b74af7"/><path d="m72.13 31.61-6.22-27.11h-34.49l-26.92 41.18 7.79 18.92-7.79 17.27 55.75-47.43z" fill="url(#b)"/><path d="m100.5 24.88-40.25 9.56-55.75 47.43 35.96 18.63 28.4-29.28z" fill="url(#c)"/><path d="m22.5 22.5h60v60h-60z"/><g fill="#fff"><path d="m28.13 71.25h22.5v3.75h-22.5z"/><path d="m26.44 42.81v-.07a12.7 12.7 0 0 1 12.97-12.74 13.62 13.62 0 0 1 9.73 3.39l-3.43 4.14a9.13 9.13 0 0 0 -6.47-2.53c-4 0-7.11 3.5-7.11 7.7v.07c0 4.53 3.11 7.85 7.5 7.85a8.67 8.67 0 0 0 5.12-1.49v-3.56h-5.48v-4.7h10.73v10.74a16.07 16.07 0 0 1 -10.57 3.93c-7.69 0-12.99-5.41-12.99-12.73z"/><path d="m52.3 42.81v-.07a12.79 12.79 0 0 1 13.19-12.74c7.63 0 13.11 5.69 13.11 12.72v.07a12.79 12.79 0 0 1 -13.18 12.8c-7.64-.05-13.12-5.74-13.12-12.78zm20.61 0v-.07a7.51 7.51 0 0 0 -7.49-7.74 7.4 7.4 0 0 0 -7.42 7.67v.07a7.52 7.52 0 0 0 7.5 7.78 7.4 7.4 0 0 0 7.41-7.71z"/></g></svg>

_examples/basic/main.go

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

bind/desktop/main.go

@@ -3,8 +3,8 @@ package main
 import "C"
 import (
 	"encoding/json"
-	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/pkg/rest"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
 )
 
 func main() {}

bind/mobile/main.go

@@ -4,8 +4,8 @@ package libgopeed
 import "C"
 import (
 	"encoding/json"
-	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/pkg/rest"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
 )
 
 func Start(cfg string) (int, error) {

cmd/api/main.go

@@ -2,28 +2,15 @@ package main
 
 import (
 	_ "embed"
-	"fmt"
+	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
-	"net/http"
 )
 
-//go:embed banner.txt
-var banner string
-
 func main() {
 	cfg := &model.StartConfig{
 		Network: "tcp",
 		Address: "127.0.0.1:9999",
 		Storage: model.StorageBolt,
 	}
-	fmt.Println(banner)
+	cmd.Start(cfg)
-	srv, listener, err := rest.BuildServer(cfg)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
-	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
-		panic(err)
-	}
 }

cmd/gopeed/main.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/download"
+	"github.com/GopeedLab/gopeed/pkg/download"
-	"github.com/monkeyWie/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/protocol/http"
-	"github.com/monkeyWie/gopeed/pkg/util"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"strings"
 	"sync"
 )
@@ -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()
 }
 
@@ -56,10 +63,10 @@ var (
 )
 
 func printProgress(task *download.Task, title string) {
-	rate := float64(task.Progress.Downloaded) / float64(task.Res.Size)
+	rate := float64(task.Progress.Downloaded) / float64(task.Meta.Res.Size)
 	completeWidth := int(progressWidth * rate)
 	speed := util.ByteFmt(task.Progress.Speed)
-	totalSize := util.ByteFmt(task.Res.Size)
+	totalSize := util.ByteFmt(task.Meta.Res.Size)
 	sb.WriteString(fmt.Sprintf("\r%s [", title))
 	for i := 0; i < progressWidth; i++ {
 		if i < completeWidth {

cmd/server.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	_ "embed"
+	"fmt"
+	"github.com/GopeedLab/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"net/http"
+	"os"
+	"path/filepath"
+)
+
+//go:embed banner.txt
+var banner string
+
+func Start(cfg *model.StartConfig) {
+	fmt.Println(banner)
+	srv, listener, err := rest.BuildServer(cfg)
+	if err != nil {
+		panic(err)
+	}
+	downloadCfg, err := rest.Downloader.GetConfig()
+	if err != nil {
+		panic(err)
+	}
+	if downloadCfg.FirstLoad {
+		// Set default download dir to user download dir
+		userDir, err := os.UserHomeDir()
+		if err == nil {
+			downloadDir := filepath.Join(userDir, "Downloads")
+			downloadCfg.DownloadDir = downloadDir
+			rest.Downloader.PutConfig(downloadCfg)
+		}
+
+	}
+	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
+	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
+		panic(err)
+	}
+}

cmd/web/banner.txt

@@ -1,7 +0,0 @@
-
-  _______   ______   .______    _______  _______  _______
- /  _____| /  __  \  |   _  \  |   ____||   ____||       \
-|  |  __  |  |  |  | |  |_)  | |  |__   |  |__   |  .--.  |
-|  | |_ | |  |  |  | |   ___/  |   __|  |   __|  |  |  |  |
-|  |__| | |  `--'  | |  |      |  |____ |  |____ |  '--'  |
- \______|  \______/  | _|      |_______||_______||_______/

cmd/web/main.go

@@ -5,16 +5,11 @@ package main
 
 import (
 	"embed"
-	"fmt"
+	"github.com/GopeedLab/gopeed/cmd"
-	"github.com/monkeyWie/gopeed/pkg/rest"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
 	"io/fs"
-	"net/http"
 )
 
-//go:embed banner.txt
-var banner string
-
 //go:embed dist/*
 var dist embed.FS
 
@@ -30,13 +25,5 @@ func main() {
 		WebEnable: true,
 		WebFS:     sub,
 	}
-	fmt.Println(banner)
+	cmd.Start(cfg)
-	srv, listener, err := rest.BuildServer(cfg)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
-	if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
-		panic(err)
-	}
 }

go.mod

@@ -1,9 +1,10 @@
-module github.com/monkeyWie/gopeed
+module github.com/GopeedLab/gopeed
 
 go 1.19
 
 require (
 	github.com/anacrolix/torrent v1.46.0
+	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/matoous/go-nanoid/v2 v2.0.0
 	go.etcd.io/bbolt v1.3.6
@@ -39,7 +40,6 @@ require (
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/lispad/go-generics-tools v1.0.0 // indirect
@@ -66,11 +66,8 @@ require (
 	github.com/tidwall/btree v1.3.1 // indirect
 	golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
 	golang.org/x/exp v0.0.0-20220428152302-39d4317da171 // indirect
-	golang.org/x/mobile v0.0.0-20220928052126-fa6bcb076835 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )

internal/fetcher/fetcher.go

@@ -1,29 +1,48 @@
 package fetcher
 
 import (
-	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"path"
 )
 
 // Fetcher defines the interface for a download protocol.
+// One fetcher for each download task
 type Fetcher interface {
 	// Name return the name of the protocol.
 	Name() string
 
 	Setup(ctl *controller.Controller) error
 	// Resolve resource info from request
-	Resolve(req *base.Request) (res *base.Resource, err error)
+	Resolve(req *base.Request) error
 	// Create ready to download, but not started
-	Create(res *base.Resource, opts *base.Options) (err error)
+	Create(opts *base.Options) error
-	Start() (err error)
+	Start() error
-	Pause() (err error)
+	Pause() error
-	Continue() (err error)
+	Continue() error
-	Close() (err error)
+	Close() error
 
+	// Meta returns the meta information of the download.
+	Meta() *FetcherMeta
 	// Progress returns the progress of the download.
 	Progress() Progress
 	// Wait for the download to complete, this method will block until the download is done.
-	Wait() (err error)
+	Wait() error
+}
+
+// FetcherMeta defines the meta information of a fetcher.
+type FetcherMeta struct {
+	Req  *base.Request  `json:"req"`
+	Res  *base.Resource `json:"res"`
+	Opts *base.Options  `json:"opts"`
+}
+
+func (m *FetcherMeta) Filepath(file *base.FileInfo) string {
+	finalName := m.Opts.Name
+	if finalName == "" {
+		finalName = file.Name
+	}
+	return path.Join(m.Opts.Path, m.Res.RootDir, finalName)
 }
 
 // FetcherBuilder defines the interface for a fetcher builder.
@@ -36,11 +55,12 @@ type FetcherBuilder interface {
 	// Store fetcher
 	Store(fetcher Fetcher) (any, error)
 	// Restore fetcher
-	Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) Fetcher)
+	Restore() (v any, f func(meta *FetcherMeta, v any) Fetcher)
 }
 
 type DefaultFetcher struct {
 	Ctl    *controller.Controller
+	Meta   *FetcherMeta
 	DoneCh chan error
 }
 

internal/protocol/bt/fetcher.go

@@ -1,13 +1,14 @@
 package bt
 
 import (
+	"github.com/GopeedLab/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/torrent/storage"
-	"github.com/monkeyWie/gopeed/internal/controller"
+	"path"
-	"github.com/monkeyWie/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/util"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
@@ -17,11 +18,10 @@ import (
 var client *torrent.Client
 
 type Fetcher struct {
-	Ctl *controller.Controller
+	ctl *controller.Controller
 
 	torrent *torrent.Torrent
-	res     *base.Resource
+	meta    *fetcher.FetcherMeta
-	opts    *base.Options
 
 	ready    atomic.Bool
 	progress fetcher.Progress
@@ -34,7 +34,10 @@ func (f *Fetcher) Name() string {
 }
 
 func (f *Fetcher) Setup(ctl *controller.Controller) (err error) {
-	f.Ctl = ctl
+	f.ctl = ctl
+	if f.meta == nil {
+		f.meta = &fetcher.FetcherMeta{}
+	}
 	var once sync.Once
 	once.Do(func() {
 		cfg := torrent.NewDefaultClientConfig()
@@ -66,48 +69,15 @@ func (f *Fetcher) Setup(ctl *controller.Controller) (err error) {
 	return
 }
 
-func (f *Fetcher) Wait() (err error) {
+func (f *Fetcher) Resolve(req *base.Request) error {
-	for {
+	if err := f.addTorrent(req.URL); err != nil {
-		if f.ready.Load() {
+		return err
-			done := true
-			for _, selectIndex := range f.opts.SelectFiles {
-				file := f.torrent.Files()[selectIndex]
-				if file.BytesCompleted() < file.Length() {
-					done = false
-					break
-				}
-			}
-			if done {
-				// remove unselected files
-				for i, file := range f.torrent.Files() {
-					selected := false
-					for _, selectIndex := range f.opts.SelectFiles {
-						if i == selectIndex {
-							selected = true
-							break
-						}
-					}
-					if !selected {
-						util.SafeRemove(filepath.Join(f.opts.Path, file.Path()))
-					}
-				}
-				break
-			}
-		}
-		time.Sleep(time.Millisecond * 500)
-	}
-	return nil
-}
-
-func (f *Fetcher) Resolve(req *base.Request) (res *base.Resource, err error) {
-	if err = f.addTorrent(req.URL, true); err != nil {
-		return
 	}
 	defer f.torrent.Drop()
-	res = &base.Resource{
+	res := &base.Resource{
-		Req:   req,
 		Name:    f.torrent.Name(),
 		Range:   true,
+		RootDir: f.torrent.Name(),
 		Files:   make([]*base.FileInfo, len(f.torrent.Files())),
 		Hash:    f.torrent.InfoHash().String(),
 	}
@@ -119,36 +89,39 @@ func (f *Fetcher) Resolve(req *base.Request) (res *base.Resource, err error) {
 		}
 		res.Size += file.Length()
 	}
-	return
+	f.meta.Req = req
+	f.meta.Res = res
+	return nil
 }
 
-func (f *Fetcher) Create(res *base.Resource, opts *base.Options) (err error) {
+func (f *Fetcher) Create(opts *base.Options) (err error) {
-	f.res = res
+	f.meta.Opts = opts
-	f.opts = opts
+	if len(opts.SelectFiles) == 0 {
-	if len(f.opts.SelectFiles) == 0 {
+		opts.SelectFiles = make([]int, 0)
-		f.opts.SelectFiles = make([]int, 0)
 		for i := range f.torrent.Files() {
-			f.opts.SelectFiles = append(f.opts.SelectFiles, i)
+			opts.SelectFiles = append(opts.SelectFiles, i)
 		}
 	}
-	if f.opts.Path != "" {
+	if opts.Path != "" {
-		f.torrentPaths[res.Hash] = f.opts.Path
+		f.torrentPaths[f.meta.Res.Hash] = path.Join(f.meta.Opts.Path, f.meta.Res.RootDir)
 	}
 
-	f.progress = make(fetcher.Progress, len(f.opts.SelectFiles))
+	f.progress = make(fetcher.Progress, len(f.meta.Opts.SelectFiles))
 	f.ready.Store(false)
 	return nil
 }
 
 func (f *Fetcher) Start() (err error) {
-	if err = f.addTorrent(f.res.Req.URL, false); err != nil {
+	if !f.ready.Load() {
+		if err = f.addTorrent(f.meta.Req.URL); err != nil {
 			return
 		}
+	}
 	files := f.torrent.Files()
-	if len(f.opts.SelectFiles) == len(files) {
+	if len(f.meta.Opts.SelectFiles) == len(files) {
 		f.torrent.DownloadAll()
 	} else {
-		for _, selectIndex := range f.opts.SelectFiles {
+		for _, selectIndex := range f.meta.Opts.SelectFiles {
 			file := files[selectIndex]
 			file.Download()
 		}
@@ -171,19 +144,56 @@ func (f *Fetcher) Close() (err error) {
 	return nil
 }
 
+func (f *Fetcher) Wait() (err error) {
+	for {
+		if f.ready.Load() {
+			done := true
+			for _, selectIndex := range f.meta.Opts.SelectFiles {
+				file := f.torrent.Files()[selectIndex]
+				if file.BytesCompleted() < file.Length() {
+					done = false
+					break
+				}
+			}
+			if done {
+				// remove unselected files
+				for i, file := range f.torrent.Files() {
+					selected := false
+					for _, selectIndex := range f.meta.Opts.SelectFiles {
+						if i == selectIndex {
+							selected = true
+							break
+						}
+					}
+					if !selected {
+						util.SafeRemove(filepath.Join(f.meta.Opts.Path, file.Path()))
+					}
+				}
+				break
+			}
+		}
+		time.Sleep(time.Millisecond * 500)
+	}
+	return nil
+}
+
+func (f *Fetcher) Meta() *fetcher.FetcherMeta {
+	return f.meta
+}
+
 func (f *Fetcher) Progress() fetcher.Progress {
 	if !f.ready.Load() {
 		return f.progress
 	}
 	for i := range f.progress {
-		selectIndex := f.opts.SelectFiles[i]
+		selectIndex := f.meta.Opts.SelectFiles[i]
 		file := f.torrent.Files()[selectIndex]
 		f.progress[i] = file.BytesCompleted()
 	}
 	return f.progress
 }
 
-func (f *Fetcher) addTorrent(url string, resolve bool) (err error) {
+func (f *Fetcher) addTorrent(url string) (err error) {
 	schema := util.ParseSchema(url)
 	if schema == "MAGNET" {
 		f.torrent, err = client.AddMagnet(url)
@@ -194,7 +204,7 @@ func (f *Fetcher) addTorrent(url string, resolve bool) (err error) {
 		return
 	}
 	var cfg config
-	exist, err := f.Ctl.GetConfig(&cfg)
+	exist, err := f.ctl.GetConfig(&cfg)
 	if err != nil {
 		return
 	}
@@ -206,9 +216,6 @@ func (f *Fetcher) addTorrent(url string, resolve bool) (err error) {
 		f.torrent.AddTrackers(announceList)
 	}
 	<-f.torrent.GotInfo()
-	if resolve {
-		return
-	}
 	f.ready.Store(true)
 	return
 }
@@ -230,6 +237,10 @@ func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
 	return nil, nil
 }
 
-func (fb *FetcherBuilder) Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) fetcher.Fetcher) {
+func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return nil, nil
+	return nil, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
+		return &Fetcher{
+			meta: meta,
+		}
+	}
 }

internal/protocol/bt/fetcher_test.go

@@ -2,10 +2,10 @@ package bt
 
 import (
 	"encoding/json"
-	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed/internal/test"
+	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/base"
 	"reflect"
 	"testing"
 )
@@ -19,7 +19,7 @@ func TestFetcher_Config(t *testing.T) {
 }
 
 func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
-	res, err := fetcher.Resolve(&base.Request{
+	err := fetcher.Resolve(&base.Request{
 		URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
 	})
 	if err != nil {
@@ -27,10 +27,10 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 	}
 
 	want := &base.Resource{
-		Req:   res.Req,
 		Name:    "ubuntu-22.04-live-server-amd64.iso",
 		Size:    1466714112,
 		Range:   true,
+		RootDir: "ubuntu-22.04-live-server-amd64.iso",
 		Files: []*base.FileInfo{
 			{
 				Name: "ubuntu-22.04-live-server-amd64.iso",
@@ -39,8 +39,8 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
 		},
 		Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
 	}
-	if !reflect.DeepEqual(want, res) {
+	if !reflect.DeepEqual(want, fetcher.Meta().Res) {
-		t.Errorf("Resolve() got = %v, want %v", res, want)
+		t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
 	}
 }
 

internal/protocol/http/fetcher.go

@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
-	fhttp "github.com/monkeyWie/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/util"
+	fhttp "github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"golang.org/x/sync/errgroup"
 	"io"
 	"mime"
@@ -16,9 +16,7 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"path/filepath"
 	"strconv"
-	"strings"
 	"time"
 )
 
@@ -51,10 +49,10 @@ func newChunk(begin int64, end int64) *chunk {
 }
 
 type Fetcher struct {
-	*fetcher.DefaultFetcher
+	ctl    *controller.Controller
+	doneCh chan error
 
-	res    *base.Resource
+	meta   *fetcher.FetcherMeta
-	opts   *base.Options
 	status base.Status
 	chunks []*chunk
 
@@ -68,25 +66,34 @@ func (f *Fetcher) Name() string {
 	return "http"
 }
 
-func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
+func (f *Fetcher) Setup(ctl *controller.Controller) (err error) {
+	f.ctl = ctl
+	f.doneCh = make(chan error, 1)
+	f.pauseCh = make(chan interface{}, 1)
+	if f.meta == nil {
+		f.meta = &fetcher.FetcherMeta{}
+	}
+	return
+}
+
+func (f *Fetcher) Resolve(req *base.Request) error {
 	if err := base.ParseReqExtra[fhttp.ReqExtra](req); err != nil {
-		return nil, err
+		return err
 	}
 	httpReq, err := buildRequest(nil, req)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	client := buildClient()
 	// 只访问一个字节，测试资源是否支持Range请求
 	httpReq.Header.Set(base.HttpHeaderRange, fmt.Sprintf(base.HttpHeaderRangeFormat, 0, 0))
 	httpResp, err := client.Do(httpReq)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	// 拿到响应头就关闭，不用加defer
 	httpResp.Body.Close()
 	res := &base.Resource{
-		Req:   req,
 		Range: false,
 		Files: []*base.FileInfo{},
 	}
@@ -98,7 +105,7 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 		if contentTotal != "" {
 			parse, err := strconv.ParseInt(contentTotal, 10, 64)
 			if err != nil {
-				return nil, err
+				return err
 			}
 			res.Size = parse
 		}
@@ -108,12 +115,12 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 		if contentLength != "" {
 			parse, err := strconv.ParseInt(contentLength, 10, 64)
 			if err != nil {
-				return nil, err
+				return err
 			}
 			res.Size = parse
 		}
 	} else {
-		return nil, NewRequestError(httpResp.StatusCode, httpResp.Status)
+		return NewRequestError(httpResp.StatusCode, httpResp.Status)
 	}
 	file := &base.FileInfo{
 		Size: res.Size,
@@ -127,27 +134,28 @@ func (f *Fetcher) Resolve(req *base.Request) (*base.Resource, error) {
 		}
 	}
 	// Get file filePath by URL
-	if file.Name == "" && strings.Count(req.URL, "/") > 2 {
+	if file.Name == "" {
-		file.Name = filepath.Base(req.URL)
+		file.Name = path.Base(httpReq.URL.Path)
 	}
 	// unknown file filePath
-	if file.Name == "" {
+	if file.Name == "" || file.Name == "/" || file.Name == "." {
 		file.Name = "unknown"
 	}
 	res.Files = append(res.Files, file)
 	res.Name = file.Name
-	return res, nil
+	f.meta.Req = req
+	f.meta.Res = res
+	return nil
 }
 
-func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
+func (f *Fetcher) Create(opts *base.Options) error {
-	f.res = res
+	f.meta.Opts = opts
-	f.opts = opts
 	f.status = base.DownloadStatusReady
 
-	if err := base.ParseReqExtra[fhttp.ReqExtra](res.Req); err != nil {
+	if err := base.ParseReqExtra[fhttp.ReqExtra](f.meta.Req); err != nil {
 		return err
 	}
-	if err := base.ParseOptsExtra[fhttp.OptsExtra](opts); err != nil {
+	if err := base.ParseOptsExtra[fhttp.OptsExtra](f.meta.Opts); err != nil {
 		return err
 	}
 	if opts.Extra == nil {
@@ -156,7 +164,7 @@ func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
 	extra := opts.Extra.(*fhttp.OptsExtra)
 	if extra.Connections == 0 {
 		var cfg config
-		exist, err := f.Ctl.GetConfig(&cfg)
+		exist, err := f.ctl.GetConfig(&cfg)
 		if err != nil {
 			return err
 		}
@@ -172,7 +180,7 @@ func (f *Fetcher) Create(res *base.Resource, opts *base.Options) error {
 func (f *Fetcher) Start() (err error) {
 	// 创建文件
 	name := f.filepath()
-	f.file, err = f.Ctl.Touch(name, f.res.Size)
+	f.file, err = f.ctl.Touch(name, f.meta.Res.Size)
 	if err != nil {
 		return err
 	}
@@ -215,6 +223,10 @@ func (f *Fetcher) Close() (err error) {
 	return
 }
 
+func (f *Fetcher) Meta() *fetcher.FetcherMeta {
+	return f.meta
+}
+
 func (f *Fetcher) Progress() fetcher.Progress {
 	p := make(fetcher.Progress, 0)
 	if len(f.chunks) > 0 {
@@ -227,14 +239,18 @@ func (f *Fetcher) Progress() fetcher.Progress {
 	return p
 }
 
+func (f *Fetcher) Wait() (err error) {
+	return <-f.doneCh
+}
+
 func (f *Fetcher) filepath() string {
-	return util.Filepath(f.opts.Path, f.res.Files[0].Name, f.opts.Name)
+	return f.meta.Filepath(f.meta.Res.Files[0])
 }
 
 func (f *Fetcher) fetch() {
 	f.ctx, f.cancel = context.WithCancel(context.Background())
 	eg, _ := errgroup.WithContext(f.ctx)
-	for i := 0; i < f.opts.Extra.(*fhttp.OptsExtra).Connections; i++ {
+	for i := 0; i < len(f.chunks); i++ {
 		i := i
 		eg.Go(func() error {
 			return f.fetchChunk(i)
@@ -253,7 +269,7 @@ func (f *Fetcher) fetch() {
 			} else {
 				f.status = base.DownloadStatusDone
 			}
-			f.DoneCh <- err
+			f.doneCh <- err
 		}
 	}()
 }
@@ -261,7 +277,7 @@ func (f *Fetcher) fetch() {
 func (f *Fetcher) fetchChunk(index int) (err error) {
 	chunk := f.chunks[index]
 
-	httpReq, err := buildRequest(f.ctx, f.res.Req)
+	httpReq, err := buildRequest(f.ctx, f.meta.Req)
 	if err != nil {
 		return err
 	}
@@ -283,7 +299,7 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 			resp  *http.Response
 			retry bool
 		)
-		if f.res.Range {
+		if f.meta.Res.Range {
 			httpReq.Header.Set(base.HttpHeaderRange,
 				fmt.Sprintf(base.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End))
 		} else {
@@ -337,7 +353,7 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 		return
 	}
 
-	isComplete := f.res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1
+	isComplete := f.meta.Res.Range && chunk.Downloaded >= chunk.End-chunk.Begin+1
 	if f.status == base.DownloadStatusPause && !isComplete {
 		chunk.Status = base.DownloadStatusPause
 		return
@@ -348,10 +364,10 @@ func (f *Fetcher) fetchChunk(index int) (err error) {
 }
 
 func (f *Fetcher) splitChunk() (chunks []*chunk) {
-	if f.res.Range {
+	if f.meta.Res.Range {
-		connections := f.opts.Extra.(*fhttp.OptsExtra).Connections
+		connections := f.meta.Opts.Extra.(*fhttp.OptsExtra).Connections
 		// 每个连接平均需要下载的分块大小
-		chunkSize := f.res.Size / int64(connections)
+		chunkSize := f.meta.Res.Size / int64(connections)
 		chunks = make([]*chunk, connections)
 		for i := 0; i < connections; i++ {
 			var (
@@ -360,7 +376,7 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
 			)
 			if i == connections-1 {
 				// 最后一个分块需要保证把文件下载完
-				end = f.res.Size - 1
+				end = f.meta.Res.Size - 1
 			} else {
 				end = begin + chunkSize - 1
 			}
@@ -440,10 +456,7 @@ func (fb *FetcherBuilder) Schemes() []string {
 }
 
 func (fb *FetcherBuilder) Build() fetcher.Fetcher {
-	return &Fetcher{
+	return &Fetcher{}
-		DefaultFetcher: new(fetcher.DefaultFetcher),
-		pauseCh:        make(chan interface{}),
-	}
 }
 
 func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
@@ -453,16 +466,15 @@ func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
 	}, nil
 }
 
-func (fb *FetcherBuilder) Restore() (v any, f func(res *base.Resource, opts *base.Options, v any) fetcher.Fetcher) {
+func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
-	return &fetcherData{}, func(res *base.Resource, opts *base.Options, v any) fetcher.Fetcher {
+	return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
 		fd := v.(*fetcherData)
 		fb := &FetcherBuilder{}
 		fetcher := fb.Build().(*Fetcher)
-		fetcher.res = res
+		fetcher.meta = meta
-		fetcher.opts = opts
 		fetcher.status = base.DownloadStatusPause
-		base.ParseReqExtra[fhttp.ReqExtra](res.Req)
+		base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
-		base.ParseOptsExtra[fhttp.OptsExtra](opts)
+		base.ParseOptsExtra[fhttp.OptsExtra](fetcher.meta.Opts)
 		if len(fd.Chunks) == 0 {
 			fetcher.chunks = fetcher.splitChunk()
 		} else {

internal/protocol/http/fetcher_test.go

@@ -3,11 +3,11 @@ package http
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed/internal/test"
+	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"net"
 	"reflect"
 	"testing"
@@ -43,15 +43,14 @@ func testResolve(startTestServer func() net.Listener, want *base.Resource, t *te
 	listener := startTestServer()
 	defer listener.Close()
 	fetcher := buildFetcher()
-	res, err := fetcher.Resolve(&base.Request{
+	err := fetcher.Resolve(&base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	res.Req = nil
+	if !reflect.DeepEqual(want, fetcher.meta.Res) {
-	if !reflect.DeepEqual(want, res) {
+		t.Errorf("Resolve() got = %v, want %v", fetcher.meta.Res, want)
-		t.Errorf("Resolve() got = %v, want %v", res, want)
 	}
 }
 
@@ -80,6 +79,7 @@ func TestFetcher_DownloadChunked(t *testing.T) {
 	defer listener.Close()
 	// chunked编码下载
 	downloadNormal(listener, 1, t)
+	downloadNormal(listener, 2, t)
 }
 
 func TestFetcher_DownloadPost(t *testing.T) {
@@ -114,7 +114,7 @@ func TestFetcher_DownloadResume(t *testing.T) {
 }
 
 func TestFetcher_Config(t *testing.T) {
-	fetcher, _, _ := doDownloadReady(buildConfigFetcher(), test.StartTestFileServer(), 0, t)
+	fetcher := doDownloadReady(buildConfigFetcher(), test.StartTestFileServer(), 0, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -130,13 +130,12 @@ func TestFetcher_Config(t *testing.T) {
 	}
 }
 
-func downloadReady(listener net.Listener, connections int, t *testing.T) (fetcher fetcher.Fetcher, res *base.Resource, opts *base.Options) {
+func downloadReady(listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
 	return doDownloadReady(buildFetcher(), listener, connections, t)
 }
 
-func doDownloadReady(f fetcher.Fetcher, listener net.Listener, connections int, t *testing.T) (fetcher fetcher.Fetcher, res *base.Resource, opts *base.Options) {
+func doDownloadReady(f fetcher.Fetcher, listener net.Listener, connections int, t *testing.T) fetcher.Fetcher {
-	fetcher = f
+	err := f.Resolve(&base.Request{
-	res, err := fetcher.Resolve(&base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	})
 	if err != nil {
@@ -148,20 +147,20 @@ func doDownloadReady(f fetcher.Fetcher, listener net.Listener, connections int,
 			Connections: connections,
 		}
 	}
-	opts = &base.Options{
+	opts := &base.Options{
 		Name:  test.DownloadName,
 		Path:  test.Dir,
 		Extra: extra,
 	}
-	err = fetcher.Create(res, opts)
+	err = f.Create(opts)
 	if err != nil {
 		t.Fatal(err)
 	}
-	return
+	return f
 }
 
 func downloadNormal(listener net.Listener, connections int, t *testing.T) {
-	fetcher, _, _ := downloadReady(listener, connections, t)
+	fetcher := downloadReady(listener, connections, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -178,8 +177,8 @@ func downloadNormal(listener net.Listener, connections int, t *testing.T) {
 }
 
 func downloadPost(listener net.Listener, connections int, t *testing.T) {
-	fetcher, _, _ := downloadReady(listener, connections, t)
+	fetcher := downloadReady(listener, connections, t)
-	fetcher.(*Fetcher).res.Req.Extra = &http.ReqExtra{
+	fetcher.Meta().Req.Extra = &http.ReqExtra{
 		Method: "POST",
 		Header: map[string]string{
 			"Authorization": "Bearer 123456",
@@ -202,7 +201,7 @@ func downloadPost(listener net.Listener, connections int, t *testing.T) {
 }
 
 func downloadContinue(listener net.Listener, connections int, t *testing.T) {
-	fetcher, _, _ := downloadReady(listener, connections, t)
+	fetcher := downloadReady(listener, connections, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -227,7 +226,7 @@ func downloadContinue(listener net.Listener, connections int, t *testing.T) {
 }
 
 func downloadError(listener net.Listener, connections int, t *testing.T) {
-	fetcher, _, _ := downloadReady(listener, connections, t)
+	fetcher := downloadReady(listener, connections, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -239,7 +238,7 @@ func downloadError(listener net.Listener, connections int, t *testing.T) {
 }
 
 func downloadResume(listener net.Listener, connections int, t *testing.T) {
-	fetcher, res, opts := downloadReady(listener, connections, t)
+	fetcher := downloadReady(listener, connections, t)
 	err := fetcher.Start()
 	if err != nil {
 		t.Fatal(err)
@@ -255,7 +254,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
 	fetcher.Pause()
 
 	_, f := fb.Restore()
-	f(res, opts, data)
+	f(fetcher.Meta(), data)
 	if err != nil {
 		t.Fatal(err)
 	}

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/base/model.go

@@ -1,27 +1,24 @@
 package base
 
-import "github.com/monkeyWie/gopeed/pkg/util"
+import (
+	"github.com/GopeedLab/gopeed/pkg/util"
+)
 
-// 下载请求
+// Request download request
 type Request struct {
-	// 下载链接
 	URL   string `json:"url"`
-	// 附加信息
 	Extra any    `json:"extra"`
 }
 
-// 资源信息
+// Resource download resource
 type Resource struct {
-	Req *Request `json:"req"`
-	// 资源名称
 	Name string `json:"name"`
-	// 资源总大小
 	Size int64  `json:"size"`
-	// 是否支持断点下载
+	// is support range download
 	Range   bool   `json:"range"`
-	// 资源所包含的文件列表
+	RootDir string `json:"rootDir"`
+	// file list
 	Files []*FileInfo `json:"files"`
-	// 资源hash值
 	Hash  string      `json:"hash"`
 }
 
@@ -31,15 +28,15 @@ type FileInfo struct {
 	Size int64  `json:"size"`
 }
 
-// 下载选项
+// Options for download
 type Options struct {
-	// 保存文件名
+	// Download file name
 	Name string `json:"name"`
-	// 保存目录
+	// Download file path
 	Path string `json:"path"`
-	// 选择下载的文件下标列表
+	// Select file indexes to download
 	SelectFiles []int `json:"selectFiles"`
-	// 附加信息
+	// Extra info for specific fetcher
 	Extra any `json:"extra"`
 }
 

pkg/download/downloader_test.go

@@ -1,9 +1,9 @@
 package download
 
 import (
-	"github.com/monkeyWie/gopeed/internal/test"
+	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/protocol/http"
 	"reflect"
 	"sync"
 	"testing"
@@ -22,13 +22,12 @@ func TestDownloader_Resolve(t *testing.T) {
 	req := &base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	}
-	res, err := downloader.Resolve(req)
+	rr, err := downloader.Resolve(req)
 	if err != nil {
 		t.Fatal(err)
 	}
 	want := &base.Resource{
 		Name:  test.BuildName,
-		Req:   req,
 		Size:  test.BuildSize,
 		Range: true,
 		Files: []*base.FileInfo{
@@ -39,8 +38,8 @@ func TestDownloader_Resolve(t *testing.T) {
 			},
 		},
 	}
-	if !reflect.DeepEqual(want, res) {
+	if !reflect.DeepEqual(want, rr.Res) {
-		t.Errorf("Resolve() got = %v, want %v", res, want)
+		t.Errorf("Resolve() got = %v, want %v", rr.Res, want)
 	}
 }
 
@@ -56,7 +55,7 @@ func TestDownloader_Create(t *testing.T) {
 	req := &base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	}
-	res, err := downloader.Resolve(req)
+	rr, err := downloader.Resolve(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -68,7 +67,7 @@ func TestDownloader_Create(t *testing.T) {
 			wg.Done()
 		}
 	})
-	_, err = downloader.Create(res, &base.Options{
+	_, err = downloader.Create(rr.ID, &base.Options{
 		Path: test.Dir,
 		Name: test.DownloadName,
 		Extra: http.OptsExtra{
@@ -100,12 +99,12 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
 	req := &base.Request{
 		URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
 	}
-	res, err := downloader.Resolve(req)
+	rr, err := downloader.Resolve(req)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	id, err := downloader.Create(res, &base.Options{
+	id, err := downloader.Create(rr.ID, &base.Options{
 		Path: test.Dir,
 		Name: test.DownloadName,
 		Extra: http.OptsExtra{
@@ -171,7 +170,6 @@ func TestDownloader_Protocol_Config(t *testing.T) {
 	}
 
 	storeCfg := &DownloaderStoreConfig{
-		RefreshInterval: 500,
 		DownloadDir: "./downloads",
 		ProtocolConfig: map[string]any{
 			"http": map[string]any{
@@ -192,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

@@ -1,15 +1,77 @@
 package download
 
 import (
-	"github.com/monkeyWie/gopeed/internal/controller"
+	"github.com/GopeedLab/gopeed/internal/controller"
-	"github.com/monkeyWie/gopeed/internal/fetcher"
+	"github.com/GopeedLab/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed/internal/protocol/bt"
+	"github.com/GopeedLab/gopeed/internal/protocol/bt"
-	"github.com/monkeyWie/gopeed/internal/protocol/http"
+	"github.com/GopeedLab/gopeed/internal/protocol/http"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/util"
+	gonanoid "github.com/matoous/go-nanoid/v2"
+	"sync"
+	"time"
 )
 
+type ResolveResult struct {
+	ID  string         `json:"id"`
+	Res *base.Resource `json:"res"`
+}
+
+type Task struct {
+	ID        string               `json:"id"`
+	Meta      *fetcher.FetcherMeta `json:"meta"`
+	Status    base.Status          `json:"status"`
+	Progress  *Progress            `json:"progress"`
+	Size      int64                `json:"size"`
+	CreatedAt time.Time            `json:"createdAt"`
+
+	fetcherBuilder fetcher.FetcherBuilder
+	fetcher        fetcher.Fetcher
+	timer          *util.Timer
+	lock           *sync.Mutex
+	speedArr       []int64
+}
+
+func NewTask() *Task {
+	id, err := gonanoid.New()
+	if err != nil {
+		panic(err)
+	}
+	return &Task{
+		ID:        id,
+		Status:    base.DownloadStatusReady,
+		CreatedAt: time.Now(),
+	}
+}
+
+func (t *Task) clone() *Task {
+	return &Task{
+		ID:        t.ID,
+		Meta:      t.Meta,
+		Status:    t.Status,
+		Progress:  t.Progress,
+		Size:      t.Size,
+		CreatedAt: t.CreatedAt,
+	}
+}
+
+func (t *Task) calcSpeed(downloaded int64, usedTime float64) int64 {
+	t.speedArr = append(t.speedArr, downloaded)
+	if len(t.speedArr) > 6 {
+		t.speedArr = t.speedArr[1:]
+	}
+	var total int64
+	for _, v := range t.speedArr {
+		total += v
+	}
+	return int64(float64(total) / float64(len(t.speedArr)) / usedTime)
+}
+
 type DownloaderConfig struct {
 	Controller    *controller.Controller
 	FetchBuilders []fetcher.FetcherBuilder
+
+	RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
 	Storage         Storage
 
 	*DownloaderStoreConfig
@@ -25,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
+
+	DownloadDir    string         `json:"downloadDir"`    // DownloadDir is the default directory to save the downloaded files
+	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/download/task.go

@@ -1,49 +0,0 @@
-package download
-
-import (
-	gonanoid "github.com/matoous/go-nanoid/v2"
-	"github.com/monkeyWie/gopeed/internal/fetcher"
-	"github.com/monkeyWie/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/util"
-	"sync"
-	"time"
-)
-
-type Task struct {
-	ID        string         `json:"id"`
-	Res       *base.Resource `json:"res"`
-	Opts      *base.Options  `json:"opts"`
-	Status    base.Status    `json:"status"`
-	Progress  *Progress      `json:"progress"`
-	Size      int64          `json:"size"`
-	CreatedAt time.Time      `json:"createdAt"`
-
-	fetcherBuilder fetcher.FetcherBuilder
-	fetcher        fetcher.Fetcher
-	timer          *util.Timer
-	lock           *sync.Mutex
-}
-
-func NewTask() *Task {
-	id, err := gonanoid.New()
-	if err != nil {
-		panic(err)
-	}
-	return &Task{
-		ID:        id,
-		Status:    base.DownloadStatusReady,
-		CreatedAt: time.Now(),
-	}
-}
-
-func (t *Task) clone() *Task {
-	return &Task{
-		ID:        t.ID,
-		Res:       t.Res,
-		Opts:      t.Opts,
-		Status:    t.Status,
-		Progress:  t.Progress,
-		Size:      t.Size,
-		CreatedAt: t.CreatedAt,
-	}
-}

pkg/rest/api.go

@@ -1,12 +1,10 @@
 package rest
 
 import (
-	"compress/gzip"
+	"github.com/GopeedLab/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/download"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"github.com/gorilla/mux"
-	"github.com/monkeyWie/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/download"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
-	"github.com/monkeyWie/gopeed/pkg/rest/util"
 	"io"
 	"net/http"
 	"net/url"
@@ -15,75 +13,123 @@ import (
 
 func Resolve(w http.ResponseWriter, r *http.Request) {
 	var req base.Request
-	if util.ReadJson(w, r, &req) {
+	if ReadJson(r, w, &req) {
-		resource, err := Downloader.Resolve(&req)
+		rr, err := Downloader.Resolve(&req)
 		if err != nil {
-			util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
+			WriteJson(w, model.NewErrorResult(err.Error()))
 			return
 		}
-		util.WriteJsonOk(w, model.NewResultWithData(resource))
+		WriteJson(w, model.NewOkResult(rr))
 	}
 }
 
 func CreateTask(w http.ResponseWriter, r *http.Request) {
 	var req model.CreateTask
-	if util.ReadJson(w, r, &req) {
+	if ReadJson(r, w, &req) {
-		taskId, err := Downloader.Create(req.Res, req.Opts)
+		var (
-		if err != nil {
+			taskId string
-			util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
+			err    error
+		)
+		if req.Rid != "" {
+			taskId, err = Downloader.Create(req.Rid, req.Opts)
+		} else if req.Req != nil {
+			taskId, err = Downloader.CreateDirect(req.Req, req.Opts)
+		} else {
+			WriteJson(w, model.NewErrorResult("param invalid: rid or req", model.CodeInvalidParam))
 			return
 		}
-		util.WriteJsonOk(w, model.NewResultWithData(taskId))
+		if err != nil {
+			WriteJson(w, model.NewErrorResult(err.Error()))
+			return
+		}
+		WriteJson(w, model.NewOkResult(taskId))
 	}
 }
 
 func PauseTask(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	taskId := vars["id"]
-	if err := Downloader.Pause(taskId); err != nil {
+	if taskId == "" {
-		util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
 		return
 	}
-	util.WriteJsonOk(w, nil)
+	if err := Downloader.Pause(taskId); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
+		return
+	}
+	WriteJson(w, model.NewNilResult())
 }
 
 func ContinueTask(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	taskId := vars["id"]
-	if err := Downloader.Continue(taskId); err != nil {
+	if taskId == "" {
-		util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
 		return
 	}
-	util.WriteJsonOk(w, nil)
+	if err := Downloader.Continue(taskId); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
+		return
+	}
+	WriteJson(w, model.NewNilResult())
+}
+
+func PauseAllTask(w http.ResponseWriter, r *http.Request) {
+	if err := Downloader.PauseAll(); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
+		return
+	}
+	WriteJson(w, model.NewNilResult())
+}
+
+func ContinueAllTask(w http.ResponseWriter, r *http.Request) {
+	if err := Downloader.ContinueAll(); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
+		return
+	}
+	WriteJson(w, model.NewNilResult())
 }
 
 func DeleteTask(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	taskId := vars["id"]
 	force := r.FormValue("force")
-	if err := Downloader.Delete(taskId, force == "true"); err != nil {
+	if taskId == "" {
-		util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
 		return
 	}
-	util.WriteJsonOk(w, nil)
+	if err := Downloader.Delete(taskId, force == "true"); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
+		return
+	}
+	WriteJson(w, model.NewNilResult())
 }
 
 func GetTask(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	taskId := vars["id"]
-	task := Downloader.GetTask(taskId)
+	if taskId == "" {
-	if task == nil {
+		WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
-		util.WriteJson(w, http.StatusNotFound, model.NewResultWithMsg("task not found"))
 		return
 	}
-	util.WriteJsonOk(w, model.NewResultWithData(task))
+	task := Downloader.GetTask(taskId)
+	if task == nil {
+		WriteJson(w, model.NewErrorResult("task not found", model.CodeTaskNotFound))
+		return
+	}
+	WriteJson(w, model.NewOkResult(task))
 }
 
 func GetTasks(w http.ResponseWriter, r *http.Request) {
 	status := r.FormValue("status")
 	if status == "" {
-		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg("param is required: status"))
+		status = strings.Join([]string{
-		return
+			string(base.DownloadStatusReady),
+			string(base.DownloadStatusRunning),
+			string(base.DownloadStatusPause),
+			string(base.DownloadStatusError),
+			string(base.DownloadStatusDone),
+		}, ",")
 	}
 	statusArr := strings.Split(status, ",")
 	tasks := Downloader.GetTasks()
@@ -95,33 +141,33 @@ func GetTasks(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	}
-	util.WriteJsonOk(w, model.NewResultWithData(result))
+	WriteJson(w, model.NewOkResult(result))
 }
 
 func GetConfig(w http.ResponseWriter, r *http.Request) {
-	util.WriteJsonOk(w, model.NewResultWithData(getServerConfig()))
+	WriteJson(w, model.NewOkResult(getServerConfig()))
 }
 
 func PutConfig(w http.ResponseWriter, r *http.Request) {
 	var cfg download.DownloaderStoreConfig
-	if util.ReadJson(w, r, &cfg) {
+	if ReadJson(r, w, &cfg) {
 		if err := Downloader.PutConfig(&cfg); err != nil {
-			util.WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
+			WriteJson(w, model.NewErrorResult(err.Error()))
 			return
 		}
 	}
-	util.WriteJsonOk(w, nil)
+	WriteJson(w, model.NewNilResult())
 }
 
 func DoProxy(w http.ResponseWriter, r *http.Request) {
 	target := r.Header.Get("X-Target-Uri")
 	if target == "" {
-		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg("header is required: X-Target-Uri"))
+		writeError(w, "param invalid: X-Target-Uri")
 		return
 	}
 	targetUrl, err := url.Parse(target)
 	if err != nil {
-		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg(err.Error()))
+		writeError(w, err.Error())
 		return
 	}
 	r.RequestURI = ""
@@ -129,31 +175,42 @@ func DoProxy(w http.ResponseWriter, r *http.Request) {
 	r.Host = targetUrl.Host
 	resp, err := http.DefaultClient.Do(r)
 	if err != nil {
-		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg(err.Error()))
+		writeError(w, err.Error())
 		return
 	}
 	defer resp.Body.Close()
-	w.WriteHeader(resp.StatusCode)
 	for k, vv := range resp.Header {
 		for _, v := range vv {
-			w.Header().Add(k, v)
+			w.Header().Set(k, v)
 		}
 	}
-	var reader io.ReadCloser
+	w.WriteHeader(resp.StatusCode)
-	switch resp.Header.Get("Content-Encoding") {
+	buf, err := io.ReadAll(resp.Body)
-	case "gzip":
+	if err != nil {
-		reader, err = gzip.NewReader(resp.Body)
+		writeError(w, err.Error())
-		defer reader.Close()
-	default:
-		reader = resp.Body
-	}
-	if _, err := io.Copy(w, reader); err != nil {
-		util.WriteJson(w, http.StatusBadRequest, model.NewResultWithMsg(err.Error()))
 		return
 	}
+	w.Write(buf)
+	//var reader io.ReadCloser
+	//switch resp.Header.Get("Content-Encoding") {
+	//case "gzip":
+	//	reader, err = gzip.NewReader(resp.Body)
+	//	defer reader.Close()
+	//default:
+	//	reader = resp.Body
+	//}
+	//if _, err := io.Copy(w, resp.Body); err != nil {
+	//	writeError(w, err.Error())
+	//	return
+	//}
+}
+
+func writeError(w http.ResponseWriter, msg string) {
+	w.WriteHeader(http.StatusInternalServerError)
+	w.Write([]byte(msg))
 }
 
 func getServerConfig() *download.DownloaderStoreConfig {
-	_, cfg, _ := Downloader.GetConfig()
+	cfg, _ := Downloader.GetConfig()
 	return cfg
 }

pkg/rest/model/result.go

@@ -1,21 +1,47 @@
 package model
 
+type RespCode int
+
+const (
+	CodeOk RespCode = 0
+	// CodeError is the common error code
+	CodeError RespCode = 1000
+	// CodeUnauthorized is the error code for unauthorized
+	CodeUnauthorized RespCode = 1001
+	// CodeInvalidParam is the error code for invalid parameter
+	CodeInvalidParam RespCode = 1002
+	// CodeTaskNotFound is the error code for task not found
+	CodeTaskNotFound RespCode = 2001
+)
+
 type Result[T any] struct {
+	Code RespCode `json:"code"`
 	Msg  string   `json:"msg"`
 	Data T        `json:"data"`
 }
 
-func NewResult[T any](msg string, data T) *Result[T] {
+func NewOkResult[T any](data T) *Result[T] {
 	return &Result[T]{
-		Msg:  msg,
+		Code: CodeOk,
 		Data: data,
 	}
 }
 
-func NewResultWithMsg(msg string) *Result[any] {
+func NewNilResult() *Result[any] {
-	return NewResult[any](msg, nil)
+	return &Result[any]{
+		Code: CodeOk,
+	}
 }
 
-func NewResultWithData[T any](data T) *Result[T] {
+func NewErrorResult(msg string, code ...RespCode) *Result[any] {
-	return NewResult[T]("", data)
+	// if code is not provided, the default code is CodeError
+	c := CodeError
+	if len(code) > 0 {
+		c = code[0]
+	}
+
+	return &Result[any]{
+		Code: c,
+		Msg:  msg,
+	}
 }

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/model/task.go

@@ -1,8 +1,9 @@
 package model
 
-import "github.com/monkeyWie/gopeed/pkg/base"
+import "github.com/GopeedLab/gopeed/pkg/base"
 
 type CreateTask struct {
-	Res  *base.Resource `json:"res"`
+	Rid  string        `json:"rid"`
+	Req  *base.Request `json:"req"`
 	Opts *base.Options `json:"opts"`
 }

pkg/rest/server.go

@@ -2,12 +2,12 @@ package rest
 
 import (
 	"context"
+	"encoding/json"
+	"github.com/GopeedLab/gopeed/pkg/download"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/util"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"github.com/monkeyWie/gopeed/pkg/download"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
-	restUtil "github.com/monkeyWie/gopeed/pkg/rest/util"
-	"github.com/monkeyWie/gopeed/pkg/util"
 	"net"
 	"net/http"
 )
@@ -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
@@ -84,6 +85,8 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
 	r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
+	r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseAllTask)
+	r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueAllTask)
 	r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
 	r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
 	r.Methods(http.MethodGet).Path("/api/v1/tasks").HandlerFunc(GetTasks)
@@ -98,7 +101,7 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 		r.Use(func(h http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				if r.Header.Get("X-Api-Token") != startCfg.ApiToken {
-					restUtil.WriteJson(w, http.StatusUnauthorized, model.NewResultWithMsg("invalid token"))
+					WriteJson(w, model.NewErrorResult("invalid token", model.CodeUnauthorized))
 					return
 				}
 				h.ServeHTTP(w, r)
@@ -113,3 +116,17 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
 	)(r)}
 	return srv, listener, nil
 }
+
+func ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
+	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
+		WriteJson(w, model.NewErrorResult(err.Error()))
+		return false
+	}
+	return true
+}
+
+func WriteJson(w http.ResponseWriter, v any) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(v)
+}

pkg/rest/server_test.go

@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/monkeyWie/gopeed/internal/test"
+	"github.com/GopeedLab/gopeed/internal/test"
-	"github.com/monkeyWie/gopeed/pkg/base"
+	"github.com/GopeedLab/gopeed/pkg/base"
-	"github.com/monkeyWie/gopeed/pkg/download"
+	"github.com/GopeedLab/gopeed/pkg/download"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
+	"github.com/GopeedLab/gopeed/pkg/rest/model"
 	"io"
 	"net"
 	"net/http"
@@ -34,7 +34,6 @@ var (
 	}
 	taskRes = &base.Resource{
 		Name:  test.BuildName,
-		Req:   taskReq,
 		Size:  test.BuildSize,
 		Range: true,
 		Files: []*base.FileInfo{
@@ -46,7 +45,7 @@ var (
 		},
 	}
 	createReq = &model.CreateTask{
-		Res: taskRes,
+		Req: taskReq,
 		Opts: &base.Options{
 			Path: test.Dir,
 			Name: test.DownloadName,
@@ -59,9 +58,9 @@ var (
 
 func TestResolve(t *testing.T) {
 	doTest(func() {
-		resp := httpRequestCheckOk[*base.Resource](http.MethodPost, "/api/v1/resolve", taskReq)
+		resp := httpRequestCheckOk[*download.ResolveResult](http.MethodPost, "/api/v1/resolve", taskReq)
-		if !test.JsonEqual(taskRes, resp) {
+		if !test.JsonEqual(taskRes, resp.Res) {
-			t.Errorf("Resolve() got = %v, want %v", test.ToJson(resp), test.ToJson(taskRes))
+			t.Errorf("Resolve() got = %v, want %v", test.ToJson(resp.Res), test.ToJson(taskRes))
 		}
 	})
 }
@@ -145,22 +144,56 @@ func TestPauseAndContinueTask(t *testing.T) {
 	})
 }
 
+func TestPauseAllAndContinueALLTasks(t *testing.T) {
+	doTest(func() {
+		cfg, err := Downloader.GetConfig()
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		createAndPause := func() {
+			taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
+			httpRequestCheckOk[*download.Task](http.MethodGet, "/api/v1/tasks/"+taskId, nil)
+		}
+
+		total := cfg.MaxRunning + 2
+		for i := 0; i < total; i++ {
+			createAndPause()
+		}
+
+		// continue all
+		httpRequestCheckOk[any](http.MethodPut, "/api/v1/tasks/continue", nil)
+		tasks := httpRequestCheckOk[[]*download.Task](http.MethodGet, fmt.Sprintf("/api/v1/tasks?status=%s", base.DownloadStatusRunning), nil)
+		if len(tasks) != cfg.MaxRunning {
+			t.Errorf("ContinueAllTasks() got = %v, want %v", len(tasks), cfg.MaxRunning)
+		}
+		// pause all
+		httpRequestCheckOk[any](http.MethodPut, "/api/v1/tasks/pause", nil)
+		tasks = httpRequestCheckOk[[]*download.Task](http.MethodGet, fmt.Sprintf("/api/v1/tasks?status=%s,%s", base.DownloadStatusReady, base.DownloadStatusPause), nil)
+		if len(tasks) != total {
+			t.Errorf("PauseAllTasks() got = %v, want %v", len(tasks), total)
+		}
+
+	})
+}
+
 func TestDeleteTask(t *testing.T) {
 	doTest(func() {
 		taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
+		time.Sleep(time.Millisecond * 200)
 		httpRequestCheckOk[any](http.MethodDelete, "/api/v1/tasks/"+taskId, nil)
 		code, _ := httpRequest[*download.Task](http.MethodGet, "/api/v1/tasks/"+taskId, nil)
-		checkCode(code, http.StatusNotFound)
+		checkCode(code, model.CodeTaskNotFound)
 	})
 }
 
 func TestDeleteTaskForce(t *testing.T) {
 	doTest(func() {
 		taskId := httpRequestCheckOk[string](http.MethodPost, "/api/v1/tasks", createReq)
-		time.Sleep(time.Millisecond * 500)
+		time.Sleep(time.Millisecond * 200)
 		httpRequestCheckOk[any](http.MethodDelete, "/api/v1/tasks/"+taskId+"?force=true", nil)
 		code, _ := httpRequest[*download.Task](http.MethodGet, "/api/v1/tasks/"+taskId, nil)
-		checkCode(code, http.StatusNotFound)
+		checkCode(code, model.CodeTaskNotFound)
 		if _, err := os.Stat(test.DownloadFile); !errors.Is(err, os.ErrNotExist) {
 			t.Errorf("DeleteTaskForce() got = %v, want %v", err, os.ErrNotExist)
 		}
@@ -179,8 +212,7 @@ func TestGetTasks(t *testing.T) {
 
 		httpRequestCheckOk[string](http.MethodPost, fmt.Sprintf("/api/v1/tasks?status=%s,%s",
 			base.DownloadStatusReady, base.DownloadStatusRunning), createReq)
-		code, _ := httpRequest[[]*download.Task](http.MethodGet, "/api/v1/tasks", nil)
+		httpRequestCheckOk[[]*download.Task](http.MethodGet, "/api/v1/tasks", nil)
-		checkCode(code, http.StatusBadRequest)
 
 		wg.Wait()
 		r := httpRequestCheckOk[[]*download.Task](http.MethodGet, fmt.Sprintf("/api/v1/tasks?status=%s",
@@ -219,7 +251,7 @@ func TestGetAndPutConfig(t *testing.T) {
 func TestDoProxy(t *testing.T) {
 	doTest(func() {
 		code, respBody := doHttpRequest0(http.MethodGet, "/api/v1/proxy", map[string]string{
-			"X-Target-Uri": "https://github.com/monkeyWie/gopeed/raw/695da7ea87d2b455552b709d3cb4d7879484d4d1/README.md",
+			"X-Target-Uri": "https://github.com/GopeedLab/gopeed/raw/695da7ea87d2b455552b709d3cb4d7879484d4d1/README.md",
 		}, nil)
 		if code != http.StatusOK {
 			t.Errorf("DoProxy() got = %v, want %v", code, http.StatusOK)
@@ -230,6 +262,15 @@ func TestDoProxy(t *testing.T) {
 			t.Errorf("DoProxy() got = %v, want %v", got, want)
 		}
 	})
+
+	doTest(func() {
+		code, _ := doHttpRequest0(http.MethodGet, "/api/v1/proxy", map[string]string{
+			"X-Target-Uri": "https://github.com/GopeedLab/gopeed/raw/695da7ea87d2b455552b709d3cb4d7879484d4d1/NOT_FOUND",
+		}, nil)
+		if code != http.StatusNotFound {
+			t.Errorf("DoProxy() got = %v, want %v", code, http.StatusNotFound)
+		}
+	})
 }
 
 func TestAuthorization(t *testing.T) {
@@ -245,12 +286,12 @@ func TestAuthorization(t *testing.T) {
 	}()
 
 	code, _ := doHttpRequest[any](http.MethodGet, "/api/v1/config", nil, nil)
-	checkCode(code, http.StatusUnauthorized)
+	checkCode(code, model.CodeUnauthorized)
 
 	code, _ = doHttpRequest[any](http.MethodGet, "/api/v1/config", map[string]string{
 		"X-Api-Token": cfg.ApiToken,
 	}, nil)
-	checkCode(code, http.StatusOK)
+	checkCode(code, model.CodeOk)
 
 }
 
@@ -267,6 +308,16 @@ func doTest(handler func()) {
 			Stop()
 		}()
 		defer Downloader.Clear()
+		defer func() {
+			tasks := Downloader.GetTasks()
+			taskIds := make([]string, len(tasks))
+			for i, task := range tasks {
+				taskIds[i] = task.ID
+			}
+			for _, id := range taskIds {
+				Downloader.Delete(id, true)
+			}
+		}()
 		taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
 		handler()
 	}
@@ -308,17 +359,21 @@ func doHttpRequest0(method string, path string, headers map[string]string, body
 	if err != nil {
 		panic(err)
 	}
+
 	return response.StatusCode, respBody
 }
 
 func doHttpRequest[T any](method string, path string, headers map[string]string, body any) (int, *model.Result[T]) {
-	code, respBody := doHttpRequest0(method, path, headers, body)
+	statusCode, respBody := doHttpRequest0(method, path, headers, body)
+	if statusCode != http.StatusOK {
+		panic(fmt.Sprintf("http request failed, status code: %d", statusCode))
+	}
 
 	var r model.Result[T]
 	if err := json.Unmarshal(respBody, &r); err != nil {
 		panic(err)
 	}
-	return code, &r
+	return int(r.Code), &r
 }
 
 func httpRequest[T any](method string, path string, body any) (int, *model.Result[T]) {
@@ -332,11 +387,11 @@ func httpRequestCheckOk[T any](method string, path string, body any) T {
 }
 
 func checkOk(code int) {
-	checkCode(code, 200)
+	checkCode(code, model.CodeOk)
 }
 
-func checkCode(code int, exceptCode int) {
+func checkCode(code int, exceptCode model.RespCode) {
-	if code != exceptCode {
+	if code != int(exceptCode) {
 		panic(fmt.Sprintf("code got = %d, want %d", code, exceptCode))
 	}
 }

pkg/rest/util/util.go

@@ -1,25 +0,0 @@
-package util
-
-import (
-	"encoding/json"
-	"github.com/monkeyWie/gopeed/pkg/rest/model"
-	"net/http"
-)
-
-func ReadJson(w http.ResponseWriter, r *http.Request, v any) bool {
-	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
-		WriteJson(w, http.StatusInternalServerError, model.NewResultWithMsg(err.Error()))
-		return false
-	}
-	return true
-}
-
-func WriteJsonOk(w http.ResponseWriter, v any) {
-	WriteJson(w, http.StatusOK, v)
-}
-
-func WriteJson(w http.ResponseWriter, code int, v any) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(code)
-	json.NewEncoder(w).Encode(v)
-}

pkg/util/path.go

@@ -2,13 +2,15 @@ package util
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"os"
-	"path/filepath"
+	syspath "path"
+	"strings"
 )
 
 func Dir(path string) string {
-	dir := filepath.Dir(path)
+	dir := syspath.Dir(path)
 	if dir == "." {
 		return ""
 	}
@@ -19,7 +21,7 @@ func Filepath(path string, originName string, customName string) string {
 	if customName == "" {
 		customName = originName
 	}
-	return filepath.Join(path, customName)
+	return syspath.Join(path, customName)
 }
 
 // SafeRemove remove file safely, ignoring errors if the path does not exist.
@@ -30,39 +32,55 @@ func SafeRemove(name string) error {
 	return nil
 }
 
-// SafeRemoveAll remove file and parent directories safely
+// CheckDuplicateAndRename rename duplicate file, add suffix (1) (2) ...
-func SafeRemoveAll(path string, names []string) error {
+// if file name is a.txt, rename to a (1).txt
-	for _, name := range names {
+// if directory name is a, rename to a (1)
-		err := SafeRemove(filepath.Join(path, name))
+// return new name
+func CheckDuplicateAndRename(path string) (string, error) {
+	dir := syspath.Dir(path)
+	name := syspath.Base(path)
+
+	// if file not exists, return directly
+	_, err := os.Stat(path)
 	if err != nil {
-			return err
+		if errors.Is(err, os.ErrNotExist) {
+			return name, nil
 		}
-		if err := safeRemoveParent(path, name); err != nil {
+		return "", err
-			return err
+	}
+
+	index := strings.LastIndex(name, ".")
+	var nameTpl string
+	if index == -1 {
+		nameTpl = name + " (%d)"
+	} else {
+		nameTpl = name[:index] + " (%d)" + name[index:]
+	}
+	for i := 1; ; i++ {
+		newName := fmt.Sprintf(nameTpl, i)
+		newPath := syspath.Join(dir, newName)
+		if _, err := os.Stat(newPath); os.IsNotExist(err) {
+			return newName, nil
 		}
 	}
-	return nil
 }
 
-func safeRemoveParent(path string, subPath string) error {
+// GetSingleDir get the top level single folder name,if not exist, return empty string
-	currPath := filepath.Dir(subPath)
+func GetSingleDir(paths []string) string {
-	if currPath == "." {
+	if len(paths) == 0 {
-		return nil
+		return ""
 	}
-	// if directory is empty, remove it
+	split := strings.Split(paths[0], "/")
-	dir := filepath.Join(path, filepath.Dir(subPath))
+	if len(split) == 0 || split[0] == "" {
-	empty, err := isEmpty(dir)
+		return ""
-	if err != nil {
-		return err
 	}
-	if empty {
+	dir := split[0]
-		err = SafeRemove(dir)
+	for i := 1; i < len(paths); i++ {
-		if err != nil {
+		if !strings.HasPrefix(paths[i], dir) {
-			return err
+			return ""
 		}
-		return safeRemoveParent(path, currPath)
 	}
-	return nil
+	return dir
 }
 
 // check directory is empty

pkg/util/path_test.go

@@ -2,7 +2,6 @@ package util
 
 import (
 	"os"
-	"path/filepath"
 	"testing"
 )
 
@@ -87,10 +86,13 @@ func TestFilepath(t *testing.T) {
 
 func TestSafeRemove(t *testing.T) {
 	name := "test_safe_remove.data"
-	_, err := os.Create(name)
+	file, err := os.Create(name)
 	if err != nil {
 		t.Fatal(err)
 	}
+	if err := file.Close(); err != nil {
+		t.Fatal(err)
+	}
 	if err := SafeRemove(name); err != nil {
 		t.Fatal(err)
 	}
@@ -103,96 +105,97 @@ func TestSafeRemove(t *testing.T) {
 	}
 }
 
-func TestSafeRemoveAll(t *testing.T) {
+func TestGetSingleDir(t *testing.T) {
-	testDir := "test_dir"
+	type args struct {
-	err := os.Mkdir(testDir, 0755)
+		paths []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "empty",
+			args: args{
+				paths: []string{},
+			},
+			want: "",
+		},
+		{
+			name: "blank",
+			args: args{
+				paths: []string{""},
+			},
+			want: "",
+		},
+		{
+			name: "blank multi",
+			args: args{
+				paths: []string{"", "a"},
+			},
+			want: "",
+		},
+		{
+			name: "multi dir not single",
+			args: args{
+				paths: []string{"a", "b"},
+			},
+			want: "",
+		},
+		{
+			name: "single dir",
+			args: args{
+				paths: []string{"a"},
+			},
+			want: "a",
+		},
+		{
+			name: "multi dir single",
+			args: args{
+				paths: []string{"a/b", "a/c"},
+			},
+			want: "a",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := GetSingleDir(tt.args.paths); got != tt.want {
+				t.Errorf("IsSingleDir() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestCheckDuplicateAndRename(t *testing.T) {
+	doCheckDuplicateAndRename(t, []string{}, "a.txt", "a.txt")
+	doCheckDuplicateAndRename(t, []string{"a.txt"}, "a.txt", "a (1).txt")
+	doCheckDuplicateAndRename(t, []string{"a.txt", "a (1).txt"}, "a.txt", "a (2).txt")
+
+	doCheckDuplicateAndRename(t, []string{}, "a", "a")
+	doCheckDuplicateAndRename(t, []string{"a"}, "a", "a (1)")
+	doCheckDuplicateAndRename(t, []string{"a", "a (1)"}, "a", "a (2)")
+}
+
+func doCheckDuplicateAndRename(t *testing.T, exitsPaths []string, path string, except string) {
+	for _, path := range exitsPaths {
+		if err := os.MkdirAll(path, 0755); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	defer func() {
+		for _, path := range exitsPaths {
+			if err := os.RemoveAll(path); err != nil {
+				t.Fatal(err)
+			}
+		}
+	}()
+
+	got, err := CheckDuplicateAndRename(path)
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.RemoveAll(testDir)
+	if got != except {
-
+		t.Errorf("CheckDuplicateAndRename() = %v, want %v", got, except)
-	doSafeRemoveAll(t, testDir, []string{
-		"1.txt",
-	}, []string{})
-
-	doSafeRemoveAll(t, testDir, []string{
-		"1.txt",
-	}, []string{
-		"2.txt",
-	}, "2.txt")
-
-	doSafeRemoveAll(t, testDir, []string{
-		"1.txt",
-		"a/b/c/1.txt",
-		"a/b/1.txt",
-		"a/1.txt",
-	}, []string{})
-
-	doSafeRemoveAll(t, testDir, []string{
-		"1.txt",
-		"a/b/c/1.txt",
-		"a/b/1.txt",
-		"a/1.txt",
-	}, []string{
-		"a/b/2.txt",
-	}, "a/b/2.txt")
-
-	doSafeRemoveAll(t, testDir, []string{
-		"1.txt",
-		"a/b/c/1.txt",
-		"a/b/1.txt",
-		"a/1.txt",
-	}, []string{
-		"a/2.txt",
-	}, "a/2.txt")
-}
-
-func doSafeRemoveAll(t *testing.T, path string, downloadNames []string, otherNames []string, exist ...string) {
-	preCreate(t, path, downloadNames)
-	preCreate(t, path, otherNames)
-
-	if err := SafeRemoveAll(path, downloadNames); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(exist) == 0 {
-		for _, name := range downloadNames {
-			filePath := filepath.Join(path, name)
-			if isExist(filePath) {
-				t.Fatalf("file %s should not exist", filePath)
-			}
-			subDirPath := filepath.Dir(name)
-			if subDirPath != "." {
-				dirPath := filepath.Join(path, subDirPath)
-				if isExist(dirPath) {
-					t.Fatalf("dir %s should not exist", dirPath)
-				}
-			}
-		}
-		return
-	}
-
-	for _, name := range exist {
-		if !isExist(filepath.Join(path, name)) {
-			t.Fatalf("file %s should exist", name)
-		}
 	}
 }
-
-func preCreate(t *testing.T, path string, names []string) {
-	for _, name := range names {
-		fullPath := filepath.Join(path, name)
-		if err := os.MkdirAll(filepath.Dir(fullPath), 0755); err != nil {
-			t.Fatal(err)
-		}
-		_, err := os.Create(fullPath)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func isExist(path string) bool {
-	_, err := os.Stat(path)
-	return err == nil || os.IsExist(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/.gitignore

@@ -29,7 +29,8 @@
 .packages
 .pub-cache/
 .pub/
-/build/
+build/
+.fvm/
 
 # Web related
 

ui/flutter/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+  revision: 7048ed95a5ad3e43d697e0c397464193991fc230
   channel: stable
 
 project_type: app
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
-    - platform: android
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-    - platform: ios
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-    - platform: linux
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-    - platform: macos
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-    - platform: web
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
     - platform: windows
-      create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
-      base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
+      base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230
 
   # User provided section
 

ui/flutter/README.md

@@ -1,16 +0,0 @@
-# gopeed
-
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.

ui/flutter/android/app/src/main/AndroidManifest.xml

@@ -12,9 +12,54 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
             android:hardwareAccelerated="true"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="file"
+                    android:host="*"
+                    android:pathPattern=".*torrent" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="file"
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="content"
+                    android:host="*"
+                    android:pathPattern=".*torrent" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="content"
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="magnet" />
+            </intent-filter>
+
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues