mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-11 10:54:08 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a75bfd6118 | ||
|
|
a5d8713ff7 | ||
|
|
81518d794f | ||
|
|
7c2b81caf7 | ||
|
|
2221332243 | ||
|
|
dc407434d0 | ||
|
|
1c2e86a991 | ||
|
|
c78dc5f18f | ||
|
|
8ea5abb5c3 | ||
|
|
d1a4067dfa | ||
|
|
a1928d202f | ||
|
|
7376e85895 | ||
|
|
eb79dd5ac5 | ||
|
|
5b945b16c1 | ||
|
|
80e60f4190 | ||
|
|
3087796ef5 | ||
|
|
99de0aaf9b |
No files matched your search
@@ -5,7 +5,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: 1.19
|
GO_VERSION: 1.19
|
||||||
FLUTTER_VERSION: 3.7.12
|
FLUTTER_VERSION: 3.10.6
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: 1.19
|
GO_VERSION: 1.19
|
||||||
FLUTTER_VERSION: 3.7.12
|
FLUTTER_VERSION: 3.10.6
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# lint:
|
# lint:
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
name: 'translator'
|
||||||
|
|
||||||
|
on:
|
||||||
|
issues:
|
||||||
|
types: [opened, edited]
|
||||||
|
issue_comment:
|
||||||
|
types: [created, edited]
|
||||||
|
discussion:
|
||||||
|
types: [created, edited]
|
||||||
|
discussion_comment:
|
||||||
|
types: [created, edited]
|
||||||
|
pull_request_target:
|
||||||
|
types: [opened, edited]
|
||||||
|
pull_request_review_comment:
|
||||||
|
types: [created, edited]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
translate:
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
|
discussions: write
|
||||||
|
pull-requests: write
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: lizheming/[email protected]
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
IS_MODIFY_TITLE: true
|
||||||
|
APPEND_TRANSLATION: true
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM cirrusci/flutter:3.7.7 AS flutter
|
FROM instrumentisto/flutter:3.10.6 AS flutter
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./
|
COPY ./ui/flutter/pubspec.yaml ./ui/flutter/pubspec.lock ./
|
||||||
RUN flutter pub get
|
RUN flutter pub get
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
|
|||||||
#### Start directly
|
#### Start directly
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
|
docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Using Docker Compose
|
#### Using Docker Compose
|
||||||
@@ -57,8 +57,6 @@ docker-compose up -d
|
|||||||
|
|
||||||
When the docker container is running, you can access the web page through `http://localhost:9999`.
|
When the docker container is running, you can access the web page through `http://localhost:9999`.
|
||||||
|
|
||||||
> Tip: Modify the download path to `/download` on the setting page to access the downloaded files on the host.
|
|
||||||
|
|
||||||
## Donate
|
## Donate
|
||||||
|
|
||||||
If you like this project, please consider [donating](/.donate/index.md#donate) to support the development of this project, thank you!
|
If you like this project, please consider [donating](/.donate/index.md#donate) to support the development of this project, thank you!
|
||||||
@@ -92,7 +90,7 @@ Please refer to [CONTRIBUTING.md](/CONTRIBUTING.md)
|
|||||||
|
|
||||||
#### Desktop
|
#### Desktop
|
||||||
|
|
||||||
First, you need to configure the environment according to the [flutter desktop official website document](https://docs.flutter.dev/development/platform-integration/desktop), and then you need to prepare the `cgo` environment, which can be searched for yourself.
|
First, you need to configure the environment according to the official [Flutter desktop website documention](https://docs.flutter.dev/development/platform-integration/desktop), then you will need to ensure the cgo environment is set up accordingly. For detailed instructions on setting up the cgo environment, please refer to relevant resources available online.
|
||||||
|
|
||||||
command:
|
command:
|
||||||
|
|
||||||
|
|||||||
+1
-3
@@ -44,7 +44,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
|
|||||||
#### 直接始める
|
#### 直接始める
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
|
docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Docker Compose の使用
|
#### Docker Compose の使用
|
||||||
@@ -57,8 +57,6 @@ docker-compose up -d
|
|||||||
|
|
||||||
docker コンテナが起動しているときは、`http://localhost:9999` からウェブページにアクセスできます。
|
docker コンテナが起動しているときは、`http://localhost:9999` からウェブページにアクセスできます。
|
||||||
|
|
||||||
> ヒント: 設定ページでダウンロードパスを `/download` に変更すると、ホスト上でダウンロードしたファイルにアクセスできます。
|
|
||||||
|
|
||||||
## 寄付
|
## 寄付
|
||||||
|
|
||||||
もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](/.donate/index.md#donate)をご検討ください!
|
もしこのプロジェクトがお気に召しましたら、このプロジェクトの発展を支援するために[寄付](/.donate/index.md#donate)をご検討ください!
|
||||||
|
|||||||
+1
-2
@@ -44,7 +44,7 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
|
|||||||
#### 直接运行
|
#### 直接运行
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d -p 9999:9999 -v /path/to/download:/download liwei2633/gopeed
|
docker run -d -p 9999:9999 -v /path/to/download:/root/Downloads liwei2633/gopeed
|
||||||
```
|
```
|
||||||
|
|
||||||
#### 使用 Docker Compose
|
#### 使用 Docker Compose
|
||||||
@@ -56,7 +56,6 @@ docker-compose up -d
|
|||||||
#### 访问服务
|
#### 访问服务
|
||||||
|
|
||||||
当 docker 容器运行时,可以通过 `http://localhost:9999` 访问 web 页面。
|
当 docker 容器运行时,可以通过 `http://localhost:9999` 访问 web 页面。
|
||||||
> 提示:在设置页面把下载路径修改为 `/download` 以便在宿主机访问下载完的文件。
|
|
||||||
|
|
||||||
## 打赏
|
## 打赏
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
)
|
||||||
|
|
||||||
|
type args struct {
|
||||||
|
Address *string `json:"address"`
|
||||||
|
Port *int `json:"port"`
|
||||||
|
Username *string `json:"username"`
|
||||||
|
Password *string `json:"password"`
|
||||||
|
ApiToken *string `json:"apiToken"`
|
||||||
|
|
||||||
|
configPath *string
|
||||||
|
}
|
||||||
|
|
||||||
|
func parse() *args {
|
||||||
|
var cliArgs args
|
||||||
|
cliArgs.Address = flag.String("A", "0.0.0.0", "Bind Address")
|
||||||
|
cliArgs.Port = flag.Int("P", 9999, "Bind Port")
|
||||||
|
cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
|
||||||
|
cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Password")
|
||||||
|
cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
|
||||||
|
cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
fmt.Println("parse")
|
||||||
|
|
||||||
|
// args priority: config file > cli args
|
||||||
|
cfgArgs := loadConfig(*cliArgs.configPath)
|
||||||
|
if cfgArgs.Address == nil {
|
||||||
|
cfgArgs.Address = cliArgs.Address
|
||||||
|
}
|
||||||
|
if cfgArgs.Port == nil {
|
||||||
|
cfgArgs.Port = cliArgs.Port
|
||||||
|
}
|
||||||
|
if cfgArgs.Username == nil {
|
||||||
|
cfgArgs.Username = cliArgs.Username
|
||||||
|
}
|
||||||
|
if cfgArgs.Password == nil {
|
||||||
|
cfgArgs.Password = cliArgs.Password
|
||||||
|
}
|
||||||
|
if cfgArgs.ApiToken == nil {
|
||||||
|
cfgArgs.ApiToken = cliArgs.ApiToken
|
||||||
|
}
|
||||||
|
return cfgArgs
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadConfig(path string) *args {
|
||||||
|
var args args
|
||||||
|
|
||||||
|
if !filepath.IsAbs(path) {
|
||||||
|
dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
|
||||||
|
if err != nil {
|
||||||
|
return &args
|
||||||
|
}
|
||||||
|
path = filepath.Join(dir, path)
|
||||||
|
}
|
||||||
|
file, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return &args
|
||||||
|
}
|
||||||
|
fmt.Println("config file read failed, reason:" + err.Error())
|
||||||
|
return &args
|
||||||
|
}
|
||||||
|
if err = json.Unmarshal(file, &args); err != nil {
|
||||||
|
fmt.Println("config file parse failed, reason:" + err.Error())
|
||||||
|
return &args
|
||||||
|
}
|
||||||
|
fmt.Printf("config file loaded: %s\n", path)
|
||||||
|
return &args
|
||||||
|
}
|
||||||
+22
-5
@@ -5,6 +5,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
||||||
|
"fmt"
|
||||||
"github.com/GopeedLab/gopeed/cmd"
|
"github.com/GopeedLab/gopeed/cmd"
|
||||||
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
"github.com/GopeedLab/gopeed/pkg/rest/model"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
@@ -18,12 +19,28 @@ func main() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
args := parse()
|
||||||
|
var webBasicAuth *model.WebBasicAuth
|
||||||
|
if isNotBlank(args.Username) && isNotBlank(args.Password) {
|
||||||
|
webBasicAuth = &model.WebBasicAuth{
|
||||||
|
Username: *args.Username,
|
||||||
|
Password: *args.Password,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cfg := &model.StartConfig{
|
cfg := &model.StartConfig{
|
||||||
Network: "tcp",
|
Network: "tcp",
|
||||||
Address: "0.0.0.0:9999",
|
Address: fmt.Sprintf("%s:%d", *args.Address, *args.Port),
|
||||||
Storage: model.StorageBolt,
|
Storage: model.StorageBolt,
|
||||||
WebEnable: true,
|
ApiToken: *args.ApiToken,
|
||||||
WebFS: sub,
|
WebEnable: true,
|
||||||
|
WebFS: sub,
|
||||||
|
WebBasicAuth: webBasicAuth,
|
||||||
}
|
}
|
||||||
cmd.Start(cfg)
|
cmd.Start(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isNotBlank(str *string) bool {
|
||||||
|
return str != nil && *str != ""
|
||||||
|
}
|
||||||
+1
-1
@@ -7,5 +7,5 @@ services:
|
|||||||
- 9999:9999 # HTTP port (host:container)
|
- 9999:9999 # HTTP port (host:container)
|
||||||
image: liwei2633/gopeed
|
image: liwei2633/gopeed
|
||||||
volumes:
|
volumes:
|
||||||
- ~/Downloads:/download # replace with your prefer path
|
- ~/Downloads:/root/Downloads # replace with your prefer path
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@@ -13,7 +13,7 @@ require (
|
|||||||
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
|
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
|
||||||
)
|
)
|
||||||
|
|
||||||
replace github.com/anacrolix/torrent => github.com/monkeyWie/torrent v1.52.4-alpha
|
replace github.com/anacrolix/torrent => github.com/monkeyWie/torrent v1.52.5-alpha
|
||||||
|
|
||||||
require (
|
require (
|
||||||
crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
|
crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
|
||||||
|
|||||||
@@ -210,8 +210,8 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
|
|||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||||
github.com/monkeyWie/torrent v1.52.4-alpha h1:iir8NMyLkv6X/D4skGUx8Htb8q57cPk9A6bYlRfrrqA=
|
github.com/monkeyWie/torrent v1.52.5-alpha h1:JnGTtfwrnrxaMdpzDgHbzfLEnXhkmldnk0iyka+2Ntw=
|
||||||
github.com/monkeyWie/torrent v1.52.4-alpha/go.mod h1:yBUcBuIOlttGEgAW/6gamzQGD+k2+wUh65fOPPzxvC4=
|
github.com/monkeyWie/torrent v1.52.5-alpha/go.mod h1:yBUcBuIOlttGEgAW/6gamzQGD+k2+wUh65fOPPzxvC4=
|
||||||
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
|
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
|
||||||
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
|
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
|
||||||
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
|
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
package bt
|
package bt
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"github.com/GopeedLab/gopeed/internal/controller"
|
"github.com/GopeedLab/gopeed/internal/controller"
|
||||||
"github.com/GopeedLab/gopeed/internal/fetcher"
|
"github.com/GopeedLab/gopeed/internal/fetcher"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/protocol/bt"
|
||||||
"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"
|
||||||
@@ -68,7 +70,11 @@ func (f *Fetcher) initClient() (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (f *Fetcher) Resolve(req *base.Request) error {
|
func (f *Fetcher) Resolve(req *base.Request) error {
|
||||||
if err := f.addTorrent(req.URL); err != nil {
|
if err := base.ParseReqExtra[bt.ReqExtra](req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := f.addTorrent(req); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
@@ -122,7 +128,7 @@ func (f *Fetcher) Create(opts *base.Options) (err error) {
|
|||||||
|
|
||||||
func (f *Fetcher) Start() (err error) {
|
func (f *Fetcher) Start() (err error) {
|
||||||
if !f.torrentReady.Load() {
|
if !f.torrentReady.Load() {
|
||||||
if err = f.addTorrent(f.meta.Req.URL); err != nil {
|
if err = f.addTorrent(f.meta.Req); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -211,15 +217,24 @@ func (f *Fetcher) Progress() fetcher.Progress {
|
|||||||
return f.progress
|
return f.progress
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Fetcher) addTorrent(url string) (err error) {
|
func (f *Fetcher) addTorrent(req *base.Request) (err error) {
|
||||||
if err = f.initClient(); err != nil {
|
if err = f.initClient(); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
schema := util.ParseSchema(url)
|
schema := util.ParseSchema(req.URL)
|
||||||
if schema == "MAGNET" {
|
if schema == "MAGNET" {
|
||||||
f.torrent, err = client.AddMagnet(url)
|
f.torrent, err = client.AddMagnet(req.URL)
|
||||||
|
} else if schema == "APPLICATION/X-BITTORRENT" {
|
||||||
|
_, data := util.ParseDataUri(req.URL)
|
||||||
|
buf := bytes.NewBuffer(data)
|
||||||
|
var metaInfo *metainfo.MetaInfo
|
||||||
|
metaInfo, err = metainfo.Load(buf)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
f.torrent, err = client.AddTorrent(metaInfo)
|
||||||
} else {
|
} else {
|
||||||
f.torrent, err = client.AddTorrentFromFile(url)
|
f.torrent, err = client.AddTorrentFromFile(req.URL)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
@@ -229,9 +244,25 @@ func (f *Fetcher) addTorrent(url string) (err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// use map to deduplicate
|
||||||
|
trackers := make(map[string]bool)
|
||||||
|
if req.Extra != nil {
|
||||||
|
extra := req.Extra.(*bt.ReqExtra)
|
||||||
|
if len(extra.Trackers) > 0 {
|
||||||
|
for _, tracker := range extra.Trackers {
|
||||||
|
trackers[tracker] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if exist && len(cfg.Trackers) > 0 {
|
if exist && len(cfg.Trackers) > 0 {
|
||||||
announceList := make([][]string, 0)
|
|
||||||
for _, tracker := range cfg.Trackers {
|
for _, tracker := range cfg.Trackers {
|
||||||
|
trackers[tracker] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(trackers) > 0 {
|
||||||
|
announceList := make([][]string, 0)
|
||||||
|
for tracker := range trackers {
|
||||||
announceList = append(announceList, []string{tracker})
|
announceList = append(announceList, []string{tracker})
|
||||||
}
|
}
|
||||||
f.torrent.AddTrackers(announceList)
|
f.torrent.AddTrackers(announceList)
|
||||||
@@ -244,7 +275,7 @@ func (f *Fetcher) addTorrent(url string) (err error) {
|
|||||||
type FetcherBuilder struct {
|
type FetcherBuilder struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
var schemes = []string{"FILE", "MAGNET"}
|
var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
|
||||||
|
|
||||||
func (fb *FetcherBuilder) Schemes() []string {
|
func (fb *FetcherBuilder) Schemes() []string {
|
||||||
return schemes
|
return schemes
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
package bt
|
package bt
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"github.com/GopeedLab/gopeed/internal/controller"
|
"github.com/GopeedLab/gopeed/internal/controller"
|
||||||
"github.com/GopeedLab/gopeed/internal/fetcher"
|
"github.com/GopeedLab/gopeed/internal/fetcher"
|
||||||
"github.com/GopeedLab/gopeed/internal/test"
|
"github.com/GopeedLab/gopeed/internal/test"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/protocol/bt"
|
||||||
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
@@ -14,6 +17,39 @@ func TestFetcher_Resolve_Torrent(t *testing.T) {
|
|||||||
doResolve(t, buildFetcher())
|
doResolve(t, buildFetcher())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFetcher_Resolve_DataUri_Torrent(t *testing.T) {
|
||||||
|
fetcher := buildFetcher()
|
||||||
|
buf, err := os.ReadFile("./testdata/ubuntu-22.04-live-server-amd64.iso.torrent")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// convert to data uri
|
||||||
|
dataUri := "data:application/x-bittorrent;base64," + base64.StdEncoding.EncodeToString(buf)
|
||||||
|
err = fetcher.Resolve(&base.Request{
|
||||||
|
URL: dataUri,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
want := &base.Resource{
|
||||||
|
Name: "ubuntu-22.04-live-server-amd64.iso",
|
||||||
|
Size: 1466714112,
|
||||||
|
Range: true,
|
||||||
|
RootDir: "ubuntu-22.04-live-server-amd64.iso",
|
||||||
|
Files: []*base.FileInfo{
|
||||||
|
{
|
||||||
|
Name: "ubuntu-22.04-live-server-amd64.iso",
|
||||||
|
Size: 1466714112,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Hash: "8a55cfbd5ca5d11507364765936c4f9e55b253ed",
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(want, fetcher.Meta().Res) {
|
||||||
|
t.Errorf("Resolve() got = %v, want %v", fetcher.Meta().Res, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestFetcher_Config(t *testing.T) {
|
func TestFetcher_Config(t *testing.T) {
|
||||||
doResolve(t, buildConfigFetcher())
|
doResolve(t, buildConfigFetcher())
|
||||||
}
|
}
|
||||||
@@ -21,6 +57,12 @@ func TestFetcher_Config(t *testing.T) {
|
|||||||
func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
|
func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
|
||||||
err := fetcher.Resolve(&base.Request{
|
err := fetcher.Resolve(&base.Request{
|
||||||
URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
|
URL: "./testdata/ubuntu-22.04-live-server-amd64.iso.torrent",
|
||||||
|
Extra: bt.ReqExtra{
|
||||||
|
Trackers: []string{
|
||||||
|
"udp://tracker.birkenwald.de:6969/announce",
|
||||||
|
"udp://tracker.bitsearch.to:1337/announce",
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
|||||||
@@ -169,9 +169,6 @@ func (d *Downloader) Setup() error {
|
|||||||
func (d *Downloader) parseFb(url string) (fetcher.FetcherBuilder, error) {
|
func (d *Downloader) parseFb(url string) (fetcher.FetcherBuilder, error) {
|
||||||
schema := util.ParseSchema(url)
|
schema := util.ParseSchema(url)
|
||||||
fetchBuilder, ok := d.fetchBuilders[schema]
|
fetchBuilder, ok := d.fetchBuilders[schema]
|
||||||
if !ok {
|
|
||||||
fetchBuilder, ok = d.fetchBuilders[util.FileSchema]
|
|
||||||
}
|
|
||||||
if ok {
|
if ok {
|
||||||
return fetchBuilder, nil
|
return fetchBuilder, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package bt
|
||||||
|
|
||||||
|
type ReqExtra struct {
|
||||||
|
Trackers []string `json:"trackers"`
|
||||||
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
import "io/fs"
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"io/fs"
|
||||||
|
)
|
||||||
|
|
||||||
type Storage string
|
type Storage string
|
||||||
|
|
||||||
@@ -17,8 +20,9 @@ type StartConfig struct {
|
|||||||
StorageDir string `json:"storageDir"`
|
StorageDir string `json:"storageDir"`
|
||||||
ApiToken string `json:"apiToken"`
|
ApiToken string `json:"apiToken"`
|
||||||
|
|
||||||
WebEnable bool
|
WebEnable bool
|
||||||
WebFS fs.FS
|
WebFS fs.FS
|
||||||
|
WebBasicAuth *WebBasicAuth
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cfg *StartConfig) Init() *StartConfig {
|
func (cfg *StartConfig) Init() *StartConfig {
|
||||||
@@ -39,3 +43,14 @@ func (cfg *StartConfig) Init() *StartConfig {
|
|||||||
}
|
}
|
||||||
return cfg
|
return cfg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type WebBasicAuth struct {
|
||||||
|
Username string
|
||||||
|
Password string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Authorization returns the value of the Authorization header to be used in HTTP requests.
|
||||||
|
func (cfg *WebBasicAuth) Authorization() string {
|
||||||
|
userId := cfg.Username + ":" + cfg.Password
|
||||||
|
return "Basic " + base64.StdEncoding.EncodeToString([]byte(userId))
|
||||||
|
}
|
||||||
+16
-5
@@ -98,14 +98,21 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
|
|||||||
r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
|
r.PathPrefix("/").Handler(http.FileServer(http.FS(startCfg.WebFS)))
|
||||||
}
|
}
|
||||||
|
|
||||||
if startCfg.ApiToken != "" {
|
if startCfg.ApiToken != "" || (startCfg.WebEnable && startCfg.WebBasicAuth != nil) {
|
||||||
r.Use(func(h http.Handler) http.Handler {
|
r.Use(func(h http.Handler) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.Header.Get("X-Api-Token") != startCfg.ApiToken {
|
if startCfg.ApiToken != "" && r.Header.Get("X-Api-Token") == startCfg.ApiToken {
|
||||||
WriteJson(w, model.NewErrorResult("invalid token", model.CodeUnauthorized))
|
h.ServeHTTP(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
h.ServeHTTP(w, r)
|
if startCfg.WebEnable && startCfg.WebBasicAuth != nil {
|
||||||
|
if r.Header.Get("Authorization") == startCfg.WebBasicAuth.Authorization() {
|
||||||
|
h.ServeHTTP(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("WWW-Authenticate", "Basic realm=\"gopeed web\"")
|
||||||
|
}
|
||||||
|
WriteStatusJson(w, http.StatusUnauthorized, model.NewErrorResult("unauthorized", model.CodeUnauthorized))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -127,7 +134,11 @@ func ReadJson(r *http.Request, w http.ResponseWriter, v any) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func WriteJson(w http.ResponseWriter, v any) {
|
func WriteJson(w http.ResponseWriter, v any) {
|
||||||
|
WriteStatusJson(w, http.StatusOK, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
func WriteStatusJson(w http.ResponseWriter, statusCode int, v any) {
|
||||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(statusCode)
|
||||||
json.NewEncoder(w).Encode(v)
|
json.NewEncoder(w).Encode(v)
|
||||||
}
|
}
|
||||||
+46
-5
@@ -273,7 +273,7 @@ func TestDoProxy(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAuthorization(t *testing.T) {
|
func TestApiToken(t *testing.T) {
|
||||||
var cfg = &model.StartConfig{}
|
var cfg = &model.StartConfig{}
|
||||||
cfg.Init()
|
cfg.Init()
|
||||||
cfg.ApiToken = "123456"
|
cfg.ApiToken = "123456"
|
||||||
@@ -285,16 +285,57 @@ func TestAuthorization(t *testing.T) {
|
|||||||
Stop()
|
Stop()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
code, _ := doHttpRequest[any](http.MethodGet, "/api/v1/config", nil, nil)
|
status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
|
||||||
checkCode(code, model.CodeUnauthorized)
|
if status != http.StatusUnauthorized {
|
||||||
|
t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusUnauthorized)
|
||||||
|
}
|
||||||
|
|
||||||
code, _ = doHttpRequest[any](http.MethodGet, "/api/v1/config", map[string]string{
|
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
||||||
"X-Api-Token": cfg.ApiToken,
|
"X-Api-Token": cfg.ApiToken,
|
||||||
}, nil)
|
}, nil)
|
||||||
checkCode(code, model.CodeOk)
|
if status != http.StatusOK {
|
||||||
|
t.Errorf("TestApiToken() got = %v, want %v", status, http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAuthorization(t *testing.T) {
|
||||||
|
var cfg = &model.StartConfig{}
|
||||||
|
cfg.Init()
|
||||||
|
cfg.ApiToken = "123456"
|
||||||
|
cfg.WebEnable = true
|
||||||
|
cfg.WebBasicAuth = &model.WebBasicAuth{
|
||||||
|
Username: "admin",
|
||||||
|
Password: "123456",
|
||||||
|
}
|
||||||
|
fileListener := doStart(cfg)
|
||||||
|
defer func() {
|
||||||
|
if err := fileListener.Close(); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
Stop()
|
||||||
|
}()
|
||||||
|
|
||||||
|
status, _ := doHttpRequest0(http.MethodGet, "/api/v1/config", nil, nil)
|
||||||
|
if status != http.StatusUnauthorized {
|
||||||
|
t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusUnauthorized)
|
||||||
|
}
|
||||||
|
|
||||||
|
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
||||||
|
"Authorization": cfg.WebBasicAuth.Authorization(),
|
||||||
|
}, nil)
|
||||||
|
if status != http.StatusOK {
|
||||||
|
t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
status, _ = doHttpRequest0(http.MethodGet, "/api/v1/config", map[string]string{
|
||||||
|
"X-Api-Token": cfg.ApiToken,
|
||||||
|
}, nil)
|
||||||
|
if status != http.StatusOK {
|
||||||
|
t.Errorf("TestAuthorization() got = %v, want %v", status, http.StatusOK)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func doTest(handler func()) {
|
func doTest(handler func()) {
|
||||||
testFunc := func(storage model.Storage) {
|
testFunc := func(storage model.Storage) {
|
||||||
var cfg = &model.StartConfig{}
|
var cfg = &model.StartConfig{}
|
||||||
|
|||||||
@@ -88,3 +88,13 @@ func CreateDirIfNotExist(dir string) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsExistsFile check file exists and is a file
|
||||||
|
func IsExistsFile(path string) bool {
|
||||||
|
info, err := os.Stat(path)
|
||||||
|
// 判断路径是否存在,并且是一个文件
|
||||||
|
if err == nil && !info.IsDir() {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -199,3 +199,43 @@ func doCheckDuplicateAndRename(t *testing.T, exitsPaths []string, path string, e
|
|||||||
t.Errorf("CheckDuplicateAndRename() = %v, want %v", got, except)
|
t.Errorf("CheckDuplicateAndRename() = %v, want %v", got, except)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestIsExistsFile(t *testing.T) {
|
||||||
|
type args struct {
|
||||||
|
path string
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args args
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "exist",
|
||||||
|
args: args{
|
||||||
|
path: "./path.go",
|
||||||
|
},
|
||||||
|
want: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "not exist",
|
||||||
|
args: args{
|
||||||
|
path: "./path_not_exist.go",
|
||||||
|
},
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "is dir",
|
||||||
|
args: args{
|
||||||
|
path: "../util",
|
||||||
|
},
|
||||||
|
want: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
if got := IsExistsFile(tt.args.path); got != tt.want {
|
||||||
|
t.Errorf("IsExistsFile() = %v, want %v", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
+32
-3
@@ -1,13 +1,42 @@
|
|||||||
package util
|
package util
|
||||||
|
|
||||||
import "strings"
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
const FileSchema = "FILE"
|
const FileSchema = "FILE"
|
||||||
|
|
||||||
func ParseSchema(url string) string {
|
func ParseSchema(url string) string {
|
||||||
index := strings.Index(url, ":")
|
index := strings.Index(url, ":")
|
||||||
if index == -1 {
|
if index == -1 {
|
||||||
return FileSchema
|
// check is file path
|
||||||
|
if IsExistsFile(url) {
|
||||||
|
return FileSchema
|
||||||
|
}
|
||||||
|
return ""
|
||||||
}
|
}
|
||||||
return strings.ToUpper(url[:index])
|
schema := url[:index]
|
||||||
|
if schema == "data" {
|
||||||
|
schema, _ = ParseDataUri(url)
|
||||||
|
}
|
||||||
|
return strings.ToUpper(schema)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseDataUri parses a data URI and returns the MIME type and decode data.
|
||||||
|
func ParseDataUri(uri string) (string, []byte) {
|
||||||
|
re := regexp.MustCompile(`^data:(.*);base64,(.*)$`)
|
||||||
|
matches := re.FindStringSubmatch(uri)
|
||||||
|
if len(matches) != 3 {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
mime := matches[1]
|
||||||
|
base64Data := matches[2]
|
||||||
|
// 解码Base64数据
|
||||||
|
data, err := base64.StdEncoding.DecodeString(base64Data)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
return mime, data
|
||||||
}
|
}
|
||||||
+82
-2
@@ -1,6 +1,10 @@
|
|||||||
package util
|
package util
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func TestParseSchema(t *testing.T) {
|
func TestParseSchema(t *testing.T) {
|
||||||
type args struct {
|
type args struct {
|
||||||
@@ -32,13 +36,27 @@ func TestParseSchema(t *testing.T) {
|
|||||||
},
|
},
|
||||||
want: "FILE",
|
want: "FILE",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "file-not-exists",
|
||||||
|
args: args{
|
||||||
|
url: "not.txt",
|
||||||
|
},
|
||||||
|
want: "",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "file-no-scheme",
|
name: "file-no-scheme",
|
||||||
args: args{
|
args: args{
|
||||||
url: "/home/bt.torrent",
|
url: "./url.go",
|
||||||
},
|
},
|
||||||
want: "FILE",
|
want: "FILE",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "data-uri",
|
||||||
|
args: args{
|
||||||
|
url: "data:application/x-bittorrent;base64,test",
|
||||||
|
},
|
||||||
|
want: "APPLICATION/X-BITTORRENT",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
@@ -48,3 +66,65 @@ func TestParseSchema(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseDataUri(t *testing.T) {
|
||||||
|
type args struct {
|
||||||
|
uri string
|
||||||
|
}
|
||||||
|
type result struct {
|
||||||
|
mime string
|
||||||
|
data []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
testData := []byte("test")
|
||||||
|
testData64 := base64.StdEncoding.EncodeToString(testData)
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args args
|
||||||
|
want result
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "success",
|
||||||
|
args: args{
|
||||||
|
uri: "data:application/x-bittorrent;base64," + testData64,
|
||||||
|
},
|
||||||
|
want: result{
|
||||||
|
mime: "application/x-bittorrent",
|
||||||
|
data: testData,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail-dirty-data",
|
||||||
|
args: args{
|
||||||
|
uri: "data::application/x-bittorrent;base64,!@$",
|
||||||
|
},
|
||||||
|
want: result{
|
||||||
|
mime: "",
|
||||||
|
data: nil,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fail-miss-data",
|
||||||
|
args: args{
|
||||||
|
uri: ":application/x-bittorrent;base64," + testData64,
|
||||||
|
},
|
||||||
|
want: result{
|
||||||
|
mime: "",
|
||||||
|
data: nil,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
mime, data := ParseDataUri(tt.args.uri)
|
||||||
|
got := result{
|
||||||
|
mime: mime,
|
||||||
|
data: data,
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(got, tt.want) {
|
||||||
|
t.Errorf("ParseDataUri() = %v, want %v", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,6 @@ subprojects {
|
|||||||
project.evaluationDependsOn(':app')
|
project.evaluationDependsOn(':app')
|
||||||
}
|
}
|
||||||
|
|
||||||
task clean(type: Delete) {
|
tasks.register("clean", Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
"donate": "Donate",
|
"donate": "Donate",
|
||||||
"exit": "Exit",
|
"exit": "Exit",
|
||||||
"create": "Create Task",
|
"create": "Create Task",
|
||||||
|
"advancedOptions": "Advanced Options",
|
||||||
"downloadLink": "Download Link",
|
"downloadLink": "Download Link",
|
||||||
"downloadLinkValid": "Please enter the download link",
|
"downloadLinkValid": "Please enter the download link",
|
||||||
"downloadLinkHit": "Please enter the download link, HTTP/HTTPS/MAGNET supported@append",
|
"downloadLinkHit": "Please enter the download link, HTTP/HTTPS/MAGNET supported@append",
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
"noFileSelected": "Please select at least one file to continue.",
|
"noFileSelected": "Please select at least one file to continue.",
|
||||||
"noStoragePermission": "Storage permission required",
|
"noStoragePermission": "Storage permission required",
|
||||||
"selectFile": "Select File",
|
"selectFile": "Select File",
|
||||||
|
"rename": "Rename",
|
||||||
"basic": "Basic",
|
"basic": "Basic",
|
||||||
"advanced": "Advanced",
|
"advanced": "Advanced",
|
||||||
"general": "General",
|
"general": "General",
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
"donate": "打赏",
|
"donate": "打赏",
|
||||||
"exit": "退出",
|
"exit": "退出",
|
||||||
"create": "创建任务",
|
"create": "创建任务",
|
||||||
|
"advancedOptions": "高级选项",
|
||||||
"downloadLink": "下载链接",
|
"downloadLink": "下载链接",
|
||||||
"downloadLinkValid": "请输入下载链接",
|
"downloadLinkValid": "请输入下载链接",
|
||||||
"downloadLinkHit": "请输入下载链接,支持 HTTP/HTTPS/MAGNET@append",
|
"downloadLinkHit": "请输入下载链接,支持 HTTP/HTTPS/MAGNET@append",
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
"noFileSelected": "请至少选择一个文件下载",
|
"noFileSelected": "请至少选择一个文件下载",
|
||||||
"noStoragePermission": "需要开启存储权限",
|
"noStoragePermission": "需要开启存储权限",
|
||||||
"selectFile": "选择文件",
|
"selectFile": "选择文件",
|
||||||
|
"rename": "重命名",
|
||||||
"basic": "基础",
|
"basic": "基础",
|
||||||
"advanced": "高级",
|
"advanced": "高级",
|
||||||
"general": "通用",
|
"general": "通用",
|
||||||
|
|||||||
@@ -147,6 +147,8 @@ Future<Response<String>> proxyRequest<T>(String uri,
|
|||||||
options.headers!["X-Target-Uri"] = uri;
|
options.headers!["X-Target-Uri"] = uri;
|
||||||
|
|
||||||
// add timestamp to avoid cache
|
// add timestamp to avoid cache
|
||||||
return _client.dio.request("/api/v1/proxy?t=${DateTime.now()}",
|
return _client.dio.request(
|
||||||
data: data, options: options);
|
"/api/v1/proxy?t=${DateTime.now().millisecondsSinceEpoch}",
|
||||||
|
data: data,
|
||||||
|
options: options);
|
||||||
}
|
}
|
||||||
@@ -2,17 +2,18 @@ import 'package:json_annotation/json_annotation.dart';
|
|||||||
|
|
||||||
part 'options.g.dart';
|
part 'options.g.dart';
|
||||||
|
|
||||||
@JsonSerializable(explicitToJson: true, genericArgumentFactories: true)
|
@JsonSerializable(explicitToJson: true)
|
||||||
class Options {
|
class Options {
|
||||||
String name;
|
String name;
|
||||||
String path;
|
String path;
|
||||||
List<int> selectFiles;
|
List<int> selectFiles;
|
||||||
Map<String, dynamic>? extra;
|
Object? extra;
|
||||||
|
|
||||||
Options({
|
Options({
|
||||||
required this.name,
|
required this.name,
|
||||||
required this.path,
|
required this.path,
|
||||||
required this.selectFiles,
|
required this.selectFiles,
|
||||||
|
this.extra,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory Options.fromJson(Map<String, dynamic> json) =>
|
factory Options.fromJson(Map<String, dynamic> json) =>
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ Options _$OptionsFromJson(Map<String, dynamic> json) => Options(
|
|||||||
path: json['path'] as String,
|
path: json['path'] as String,
|
||||||
selectFiles:
|
selectFiles:
|
||||||
(json['selectFiles'] as List<dynamic>).map((e) => e as int).toList(),
|
(json['selectFiles'] as List<dynamic>).map((e) => e as int).toList(),
|
||||||
)..extra = json['extra'] as Map<String, dynamic>?;
|
extra: json['extra'],
|
||||||
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$OptionsToJson(Options instance) {
|
Map<String, dynamic> _$OptionsToJson(Options instance) {
|
||||||
final val = <String, dynamic>{
|
final val = <String, dynamic>{
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ part 'request.g.dart';
|
|||||||
@JsonSerializable(explicitToJson: true)
|
@JsonSerializable(explicitToJson: true)
|
||||||
class Request {
|
class Request {
|
||||||
String url;
|
String url;
|
||||||
Map<String, dynamic>? extra;
|
Object? extra;
|
||||||
|
|
||||||
Request({
|
Request({
|
||||||
required this.url,
|
required this.url,
|
||||||
|
this.extra,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory Request.fromJson(Map<String, dynamic> json) =>
|
factory Request.fromJson(Map<String, dynamic> json) =>
|
||||||
@@ -20,7 +21,7 @@ class Request {
|
|||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
class ReqExtraHttp {
|
class ReqExtraHttp {
|
||||||
String method = 'GET';
|
String method = 'GET';
|
||||||
Map<String, String> headers = {};
|
Map<String, String> header = {};
|
||||||
String body = '';
|
String body = '';
|
||||||
|
|
||||||
ReqExtraHttp();
|
ReqExtraHttp();
|
||||||
@@ -30,3 +31,15 @@ class ReqExtraHttp {
|
|||||||
|
|
||||||
Map<String, dynamic> toJson() => _$ReqExtraHttpToJson(this);
|
Map<String, dynamic> toJson() => _$ReqExtraHttpToJson(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@JsonSerializable()
|
||||||
|
class ReqExtraBt {
|
||||||
|
List<String> trackers = [];
|
||||||
|
|
||||||
|
ReqExtraBt();
|
||||||
|
|
||||||
|
factory ReqExtraBt.fromJson(Map<String, dynamic> json) =>
|
||||||
|
_$ReqExtraBtFromJson(json);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => _$ReqExtraBtToJson(this);
|
||||||
|
}
|
||||||
@@ -8,7 +8,8 @@ part of 'request.dart';
|
|||||||
|
|
||||||
Request _$RequestFromJson(Map<String, dynamic> json) => Request(
|
Request _$RequestFromJson(Map<String, dynamic> json) => Request(
|
||||||
url: json['url'] as String,
|
url: json['url'] as String,
|
||||||
)..extra = json['extra'] as Map<String, dynamic>?;
|
extra: json['extra'],
|
||||||
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$RequestToJson(Request instance) {
|
Map<String, dynamic> _$RequestToJson(Request instance) {
|
||||||
final val = <String, dynamic>{
|
final val = <String, dynamic>{
|
||||||
@@ -27,12 +28,21 @@ Map<String, dynamic> _$RequestToJson(Request instance) {
|
|||||||
|
|
||||||
ReqExtraHttp _$ReqExtraHttpFromJson(Map<String, dynamic> json) => ReqExtraHttp()
|
ReqExtraHttp _$ReqExtraHttpFromJson(Map<String, dynamic> json) => ReqExtraHttp()
|
||||||
..method = json['method'] as String
|
..method = json['method'] as String
|
||||||
..headers = Map<String, String>.from(json['headers'] as Map)
|
..header = Map<String, String>.from(json['header'] as Map)
|
||||||
..body = json['body'] as String;
|
..body = json['body'] as String;
|
||||||
|
|
||||||
Map<String, dynamic> _$ReqExtraHttpToJson(ReqExtraHttp instance) =>
|
Map<String, dynamic> _$ReqExtraHttpToJson(ReqExtraHttp instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
'method': instance.method,
|
'method': instance.method,
|
||||||
'headers': instance.headers,
|
'header': instance.header,
|
||||||
'body': instance.body,
|
'body': instance.body,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ReqExtraBt _$ReqExtraBtFromJson(Map<String, dynamic> json) => ReqExtraBt()
|
||||||
|
..trackers =
|
||||||
|
(json['trackers'] as List<dynamic>).map((e) => e as String).toList();
|
||||||
|
|
||||||
|
Map<String, dynamic> _$ReqExtraBtToJson(ReqExtraBt instance) =>
|
||||||
|
<String, dynamic>{
|
||||||
|
'trackers': instance.trackers,
|
||||||
|
};
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:ui' as ui;
|
import 'dart:ui';
|
||||||
|
|
||||||
import 'package:app_links/app_links.dart';
|
import 'package:app_links/app_links.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -42,10 +42,13 @@ const allTrackerSubscribeUrls = [
|
|||||||
'https://github.com/XIU2/TrackersListCollection/raw/master/http.txt',
|
'https://github.com/XIU2/TrackersListCollection/raw/master/http.txt',
|
||||||
];
|
];
|
||||||
const allTrackerCdns = [
|
const allTrackerCdns = [
|
||||||
// jsdelivr: https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt
|
// jsdelivr: https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt
|
||||||
["https://cdn.jsdelivr.net/gh", r".*github.com(/.*)/raw/master(/.*)"],
|
["https://fastly.jsdelivr.net/gh", r".*github.com(/.*)/raw/master(/.*)"],
|
||||||
// nuaa: https://hub.nuaa.cf/ngosang/trackerslist/raw/master/trackers_all.txt
|
// ghproxy: https://ghproxy.com/https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt
|
||||||
["https://hub.nuaa.cf", r".*github.com(/.*)"]
|
[
|
||||||
|
"https://ghproxy.com/https://raw.githubusercontent.com",
|
||||||
|
r".*github.com(/.*)/raw(/.*)"
|
||||||
|
]
|
||||||
];
|
];
|
||||||
final allTrackerSubscribeUrlCdns = Map.fromIterable(allTrackerSubscribeUrls,
|
final allTrackerSubscribeUrlCdns = Map.fromIterable(allTrackerSubscribeUrls,
|
||||||
key: (v) => v as String,
|
key: (v) => v as String,
|
||||||
@@ -265,18 +268,16 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
final btExtConfig = downloaderConfig.value.extra.bt;
|
final btExtConfig = downloaderConfig.value.extra.bt;
|
||||||
final result = <String>[];
|
final result = <String>[];
|
||||||
for (var u in btExtConfig.trackerSubscribeUrls) {
|
for (var u in btExtConfig.trackerSubscribeUrls) {
|
||||||
var allFail = true;
|
final cdns = allTrackerSubscribeUrlCdns[u];
|
||||||
for (var cdn in allTrackerSubscribeUrlCdns[u]!) {
|
if (cdns == null) {
|
||||||
try {
|
continue;
|
||||||
result.addAll(await _fetchTrackers(cdn));
|
|
||||||
allFail = false;
|
|
||||||
break;
|
|
||||||
} catch (e) {
|
|
||||||
logger.w("subscribe trackers fail, url: $cdn", e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (allFail) {
|
try {
|
||||||
throw Exception('subscribe trackers fail, network error');
|
final trackers =
|
||||||
|
await Util.anyOk(cdns.map((cdn) => _fetchTrackers(cdn)));
|
||||||
|
result.addAll(trackers);
|
||||||
|
} catch (e) {
|
||||||
|
logger.w("subscribe trackers fail, url: $u", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
btExtConfig.subscribeTrackers.clear();
|
btExtConfig.subscribeTrackers.clear();
|
||||||
@@ -336,7 +337,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
extra.themeMode = ThemeMode.system.name;
|
extra.themeMode = ThemeMode.system.name;
|
||||||
}
|
}
|
||||||
if (extra.locale.isEmpty) {
|
if (extra.locale.isEmpty) {
|
||||||
final systemLocale = getLocaleKey(ui.window.locale);
|
final systemLocale = getLocaleKey(PlatformDispatcher.instance.locale);
|
||||||
extra.locale = AppTranslation.translations.containsKey(systemLocale)
|
extra.locale = AppTranslation.translations.containsKey(systemLocale)
|
||||||
? systemLocale
|
? systemLocale
|
||||||
: getLocaleKey(fallbackLocale);
|
: getLocaleKey(fallbackLocale);
|
||||||
|
|||||||
@@ -1,9 +1,38 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
class CreateController extends GetxController {
|
class CreateController extends GetxController
|
||||||
|
with GetSingleTickerProviderStateMixin {
|
||||||
// final files = [].obs;
|
// final files = [].obs;
|
||||||
final RxList fileInfos = [].obs;
|
final RxList fileInfos = [].obs;
|
||||||
final RxList selectedIndexes = [].obs;
|
final RxList selectedIndexes = [].obs;
|
||||||
final RxList openedFolders = [].obs;
|
final RxList openedFolders = [].obs;
|
||||||
final isResolving = false.obs;
|
final isResolving = false.obs;
|
||||||
|
final showAdvanced = false.obs;
|
||||||
|
late TabController advancedTabController;
|
||||||
|
final fileDataUri = "".obs;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onInit() {
|
||||||
|
super.onInit();
|
||||||
|
advancedTabController = TabController(length: 2, vsync: this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onClose() {
|
||||||
|
advancedTabController.dispose();
|
||||||
|
super.onClose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void setFileDataUri(Uint8List bytes) {
|
||||||
|
fileDataUri.value =
|
||||||
|
"data:application/x-bittorrent;base64,${base64.encode(bytes)}";
|
||||||
|
}
|
||||||
|
|
||||||
|
void clearFileDataUri() {
|
||||||
|
fileDataUri.value = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
|
import 'package:autoscale_tabbarview/autoscale_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';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import '../../../../api/model/resolve_result.dart';
|
import '../../../../api/model/resolve_result.dart';
|
||||||
import 'package:rounded_loading_button/rounded_loading_button.dart';
|
import 'package:rounded_loading_button/rounded_loading_button.dart';
|
||||||
@@ -9,6 +11,7 @@ import '../../../../api/api.dart';
|
|||||||
import '../../../../api/model/create_task.dart';
|
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 '../../../../util/input_formatter.dart';
|
||||||
import '../../../../util/message.dart';
|
import '../../../../util/message.dart';
|
||||||
import '../../../../util/util.dart';
|
import '../../../../util/util.dart';
|
||||||
import '../../../routes/app_pages.dart';
|
import '../../../routes/app_pages.dart';
|
||||||
@@ -22,6 +25,10 @@ class CreateView extends GetView<CreateController> {
|
|||||||
|
|
||||||
final _urlController = TextEditingController();
|
final _urlController = TextEditingController();
|
||||||
final _confirmController = RoundedLoadingButtonController();
|
final _confirmController = RoundedLoadingButtonController();
|
||||||
|
final _httpUaController = TextEditingController();
|
||||||
|
final _httpCookieController = TextEditingController();
|
||||||
|
final _httpRefererController = TextEditingController();
|
||||||
|
final _btTrackerController = TextEditingController();
|
||||||
|
|
||||||
CreateView({Key? key}) : super(key: key);
|
CreateView({Key? key}) : super(key: key);
|
||||||
|
|
||||||
@@ -44,39 +51,51 @@ class CreateView extends GetView<CreateController> {
|
|||||||
title: Text('create'.tr),
|
title: Text('create'.tr),
|
||||||
),
|
),
|
||||||
body: DropTarget(
|
body: DropTarget(
|
||||||
onDragDone: (details) {
|
onDragDone: (details) async {
|
||||||
_urlController.text = details.files[0].path;
|
if (!Util.isWeb()) {
|
||||||
|
_urlController.text = details.files[0].path;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_urlController.text = details.files[0].name;
|
||||||
|
final bytes = await details.files[0].readAsBytes();
|
||||||
|
controller.setFileDataUri(bytes);
|
||||||
},
|
},
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 24.0),
|
padding:
|
||||||
child: Form(
|
const EdgeInsets.symmetric(vertical: 16.0, horizontal: 24.0),
|
||||||
key: _resolveFormKey,
|
child: Form(
|
||||||
autovalidateMode: AutovalidateMode.always,
|
key: _resolveFormKey,
|
||||||
child: Column(
|
autovalidateMode: AutovalidateMode.onUserInteraction,
|
||||||
children: [
|
child: Column(children: [
|
||||||
Row(
|
Row(children: [
|
||||||
children: [
|
|
||||||
Expanded(
|
Expanded(
|
||||||
child: TextFormField(
|
child: TextFormField(
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
controller: _urlController,
|
controller: _urlController,
|
||||||
minLines: 1,
|
minLines: 1,
|
||||||
maxLines: 30,
|
maxLines: 5,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
hintText: _hitText(),
|
hintText: _hitText(),
|
||||||
hintStyle: const TextStyle(fontSize: 12),
|
hintStyle: const TextStyle(fontSize: 12),
|
||||||
labelText: 'downloadLink'.tr,
|
labelText: 'downloadLink'.tr,
|
||||||
icon: const Icon(Icons.link),
|
icon: const Icon(Icons.link),
|
||||||
suffixIcon: IconButton(
|
suffixIcon: IconButton(
|
||||||
onPressed: _urlController.clear,
|
onPressed: () {
|
||||||
icon: const Icon(Icons.clear),
|
_urlController.clear();
|
||||||
),
|
controller.clearFileDataUri();
|
||||||
|
},
|
||||||
|
icon: const Icon(Icons.clear),
|
||||||
),
|
),
|
||||||
validator: (v) {
|
),
|
||||||
return v!.trim().isNotEmpty
|
validator: (v) {
|
||||||
? null
|
return v!.trim().isNotEmpty
|
||||||
: 'downloadLinkValid'.tr;
|
? null
|
||||||
}),
|
: 'downloadLinkValid'.tr;
|
||||||
|
},
|
||||||
|
onChanged: (v) async {
|
||||||
|
controller.clearFileDataUri();
|
||||||
|
},
|
||||||
|
),
|
||||||
),
|
),
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: const Icon(Icons.folder_open),
|
icon: const Icon(Icons.folder_open),
|
||||||
@@ -85,31 +104,110 @@ class CreateView extends GetView<CreateController> {
|
|||||||
type: FileType.custom,
|
type: FileType.custom,
|
||||||
allowedExtensions: ["torrent"]);
|
allowedExtensions: ["torrent"]);
|
||||||
if (pr != null) {
|
if (pr != null) {
|
||||||
_urlController.text = pr.files[0].path ?? "";
|
if (!Util.isWeb()) {
|
||||||
|
_urlController.text = pr.files[0].path ?? "";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_urlController.text = pr.files[0].name;
|
||||||
|
controller.setFileDataUri(pr.files[0].bytes!);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
],
|
]
|
||||||
),
|
//.where((e) => e != null).map((e) => e!).toList(),
|
||||||
Center(
|
),
|
||||||
child: Padding(
|
Obx(() => Visibility(
|
||||||
padding: const EdgeInsets.all(15.0),
|
visible: controller.showAdvanced.value,
|
||||||
child: ConstrainedBox(
|
child: Padding(
|
||||||
constraints: const BoxConstraints.tightFor(
|
padding: const EdgeInsets.only(left: 40, top: 15),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
TabBar(
|
||||||
|
controller: controller.advancedTabController,
|
||||||
|
tabs: const [
|
||||||
|
Tab(
|
||||||
|
text: 'HTTP',
|
||||||
|
),
|
||||||
|
Tab(
|
||||||
|
text: 'BitTorrent',
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
AutoScaleTabBarView(
|
||||||
|
controller: controller.advancedTabController,
|
||||||
|
children: [
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
TextFormField(
|
||||||
|
controller: _httpUaController,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: 'User-Agent',
|
||||||
|
)),
|
||||||
|
TextFormField(
|
||||||
|
controller: _httpCookieController,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: 'Cookie',
|
||||||
|
)),
|
||||||
|
TextFormField(
|
||||||
|
controller: _httpRefererController,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: 'Referer',
|
||||||
|
)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
TextFormField(
|
||||||
|
controller: _btTrackerController,
|
||||||
|
maxLines: 5,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
labelText: 'Trakers',
|
||||||
|
hintText: 'addTrackerHit'.tr,
|
||||||
|
)),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
))),
|
||||||
|
Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 15),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(right: 10),
|
||||||
|
child: TextButton(
|
||||||
|
onPressed: () {
|
||||||
|
controller.showAdvanced.value =
|
||||||
|
!controller.showAdvanced.value;
|
||||||
|
},
|
||||||
|
child:
|
||||||
|
Row(mainAxisSize: MainAxisSize.min, children: [
|
||||||
|
Obx(() => Checkbox(
|
||||||
|
value: controller.showAdvanced.value,
|
||||||
|
onChanged: (bool? value) {
|
||||||
|
controller.showAdvanced.value =
|
||||||
|
value ?? false;
|
||||||
|
},
|
||||||
|
)),
|
||||||
|
Text('advancedOptions'.tr),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
width: 150,
|
width: 150,
|
||||||
height: 40,
|
child: RoundedLoadingButton(
|
||||||
|
color: Get.theme.colorScheme.secondary,
|
||||||
|
onPressed: _doResolve,
|
||||||
|
controller: _confirmController,
|
||||||
|
child: Text('confirm'.tr),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
child: RoundedLoadingButton(
|
],
|
||||||
color: Get.theme.colorScheme.secondary,
|
),
|
||||||
onPressed: _doResolve,
|
)),
|
||||||
controller: _confirmController,
|
]))),
|
||||||
child: Text('confirm'.tr),
|
|
||||||
),
|
|
||||||
)),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -122,8 +220,27 @@ class CreateView extends GetView<CreateController> {
|
|||||||
try {
|
try {
|
||||||
_confirmController.start();
|
_confirmController.start();
|
||||||
if (_resolveFormKey.currentState!.validate()) {
|
if (_resolveFormKey.currentState!.validate()) {
|
||||||
|
Object? extra;
|
||||||
|
final submitUrl = Util.isWeb() && controller.fileDataUri.isNotEmpty
|
||||||
|
? controller.fileDataUri.value
|
||||||
|
: _urlController.text;
|
||||||
|
if (controller.showAdvanced.value) {
|
||||||
|
final u = Uri.parse(submitUrl);
|
||||||
|
if (u.scheme.startsWith("http")) {
|
||||||
|
extra = ReqExtraHttp()
|
||||||
|
..header = {
|
||||||
|
"User-Agent": _httpUaController.text,
|
||||||
|
"Cookie": _httpCookieController.text,
|
||||||
|
"Referer": _httpRefererController.text,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
extra = ReqExtraBt()
|
||||||
|
..trackers = Util.textToLines(_btTrackerController.text);
|
||||||
|
}
|
||||||
|
}
|
||||||
final rr = await resolve(Request(
|
final rr = await resolve(Request(
|
||||||
url: _urlController.text,
|
url: submitUrl,
|
||||||
|
extra: extra,
|
||||||
));
|
));
|
||||||
await _showResolveDialog(rr);
|
await _showResolveDialog(rr);
|
||||||
}
|
}
|
||||||
@@ -137,7 +254,8 @@ class CreateView extends GetView<CreateController> {
|
|||||||
|
|
||||||
String _hitText() {
|
String _hitText() {
|
||||||
return 'downloadLinkHit'.trParams({
|
return 'downloadLinkHit'.trParams({
|
||||||
'append': Util.isDesktop() ? 'downloadLinkHitDesktop'.tr : '',
|
'append':
|
||||||
|
Util.isDesktop() || Util.isWeb() ? 'downloadLinkHitDesktop'.tr : '',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,6 +264,8 @@ class CreateView extends GetView<CreateController> {
|
|||||||
final appController = Get.find<AppController>();
|
final appController = Get.find<AppController>();
|
||||||
|
|
||||||
final createFormKey = GlobalKey<FormState>();
|
final createFormKey = GlobalKey<FormState>();
|
||||||
|
final nameController = TextEditingController();
|
||||||
|
final connectionsController = TextEditingController();
|
||||||
final pathController = TextEditingController(
|
final pathController = TextEditingController(
|
||||||
text: appController.downloaderConfig.value.downloadDir);
|
text: appController.downloaderConfig.value.downloadDir);
|
||||||
final downloadController = RoundedLoadingButtonController();
|
final downloadController = RoundedLoadingButtonController();
|
||||||
@@ -168,6 +288,23 @@ class CreateView extends GetView<CreateController> {
|
|||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: FileListView(files: files)),
|
Expanded(child: FileListView(files: files)),
|
||||||
|
TextFormField(
|
||||||
|
controller: nameController,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
labelText: 'rename'.tr,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
TextFormField(
|
||||||
|
controller: connectionsController,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
labelText: 'connections'.tr,
|
||||||
|
),
|
||||||
|
keyboardType: TextInputType.number,
|
||||||
|
inputFormatters: [
|
||||||
|
FilteringTextInputFormatter.digitsOnly,
|
||||||
|
NumericalRangeFormatter(min: 1, max: 256),
|
||||||
|
],
|
||||||
|
),
|
||||||
DirectorySelector(
|
DirectorySelector(
|
||||||
controller: pathController,
|
controller: pathController,
|
||||||
),
|
),
|
||||||
@@ -209,20 +346,18 @@ class CreateView extends GetView<CreateController> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (createFormKey.currentState!.validate()) {
|
if (createFormKey.currentState!.validate()) {
|
||||||
// if (Util.isAndroid()) {
|
|
||||||
// if (!await Permission.storage.request().isGranted) {
|
|
||||||
// Get.snackbar('error'.tr,
|
|
||||||
// 'noStoragePermission'.tr);
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
await createTask(CreateTask(
|
await createTask(CreateTask(
|
||||||
rid: rr.id,
|
rid: rr.id,
|
||||||
opts: Options(
|
opts: Options(
|
||||||
name: '',
|
name: nameController.text,
|
||||||
path: pathController.text,
|
path: pathController.text,
|
||||||
selectFiles: controller.selectedIndexes
|
selectFiles:
|
||||||
.cast<int>())));
|
controller.selectedIndexes.cast<int>(),
|
||||||
|
extra: connectionsController.text.isEmpty
|
||||||
|
? null
|
||||||
|
: (OptsExtraHttp()
|
||||||
|
..connections = int.parse(
|
||||||
|
connectionsController.text)))));
|
||||||
Get.back();
|
Get.back();
|
||||||
Get.rootDelegate.offNamed(Routes.TASK);
|
Get.rootDelegate.offNamed(Routes.TASK);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,17 +28,21 @@ class SettingController extends GetxController {
|
|||||||
void fetchLatestVersion() async {
|
void fetchLatestVersion() async {
|
||||||
String? releaseDataStr;
|
String? releaseDataStr;
|
||||||
try {
|
try {
|
||||||
releaseDataStr =
|
|
||||||
(await proxyRequest("https://gopeed.com/api/release")).data;
|
|
||||||
} catch (e) {
|
|
||||||
releaseDataStr = (await proxyRequest(
|
releaseDataStr = (await proxyRequest(
|
||||||
"https://api.github.com/repos/GopeedLab/gopeed/releases/latest"))
|
"https://api.github.com/repos/GopeedLab/gopeed/releases/latest"))
|
||||||
.data;
|
.data;
|
||||||
|
} catch (e) {
|
||||||
|
releaseDataStr =
|
||||||
|
(await proxyRequest("https://gopeed.com/api/release")).data;
|
||||||
}
|
}
|
||||||
if (releaseDataStr == null) {
|
if (releaseDataStr == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final releaseData = jsonDecode(releaseDataStr);
|
final releaseData = jsonDecode(releaseDataStr);
|
||||||
|
final tagName = releaseData["tag_name"];
|
||||||
|
if (tagName == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
latestVersion.value = releaseData["tag_name"].substring(1);
|
latestVersion.value = releaseData["tag_name"].substring(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,6 +9,7 @@ import 'package:intl/intl.dart';
|
|||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
import '../../../../generated/locales.g.dart';
|
import '../../../../generated/locales.g.dart';
|
||||||
|
import '../../../../util/input_formatter.dart';
|
||||||
import '../../../../util/locale_manager.dart';
|
import '../../../../util/locale_manager.dart';
|
||||||
import '../../../../util/message.dart';
|
import '../../../../util/message.dart';
|
||||||
import '../../../../util/package_info.dart';
|
import '../../../../util/package_info.dart';
|
||||||
@@ -89,7 +90,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
keyboardType: TextInputType.number,
|
keyboardType: TextInputType.number,
|
||||||
inputFormatters: [
|
inputFormatters: [
|
||||||
FilteringTextInputFormatter.digitsOnly,
|
FilteringTextInputFormatter.digitsOnly,
|
||||||
_NumericalRangeFormatter(min: 1, max: 256),
|
NumericalRangeFormatter(min: 1, max: 256),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -116,7 +117,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
keyboardType: TextInputType.number,
|
keyboardType: TextInputType.number,
|
||||||
inputFormatters: [
|
inputFormatters: [
|
||||||
FilteringTextInputFormatter.digitsOnly,
|
FilteringTextInputFormatter.digitsOnly,
|
||||||
_NumericalRangeFormatter(min: 1, max: 256),
|
NumericalRangeFormatter(min: 1, max: 256),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -187,7 +188,6 @@ class SettingView extends GetView<SettingController> {
|
|||||||
(Key key) {
|
(Key key) {
|
||||||
final trackersController = TextEditingController(
|
final trackersController = TextEditingController(
|
||||||
text: btExtConfig.customTrackers.join('\r\n').toString());
|
text: btExtConfig.customTrackers.join('\r\n').toString());
|
||||||
const ls = LineSplitter();
|
|
||||||
return TextField(
|
return TextField(
|
||||||
key: key,
|
key: key,
|
||||||
focusNode: FocusNode(),
|
focusNode: FocusNode(),
|
||||||
@@ -198,7 +198,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
hintText: 'addTrackerHit'.tr,
|
hintText: 'addTrackerHit'.tr,
|
||||||
),
|
),
|
||||||
onChanged: (value) async {
|
onChanged: (value) async {
|
||||||
btExtConfig.customTrackers = ls.convert(value);
|
btExtConfig.customTrackers = Util.textToLines(value);
|
||||||
appController.refreshTrackers();
|
appController.refreshTrackers();
|
||||||
|
|
||||||
await debounceSave();
|
await debounceSave();
|
||||||
@@ -408,7 +408,7 @@ class SettingView extends GetView<SettingController> {
|
|||||||
keyboardType: TextInputType.number,
|
keyboardType: TextInputType.number,
|
||||||
inputFormatters: [
|
inputFormatters: [
|
||||||
FilteringTextInputFormatter.digitsOnly,
|
FilteringTextInputFormatter.digitsOnly,
|
||||||
_NumericalRangeFormatter(min: 0, max: 65535),
|
NumericalRangeFormatter(min: 0, max: 65535),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -605,39 +605,3 @@ class SettingView extends GetView<SettingController> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// class _ConfigItem {
|
|
||||||
// late String label;
|
|
||||||
// late String Function() text;
|
|
||||||
// late Widget Function(Key key) inputItem;
|
|
||||||
//
|
|
||||||
// _ConfigItem(this.label, this.text, this.inputItem);
|
|
||||||
// }
|
|
||||||
|
|
||||||
class _NumericalRangeFormatter extends TextInputFormatter {
|
|
||||||
final int min;
|
|
||||||
final int max;
|
|
||||||
|
|
||||||
_NumericalRangeFormatter({required this.min, required this.max});
|
|
||||||
|
|
||||||
@override
|
|
||||||
TextEditingValue formatEditUpdate(
|
|
||||||
TextEditingValue oldValue,
|
|
||||||
TextEditingValue newValue,
|
|
||||||
) {
|
|
||||||
if (newValue.text.isEmpty) {
|
|
||||||
return newValue;
|
|
||||||
}
|
|
||||||
var intVal = int.tryParse(newValue.text);
|
|
||||||
if (intVal == null) {
|
|
||||||
return oldValue;
|
|
||||||
}
|
|
||||||
if (intVal < min) {
|
|
||||||
return newValue.copyWith(text: min.toString());
|
|
||||||
} else if (intVal > max) {
|
|
||||||
return oldValue.copyWith(text: max.toString());
|
|
||||||
} else {
|
|
||||||
return newValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:gopeed/api/model/meta.dart';
|
||||||
|
import 'package:gopeed/api/model/resource.dart';
|
||||||
import 'package:path/path.dart' as path;
|
import 'package:path/path.dart' as path;
|
||||||
|
|
||||||
import '../../api/api.dart';
|
import '../../api/api.dart';
|
||||||
@@ -190,7 +191,7 @@ class BuildTaskListView extends GetView {
|
|||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
ListTile(
|
ListTile(
|
||||||
// isThreeLine: true,
|
// isThreeLine: true,
|
||||||
title: Text(task.meta.res.name,
|
title: Text(fileName(task.meta),
|
||||||
maxLines: 2,
|
maxLines: 2,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: Get.textTheme.titleSmall),
|
style: Get.textTheme.titleSmall),
|
||||||
@@ -199,9 +200,9 @@ class BuildTaskListView extends GetView {
|
|||||||
style: context.textTheme.bodyLarge
|
style: context.textTheme.bodyLarge
|
||||||
?.copyWith(color: Get.theme.disabledColor),
|
?.copyWith(color: Get.theme.disabledColor),
|
||||||
),
|
),
|
||||||
leading: task.meta.res.name.lastIndexOf('.') == -1
|
leading: (task.meta.res.rootDir.isNotEmpty
|
||||||
? const Icon(FaIcons.file)
|
? const Icon(FaIcons.folder)
|
||||||
: Icon(FaIcons.allIcons[findIcon(task.meta.res.name)]),
|
: Icon(FaIcons.allIcons[findIcon(fileName(task.meta))])),
|
||||||
|
|
||||||
trailing: SizedBox(
|
trailing: SizedBox(
|
||||||
width: 180,
|
width: 180,
|
||||||
@@ -220,4 +221,11 @@ class BuildTaskListView extends GetView {
|
|||||||
])
|
])
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String fileName(Meta meta) {
|
||||||
|
if (meta.res.files.length > 1) {
|
||||||
|
return meta.res.name;
|
||||||
|
}
|
||||||
|
return meta.opts.name.isEmpty ? meta.res.files[0].name : meta.opts.name;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,6 @@ LibgopeedBoot create() => LibgopeedBootNative();
|
|||||||
|
|
||||||
class LibgopeedBootNative implements LibgopeedBoot {
|
class LibgopeedBootNative implements LibgopeedBoot {
|
||||||
late LibgopeedInterface _libgopeed;
|
late LibgopeedInterface _libgopeed;
|
||||||
late SendPort _childSendPort;
|
|
||||||
|
|
||||||
LibgopeedBootNative() {
|
LibgopeedBootNative() {
|
||||||
if (!Util.isDesktop()) {
|
if (!Util.isDesktop()) {
|
||||||
@@ -44,11 +43,7 @@ class LibgopeedBootNative implements LibgopeedBoot {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<void> stop() async {
|
Future<void> stop() async {
|
||||||
if (Util.isDesktop()) {
|
await _libgopeed.stop();
|
||||||
await _ffiStop();
|
|
||||||
} else {
|
|
||||||
await _libgopeed.stop();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_ffiInit() {
|
_ffiInit() {
|
||||||
@@ -67,90 +62,9 @@ class LibgopeedBootNative implements LibgopeedBoot {
|
|||||||
|
|
||||||
// FFI run in isolate
|
// FFI run in isolate
|
||||||
Future<int> _ffiStart(StartConfig cfg) async {
|
Future<int> _ffiStart(StartConfig cfg) async {
|
||||||
var startCompleter = Completer<int>();
|
return await Isolate.run(() async {
|
||||||
|
|
||||||
var mainReceive = ReceivePort();
|
|
||||||
var isolate = await Isolate.spawn((SendPort sendPort) {
|
|
||||||
_ffiInit();
|
_ffiInit();
|
||||||
var childReceive = ReceivePort();
|
return await _libgopeed.start(cfg);
|
||||||
sendPort.send(childReceive.sendPort);
|
|
||||||
|
|
||||||
childReceive.listen((message) async {
|
|
||||||
late _Result result;
|
|
||||||
try {
|
|
||||||
if (message is _StartParam) {
|
|
||||||
result = _StartResult();
|
|
||||||
(result as _StartResult).port = await _libgopeed.start(message.cfg);
|
|
||||||
}
|
|
||||||
if (message is _StopParam) {
|
|
||||||
result = _StopResult();
|
|
||||||
await _libgopeed.stop();
|
|
||||||
childReceive.close();
|
|
||||||
Isolate.exit(sendPort);
|
|
||||||
}
|
|
||||||
} on Exception catch (e) {
|
|
||||||
result.exception = e;
|
|
||||||
}
|
|
||||||
sendPort.send(result);
|
|
||||||
});
|
|
||||||
}, mainReceive.sendPort);
|
|
||||||
|
|
||||||
var childCompleter = Completer<void>();
|
|
||||||
mainReceive.listen((message) {
|
|
||||||
if (message is SendPort) {
|
|
||||||
_childSendPort = message;
|
|
||||||
childCompleter.complete();
|
|
||||||
}
|
|
||||||
if (message is _StartResult) {
|
|
||||||
if (message.exception != null) {
|
|
||||||
startCompleter.completeError(message.exception!);
|
|
||||||
} else {
|
|
||||||
startCompleter.complete(message.port!);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (message is _StopResult) {
|
|
||||||
isolate.kill();
|
|
||||||
if (message.exception != null) {
|
|
||||||
_stopCompleter.completeError(message.exception!);
|
|
||||||
} else {
|
|
||||||
_stopCompleter.complete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
await childCompleter.future;
|
|
||||||
_childSendPort.send(_StartParam(cfg: cfg));
|
|
||||||
return startCompleter.future;
|
|
||||||
}
|
|
||||||
|
|
||||||
late Completer<void> _stopCompleter;
|
|
||||||
|
|
||||||
Future<void> _ffiStop() async {
|
|
||||||
_stopCompleter = Completer<void>();
|
|
||||||
_childSendPort.send(_StopParam());
|
|
||||||
return _stopCompleter.future;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _Result {
|
|
||||||
Exception? exception;
|
|
||||||
|
|
||||||
_Result();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _StartParam {
|
|
||||||
final StartConfig cfg;
|
|
||||||
|
|
||||||
_StartParam({required this.cfg});
|
|
||||||
}
|
|
||||||
|
|
||||||
class _StartResult extends _Result {
|
|
||||||
int? port;
|
|
||||||
|
|
||||||
_StartResult();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _StopParam {}
|
|
||||||
|
|
||||||
class _StopResult extends _Result {
|
|
||||||
_StopResult();
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -27,6 +27,7 @@ class LocaleKeys {
|
|||||||
static const donate = 'donate';
|
static const donate = 'donate';
|
||||||
static const exit = 'exit';
|
static const exit = 'exit';
|
||||||
static const create = 'create';
|
static const create = 'create';
|
||||||
|
static const advancedOptions = 'advancedOptions';
|
||||||
static const downloadLink = 'downloadLink';
|
static const downloadLink = 'downloadLink';
|
||||||
static const downloadLinkValid = 'downloadLinkValid';
|
static const downloadLinkValid = 'downloadLinkValid';
|
||||||
static const downloadLinkHit = 'downloadLinkHit';
|
static const downloadLinkHit = 'downloadLinkHit';
|
||||||
@@ -35,6 +36,7 @@ class LocaleKeys {
|
|||||||
static const noFileSelected = 'noFileSelected';
|
static const noFileSelected = 'noFileSelected';
|
||||||
static const noStoragePermission = 'noStoragePermission';
|
static const noStoragePermission = 'noStoragePermission';
|
||||||
static const selectFile = 'selectFile';
|
static const selectFile = 'selectFile';
|
||||||
|
static const rename = 'rename';
|
||||||
static const basic = 'basic';
|
static const basic = 'basic';
|
||||||
static const advanced = 'advanced';
|
static const advanced = 'advanced';
|
||||||
static const general = 'general';
|
static const general = 'general';
|
||||||
@@ -90,6 +92,7 @@ class Locales {
|
|||||||
'donate': 'Donate',
|
'donate': 'Donate',
|
||||||
'exit': 'Exit',
|
'exit': 'Exit',
|
||||||
'create': 'Create Task',
|
'create': 'Create Task',
|
||||||
|
'advancedOptions': 'Advanced Options',
|
||||||
'downloadLink': 'Download Link',
|
'downloadLink': 'Download Link',
|
||||||
'downloadLinkValid': 'Please enter the download link',
|
'downloadLinkValid': 'Please enter the download link',
|
||||||
'downloadLinkHit':
|
'downloadLinkHit':
|
||||||
@@ -99,6 +102,7 @@ class Locales {
|
|||||||
'noFileSelected': 'Please select at least one file to continue.',
|
'noFileSelected': 'Please select at least one file to continue.',
|
||||||
'noStoragePermission': 'Storage permission required',
|
'noStoragePermission': 'Storage permission required',
|
||||||
'selectFile': 'Select File',
|
'selectFile': 'Select File',
|
||||||
|
'rename': 'Rename',
|
||||||
'basic': 'Basic',
|
'basic': 'Basic',
|
||||||
'advanced': 'Advanced',
|
'advanced': 'Advanced',
|
||||||
'general': 'General',
|
'general': 'General',
|
||||||
@@ -336,6 +340,7 @@ class Locales {
|
|||||||
'donate': '打赏',
|
'donate': '打赏',
|
||||||
'exit': '退出',
|
'exit': '退出',
|
||||||
'create': '创建任务',
|
'create': '创建任务',
|
||||||
|
'advancedOptions': '高级选项',
|
||||||
'downloadLink': '下载链接',
|
'downloadLink': '下载链接',
|
||||||
'downloadLinkValid': '请输入下载链接',
|
'downloadLinkValid': '请输入下载链接',
|
||||||
'downloadLinkHit': '请输入下载链接,支持 HTTP/HTTPS/MAGNET@append',
|
'downloadLinkHit': '请输入下载链接,支持 HTTP/HTTPS/MAGNET@append',
|
||||||
@@ -344,6 +349,7 @@ class Locales {
|
|||||||
'noFileSelected': '请至少选择一个文件下载',
|
'noFileSelected': '请至少选择一个文件下载',
|
||||||
'noStoragePermission': '需要开启存储权限',
|
'noStoragePermission': '需要开启存储权限',
|
||||||
'selectFile': '选择文件',
|
'selectFile': '选择文件',
|
||||||
|
'rename': '重命名',
|
||||||
'basic': '基础',
|
'basic': '基础',
|
||||||
'advanced': '高级',
|
'advanced': '高级',
|
||||||
'general': '通用',
|
'general': '通用',
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ Future<void> init() async {
|
|||||||
if (Util.isDesktop()) {
|
if (Util.isDesktop()) {
|
||||||
await windowManager.ensureInitialized();
|
await windowManager.ensureInitialized();
|
||||||
const windowOptions = WindowOptions(
|
const windowOptions = WindowOptions(
|
||||||
size: Size(1024, 768),
|
size: Size(800, 600),
|
||||||
center: true,
|
center: true,
|
||||||
skipTaskbar: false,
|
skipTaskbar: false,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
findIcon(String filename) {
|
findIcon(String filename) {
|
||||||
String res = 'doc';
|
String res = 'file';
|
||||||
String ext = filename.substring(filename.lastIndexOf('.') + 1);
|
String ext = filename.substring(filename.lastIndexOf('.') + 1);
|
||||||
for (var iconMap in iconMaps) {
|
for (var iconMap in iconMaps) {
|
||||||
if (iconMap['extensions'].contains(ext)) {
|
if (iconMap['extensions'].contains(ext)) {
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ class FaIcons {
|
|||||||
|
|
||||||
static const _kFontFam = 'FontAwesome';
|
static const _kFontFam = 'FontAwesome';
|
||||||
static const Map<String, IconData> allIcons = {
|
static const Map<String, IconData> allIcons = {
|
||||||
|
'file': file,
|
||||||
'doc': doc,
|
'doc': doc,
|
||||||
'file_image': file_image,
|
'file_image': file_image,
|
||||||
'file_video': file_video,
|
'file_video': file_video,
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
|
/// A [TextInputFormatter] that restricts input to a numerical range between [min] and [max].
|
||||||
|
class NumericalRangeFormatter extends TextInputFormatter {
|
||||||
|
final int min;
|
||||||
|
final int max;
|
||||||
|
|
||||||
|
NumericalRangeFormatter({required this.min, required this.max});
|
||||||
|
|
||||||
|
@override
|
||||||
|
TextEditingValue formatEditUpdate(
|
||||||
|
TextEditingValue oldValue,
|
||||||
|
TextEditingValue newValue,
|
||||||
|
) {
|
||||||
|
if (newValue.text.isEmpty) {
|
||||||
|
return newValue;
|
||||||
|
}
|
||||||
|
var intVal = int.tryParse(newValue.text);
|
||||||
|
if (intVal == null) {
|
||||||
|
return oldValue;
|
||||||
|
}
|
||||||
|
if (intVal < min) {
|
||||||
|
return newValue.copyWith(text: min.toString());
|
||||||
|
} else if (intVal > max) {
|
||||||
|
return oldValue.copyWith(text: max.toString());
|
||||||
|
} else {
|
||||||
|
return newValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
@@ -11,7 +13,9 @@ class Util {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static String fmtByte(int byte) {
|
static String fmtByte(int byte) {
|
||||||
if (byte < 1024) {
|
if (byte < 0) {
|
||||||
|
return "0 B";
|
||||||
|
} else if (byte < 1024) {
|
||||||
return "$byte B";
|
return "$byte B";
|
||||||
} else if (byte < 1024 * 1024) {
|
} else if (byte < 1024 * 1024) {
|
||||||
return "${(byte / 1024).toStringAsFixed(2)} KB";
|
return "${(byte / 1024).toStringAsFixed(2)} KB";
|
||||||
@@ -59,4 +63,33 @@ class Util {
|
|||||||
static isWeb() {
|
static isWeb() {
|
||||||
return kIsWeb;
|
return kIsWeb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static List<String> textToLines(String text) {
|
||||||
|
if (text.isEmpty) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
const ls = LineSplitter();
|
||||||
|
return ls.convert(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// if one future complete, return the result, only all future error, return the last error
|
||||||
|
static anyOk<T>(Iterable<Future<T>> futures) {
|
||||||
|
final completer = Completer<T>();
|
||||||
|
Object lastError;
|
||||||
|
var count = futures.length;
|
||||||
|
for (var future in futures) {
|
||||||
|
future.then((value) {
|
||||||
|
if (!completer.isCompleted) {
|
||||||
|
completer.complete(value);
|
||||||
|
}
|
||||||
|
}).catchError((e) {
|
||||||
|
lastError = e;
|
||||||
|
count--;
|
||||||
|
if (count == 0) {
|
||||||
|
completer.completeError(lastError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return completer.future;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+229
-214
File diff suppressed because it is too large.
Load diff
+9
-10
@@ -15,10 +15,10 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
|
|||||||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||||
# Read more about iOS versioning at
|
# Read more about iOS versioning at
|
||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
version: 1.3.5+1
|
version: 1.3.8+1
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ">=2.17.6 <3.0.0"
|
sdk: '>=3.0.0 <4.0.0'
|
||||||
|
|
||||||
# Dependencies specify other packages that your package needs in order to work.
|
# Dependencies specify other packages that your package needs in order to work.
|
||||||
# To automatically upgrade your package dependencies to the latest versions
|
# To automatically upgrade your package dependencies to the latest versions
|
||||||
@@ -42,13 +42,13 @@ dependencies:
|
|||||||
json_annotation: ^4.6.0
|
json_annotation: ^4.6.0
|
||||||
dio: ^5.2.1
|
dio: ^5.2.1
|
||||||
path_provider: ^2.0.11
|
path_provider: ^2.0.11
|
||||||
file_picker: ^5.2.5
|
file_picker: 5.3.1
|
||||||
macos_secure_bookmarks: ^0.2.1
|
macos_secure_bookmarks: ^0.2.1
|
||||||
rounded_loading_button: ^2.1.0
|
rounded_loading_button: ^2.1.0
|
||||||
url_launcher: ^6.1.6
|
url_launcher: ^6.1.6
|
||||||
shared_preferences: ^2.0.15
|
shared_preferences: ^2.2.0
|
||||||
logger: ^1.3.0
|
logger: ^1.3.0
|
||||||
desktop_drop: ^0.3.3
|
desktop_drop: ^0.4.1
|
||||||
package_info_plus: ^4.0.0
|
package_info_plus: ^4.0.0
|
||||||
fluent_ui: ^4.4.0
|
fluent_ui: ^4.4.0
|
||||||
path: any
|
path: any
|
||||||
@@ -57,6 +57,7 @@ dependencies:
|
|||||||
uri_to_file: ^0.2.0
|
uri_to_file: ^0.2.0
|
||||||
window_manager: ^0.3.4
|
window_manager: ^0.3.4
|
||||||
tray_manager: ^0.2.0
|
tray_manager: ^0.2.0
|
||||||
|
autoscale_tabbarview: ^1.0.2
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
@@ -67,14 +68,11 @@ dev_dependencies:
|
|||||||
# package. See that file for information about deactivating specific lint
|
# package. See that file for information about deactivating specific lint
|
||||||
# rules and activating additional ones.
|
# rules and activating additional ones.
|
||||||
flutter_lints: ^2.0.0
|
flutter_lints: ^2.0.0
|
||||||
ffigen: ^6.1.2
|
ffigen: ^8.0.2
|
||||||
# build json model: flutter pub run build_runner build --delete-conflicting-outputs
|
# build json model: flutter pub run build_runner build --delete-conflicting-outputs
|
||||||
build_runner: ^2.2.1
|
build_runner: ^2.2.1
|
||||||
json_serializable: ^6.3.2
|
json_serializable: ^6.3.2
|
||||||
flutter_launcher_icons:
|
flutter_launcher_icons: ^0.13.1
|
||||||
git:
|
|
||||||
url: https://github.com/fluttercommunity/flutter_launcher_icons.git
|
|
||||||
ref: v0.11.0
|
|
||||||
|
|
||||||
# For information on the generic Dart part of this file, see the
|
# For information on the generic Dart part of this file, see the
|
||||||
# following page: https://dart.dev/tools/pub/pubspec
|
# following page: https://dart.dev/tools/pub/pubspec
|
||||||
@@ -128,6 +126,7 @@ flutter_icons:
|
|||||||
generate: true
|
generate: true
|
||||||
image_path: "assets/icon/icon_macos_1024.png"
|
image_path: "assets/icon/icon_macos_1024.png"
|
||||||
|
|
||||||
|
# flutter pub run ffigen
|
||||||
ffigen:
|
ffigen:
|
||||||
name: LibgopeedBind
|
name: LibgopeedBind
|
||||||
description: Bindings to gopeed library.
|
description: Bindings to gopeed library.
|
||||||
|
|||||||
Reference in new issue
Block a user