mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-15 21:03:41 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b0178fed9 | ||
|
|
83febe0a00 | ||
|
|
987580d400 | ||
|
|
0919936050 | ||
|
|
acc7ed8f6b | ||
|
|
ccb3267fba | ||
|
|
1249493a8a | ||
|
|
107141bbe7 | ||
|
|
b329fee107 | ||
|
|
3ce95f21fd | ||
|
|
f54ed5df5a | ||
|
|
727b7edb84 | ||
|
|
f5891ee03d |
No files matched your search
@@ -4,17 +4,17 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
platform:
|
platform:
|
||||||
description: 'Build platform'
|
description: "Build platform"
|
||||||
required: true
|
required: true
|
||||||
default: 'all'
|
default: "all"
|
||||||
test:
|
test:
|
||||||
description: 'Test mode'
|
description: "Test mode"
|
||||||
required: true
|
required: true
|
||||||
default: "false"
|
default: "false"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.23"
|
GO_VERSION: "1.23"
|
||||||
FLUTTER_VERSION: "3.16.8"
|
FLUTTER_VERSION: "3.24.5"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -97,11 +97,13 @@ jobs:
|
|||||||
PrivilegesRequired=lowest
|
PrivilegesRequired=lowest
|
||||||
OutputBaseFilename=gopeed
|
OutputBaseFilename=gopeed
|
||||||
SetupIconFile=..\..\assets\icon\icon.ico
|
SetupIconFile=..\..\assets\icon\icon.ico
|
||||||
|
UninstallDisplayIcon={app}\{#MyAppExeName}
|
||||||
Compression=lzma
|
Compression=lzma
|
||||||
SolidCompression=yes
|
SolidCompression=yes
|
||||||
WizardStyle=modern
|
WizardStyle=modern
|
||||||
LanguageDetectionMethod=uilanguage
|
LanguageDetectionMethod=uilanguage
|
||||||
ShowLanguageDialog=yes
|
ShowLanguageDialog=yes
|
||||||
|
CloseApplications=force
|
||||||
|
|
||||||
[Languages]
|
[Languages]
|
||||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||||
@@ -111,7 +113,7 @@ jobs:
|
|||||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
Source: ".\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
|
Source: ".\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
|
||||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
[UninstallDelete]
|
[UninstallDelete]
|
||||||
@@ -366,7 +368,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: "zulu"
|
distribution: "zulu"
|
||||||
java-version: "11"
|
java-version: "17"
|
||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
@@ -443,7 +445,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
|
VERSION=${VERSION:-$(date +%y%m%d%H%M)} # Use current time as version if not specified
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --web-renderer html
|
flutter build web --no-web-resources-cdn
|
||||||
cd ../../
|
cd ../../
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
mkdir -p dist/zip
|
mkdir -p dist/zip
|
||||||
@@ -533,7 +535,7 @@ jobs:
|
|||||||
- name: Build flutter web
|
- name: Build flutter web
|
||||||
run: |
|
run: |
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --web-renderer html
|
flutter build web --no-web-resources-cdn
|
||||||
cd ../../
|
cd ../../
|
||||||
rm -rf cmd/web/dist
|
rm -rf cmd/web/dist
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.23"
|
GO_VERSION: "1.23"
|
||||||
FLUTTER_VERSION: "3.16.8"
|
FLUTTER_VERSION: "3.24.5"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# lint:
|
# lint:
|
||||||
@@ -73,17 +73,17 @@ jobs:
|
|||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
- if: runner.os == 'windows'
|
- if: runner.os == 'windows-latest'
|
||||||
run: |
|
run: |
|
||||||
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/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
|
cd ui/flutter
|
||||||
flutter build windows
|
flutter build windows
|
||||||
- if: runner.os == 'macOS'
|
- if: runner.os == 'macos-latest'
|
||||||
run: |
|
run: |
|
||||||
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/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
|
cd ui/flutter
|
||||||
flutter build macos
|
flutter build macos
|
||||||
- if: runner.os == 'Linux'
|
- if: runner.os == 'ubuntu-latest'
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
sudo apt-get update -y
|
||||||
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
|
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
|
||||||
@@ -140,7 +140,7 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --web-renderer html
|
flutter build web --no-web-resources-cdn
|
||||||
cd ../../
|
cd ../../
|
||||||
rm -rf cmd/web/dist
|
rm -rf cmd/web/dist
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
@@ -160,7 +160,7 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build web --web-renderer html
|
flutter build web --no-web-resources-cdn
|
||||||
cd ../../
|
cd ../../
|
||||||
rm -rf cmd/web/dist
|
rm -rf cmd/web/dist
|
||||||
cp -r ui/flutter/build/web cmd/web/dist
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
|
|||||||
@@ -71,6 +71,11 @@ Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Qnap</td>
|
||||||
|
<td><code>QPKG</code></td>
|
||||||
|
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">Link</a></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -115,7 +120,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
|
|||||||
### Environment
|
### Environment
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
@@ -174,7 +179,7 @@ command:
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+7
-2
@@ -71,6 +71,11 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Link</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Qnap</td>
|
||||||
|
<td><code>QPKG</code></td>
|
||||||
|
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">Link</a></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -103,7 +108,7 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
|
|||||||
### 環境
|
### 環境
|
||||||
|
|
||||||
1. Go 言語 1.23+
|
1. Go 言語 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### クローン
|
### クローン
|
||||||
|
|
||||||
@@ -162,7 +167,7 @@ gomobile init
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+7
-2
@@ -71,6 +71,11 @@ Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Liên kết</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Liên kết</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Qnap</td>
|
||||||
|
<td><code>QPKG</code></td>
|
||||||
|
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">Liên kết</a></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -111,7 +116,7 @@ Dự án này được chia thành hai phần, phần giao diện sử dụng `f
|
|||||||
### Environment
|
### Environment
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
@@ -170,7 +175,7 @@ command:
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+7
-2
@@ -71,6 +71,11 @@ Gopeed(全称 Go Speed),直译过来中文名叫做`够快下载器`(不
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Qnap</td>
|
||||||
|
<td><code>QPKG</code></td>
|
||||||
|
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">前往</a></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -115,7 +120,7 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载,支持 Chrome、
|
|||||||
### 环境要求
|
### 环境要求
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### 克隆项目
|
### 克隆项目
|
||||||
|
|
||||||
@@ -174,7 +179,7 @@ gomobile init
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
+7
-2
@@ -71,6 +71,11 @@ Gopeed(全稱 Go Speed),是一款使用`Golang`+`Flutter`編寫的高速
|
|||||||
<td><code>IPA</code></td>
|
<td><code>IPA</code></td>
|
||||||
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">前往</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Qnap</td>
|
||||||
|
<td><code>QPKG</code></td>
|
||||||
|
<td><a href="https://gopeed.com/api/download?tpl=gopeed-qnap-$version-amd64.qpkg">前往</a></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Web</td>
|
<td>Web</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
@@ -111,7 +116,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
|
|||||||
### 開發環境
|
### 開發環境
|
||||||
|
|
||||||
1. Golang 1.23+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### 克隆項目
|
### 克隆項目
|
||||||
|
|
||||||
@@ -170,7 +175,7 @@ gomobile init
|
|||||||
- android
|
- android
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
gomobile bind -tags nosqlite -ldflags="-w -s -checklinkname=0" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 21 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build apk
|
flutter build apk
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -11,7 +11,9 @@ import (
|
|||||||
"github.com/GopeedLab/gopeed/pkg/util"
|
"github.com/GopeedLab/gopeed/pkg/util"
|
||||||
"github.com/anacrolix/torrent"
|
"github.com/anacrolix/torrent"
|
||||||
"github.com/anacrolix/torrent/metainfo"
|
"github.com/anacrolix/torrent/metainfo"
|
||||||
|
"io"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -359,17 +361,34 @@ func (f *Fetcher) addTorrent(req *base.Request, fromUpload bool) (err error) {
|
|||||||
schema := util.ParseSchema(req.URL)
|
schema := util.ParseSchema(req.URL)
|
||||||
if schema == "MAGNET" {
|
if schema == "MAGNET" {
|
||||||
f.torrent, err = client.AddMagnet(req.URL)
|
f.torrent, err = client.AddMagnet(req.URL)
|
||||||
|
} else {
|
||||||
|
var reader io.Reader
|
||||||
|
if schema == "FILE" {
|
||||||
|
fileUrl, _ := url.Parse(req.URL)
|
||||||
|
filePath := fileUrl.Path[1:]
|
||||||
|
reader, err = os.Open(filePath)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
} else if schema == "DATA" {
|
} else if schema == "DATA" {
|
||||||
_, data := util.ParseDataUri(req.URL)
|
_, data := util.ParseDataUri(req.URL)
|
||||||
buf := bytes.NewBuffer(data)
|
reader = bytes.NewBuffer(data)
|
||||||
var metaInfo *metainfo.MetaInfo
|
} else {
|
||||||
metaInfo, err = metainfo.Load(buf)
|
reader, err = os.Open(req.URL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer reader.(io.Closer).Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
var metaInfo *metainfo.MetaInfo
|
||||||
|
metaInfo, err = metainfo.Load(reader)
|
||||||
|
// Hotfix for https://github.com/anacrolix/torrent/issues/992, ignore "expected EOF" error
|
||||||
|
// TODO remove this after the issue is fixed
|
||||||
|
if err != nil && !strings.Contains(err.Error(), "expected EOF") {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
f.torrent, err = client.AddTorrent(metaInfo)
|
f.torrent, err = client.AddTorrent(metaInfo)
|
||||||
} else {
|
|
||||||
f.torrent, err = client.AddTorrentFromFile(req.URL)
|
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
@@ -96,7 +97,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
|
|||||||
Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
|
Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
||||||
t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
t.Errorf("Resolve Single File Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -136,10 +137,29 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
|
|||||||
Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
|
Hash: "ccbc92b0cd8deec16a2ef4be242a8c9243b1cedb",
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
||||||
t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
t.Errorf("Resolve Multi Files Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Resolve Unclean Torrent", func(t *testing.T) {
|
||||||
|
err := fetcher.Resolve(&base.Request{
|
||||||
|
URL: "./testdata/test.unclean.torrent",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Resolve Unclean Torrent Resolve() got = %v, want nil", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("Resolve file scheme Torrent", func(t *testing.T) {
|
||||||
|
file, _ := filepath.Abs("./testdata/test.unclean.torrent")
|
||||||
|
uri := "file:///" + file
|
||||||
|
err := fetcher.Resolve(&base.Request{
|
||||||
|
URL: uri,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Resolve file scheme Torrent Resolve() got = %v, want nil", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFetcherManager_ParseName(t *testing.T) {
|
func TestFetcherManager_ParseName(t *testing.T) {
|
||||||
|
|||||||
Binary file not shown.
@@ -107,9 +107,9 @@ func (f *Fetcher) Resolve(req *base.Request) error {
|
|||||||
if base.HttpCodePartialContent == httpResp.StatusCode || (base.HttpCodeOK == httpResp.StatusCode && httpResp.Header.Get(base.HttpHeaderAcceptRanges) == base.HttpHeaderBytes && strings.HasPrefix(httpResp.Header.Get(base.HttpHeaderContentRange), base.HttpHeaderBytes)) {
|
if base.HttpCodePartialContent == httpResp.StatusCode || (base.HttpCodeOK == httpResp.StatusCode && httpResp.Header.Get(base.HttpHeaderAcceptRanges) == base.HttpHeaderBytes && strings.HasPrefix(httpResp.Header.Get(base.HttpHeaderContentRange), base.HttpHeaderBytes)) {
|
||||||
// response 206 status code, support breakpoint continuation
|
// response 206 status code, support breakpoint continuation
|
||||||
res.Range = true
|
res.Range = true
|
||||||
// parse content length from Content-Range header, eg: bytes 0-1000/1001
|
// parse content length from Content-Range header, eg: bytes 0-1000/1001 or bytes 0-0/*
|
||||||
contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
|
contentTotal := path.Base(httpResp.Header.Get(base.HttpHeaderContentRange))
|
||||||
if contentTotal != "" {
|
if contentTotal != "" && contentTotal != "*" {
|
||||||
parse, err := strconv.ParseInt(contentTotal, 10, 64)
|
parse, err := strconv.ParseInt(contentTotal, 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -427,6 +427,10 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpReq.Header = headers
|
httpReq.Header = headers
|
||||||
|
// Override Host header
|
||||||
|
if host := headers.Get(base.HttpHeaderHost); host != "" {
|
||||||
|
httpReq.Host = host
|
||||||
|
}
|
||||||
return httpReq, nil
|
return httpReq, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -59,6 +60,21 @@ func TestFetcher_Resolve(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFetcher_ResolveWithHostHeader(t *testing.T) {
|
||||||
|
fetcher := buildFetcher()
|
||||||
|
err := fetcher.Resolve(&base.Request{
|
||||||
|
URL: "https://bing.com",
|
||||||
|
Extra: &http.ReqExtra{
|
||||||
|
Header: map[string]string{
|
||||||
|
"Host": "test",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "400") {
|
||||||
|
t.Errorf("Resolve() got = %v, want %v", err, "400")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
|
func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
|
||||||
listener := startTestServer()
|
listener := startTestServer()
|
||||||
defer listener.Close()
|
defer listener.Close()
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const (
|
|||||||
HttpCodeOK = 200
|
HttpCodeOK = 200
|
||||||
HttpCodePartialContent = 206
|
HttpCodePartialContent = 206
|
||||||
|
|
||||||
|
HttpHeaderHost = "Host"
|
||||||
HttpHeaderRange = "Range"
|
HttpHeaderRange = "Range"
|
||||||
HttpHeaderAcceptRanges = "Accept-Ranges"
|
HttpHeaderAcceptRanges = "Accept-Ranges"
|
||||||
HttpHeaderContentLength = "Content-Length"
|
HttpHeaderContentLength = "Content-Length"
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import (
|
|||||||
|
|
||||||
func ParseSchema(url string) string {
|
func ParseSchema(url string) string {
|
||||||
index := strings.Index(url, ":")
|
index := strings.Index(url, ":")
|
||||||
// if no schema or windows path like C:\a.txt, return FILE
|
|
||||||
if index == -1 || index == 1 {
|
if index == -1 || index == 1 {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -129,12 +129,20 @@ Future<void> continueTask(String id) async {
|
|||||||
return _parse(() => _client.dio.put("/api/v1/tasks/$id/continue"), null);
|
return _parse(() => _client.dio.put("/api/v1/tasks/$id/continue"), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> pauseAllTasks() async {
|
Future<void> pauseAllTasks(List<String>? ids) async {
|
||||||
return _parse(() => _client.dio.put("/api/v1/tasks/pause"), null);
|
return _parse(
|
||||||
|
() => _client.dio.put("/api/v1/tasks/pause", queryParameters: {
|
||||||
|
"id": ids,
|
||||||
|
}),
|
||||||
|
null);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> continueAllTasks() async {
|
Future<void> continueAllTasks(List<String>? ids) async {
|
||||||
return _parse(() => _client.dio.put("/api/v1/tasks/continue"), null);
|
return _parse(
|
||||||
|
() => _client.dio.put("/api/v1/tasks/continue", queryParameters: {
|
||||||
|
"id": ids,
|
||||||
|
}),
|
||||||
|
null);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> deleteTask(String id, bool force) async {
|
Future<void> deleteTask(String id, bool force) async {
|
||||||
@@ -142,6 +150,15 @@ Future<void> deleteTask(String id, bool force) async {
|
|||||||
() => _client.dio.delete("/api/v1/tasks/$id?force=$force"), null);
|
() => _client.dio.delete("/api/v1/tasks/$id?force=$force"), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> deleteTasks(List<String>? ids, bool force) async {
|
||||||
|
return _parse(
|
||||||
|
() => _client.dio.delete("/api/v1/tasks", queryParameters: {
|
||||||
|
"id": ids,
|
||||||
|
"force": force,
|
||||||
|
}),
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
|
||||||
Future<DownloaderConfig> getConfig() async {
|
Future<DownloaderConfig> getConfig() async {
|
||||||
return _parse(() => _client.dio.get("/api/v1/config"),
|
return _parse(() => _client.dio.get("/api/v1/config"),
|
||||||
(data) => DownloaderConfig.fromJson(data));
|
(data) => DownloaderConfig.fromJson(data));
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ class ExtraConfig {
|
|||||||
String locale;
|
String locale;
|
||||||
bool lastDeleteTaskKeep;
|
bool lastDeleteTaskKeep;
|
||||||
bool defaultDirectDownload;
|
bool defaultDirectDownload;
|
||||||
|
bool defaultBtClient;
|
||||||
|
|
||||||
ExtraConfigBt bt = ExtraConfigBt();
|
ExtraConfigBt bt = ExtraConfigBt();
|
||||||
|
|
||||||
@@ -88,6 +89,7 @@ class ExtraConfig {
|
|||||||
this.locale = '',
|
this.locale = '',
|
||||||
this.lastDeleteTaskKeep = false,
|
this.lastDeleteTaskKeep = false,
|
||||||
this.defaultDirectDownload = false,
|
this.defaultDirectDownload = false,
|
||||||
|
this.defaultBtClient = true,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>
|
factory ExtraConfig.fromJson(Map<String, dynamic>? json) =>
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ ExtraConfig _$ExtraConfigFromJson(Map<String, dynamic> json) => ExtraConfig(
|
|||||||
locale: json['locale'] as String? ?? '',
|
locale: json['locale'] as String? ?? '',
|
||||||
lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
|
lastDeleteTaskKeep: json['lastDeleteTaskKeep'] as bool? ?? false,
|
||||||
defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
|
defaultDirectDownload: json['defaultDirectDownload'] as bool? ?? false,
|
||||||
|
defaultBtClient: json['defaultBtClient'] as bool? ?? true,
|
||||||
)..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
|
)..bt = ExtraConfigBt.fromJson(json['bt'] as Map<String, dynamic>);
|
||||||
|
|
||||||
Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
|
Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
|
||||||
@@ -81,6 +82,7 @@ Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
|
|||||||
'locale': instance.locale,
|
'locale': instance.locale,
|
||||||
'lastDeleteTaskKeep': instance.lastDeleteTaskKeep,
|
'lastDeleteTaskKeep': instance.lastDeleteTaskKeep,
|
||||||
'defaultDirectDownload': instance.defaultDirectDownload,
|
'defaultDirectDownload': instance.defaultDirectDownload,
|
||||||
|
'defaultBtClient': instance.defaultBtClient,
|
||||||
'bt': instance.bt.toJson(),
|
'bt': instance.bt.toJson(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ class Options {
|
|||||||
Object? extra;
|
Object? extra;
|
||||||
|
|
||||||
Options({
|
Options({
|
||||||
required this.name,
|
this.name = '',
|
||||||
required this.path,
|
this.path = '',
|
||||||
this.selectFiles = const [],
|
this.selectFiles = const [],
|
||||||
this.extra,
|
this.extra,
|
||||||
});
|
});
|
||||||
@@ -24,12 +24,16 @@ class Options {
|
|||||||
|
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
class OptsExtraHttp {
|
class OptsExtraHttp {
|
||||||
int connections = 0;
|
int connections;
|
||||||
bool autoTorrent = false;
|
bool autoTorrent;
|
||||||
|
|
||||||
OptsExtraHttp();
|
OptsExtraHttp({
|
||||||
|
this.connections = 0,
|
||||||
|
this.autoTorrent = false,
|
||||||
|
});
|
||||||
|
|
||||||
factory OptsExtraHttp.fromJson(Map<String, dynamic> json) =>
|
factory OptsExtraHttp.fromJson(Map<String, dynamic> json) =>
|
||||||
_$OptsExtraHttpFromJson(json);
|
_$OptsExtraHttpFromJson(json);
|
||||||
|
|
||||||
Map<String, dynamic> toJson() => _$OptsExtraHttpToJson(this);
|
Map<String, dynamic> toJson() => _$OptsExtraHttpToJson(this);
|
||||||
}
|
}
|
||||||
@@ -7,10 +7,10 @@ part of 'options.dart';
|
|||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
|
|
||||||
Options _$OptionsFromJson(Map<String, dynamic> json) => Options(
|
Options _$OptionsFromJson(Map<String, dynamic> json) => Options(
|
||||||
name: json['name'] as String,
|
name: json['name'] as String? ?? '',
|
||||||
path: json['path'] as String,
|
path: json['path'] as String? ?? '',
|
||||||
selectFiles: (json['selectFiles'] as List<dynamic>?)
|
selectFiles: (json['selectFiles'] as List<dynamic>?)
|
||||||
?.map((e) => e as int)
|
?.map((e) => (e as num).toInt())
|
||||||
.toList() ??
|
.toList() ??
|
||||||
const [],
|
const [],
|
||||||
extra: json['extra'],
|
extra: json['extra'],
|
||||||
@@ -34,9 +34,10 @@ Map<String, dynamic> _$OptionsToJson(Options instance) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) =>
|
OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) =>
|
||||||
OptsExtraHttp()
|
OptsExtraHttp(
|
||||||
..connections = json['connections'] as int
|
connections: (json['connections'] as num?)?.toInt() ?? 0,
|
||||||
..autoTorrent = json['autoTorrent'] as bool;
|
autoTorrent: json['autoTorrent'] as bool? ?? false,
|
||||||
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
|
Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ part 'request.g.dart';
|
|||||||
class Request {
|
class Request {
|
||||||
String url;
|
String url;
|
||||||
Object? extra;
|
Object? extra;
|
||||||
Map<String, String>? labels = {};
|
Map<String, String>? labels;
|
||||||
RequestProxy? proxy;
|
RequestProxy? proxy;
|
||||||
bool skipVerifyCert = false;
|
bool skipVerifyCert;
|
||||||
|
|
||||||
Request({
|
Request({
|
||||||
required this.url,
|
required this.url,
|
||||||
@@ -26,11 +26,15 @@ class Request {
|
|||||||
|
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
class ReqExtraHttp {
|
class ReqExtraHttp {
|
||||||
String method = 'GET';
|
String method;
|
||||||
Map<String, String> header = {};
|
Map<String, String> header;
|
||||||
String body = '';
|
String body;
|
||||||
|
|
||||||
ReqExtraHttp();
|
ReqExtraHttp({
|
||||||
|
this.method = 'GET',
|
||||||
|
this.header = const {},
|
||||||
|
this.body = '',
|
||||||
|
});
|
||||||
|
|
||||||
factory ReqExtraHttp.fromJson(Map<String, dynamic> json) =>
|
factory ReqExtraHttp.fromJson(Map<String, dynamic> json) =>
|
||||||
_$ReqExtraHttpFromJson(json);
|
_$ReqExtraHttpFromJson(json);
|
||||||
@@ -40,9 +44,11 @@ class ReqExtraHttp {
|
|||||||
|
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
class ReqExtraBt {
|
class ReqExtraBt {
|
||||||
List<String> trackers = [];
|
List<String> trackers;
|
||||||
|
|
||||||
ReqExtraBt();
|
ReqExtraBt({
|
||||||
|
this.trackers = const [],
|
||||||
|
});
|
||||||
|
|
||||||
factory ReqExtraBt.fromJson(Map<String, dynamic> json) =>
|
factory ReqExtraBt.fromJson(Map<String, dynamic> json) =>
|
||||||
_$ReqExtraBtFromJson(json);
|
_$ReqExtraBtFromJson(json);
|
||||||
@@ -58,15 +64,22 @@ enum RequestProxyMode {
|
|||||||
|
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
class RequestProxy {
|
class RequestProxy {
|
||||||
RequestProxyMode mode = RequestProxyMode.follow;
|
RequestProxyMode mode;
|
||||||
String scheme = 'http';
|
String scheme;
|
||||||
String host = '';
|
String host;
|
||||||
String usr = '';
|
String usr;
|
||||||
String pwd = '';
|
String pwd;
|
||||||
|
|
||||||
RequestProxy();
|
RequestProxy({
|
||||||
|
this.mode = RequestProxyMode.follow,
|
||||||
|
this.scheme = 'http',
|
||||||
|
this.host = '',
|
||||||
|
this.usr = '',
|
||||||
|
this.pwd = '',
|
||||||
|
});
|
||||||
|
|
||||||
factory RequestProxy.fromJson(Map<String, dynamic> json) =>
|
factory RequestProxy.fromJson(Map<String, dynamic> json) =>
|
||||||
_$RequestProxyFromJson(json);
|
_$RequestProxyFromJson(json);
|
||||||
|
|
||||||
Map<String, dynamic> toJson() => _$RequestProxyToJson(this);
|
Map<String, dynamic> toJson() => _$RequestProxyToJson(this);
|
||||||
}
|
}
|
||||||
@@ -36,10 +36,14 @@ Map<String, dynamic> _$RequestToJson(Request instance) {
|
|||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
ReqExtraHttp _$ReqExtraHttpFromJson(Map<String, dynamic> json) => ReqExtraHttp()
|
ReqExtraHttp _$ReqExtraHttpFromJson(Map<String, dynamic> json) => ReqExtraHttp(
|
||||||
..method = json['method'] as String
|
method: json['method'] as String? ?? 'GET',
|
||||||
..header = Map<String, String>.from(json['header'] as Map)
|
header: (json['header'] as Map<String, dynamic>?)?.map(
|
||||||
..body = json['body'] as String;
|
(k, e) => MapEntry(k, e as String),
|
||||||
|
) ??
|
||||||
|
const {},
|
||||||
|
body: json['body'] as String? ?? '',
|
||||||
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$ReqExtraHttpToJson(ReqExtraHttp instance) =>
|
Map<String, dynamic> _$ReqExtraHttpToJson(ReqExtraHttp instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
@@ -48,21 +52,26 @@ Map<String, dynamic> _$ReqExtraHttpToJson(ReqExtraHttp instance) =>
|
|||||||
'body': instance.body,
|
'body': instance.body,
|
||||||
};
|
};
|
||||||
|
|
||||||
ReqExtraBt _$ReqExtraBtFromJson(Map<String, dynamic> json) => ReqExtraBt()
|
ReqExtraBt _$ReqExtraBtFromJson(Map<String, dynamic> json) => ReqExtraBt(
|
||||||
..trackers =
|
trackers: (json['trackers'] as List<dynamic>?)
|
||||||
(json['trackers'] as List<dynamic>).map((e) => e as String).toList();
|
?.map((e) => e as String)
|
||||||
|
.toList() ??
|
||||||
|
const [],
|
||||||
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$ReqExtraBtToJson(ReqExtraBt instance) =>
|
Map<String, dynamic> _$ReqExtraBtToJson(ReqExtraBt instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
'trackers': instance.trackers,
|
'trackers': instance.trackers,
|
||||||
};
|
};
|
||||||
|
|
||||||
RequestProxy _$RequestProxyFromJson(Map<String, dynamic> json) => RequestProxy()
|
RequestProxy _$RequestProxyFromJson(Map<String, dynamic> json) => RequestProxy(
|
||||||
..mode = $enumDecode(_$RequestProxyModeEnumMap, json['mode'])
|
mode: $enumDecodeNullable(_$RequestProxyModeEnumMap, json['mode']) ??
|
||||||
..scheme = json['scheme'] as String
|
RequestProxyMode.follow,
|
||||||
..host = json['host'] as String
|
scheme: json['scheme'] as String? ?? 'http',
|
||||||
..usr = json['usr'] as String
|
host: json['host'] as String? ?? '',
|
||||||
..pwd = json['pwd'] as String;
|
usr: json['usr'] as String? ?? '',
|
||||||
|
pwd: json['pwd'] as String? ?? '',
|
||||||
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$RequestProxyToJson(RequestProxy instance) =>
|
Map<String, dynamic> _$RequestProxyToJson(RequestProxy instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Result<T> _$ResultFromJson<T>(
|
|||||||
T Function(Object? json) fromJsonT,
|
T Function(Object? json) fromJsonT,
|
||||||
) =>
|
) =>
|
||||||
Result<T>(
|
Result<T>(
|
||||||
code: json['code'] as int,
|
code: (json['code'] as num).toInt(),
|
||||||
msg: json['msg'] as String?,
|
msg: json['msg'] as String?,
|
||||||
data: _$nullableGenericFromJson(json['data'], fromJsonT),
|
data: _$nullableGenericFromJson(json['data'], fromJsonT),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import 'package:window_manager/window_manager.dart';
|
|||||||
|
|
||||||
import '../../../../api/api.dart';
|
import '../../../../api/api.dart';
|
||||||
import '../../../../api/model/downloader_config.dart';
|
import '../../../../api/model/downloader_config.dart';
|
||||||
|
import '../../../../api/model/request.dart';
|
||||||
import '../../../../core/common/start_config.dart';
|
import '../../../../core/common/start_config.dart';
|
||||||
import '../../../../core/libgopeed_boot.dart';
|
import '../../../../core/libgopeed_boot.dart';
|
||||||
import '../../../../database/database.dart';
|
import '../../../../database/database.dart';
|
||||||
@@ -27,6 +28,9 @@ import '../../../../util/log_util.dart';
|
|||||||
import '../../../../util/package_info.dart';
|
import '../../../../util/package_info.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
import '../../../routes/app_pages.dart';
|
import '../../../routes/app_pages.dart';
|
||||||
|
import '../../create/controllers/create_controller.dart';
|
||||||
|
import '../../create/dto/create_router_params.dart';
|
||||||
|
import '../../redirect/views/redirect_view.dart';
|
||||||
|
|
||||||
const unixSocketPath = 'gopeed.sock';
|
const unixSocketPath = 'gopeed.sock';
|
||||||
|
|
||||||
@@ -160,8 +164,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _initDeepLinks() async {
|
Future<void> _initDeepLinks() async {
|
||||||
// currently only support android
|
if (Util.isWeb()) {
|
||||||
if (!Util.isAndroid()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -169,13 +172,13 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
|
|
||||||
// Handle link when app is in warm state (front or background)
|
// Handle link when app is in warm state (front or background)
|
||||||
_linkSubscription = _appLinks.uriLinkStream.listen((uri) async {
|
_linkSubscription = _appLinks.uriLinkStream.listen((uri) async {
|
||||||
await _toCreate(uri);
|
await _handleDeepLink(uri);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Check initial link if app was in cold state (terminated)
|
// Check initial link if app was in cold state (terminated)
|
||||||
final uri = await _appLinks.getInitialAppLink();
|
final uri = await _appLinks.getInitialLink();
|
||||||
if (uri != null) {
|
if (uri != null) {
|
||||||
await _toCreate(uri);
|
await _handleDeepLink(uri);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,11 +221,11 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
),
|
),
|
||||||
MenuItem(
|
MenuItem(
|
||||||
label: "startAll".tr,
|
label: "startAll".tr,
|
||||||
onClick: (menuItem) async => {continueAllTasks()},
|
onClick: (menuItem) async => {continueAllTasks(null)},
|
||||||
),
|
),
|
||||||
MenuItem(
|
MenuItem(
|
||||||
label: "pauseAll".tr,
|
label: "pauseAll".tr,
|
||||||
onClick: (menuItem) async => {pauseAllTasks()},
|
onClick: (menuItem) async => {pauseAllTasks(null)},
|
||||||
),
|
),
|
||||||
MenuItem(
|
MenuItem(
|
||||||
label: 'setting'.tr,
|
label: 'setting'.tr,
|
||||||
@@ -304,13 +307,38 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _toCreate(Uri uri) async {
|
Future<void> _handleDeepLink(Uri uri) async {
|
||||||
final path = (uri.scheme == "magnet" ||
|
if (uri.scheme == "gopeed") {
|
||||||
|
if (uri.path == "/create") {
|
||||||
|
final params = uri.queryParameters["params"];
|
||||||
|
if (params?.isNotEmpty == true) {
|
||||||
|
final paramsJson = String.fromCharCodes(base64Decode(params!));
|
||||||
|
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
||||||
|
arguments: RedirectArgs(Routes.CREATE,
|
||||||
|
arguments:
|
||||||
|
CreateRouterParams.fromJson(jsonDecode(paramsJson))));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Get.rootDelegate.offAndToNamed(Routes.CREATE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Get.rootDelegate.offAndToNamed(Routes.HOME);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String path;
|
||||||
|
if (uri.scheme == "magnet" ||
|
||||||
uri.scheme == "http" ||
|
uri.scheme == "http" ||
|
||||||
uri.scheme == "https")
|
uri.scheme == "https") {
|
||||||
? uri.toString()
|
path = uri.toString();
|
||||||
: (await toFile(uri.toString())).path;
|
} else if (uri.scheme == "file") {
|
||||||
await Get.rootDelegate.offAndToNamed(Routes.CREATE, arguments: path);
|
path = Util.isWindows() ? uri.path.substring(1) : uri.path;
|
||||||
|
} else {
|
||||||
|
path = (await toFile(uri.toString())).path;
|
||||||
|
}
|
||||||
|
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
||||||
|
arguments: RedirectArgs(Routes.CREATE,
|
||||||
|
arguments: CreateRouterParams(req: Request(url: path))));
|
||||||
}
|
}
|
||||||
|
|
||||||
String runningAddress() {
|
String runningAddress() {
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import '../../app/controllers/app_controller.dart';
|
|||||||
|
|
||||||
class CreateController extends GetxController
|
class CreateController extends GetxController
|
||||||
with GetSingleTickerProviderStateMixin {
|
with GetSingleTickerProviderStateMixin {
|
||||||
// final files = [].obs;
|
|
||||||
final RxList fileInfos = [].obs;
|
final RxList fileInfos = [].obs;
|
||||||
final RxList openedFolders = [].obs;
|
final RxList openedFolders = [].obs;
|
||||||
final selectedIndexes = <int>[].obs;
|
final selectedIndexes = <int>[].obs;
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import 'package:json_annotation/json_annotation.dart';
|
||||||
|
|
||||||
|
import '../../../../api/model/options.dart';
|
||||||
|
import '../../../../api/model/request.dart';
|
||||||
|
|
||||||
|
part 'create_router_params.g.dart';
|
||||||
|
|
||||||
|
@JsonSerializable(explicitToJson: true)
|
||||||
|
class CreateRouterParams {
|
||||||
|
Request? req;
|
||||||
|
Options? opt;
|
||||||
|
|
||||||
|
CreateRouterParams({
|
||||||
|
this.req,
|
||||||
|
this.opt,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory CreateRouterParams.fromJson(
|
||||||
|
Map<String, dynamic> json,
|
||||||
|
) =>
|
||||||
|
_$CreateRouterParamsFromJson(json);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => _$CreateRouterParamsToJson(this);
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
|
part of 'create_router_params.dart';
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// JsonSerializableGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
CreateRouterParams _$CreateRouterParamsFromJson(Map<String, dynamic> json) =>
|
||||||
|
CreateRouterParams(
|
||||||
|
req: json['req'] == null
|
||||||
|
? null
|
||||||
|
: Request.fromJson(json['req'] as Map<String, dynamic>),
|
||||||
|
opt: json['opt'] == null
|
||||||
|
? null
|
||||||
|
: Options.fromJson(json['opt'] as Map<String, dynamic>),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> _$CreateRouterParamsToJson(CreateRouterParams instance) {
|
||||||
|
final val = <String, dynamic>{};
|
||||||
|
|
||||||
|
void writeNotNull(String key, dynamic value) {
|
||||||
|
if (value != null) {
|
||||||
|
val[key] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
writeNotNull('req', instance.req?.toJson());
|
||||||
|
writeNotNull('opt', instance.opt?.toJson());
|
||||||
|
return val;
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:autoscale_tabbarview/autoscale_tabbarview.dart';
|
import 'dart:convert';
|
||||||
import 'package:checkable_treeview/checkable_treeview.dart';
|
|
||||||
|
import 'package:contentsize_tabbarview/contentsize_tabbarview.dart';
|
||||||
import 'package:desktop_drop/desktop_drop.dart';
|
import 'package:desktop_drop/desktop_drop.dart';
|
||||||
import 'package:file_picker/file_picker.dart';
|
import 'package:file_picker/file_picker.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -13,11 +14,11 @@ import '../../../../api/model/create_task.dart';
|
|||||||
import '../../../../api/model/options.dart';
|
import '../../../../api/model/options.dart';
|
||||||
import '../../../../api/model/request.dart';
|
import '../../../../api/model/request.dart';
|
||||||
import '../../../../api/model/resolve_result.dart';
|
import '../../../../api/model/resolve_result.dart';
|
||||||
|
import '../../../../api/model/task.dart';
|
||||||
import '../../../../database/database.dart';
|
import '../../../../database/database.dart';
|
||||||
import '../../../../util/input_formatter.dart';
|
import '../../../../util/input_formatter.dart';
|
||||||
import '../../../../util/message.dart';
|
import '../../../../util/message.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
import '../../../../util/extensions.dart';
|
|
||||||
import '../../../routes/app_pages.dart';
|
import '../../../routes/app_pages.dart';
|
||||||
import '../../../views/compact_checkbox.dart';
|
import '../../../views/compact_checkbox.dart';
|
||||||
import '../../../views/directory_selector.dart';
|
import '../../../views/directory_selector.dart';
|
||||||
@@ -25,6 +26,7 @@ import '../../../views/file_tree_view.dart';
|
|||||||
import '../../app/controllers/app_controller.dart';
|
import '../../app/controllers/app_controller.dart';
|
||||||
import '../../history/views/history_view.dart';
|
import '../../history/views/history_view.dart';
|
||||||
import '../controllers/create_controller.dart';
|
import '../controllers/create_controller.dart';
|
||||||
|
import '../dto/create_router_params.dart';
|
||||||
|
|
||||||
class CreateView extends GetView<CreateController> {
|
class CreateView extends GetView<CreateController> {
|
||||||
final _confirmFormKey = GlobalKey<FormState>();
|
final _confirmFormKey = GlobalKey<FormState>();
|
||||||
@@ -38,11 +40,21 @@ class CreateView extends GetView<CreateController> {
|
|||||||
final _proxyPortController = TextEditingController();
|
final _proxyPortController = TextEditingController();
|
||||||
final _proxyUsrController = TextEditingController();
|
final _proxyUsrController = TextEditingController();
|
||||||
final _proxyPwdController = TextEditingController();
|
final _proxyPwdController = TextEditingController();
|
||||||
final _httpUaController = TextEditingController();
|
final _httpHeaderControllers = [
|
||||||
final _httpCookieController = TextEditingController();
|
(
|
||||||
final _httpRefererController = TextEditingController();
|
name: TextEditingController(text: "User-Agent"),
|
||||||
|
value: TextEditingController()
|
||||||
|
),
|
||||||
|
(
|
||||||
|
name: TextEditingController(text: "Cookie"),
|
||||||
|
value: TextEditingController()
|
||||||
|
),
|
||||||
|
(
|
||||||
|
name: TextEditingController(text: "Referer"),
|
||||||
|
value: TextEditingController()
|
||||||
|
),
|
||||||
|
];
|
||||||
final _btTrackerController = TextEditingController();
|
final _btTrackerController = TextEditingController();
|
||||||
final _fileTreeViewKey = GlobalKey<TreeViewState<int>>();
|
|
||||||
|
|
||||||
final _availableSchemes = ["http:", "https:", "magnet:"];
|
final _availableSchemes = ["http:", "https:", "magnet:"];
|
||||||
|
|
||||||
@@ -63,14 +75,74 @@ class CreateView extends GetView<CreateController> {
|
|||||||
_pathController.text = appController.downloaderConfig.value.downloadDir;
|
_pathController.text = appController.downloaderConfig.value.downloadDir;
|
||||||
}
|
}
|
||||||
|
|
||||||
final String? filePath = Get.rootDelegate.arguments();
|
final CreateRouterParams? routerParams = Get.rootDelegate.arguments();
|
||||||
if (_urlController.text.isEmpty) {
|
if (routerParams?.req?.url.isNotEmpty ?? false) {
|
||||||
if (filePath?.isNotEmpty ?? false) {
|
// get url from route arguments
|
||||||
// get file path from route arguments
|
final url = routerParams!.req!.url;
|
||||||
_urlController.text = filePath!;
|
_urlController.text = url;
|
||||||
_urlController.selection = TextSelection.fromPosition(
|
_urlController.selection = TextSelection.fromPosition(
|
||||||
TextPosition(offset: _urlController.text.length));
|
TextPosition(offset: _urlController.text.length));
|
||||||
} else {
|
final uppercaseUrl = url.toUpperCase();
|
||||||
|
Protocol? protocol;
|
||||||
|
if (uppercaseUrl.startsWith("HTTP:") ||
|
||||||
|
uppercaseUrl.startsWith("HTTPS:")) {
|
||||||
|
protocol = Protocol.http;
|
||||||
|
}
|
||||||
|
if (uppercaseUrl.startsWith("MAGNET:") ||
|
||||||
|
uppercaseUrl.endsWith(".TORRENT")) {
|
||||||
|
protocol = Protocol.bt;
|
||||||
|
}
|
||||||
|
if (protocol != null) {
|
||||||
|
final extraHandlers = {
|
||||||
|
Protocol.http: () {
|
||||||
|
final reqExtra = ReqExtraHttp.fromJson(
|
||||||
|
jsonDecode(jsonEncode(routerParams.req!.extra)));
|
||||||
|
_httpHeaderControllers.clear();
|
||||||
|
reqExtra.header.forEach((key, value) {
|
||||||
|
_httpHeaderControllers.add(
|
||||||
|
(
|
||||||
|
name: TextEditingController(text: key),
|
||||||
|
value: TextEditingController(text: value),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
_skipVerifyCertController.value = routerParams.req!.skipVerifyCert;
|
||||||
|
},
|
||||||
|
Protocol.bt: () {
|
||||||
|
final reqExtra = ReqExtraBt.fromJson(
|
||||||
|
jsonDecode(jsonEncode(routerParams.req!.extra)));
|
||||||
|
_btTrackerController.text = reqExtra.trackers.join("\n");
|
||||||
|
},
|
||||||
|
};
|
||||||
|
if (routerParams.req?.extra != null) {
|
||||||
|
extraHandlers[protocol]?.call();
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle options
|
||||||
|
if (routerParams.opt != null) {
|
||||||
|
_renameController.text = routerParams.opt!.name;
|
||||||
|
_pathController.text = routerParams.opt!.path;
|
||||||
|
|
||||||
|
final optionsHandlers = {
|
||||||
|
Protocol.http: () {
|
||||||
|
final opt = routerParams.opt!;
|
||||||
|
_renameController.text = opt.name;
|
||||||
|
_pathController.text = opt.path;
|
||||||
|
if (opt.extra != null) {
|
||||||
|
final optsExtraHttp =
|
||||||
|
OptsExtraHttp.fromJson(jsonDecode(jsonEncode(opt.extra)));
|
||||||
|
_connectionsController.text =
|
||||||
|
optsExtraHttp.connections.toString();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Protocol.bt: null,
|
||||||
|
};
|
||||||
|
if (routerParams.opt?.extra != null) {
|
||||||
|
optionsHandlers[protocol]?.call();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (_urlController.text.isEmpty) {
|
||||||
// read clipboard
|
// read clipboard
|
||||||
Clipboard.getData('text/plain').then((value) {
|
Clipboard.getData('text/plain').then((value) {
|
||||||
if (value?.text?.isNotEmpty ?? false) {
|
if (value?.text?.isNotEmpty ?? false) {
|
||||||
@@ -89,7 +161,6 @@ class CreateView extends GetView<CreateController> {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
@@ -439,36 +510,84 @@ class CreateView extends GetView<CreateController> {
|
|||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
AutoScaleTabBarView(
|
DefaultTabController(
|
||||||
controller: controller.advancedTabController,
|
length: 2,
|
||||||
|
child: ContentSizeTabBarView(
|
||||||
|
controller:
|
||||||
|
controller.advancedTabController,
|
||||||
children: [
|
children: [
|
||||||
Column(
|
Column(
|
||||||
children: [
|
children: [
|
||||||
TextFormField(
|
..._httpHeaderControllers.map((e) {
|
||||||
controller: _httpUaController,
|
return Row(
|
||||||
decoration: const InputDecoration(
|
children: [
|
||||||
labelText: 'User-Agent',
|
Flexible(
|
||||||
)),
|
child: TextFormField(
|
||||||
TextFormField(
|
controller: e.name,
|
||||||
controller: _httpCookieController,
|
decoration: InputDecoration(
|
||||||
decoration: const InputDecoration(
|
hintText:
|
||||||
labelText: 'Cookie',
|
'httpHeaderName'.tr,
|
||||||
)),
|
),
|
||||||
TextFormField(
|
),
|
||||||
controller: _httpRefererController,
|
),
|
||||||
decoration: const InputDecoration(
|
const Padding(
|
||||||
labelText: 'Referer',
|
padding: EdgeInsets.only(
|
||||||
)),
|
left: 10)),
|
||||||
|
Flexible(
|
||||||
|
child: TextFormField(
|
||||||
|
controller: e.value,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText:
|
||||||
|
'httpHeaderValue'.tr,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(
|
||||||
|
left: 10)),
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.add),
|
||||||
|
onPressed: () {
|
||||||
|
_httpHeaderControllers.add(
|
||||||
|
(
|
||||||
|
name:
|
||||||
|
TextEditingController(),
|
||||||
|
value:
|
||||||
|
TextEditingController(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
controller.showAdvanced
|
||||||
|
.update((val) => val);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon:
|
||||||
|
const Icon(Icons.remove),
|
||||||
|
onPressed: () {
|
||||||
|
if (_httpHeaderControllers
|
||||||
|
.length <=
|
||||||
|
1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_httpHeaderControllers
|
||||||
|
.remove(e);
|
||||||
|
controller.showAdvanced
|
||||||
|
.update((val) => val);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
Padding(
|
Padding(
|
||||||
padding:
|
padding:
|
||||||
const EdgeInsets.only(top: 10),
|
const EdgeInsets.only(top: 10),
|
||||||
child: CompactCheckbox(
|
child: CompactCheckbox(
|
||||||
label: 'skipVerifyCert'.tr,
|
label: 'skipVerifyCert'.tr,
|
||||||
value:
|
value: _skipVerifyCertController
|
||||||
_skipVerifyCertController.value,
|
.value,
|
||||||
onChanged: (bool? value) {
|
onChanged: (bool? value) {
|
||||||
_skipVerifyCertController.value =
|
_skipVerifyCertController
|
||||||
value ?? false;
|
.value = value ?? false;
|
||||||
},
|
},
|
||||||
textStyle: const TextStyle(
|
textStyle: const TextStyle(
|
||||||
color: Colors.grey,
|
color: Colors.grey,
|
||||||
@@ -489,6 +608,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
).paddingOnly(top: 16),
|
).paddingOnly(top: 16),
|
||||||
@@ -647,12 +767,10 @@ class CreateView extends GetView<CreateController> {
|
|||||||
if (controller.showAdvanced.value) {
|
if (controller.showAdvanced.value) {
|
||||||
switch (controller.advancedTabController.index) {
|
switch (controller.advancedTabController.index) {
|
||||||
case 0:
|
case 0:
|
||||||
final header = {
|
final header = Map<String, String>.fromEntries(_httpHeaderControllers
|
||||||
"User-Agent": _httpUaController.text,
|
.map((e) => MapEntry(e.name.text, e.value.text)));
|
||||||
"Cookie": _httpCookieController.text,
|
header.removeWhere(
|
||||||
"Referer": _httpRefererController.text,
|
(key, value) => key.trim().isEmpty || value.trim().isEmpty);
|
||||||
};
|
|
||||||
header.removeWhere((key, value) => value.trim().isEmpty);
|
|
||||||
if (header.isNotEmpty) {
|
if (header.isNotEmpty) {
|
||||||
reqExtra = ReqExtraHttp()..header = header;
|
reqExtra = ReqExtraHttp()..header = header;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
import '../controllers/redirect_controller.dart';
|
||||||
|
|
||||||
|
class RedirectBinding extends Bindings {
|
||||||
|
@override
|
||||||
|
void dependencies() {
|
||||||
|
Get.lazyPut<RedirectController>(
|
||||||
|
() => RedirectController(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
class RedirectController extends GetxController {}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
import '../controllers/redirect_controller.dart';
|
||||||
|
|
||||||
|
class RedirectArgs {
|
||||||
|
final String page;
|
||||||
|
final dynamic arguments;
|
||||||
|
|
||||||
|
RedirectArgs(this.page, {this.arguments});
|
||||||
|
}
|
||||||
|
|
||||||
|
class RedirectView extends GetView<RedirectController> {
|
||||||
|
const RedirectView({Key? key}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final redirectArgs = Get.rootDelegate.arguments() as RedirectArgs;
|
||||||
|
// Waiting for previous page controller to delete, avoid deleting controller that route page after redirect
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||||
|
await Future.delayed(const Duration(milliseconds: 350));
|
||||||
|
Get.rootDelegate
|
||||||
|
.offAndToNamed(redirectArgs.page, arguments: redirectArgs.arguments);
|
||||||
|
});
|
||||||
|
return const SizedBox();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@ import '../../../../util/locale_manager.dart';
|
|||||||
import '../../../../util/log_util.dart';
|
import '../../../../util/log_util.dart';
|
||||||
import '../../../../util/message.dart';
|
import '../../../../util/message.dart';
|
||||||
import '../../../../util/package_info.dart';
|
import '../../../../util/package_info.dart';
|
||||||
|
import '../../../../util/scheme_register/scheme_register.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
import '../../../views/check_list_view.dart';
|
import '../../../views/check_list_view.dart';
|
||||||
import '../../../views/directory_selector.dart';
|
import '../../../views/directory_selector.dart';
|
||||||
@@ -111,7 +112,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
});
|
});
|
||||||
|
|
||||||
final buildDefaultDirectDownload =
|
final buildDefaultDirectDownload =
|
||||||
_buildConfigItem('defaultDirectDownload'.tr, () {
|
_buildConfigItem('defaultDirectDownload', () {
|
||||||
return appController.downloaderConfig.value.extra.defaultDirectDownload
|
return appController.downloaderConfig.value.extra.defaultDirectDownload
|
||||||
? 'on'.tr
|
? 'on'.tr
|
||||||
: 'off'.tr;
|
: 'off'.tr;
|
||||||
@@ -161,7 +162,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
// Currently auto startup only support Windows and Linux
|
// Currently auto startup only support Windows and Linux
|
||||||
final buildAutoStartup = !Util.isWindows() && !Util.isLinux()
|
final buildAutoStartup = !Util.isWindows() && !Util.isLinux()
|
||||||
? () => null
|
? () => null
|
||||||
: _buildConfigItem('launchAtStartup'.tr, () {
|
: _buildConfigItem('launchAtStartup', () {
|
||||||
return appController.autoStartup.value ? 'on'.tr : 'off'.tr;
|
return appController.autoStartup.value ? 'on'.tr : 'off'.tr;
|
||||||
}, (Key key) {
|
}, (Key key) {
|
||||||
return Container(
|
return Container(
|
||||||
@@ -229,8 +230,9 @@ class SettingView extends GetView<SettingController> {
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
final buildHttpUseServerCtime = _buildConfigItem('useServerCtime'.tr,
|
final buildHttpUseServerCtime = _buildConfigItem(
|
||||||
() => httpConfig.useServerCtime ? 'on'.tr : 'off'.tr, (Key key) {
|
'useServerCtime', () => httpConfig.useServerCtime ? 'on'.tr : 'off'.tr,
|
||||||
|
(Key key) {
|
||||||
return Container(
|
return Container(
|
||||||
alignment: Alignment.centerLeft,
|
alignment: Alignment.centerLeft,
|
||||||
child: Switch(
|
child: Switch(
|
||||||
@@ -420,6 +422,37 @@ class SettingView extends GetView<SettingController> {
|
|||||||
].where((e) => e != null).map((e) => e!).toList(),
|
].where((e) => e != null).map((e) => e!).toList(),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
final buildBtDefaultClientConfig = !Util.isWindows()
|
||||||
|
? () => null
|
||||||
|
: _buildConfigItem('setAsDefaultBtClient', () {
|
||||||
|
return appController.downloaderConfig.value.extra.defaultBtClient
|
||||||
|
? 'on'.tr
|
||||||
|
: 'off'.tr;
|
||||||
|
}, (Key key) {
|
||||||
|
return Container(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: Switch(
|
||||||
|
value:
|
||||||
|
appController.downloaderConfig.value.extra.defaultBtClient,
|
||||||
|
onChanged: (bool value) async {
|
||||||
|
try {
|
||||||
|
if (value) {
|
||||||
|
registerDefaultTorrentClient();
|
||||||
|
} else {
|
||||||
|
unregisterDefaultTorrentClient();
|
||||||
|
}
|
||||||
|
appController.downloaderConfig.update((val) {
|
||||||
|
val!.extra.defaultBtClient = value;
|
||||||
|
});
|
||||||
|
await debounceSave();
|
||||||
|
} catch (e) {
|
||||||
|
showErrorMessage(e);
|
||||||
|
logger.e('register default torrent client fail', e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
// ui config items start
|
// ui config items start
|
||||||
final buildTheme = _buildConfigItem(
|
final buildTheme = _buildConfigItem(
|
||||||
@@ -947,6 +980,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
buildBtTrackerSubscribeUrls(),
|
buildBtTrackerSubscribeUrls(),
|
||||||
buildBtTrackers(),
|
buildBtTrackers(),
|
||||||
buildBtSeedConfig(),
|
buildBtSeedConfig(),
|
||||||
|
buildBtDefaultClientConfig(),
|
||||||
]),
|
]),
|
||||||
)),
|
)),
|
||||||
Text('ui'.tr),
|
Text('ui'.tr),
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:gopeed/api/model/task.dart';
|
import 'package:gopeed/api/model/task.dart';
|
||||||
|
|
||||||
@@ -6,5 +8,20 @@ class TaskController extends GetxController {
|
|||||||
final tabIndex = 0.obs;
|
final tabIndex = 0.obs;
|
||||||
final scaffoldKey = GlobalKey<ScaffoldState>();
|
final scaffoldKey = GlobalKey<ScaffoldState>();
|
||||||
final selectTask = Rx<Task?>(null);
|
final selectTask = Rx<Task?>(null);
|
||||||
final copyUrlDone = false.obs;
|
|
||||||
|
@override
|
||||||
|
void onInit() {
|
||||||
|
super.onInit();
|
||||||
|
if (kIsWeb) {
|
||||||
|
BrowserContextMenu.disableContextMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onClose() {
|
||||||
|
super.onClose();
|
||||||
|
if (kIsWeb) {
|
||||||
|
BrowserContextMenu.enableContextMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -9,5 +9,13 @@ class TaskDownloadingController extends TaskListController {
|
|||||||
Status.pause,
|
Status.pause,
|
||||||
Status.wait,
|
Status.wait,
|
||||||
Status.error
|
Status.error
|
||||||
], (a, b) => b.createdAt.compareTo(a.createdAt));
|
], (a, b) {
|
||||||
|
if (a.status == Status.running && b.status != Status.running) {
|
||||||
|
return -1;
|
||||||
|
} else if (a.status != Status.running && b.status == Status.running) {
|
||||||
|
return 1;
|
||||||
|
} else {
|
||||||
|
return b.updatedAt.compareTo(a.updatedAt);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,7 @@ abstract class TaskListController extends GetxController {
|
|||||||
TaskListController(this.statuses, this.compare);
|
TaskListController(this.statuses, this.compare);
|
||||||
|
|
||||||
final tasks = <Task>[].obs;
|
final tasks = <Task>[].obs;
|
||||||
|
final selectedTaskIds = <String>[].obs;
|
||||||
final isRunning = false.obs;
|
final isRunning = false.obs;
|
||||||
|
|
||||||
late final Timer _timer;
|
late final Timer _timer;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class TaskDownloadedView extends GetView<TaskDownloadedController> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BuildTaskListView(tasks: controller.tasks);
|
return BuildTaskListView(
|
||||||
|
tasks: controller.tasks, selectedTaskIds: controller.selectedTaskIds);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,6 +9,7 @@ class TaskDownloadingView extends GetView<TaskDownloadingController> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BuildTaskListView(tasks: controller.tasks);
|
return BuildTaskListView(
|
||||||
|
tasks: controller.tasks, selectedTaskIds: controller.selectedTaskIds);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,9 +64,8 @@ class TaskFilesView extends GetView<TaskFilesController> {
|
|||||||
[meta.opts.path, meta.res!.name, fileRelativePath]);
|
[meta.opts.path, meta.res!.name, fileRelativePath]);
|
||||||
final fileName = basename(filePath);
|
final fileName = basename(filePath);
|
||||||
return ListTile(
|
return ListTile(
|
||||||
leading: file.isDirectory
|
leading:
|
||||||
? const Icon(folderIcon)
|
Icon(fileIcon(fileName, isFolder: file.isDirectory)),
|
||||||
: Icon(fileIcon(fileName)),
|
|
||||||
title: Text(fileName),
|
title: Text(fileName),
|
||||||
subtitle: file.isDirectory
|
subtitle: file.isDirectory
|
||||||
? Text('items'.trParams({
|
? Text('items'.trParams({
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:gopeed/app/modules/task/views/task_files_view.dart';
|
|
||||||
import 'package:gopeed/app/modules/task/views/task_view.dart';
|
|
||||||
|
|
||||||
import '../modules/create/bindings/create_binding.dart';
|
import '../modules/create/bindings/create_binding.dart';
|
||||||
import '../modules/create/views/create_view.dart';
|
import '../modules/create/views/create_view.dart';
|
||||||
@@ -8,12 +6,16 @@ import '../modules/extension/bindings/extension_binding.dart';
|
|||||||
import '../modules/extension/views/extension_view.dart';
|
import '../modules/extension/views/extension_view.dart';
|
||||||
import '../modules/home/bindings/home_binding.dart';
|
import '../modules/home/bindings/home_binding.dart';
|
||||||
import '../modules/home/views/home_view.dart';
|
import '../modules/home/views/home_view.dart';
|
||||||
|
import '../modules/redirect/bindings/redirect_binding.dart';
|
||||||
|
import '../modules/redirect/views/redirect_view.dart';
|
||||||
import '../modules/root/bindings/root_binding.dart';
|
import '../modules/root/bindings/root_binding.dart';
|
||||||
import '../modules/root/views/root_view.dart';
|
import '../modules/root/views/root_view.dart';
|
||||||
import '../modules/setting/bindings/setting_binding.dart';
|
import '../modules/setting/bindings/setting_binding.dart';
|
||||||
import '../modules/setting/views/setting_view.dart';
|
import '../modules/setting/views/setting_view.dart';
|
||||||
import '../modules/task/bindings/task_binding.dart';
|
import '../modules/task/bindings/task_binding.dart';
|
||||||
import '../modules/task/bindings/task_files_binding.dart';
|
import '../modules/task/bindings/task_files_binding.dart';
|
||||||
|
import '../modules/task/views/task_files_view.dart';
|
||||||
|
import '../modules/task/views/task_view.dart';
|
||||||
|
|
||||||
part 'app_routes.dart';
|
part 'app_routes.dart';
|
||||||
|
|
||||||
@@ -68,6 +70,11 @@ class AppPages {
|
|||||||
page: () => CreateView(),
|
page: () => CreateView(),
|
||||||
binding: CreateBinding(),
|
binding: CreateBinding(),
|
||||||
),
|
),
|
||||||
|
GetPage(
|
||||||
|
name: _Paths.REDIRECT,
|
||||||
|
page: () => const RedirectView(),
|
||||||
|
binding: RedirectBinding(),
|
||||||
|
),
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ part of 'app_pages.dart';
|
|||||||
|
|
||||||
abstract class Routes {
|
abstract class Routes {
|
||||||
Routes._();
|
Routes._();
|
||||||
|
|
||||||
static const ROOT = _Paths.ROOT;
|
static const ROOT = _Paths.ROOT;
|
||||||
static const HOME = _Paths.HOME;
|
static const HOME = _Paths.HOME;
|
||||||
static const CREATE = _Paths.CREATE;
|
static const CREATE = _Paths.CREATE;
|
||||||
@@ -10,10 +11,12 @@ abstract class Routes {
|
|||||||
static const TASK_FILES = TASK + _Paths.TASK_FILES;
|
static const TASK_FILES = TASK + _Paths.TASK_FILES;
|
||||||
static const EXTENSION = _Paths.HOME + _Paths.EXTENSION;
|
static const EXTENSION = _Paths.HOME + _Paths.EXTENSION;
|
||||||
static const SETTING = _Paths.HOME + _Paths.SETTING;
|
static const SETTING = _Paths.HOME + _Paths.SETTING;
|
||||||
|
static const REDIRECT = _Paths.REDIRECT;
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract class _Paths {
|
abstract class _Paths {
|
||||||
_Paths._();
|
_Paths._();
|
||||||
|
|
||||||
static const ROOT = '/';
|
static const ROOT = '/';
|
||||||
static const HOME = '/home';
|
static const HOME = '/home';
|
||||||
static const CREATE = '/create';
|
static const CREATE = '/create';
|
||||||
@@ -21,4 +24,5 @@ abstract class _Paths {
|
|||||||
static const TASK_FILES = '/files';
|
static const TASK_FILES = '/files';
|
||||||
static const EXTENSION = '/extension';
|
static const EXTENSION = '/extension';
|
||||||
static const SETTING = '/setting';
|
static const SETTING = '/setting';
|
||||||
|
static const REDIRECT = '/redirect';
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'package:contextmenu_plus/contextmenu_plus.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:styled_widget/styled_widget.dart';
|
import 'package:styled_widget/styled_widget.dart';
|
||||||
@@ -8,16 +9,20 @@ import '../../util/message.dart';
|
|||||||
import '../../util/util.dart';
|
import '../../util/util.dart';
|
||||||
import '../modules/app/controllers/app_controller.dart';
|
import '../modules/app/controllers/app_controller.dart';
|
||||||
import '../modules/task/controllers/task_controller.dart';
|
import '../modules/task/controllers/task_controller.dart';
|
||||||
|
import '../modules/task/controllers/task_downloaded_controller.dart';
|
||||||
|
import '../modules/task/controllers/task_downloading_controller.dart';
|
||||||
import '../modules/task/views/task_view.dart';
|
import '../modules/task/views/task_view.dart';
|
||||||
import '../routes/app_pages.dart';
|
import '../routes/app_pages.dart';
|
||||||
import 'file_icon.dart';
|
import 'file_icon.dart';
|
||||||
|
|
||||||
class BuildTaskListView extends GetView {
|
class BuildTaskListView extends GetView {
|
||||||
final List<Task> tasks;
|
final List<Task> tasks;
|
||||||
|
final List<String> selectedTaskIds;
|
||||||
|
|
||||||
const BuildTaskListView({
|
const BuildTaskListView({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.tasks,
|
required this.tasks,
|
||||||
|
required this.selectedTaskIds,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -56,11 +61,15 @@ class BuildTaskListView extends GetView {
|
|||||||
return task.status == Status.running;
|
return task.status == Status.running;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isSelect() {
|
||||||
|
return selectedTaskIds.contains(task.id);
|
||||||
|
}
|
||||||
|
|
||||||
bool isFolderTask() {
|
bool isFolderTask() {
|
||||||
return task.isFolder;
|
return task.isFolder;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> showDeleteDialog(String id) {
|
Future<void> showDeleteDialog(List<String> ids) {
|
||||||
final appController = Get.find<AppController>();
|
final appController = Get.find<AppController>();
|
||||||
|
|
||||||
final context = Get.context!;
|
final context = Get.context!;
|
||||||
@@ -69,7 +78,8 @@ class BuildTaskListView extends GetView {
|
|||||||
context: context,
|
context: context,
|
||||||
barrierDismissible: false,
|
barrierDismissible: false,
|
||||||
builder: (_) => AlertDialog(
|
builder: (_) => AlertDialog(
|
||||||
title: Text('deleteTask'.tr),
|
title: Text(
|
||||||
|
'deleteTask'.trParams({'count': ids.length.toString()})),
|
||||||
content: Obx(() => CheckboxListTile(
|
content: Obx(() => CheckboxListTile(
|
||||||
value: appController
|
value: appController
|
||||||
.downloaderConfig.value.extra.lastDeleteTaskKeep,
|
.downloaderConfig.value.extra.lastDeleteTaskKeep,
|
||||||
@@ -95,7 +105,7 @@ class BuildTaskListView extends GetView {
|
|||||||
final force = !appController
|
final force = !appController
|
||||||
.downloaderConfig.value.extra.lastDeleteTaskKeep;
|
.downloaderConfig.value.extra.lastDeleteTaskKeep;
|
||||||
await appController.saveConfig();
|
await appController.saveConfig();
|
||||||
await deleteTask(id, force);
|
await deleteTasks(ids, force);
|
||||||
Get.back();
|
Get.back();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
showErrorMessage(e);
|
showErrorMessage(e);
|
||||||
@@ -143,12 +153,35 @@ class BuildTaskListView extends GetView {
|
|||||||
list.add(IconButton(
|
list.add(IconButton(
|
||||||
icon: const Icon(Icons.delete),
|
icon: const Icon(Icons.delete),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
showDeleteDialog(task.id);
|
showDeleteDialog([task.id]);
|
||||||
},
|
},
|
||||||
));
|
));
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget buildContextItem(IconData icon, String label, Function() onTap,
|
||||||
|
{bool enabled = true}) {
|
||||||
|
return ListTile(
|
||||||
|
dense: true,
|
||||||
|
visualDensity: const VisualDensity(vertical: -1),
|
||||||
|
minLeadingWidth: 12,
|
||||||
|
leading: Icon(icon, size: 18),
|
||||||
|
title: Text(label,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontWeight: FontWeight.bold, // Make the text bold
|
||||||
|
)),
|
||||||
|
onTap: () async {
|
||||||
|
Get.back();
|
||||||
|
try {
|
||||||
|
await onTap();
|
||||||
|
} catch (e) {
|
||||||
|
showErrorMessage(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
enabled: enabled,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
double getProgress() {
|
double getProgress() {
|
||||||
final totalSize = task.meta.res?.size ?? 0;
|
final totalSize = task.meta.res?.size ?? 0;
|
||||||
return totalSize <= 0 ? 0 : task.progress.downloaded / totalSize;
|
return totalSize <= 0 ? 0 : task.progress.downloaded / totalSize;
|
||||||
@@ -167,9 +200,79 @@ class BuildTaskListView extends GetView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final taskController = Get.find<TaskController>();
|
final taskController = Get.find<TaskController>();
|
||||||
|
final taskListController = taskController.tabIndex.value == 0
|
||||||
|
? Get.find<TaskDownloadingController>()
|
||||||
|
: Get.find<TaskDownloadedController>();
|
||||||
|
|
||||||
return Card(
|
// Filter selected task ids that are still in the task list
|
||||||
|
filterSelectedTaskIds(Iterable<String> selectedTaskIds) => selectedTaskIds
|
||||||
|
.where((id) => tasks.any((task) => task.id == id))
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
return ContextMenuArea(
|
||||||
|
width: 140,
|
||||||
|
builder: (context) => [
|
||||||
|
buildContextItem(Icons.checklist, 'selectAll'.tr, () {
|
||||||
|
if (tasks.isEmpty) return;
|
||||||
|
|
||||||
|
if (selectedTaskIds.isNotEmpty) {
|
||||||
|
taskListController.selectedTaskIds([]);
|
||||||
|
} else {
|
||||||
|
taskListController.selectedTaskIds(tasks.map((e) => e.id).toList());
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
buildContextItem(Icons.check, 'select'.tr, () {
|
||||||
|
if (isSelect()) {
|
||||||
|
taskListController.selectedTaskIds(taskListController
|
||||||
|
.selectedTaskIds
|
||||||
|
.where((element) => element != task.id)
|
||||||
|
.toList());
|
||||||
|
} else {
|
||||||
|
taskListController.selectedTaskIds(
|
||||||
|
[...taskListController.selectedTaskIds, task.id]);
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
const Divider(
|
||||||
|
indent: 8,
|
||||||
|
endIndent: 8,
|
||||||
|
),
|
||||||
|
buildContextItem(Icons.play_arrow, 'continue'.tr, () async {
|
||||||
|
try {
|
||||||
|
await continueAllTasks(filterSelectedTaskIds(
|
||||||
|
{...taskListController.selectedTaskIds, task.id}));
|
||||||
|
} finally {
|
||||||
|
taskListController.selectedTaskIds([]);
|
||||||
|
}
|
||||||
|
}, enabled: !isDone() && !isRunning()),
|
||||||
|
buildContextItem(Icons.pause, 'pause'.tr, () async {
|
||||||
|
try {
|
||||||
|
await pauseAllTasks(filterSelectedTaskIds(
|
||||||
|
{...taskListController.selectedTaskIds, task.id}));
|
||||||
|
} finally {
|
||||||
|
taskListController.selectedTaskIds([]);
|
||||||
|
}
|
||||||
|
}, enabled: !isDone() && isRunning()),
|
||||||
|
buildContextItem(Icons.delete, 'delete'.tr, () async {
|
||||||
|
try {
|
||||||
|
await showDeleteDialog(filterSelectedTaskIds(
|
||||||
|
{...taskListController.selectedTaskIds, task.id}));
|
||||||
|
} finally {
|
||||||
|
taskListController.selectedTaskIds([]);
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
child: Obx(
|
||||||
|
() => Card(
|
||||||
elevation: 4.0,
|
elevation: 4.0,
|
||||||
|
shape: isSelect()
|
||||||
|
? RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8.0),
|
||||||
|
side: BorderSide(
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
width: 2.0,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: null,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
taskController.scaffoldKey.currentState?.openEndDrawer();
|
taskController.scaffoldKey.currentState?.openEndDrawer();
|
||||||
@@ -183,9 +286,11 @@ class BuildTaskListView extends GetView {
|
|||||||
children: [
|
children: [
|
||||||
ListTile(
|
ListTile(
|
||||||
title: Text(task.name),
|
title: Text(task.name),
|
||||||
leading: isFolderTask()
|
leading: Icon(
|
||||||
? const Icon(folderIcon)
|
fileIcon(task.name,
|
||||||
: Icon(fileIcon(task.name))),
|
isFolder: isFolderTask(),
|
||||||
|
isBitTorrent: task.protocol == Protocol.bt),
|
||||||
|
)),
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
@@ -214,6 +319,8 @@ class BuildTaskListView extends GetView {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)).padding(horizontal: 14, top: 8);
|
)).padding(horizontal: 14, top: 8),
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -52,9 +52,6 @@ final Map<String, IconData> _iconCache = Map.fromEntries(
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
const folderIcon = Gopeed.folder;
|
|
||||||
const folderBtIcon = Gopeed.folder_bt;
|
|
||||||
|
|
||||||
String fileExt(String? name) {
|
String fileExt(String? name) {
|
||||||
if (name == null) {
|
if (name == null) {
|
||||||
return '';
|
return '';
|
||||||
@@ -71,7 +68,7 @@ String fileExt(String? name) {
|
|||||||
IconData fileIcon(String? name,
|
IconData fileIcon(String? name,
|
||||||
{bool isFolder = false, bool isBitTorrent = false}) {
|
{bool isFolder = false, bool isBitTorrent = false}) {
|
||||||
if (isFolder) {
|
if (isFolder) {
|
||||||
return isBitTorrent ? folderBtIcon : folderIcon;
|
return isBitTorrent ? Gopeed.folder_bt : Gopeed.folder;
|
||||||
}
|
}
|
||||||
|
|
||||||
final ext = fileExt(name);
|
final ext = fileExt(name);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import '../../api/model/resource.dart';
|
|||||||
import '../../icon/gopeed_icons.dart';
|
import '../../icon/gopeed_icons.dart';
|
||||||
import '../../util/util.dart';
|
import '../../util/util.dart';
|
||||||
import 'file_icon.dart';
|
import 'file_icon.dart';
|
||||||
|
import 'responsive_builder.dart';
|
||||||
import 'sort_icon_button.dart';
|
import 'sort_icon_button.dart';
|
||||||
|
|
||||||
const _toggleSwitchIcons = [
|
const _toggleSwitchIcons = [
|
||||||
@@ -14,6 +15,7 @@ const _toggleSwitchIcons = [
|
|||||||
Gopeed.file_audio,
|
Gopeed.file_audio,
|
||||||
Gopeed.file_image,
|
Gopeed.file_image,
|
||||||
];
|
];
|
||||||
|
const _sizeGapWidth = 72.0;
|
||||||
|
|
||||||
class FileTreeView extends StatefulWidget {
|
class FileTreeView extends StatefulWidget {
|
||||||
final List<FileInfo> files;
|
final List<FileInfo> files;
|
||||||
@@ -50,7 +52,53 @@ class _FileTreeViewState extends State<FileTreeView> {
|
|||||||
final selectedFileCount =
|
final selectedFileCount =
|
||||||
key.currentState?.getSelectedValues().where((e) => e != null).length ??
|
key.currentState?.getSelectedValues().where((e) => e != null).length ??
|
||||||
widget.files.length;
|
widget.files.length;
|
||||||
final selectdFileSize = calcSelectedSize(null);
|
final selectedFileSize = calcSelectedSize(null);
|
||||||
|
|
||||||
|
final filterRow = InkWell(
|
||||||
|
onTap: () {},
|
||||||
|
child: ToggleSwitch(
|
||||||
|
minHeight: 32,
|
||||||
|
cornerRadius: 8,
|
||||||
|
doubleTapDisable: true,
|
||||||
|
inactiveBgColor: Theme.of(context).dividerColor,
|
||||||
|
activeBgColor: [Theme.of(context).colorScheme.primary],
|
||||||
|
initialLabelIndex: toggleSwitchIndex,
|
||||||
|
icons: _toggleSwitchIcons,
|
||||||
|
onToggle: (index) {
|
||||||
|
toggleSwitchIndex = index;
|
||||||
|
if (index == null) {
|
||||||
|
key.currentState?.setSelectedValues(List.empty());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final iconFileExtArr = iconConfigMap[_toggleSwitchIcons[index]] ?? [];
|
||||||
|
final selectedFileIndexes = widget.files
|
||||||
|
.asMap()
|
||||||
|
.entries
|
||||||
|
.where((e) => iconFileExtArr.contains(fileExt(e.value.name)))
|
||||||
|
.map((e) => e.key)
|
||||||
|
.toList();
|
||||||
|
key.currentState?.setSelectedValues(selectedFileIndexes);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final countRow = Row(
|
||||||
|
children: [
|
||||||
|
Text('fileSelectedCount'.tr),
|
||||||
|
Text(
|
||||||
|
selectedFileCount.toString(),
|
||||||
|
style: Theme.of(context).textTheme.bodySmall,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Text('fileSelectedSize'.tr),
|
||||||
|
Text(
|
||||||
|
selectedFileCount > 0 && selectedFileSize == 0
|
||||||
|
? 'unknown'.tr
|
||||||
|
: Util.fmtByte(selectedFileSize),
|
||||||
|
style: Theme.of(context).textTheme.bodySmall,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
return Column(
|
return Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
@@ -140,57 +188,21 @@ class _FileTreeViewState extends State<FileTreeView> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
Row(
|
!ResponsiveBuilder.isNarrow(context)
|
||||||
|
? Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
InkWell(
|
filterRow,
|
||||||
onTap: () {},
|
countRow,
|
||||||
child: ToggleSwitch(
|
|
||||||
minHeight: 32,
|
|
||||||
cornerRadius: 8,
|
|
||||||
doubleTapDisable: true,
|
|
||||||
inactiveBgColor: Theme.of(context).dividerColor,
|
|
||||||
activeBgColor: [Theme.of(context).colorScheme.primary],
|
|
||||||
initialLabelIndex: toggleSwitchIndex,
|
|
||||||
icons: _toggleSwitchIcons,
|
|
||||||
onToggle: (index) {
|
|
||||||
toggleSwitchIndex = index;
|
|
||||||
if (index == null) {
|
|
||||||
key.currentState?.setSelectedValues(List.empty());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final iconFileExtArr =
|
|
||||||
iconConfigMap[_toggleSwitchIcons[index]] ?? [];
|
|
||||||
final selectedFileIndexes = widget.files
|
|
||||||
.asMap()
|
|
||||||
.entries
|
|
||||||
.where(
|
|
||||||
(e) => iconFileExtArr.contains(fileExt(e.value.name)))
|
|
||||||
.map((e) => e.key)
|
|
||||||
.toList();
|
|
||||||
key.currentState?.setSelectedValues(selectedFileIndexes);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Text('fileSelectedCount'.tr),
|
|
||||||
Text(
|
|
||||||
selectedFileCount.toString(),
|
|
||||||
style: Theme.of(context).textTheme.bodySmall,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 16),
|
|
||||||
Text('fileSelectedSize'.tr),
|
|
||||||
Text(
|
|
||||||
selectedFileCount > 0 && selectdFileSize == 0
|
|
||||||
? 'unknown'.tr
|
|
||||||
: Util.fmtByte(selectdFileSize),
|
|
||||||
style: Theme.of(context).textTheme.bodySmall,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
)
|
||||||
|
: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
filterRow,
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
countRow,
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -241,7 +253,7 @@ class _FileTreeViewState extends State<FileTreeView> {
|
|||||||
return size > 0
|
return size > 0
|
||||||
? Text(Util.fmtByte(calcSelectedSize(node)),
|
? Text(Util.fmtByte(calcSelectedSize(node)),
|
||||||
style: Theme.of(context).textTheme.bodySmall)
|
style: Theme.of(context).textTheme.bodySmall)
|
||||||
: const SizedBox();
|
: const SizedBox(width: _sizeGapWidth);
|
||||||
},
|
},
|
||||||
children: [],
|
children: [],
|
||||||
);
|
);
|
||||||
@@ -265,7 +277,7 @@ class _FileTreeViewState extends State<FileTreeView> {
|
|||||||
return file.size > 0
|
return file.size > 0
|
||||||
? Text(Util.fmtByte(file.size),
|
? Text(Util.fmtByte(file.size),
|
||||||
style: Theme.of(context).textTheme.bodySmall)
|
style: Theme.of(context).textTheme.bodySmall)
|
||||||
: const SizedBox();
|
: const SizedBox(width: _sizeGapWidth);
|
||||||
},
|
},
|
||||||
isSelected: widget.initialValues.contains(i),
|
isSelected: widget.initialValues.contains(i),
|
||||||
children: [],
|
children: [],
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ StartConfig _$StartConfigFromJson(Map<String, dynamic> json) => StartConfig()
|
|||||||
..address = json['address'] as String
|
..address = json['address'] as String
|
||||||
..storage = json['storage'] as String
|
..storage = json['storage'] as String
|
||||||
..storageDir = json['storageDir'] as String
|
..storageDir = json['storageDir'] as String
|
||||||
..refreshInterval = json['refreshInterval'] as int
|
..refreshInterval = (json['refreshInterval'] as num).toInt()
|
||||||
..apiToken = json['apiToken'] as String;
|
..apiToken = json['apiToken'] as String;
|
||||||
|
|
||||||
Map<String, dynamic> _$StartConfigToJson(StartConfig instance) =>
|
Map<String, dynamic> _$StartConfigToJson(StartConfig instance) =>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ const enUS = {
|
|||||||
'on': 'On',
|
'on': 'On',
|
||||||
'off': 'Off',
|
'off': 'Off',
|
||||||
'selectAll': 'Select All',
|
'selectAll': 'Select All',
|
||||||
|
'select': 'Select',
|
||||||
'task': 'Tasks',
|
'task': 'Tasks',
|
||||||
'downloading': 'downloading',
|
'downloading': 'downloading',
|
||||||
'downloaded': 'downloaded',
|
'downloaded': 'downloaded',
|
||||||
@@ -20,8 +21,7 @@ const enUS = {
|
|||||||
'followSettings': 'Follow Settings',
|
'followSettings': 'Follow Settings',
|
||||||
'downloadLink': 'Download Link',
|
'downloadLink': 'Download Link',
|
||||||
'downloadLinkValid': 'Please enter the download link',
|
'downloadLinkValid': 'Please enter the download link',
|
||||||
'downloadLinkHit':
|
'downloadLinkHit': 'Please enter the download link, one per line@append',
|
||||||
'Please enter the download link, HTTP/HTTPS/MAGNET supported@append',
|
|
||||||
'downloadLinkHitDesktop': ', or drag the torrent file here directly',
|
'downloadLinkHitDesktop': ', or drag the torrent file here directly',
|
||||||
'download': 'Download',
|
'download': 'Download',
|
||||||
'noFileSelected': 'Please select at least one file to continue.',
|
'noFileSelected': 'Please select at least one file to continue.',
|
||||||
@@ -65,9 +65,11 @@ const enUS = {
|
|||||||
'developer': 'Developer',
|
'developer': 'Developer',
|
||||||
'logDirectory': 'Log Directory',
|
'logDirectory': 'Log Directory',
|
||||||
'show': 'Show',
|
'show': 'Show',
|
||||||
|
'continue': 'Continue',
|
||||||
|
'pause': 'Pause',
|
||||||
'startAll': 'Start All',
|
'startAll': 'Start All',
|
||||||
'pauseAll': 'Pause All',
|
'pauseAll': 'Pause All',
|
||||||
'deleteTask': 'Delete Task',
|
'deleteTask': 'Delete @count tasks',
|
||||||
'deleteTaskTip': 'Keep downloaded files',
|
'deleteTaskTip': 'Keep downloaded files',
|
||||||
'delete': 'Delete',
|
'delete': 'Delete',
|
||||||
'newVersionTitle': 'Discover new version @version',
|
'newVersionTitle': 'Discover new version @version',
|
||||||
@@ -103,6 +105,7 @@ const enUS = {
|
|||||||
'seedKeep': 'Keep seeding until manually stopped',
|
'seedKeep': 'Keep seeding until manually stopped',
|
||||||
'seedRatio': 'Seed ratio',
|
'seedRatio': 'Seed ratio',
|
||||||
'seedTime': 'Seed time (minutes)',
|
'seedTime': 'Seed time (minutes)',
|
||||||
|
'setAsDefaultBtClient': 'Set as the default BT client',
|
||||||
'taskDetail': 'Task Detail',
|
'taskDetail': 'Task Detail',
|
||||||
'taskName': 'Task Name',
|
'taskName': 'Task Name',
|
||||||
'taskUrl': 'Task URL',
|
'taskUrl': 'Task URL',
|
||||||
@@ -113,5 +116,7 @@ const enUS = {
|
|||||||
'unknown': 'Unknown',
|
'unknown': 'Unknown',
|
||||||
'fileSelectedCount': 'Files: ',
|
'fileSelectedCount': 'Files: ',
|
||||||
'fileSelectedSize': 'Size: ',
|
'fileSelectedSize': 'Size: ',
|
||||||
|
'httpHeaderName': 'Header Name',
|
||||||
|
'httpHeaderValue': 'Header Value',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -63,7 +63,7 @@ const esES = {
|
|||||||
'show': 'Mostrar',
|
'show': 'Mostrar',
|
||||||
'startAll': 'Iniciar Todo',
|
'startAll': 'Iniciar Todo',
|
||||||
'pauseAll': 'Pausar Todo',
|
'pauseAll': 'Pausar Todo',
|
||||||
'deleteTask': 'Eliminar Tarea',
|
'deleteTask': 'Eliminar @count tareas',
|
||||||
'deleteTaskTip': 'Mantener archivos descargados',
|
'deleteTaskTip': 'Mantener archivos descargados',
|
||||||
'delete': 'Eliminar',
|
'delete': 'Eliminar',
|
||||||
'newVersionTitle': 'Nueva versión @version disponible',
|
'newVersionTitle': 'Nueva versión @version disponible',
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ const faIR = {
|
|||||||
'effectAfterRestart': 'Effect after restart',
|
'effectAfterRestart': 'Effect after restart',
|
||||||
'startAll': 'شروع همه',
|
'startAll': 'شروع همه',
|
||||||
'pauseAll': 'توقف همه',
|
'pauseAll': 'توقف همه',
|
||||||
'deleteTask': 'پاک کردن کار',
|
'deleteTask': 'حذف @count کار',
|
||||||
'deleteTaskTip': 'فایل های دانلود شده را نگه دارد',
|
'deleteTaskTip': 'فایل های دانلود شده را نگه دارد',
|
||||||
'delete': 'پاک کردن',
|
'delete': 'پاک کردن',
|
||||||
'newVersionTitle': '@version عنوان: کشف نسخه جدید',
|
'newVersionTitle': '@version عنوان: کشف نسخه جدید',
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ const frFR = {
|
|||||||
'show': 'Afficher',
|
'show': 'Afficher',
|
||||||
'startAll': 'Tout démarrer',
|
'startAll': 'Tout démarrer',
|
||||||
'pauseAll': 'Tout suspendre',
|
'pauseAll': 'Tout suspendre',
|
||||||
'deleteTask': 'Supprimer la tâche',
|
'deleteTask': 'Supprimer @count tâches',
|
||||||
'deleteTaskTip': 'Conserver les fichiers téléchargés',
|
'deleteTaskTip': 'Conserver les fichiers téléchargés',
|
||||||
'delete': 'Supprimer',
|
'delete': 'Supprimer',
|
||||||
'newVersionTitle': 'Nouvelle version @version disponible',
|
'newVersionTitle': 'Nouvelle version @version disponible',
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ const idID = {
|
|||||||
'show': 'Tampilkan',
|
'show': 'Tampilkan',
|
||||||
'startAll': 'Mulai Semua',
|
'startAll': 'Mulai Semua',
|
||||||
'pauseAll': 'Jeda Semua',
|
'pauseAll': 'Jeda Semua',
|
||||||
'deleteTask': 'Hapus Tugas',
|
'deleteTask': 'Hapus @count Tugas',
|
||||||
'deleteTaskTip': 'Simpan file yang terunduh',
|
'deleteTaskTip': 'Simpan file yang terunduh',
|
||||||
'delete': 'Hapus',
|
'delete': 'Hapus',
|
||||||
'newVersionTitle': 'Temukan versi batu @version',
|
'newVersionTitle': 'Temukan versi batu @version',
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ const itIT = {
|
|||||||
'show': 'Mostra',
|
'show': 'Mostra',
|
||||||
'startAll': 'Avvia tutti',
|
'startAll': 'Avvia tutti',
|
||||||
'pauseAll': 'Mtti in pausa tutti',
|
'pauseAll': 'Mtti in pausa tutti',
|
||||||
'deleteTask': 'Elimina attività',
|
'deleteTask': 'Elimina @count attività',
|
||||||
'deleteTaskTip': 'Conserva i file scaricati',
|
'deleteTaskTip': 'Conserva i file scaricati',
|
||||||
'delete': 'Elimina',
|
'delete': 'Elimina',
|
||||||
'newVersionTitle': 'Scopri la nuova versione @version',
|
'newVersionTitle': 'Scopri la nuova versione @version',
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ const jaJP = {
|
|||||||
'effectAfterRestart': '再起動後の効果',
|
'effectAfterRestart': '再起動後の効果',
|
||||||
'startAll': 'すべてを開始',
|
'startAll': 'すべてを開始',
|
||||||
'pauseAll': 'すべてを一時停止',
|
'pauseAll': 'すべてを一時停止',
|
||||||
'deleteTask': 'タスクを削除',
|
'deleteTask': '@count タスクを削除',
|
||||||
'deleteTaskTip': 'ダウンロードしたファイルを保持',
|
'deleteTaskTip': 'ダウンロードしたファイルを保持',
|
||||||
'delete': '削除',
|
'delete': '削除',
|
||||||
'newVersionTitle': '新しいバージョン @version を発見する',
|
'newVersionTitle': '新しいバージョン @version を発見する',
|
||||||
|
|||||||
Loaded 50 of 74 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user