mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-15 04:43:41 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd409fcfb9 | ||
|
|
366244fa5d | ||
|
|
7a2e9b4fd1 | ||
|
|
203385d3f8 | ||
|
|
aaf73dec24 | ||
|
|
2523282a89 | ||
|
|
3384f5197a | ||
|
|
cd77665f02 | ||
|
|
a22b431150 | ||
|
|
eb7c9ad7f2 | ||
|
|
ea11fc38f1 | ||
|
|
1be16e9f2c | ||
|
|
1d86d14a20 | ||
|
|
5ad15cc4ac | ||
|
|
49604966fd | ||
|
|
bdb8ed177f | ||
|
|
2dc7048cba | ||
|
|
d3750464aa | ||
|
|
5c9bcd3731 | ||
|
|
bdda550b2c | ||
|
|
3308d966f0 | ||
|
|
18041ed9ec |
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.22"
|
GO_VERSION: "1.23"
|
||||||
FLUTTER_VERSION: "3.16.8"
|
FLUTTER_VERSION: "3.24.3"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -51,7 +51,7 @@ jobs:
|
|||||||
Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "ChineseSimplified.isl"
|
Invoke-WebRequest -Uri "https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/ChineseSimplified.isl" -OutFile "ChineseSimplified.isl"
|
||||||
mv ChineseSimplified.isl "C:\Program Files (x86)\Inno Setup 6\Languages\"
|
mv ChineseSimplified.isl "C:\Program Files (x86)\Inno Setup 6\Languages\"
|
||||||
|
|
||||||
go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
|
go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$env:VERSION" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
$TAG = "v$env:VERSION"
|
$TAG = "v$env:VERSION"
|
||||||
flutter build windows
|
flutter build windows
|
||||||
@@ -366,7 +366,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 }}
|
||||||
@@ -380,7 +380,7 @@ jobs:
|
|||||||
go install golang.org/x/mobile/cmd/gomobile@latest
|
go install golang.org/x/mobile/cmd/gomobile@latest
|
||||||
go get golang.org/x/mobile/bind
|
go get golang.org/x/mobile/bind
|
||||||
gomobile init
|
gomobile init
|
||||||
gomobile bind -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -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 -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION" -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
|
||||||
echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
|
echo $APK_KEYSTORE | base64 -di > android/app/upload-keystore.jks
|
||||||
flutter build apk
|
flutter build apk
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ on:
|
|||||||
- "Dockerfile"
|
- "Dockerfile"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.22"
|
GO_VERSION: "1.23"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|||||||
+96
-10
@@ -27,8 +27,8 @@ on:
|
|||||||
- "go.sum"
|
- "go.sum"
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.22"
|
GO_VERSION: "1.23"
|
||||||
FLUTTER_VERSION: "3.16.8"
|
FLUTTER_VERSION: "3.24.3"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# lint:
|
# lint:
|
||||||
@@ -58,10 +58,44 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
files: ./coverage.txt
|
files: ./coverage.txt
|
||||||
token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
|
token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
|
||||||
build:
|
build-desktop:
|
||||||
name: Build check
|
name: Build desktop check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ${{ matrix.os }}
|
||||||
# needs: [lint, test]
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ windows-latest, macos-latest, ubuntu-latest ]
|
||||||
|
needs: [ test ]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-go@v4
|
||||||
|
with:
|
||||||
|
go-version: ${{ env.GO_VERSION }}
|
||||||
|
- uses: subosito/flutter-action@v2
|
||||||
|
with:
|
||||||
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
|
- if: runner.os == 'windows-latest'
|
||||||
|
run: |
|
||||||
|
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/windows/libgopeed.dll github.com/GopeedLab/gopeed/bind/desktop
|
||||||
|
cd ui/flutter
|
||||||
|
flutter build windows
|
||||||
|
- if: runner.os == 'macos-latest'
|
||||||
|
run: |
|
||||||
|
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/macos/Frameworks/libgopeed.dylib github.com/GopeedLab/gopeed/bind/desktop
|
||||||
|
cd ui/flutter
|
||||||
|
flutter build macos
|
||||||
|
- if: runner.os == 'ubuntu-latest'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -y
|
||||||
|
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
|
||||||
|
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
|
||||||
|
cd ui/flutter
|
||||||
|
flutter build linux
|
||||||
|
build-mobile:
|
||||||
|
name: Build mobile check
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ macos-latest, ubuntu-latest ]
|
||||||
needs: [ test ]
|
needs: [ test ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
@@ -72,10 +106,62 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
- run: |
|
- run: |
|
||||||
sudo apt-get update -y
|
go install golang.org/x/mobile/cmd/gomobile@latest
|
||||||
sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev
|
go get golang.org/x/mobile/bind
|
||||||
|
gomobile init
|
||||||
|
- if: runner.os == 'macOS'
|
||||||
|
run: |
|
||||||
|
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/ios/Frameworks/Libgopeed.xcframework -target=ios github.com/GopeedLab/gopeed/bind/mobile
|
||||||
|
cd ui/flutter
|
||||||
|
flutter build ipa --no-codesign
|
||||||
|
- if: runner.os == 'Linux'
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
distribution: "zulu"
|
||||||
|
java-version: "17"
|
||||||
|
- if: runner.os == 'Linux'
|
||||||
|
run: |
|
||||||
|
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
|
||||||
|
flutter build apk
|
||||||
|
|
||||||
|
build-web:
|
||||||
|
name: Build web check
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [ test ]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-go@v4
|
||||||
|
with:
|
||||||
|
go-version: ${{ env.GO_VERSION }}
|
||||||
|
- uses: subosito/flutter-action@v2
|
||||||
|
with:
|
||||||
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop
|
|
||||||
cd ui/flutter
|
cd ui/flutter
|
||||||
flutter build linux
|
flutter build web --web-renderer html
|
||||||
|
cd ../../
|
||||||
|
rm -rf cmd/web/dist
|
||||||
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
|
go build -tags nosqlite,web -ldflags="-s -w" github.com/GopeedLab/gopeed/cmd/web
|
||||||
|
build-docker:
|
||||||
|
name: Build docker check
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [ test ]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-go@v4
|
||||||
|
with:
|
||||||
|
go-version: ${{ env.GO_VERSION }}
|
||||||
|
- uses: subosito/flutter-action@v2
|
||||||
|
with:
|
||||||
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
cd ui/flutter
|
||||||
|
flutter build web --web-renderer html
|
||||||
|
cd ../../
|
||||||
|
rm -rf cmd/web/dist
|
||||||
|
cp -r ui/flutter/build/web cmd/web/dist
|
||||||
|
docker build -t gopeed .
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM golang:1.22.6 AS go
|
FROM golang:1.23.3 AS go
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY ./go.mod ./go.sum ./
|
COPY ./go.mod ./go.sum ./
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# [](https://gopeed.com)
|
||||||
|
|
||||||
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
||||||
[](https://codecov.io/gh/GopeedLab/gopeed)
|
[](https://codecov.io/gh/GopeedLab/gopeed)
|
||||||
[](https://github.com/GopeedLab/gopeed/releases)
|
[](https://github.com/GopeedLab/gopeed/releases)
|
||||||
@@ -7,8 +9,6 @@
|
|||||||
|
|
||||||
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
[](https://ko-fi.com/R6R6IJGN6)
|
[](https://ko-fi.com/R6R6IJGN6)
|
||||||
|
|
||||||
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
||||||
@@ -114,8 +114,8 @@ This project is divided into two parts, the front end uses `flutter`, the back e
|
|||||||
|
|
||||||
### Environment
|
### Environment
|
||||||
|
|
||||||
1. Golang 1.21+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -1,3 +1,5 @@
|
|||||||
|
# [](https://gopeed.com)
|
||||||
|
|
||||||
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
||||||
[](https://codecov.io/gh/GopeedLab/gopeed)
|
[](https://codecov.io/gh/GopeedLab/gopeed)
|
||||||
[](https://github.com/GopeedLab/gopeed/releases)
|
[](https://github.com/GopeedLab/gopeed/releases)
|
||||||
@@ -7,8 +9,6 @@
|
|||||||
|
|
||||||
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
[](https://ko-fi.com/R6R6IJGN6)
|
[](https://ko-fi.com/R6R6IJGN6)
|
||||||
|
|
||||||
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
||||||
@@ -102,8 +102,8 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
|
|||||||
|
|
||||||
### 環境
|
### 環境
|
||||||
|
|
||||||
1. Go 言語 1.22+
|
1. Go 言語 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### クローン
|
### クローン
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -1,3 +1,5 @@
|
|||||||
|
# [](https://gopeed.com)
|
||||||
|
|
||||||
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
||||||
[](https://codecov.io/gh/GopeedLab/gopeed)
|
[](https://codecov.io/gh/GopeedLab/gopeed)
|
||||||
[](https://github.com/GopeedLab/gopeed/releases)
|
[](https://github.com/GopeedLab/gopeed/releases)
|
||||||
@@ -7,8 +9,6 @@
|
|||||||
|
|
||||||
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
[](https://ko-fi.com/R6R6IJGN6)
|
[](https://ko-fi.com/R6R6IJGN6)
|
||||||
|
|
||||||
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
||||||
@@ -110,8 +110,8 @@ 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.22+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -1,3 +1,5 @@
|
|||||||
|
# [](https://gopeed.com)
|
||||||
|
|
||||||
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
||||||
[](https://codecov.io/gh/GopeedLab/gopeed)
|
[](https://codecov.io/gh/GopeedLab/gopeed)
|
||||||
[](https://github.com/GopeedLab/gopeed/releases)
|
[](https://github.com/GopeedLab/gopeed/releases)
|
||||||
@@ -7,8 +9,6 @@
|
|||||||
|
|
||||||
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
[](https://ko-fi.com/R6R6IJGN6)
|
[](https://ko-fi.com/R6R6IJGN6)
|
||||||
|
|
||||||
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
||||||
@@ -114,8 +114,8 @@ Gopeed 还提供了浏览器扩展用于接管浏览器下载,支持 Chrome、
|
|||||||
|
|
||||||
### 环境要求
|
### 环境要求
|
||||||
|
|
||||||
1. Golang 1.22+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### 克隆项目
|
### 克隆项目
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -1,3 +1,5 @@
|
|||||||
|
# [](https://gopeed.com)
|
||||||
|
|
||||||
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
[](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
|
||||||
[](https://codecov.io/gh/GopeedLab/gopeed)
|
[](https://codecov.io/gh/GopeedLab/gopeed)
|
||||||
[](https://github.com/GopeedLab/gopeed/releases)
|
[](https://github.com/GopeedLab/gopeed/releases)
|
||||||
@@ -7,8 +9,6 @@
|
|||||||
|
|
||||||
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/7953" target="_blank"><img src="https://trendshift.io/api/badge/repositories/7953" alt="GopeedLab%2Fgopeed | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
[](https://ko-fi.com/R6R6IJGN6)
|
[](https://ko-fi.com/R6R6IJGN6)
|
||||||
|
|
||||||
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
|
||||||
@@ -110,8 +110,8 @@ go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
|
|||||||
|
|
||||||
### 開發環境
|
### 開發環境
|
||||||
|
|
||||||
1. Golang 1.22+
|
1. Golang 1.23+
|
||||||
2. Flutter 3.16+
|
2. Flutter 3.24+
|
||||||
|
|
||||||
### 克隆項目
|
### 克隆項目
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 51 KiB |
+1
-1
@@ -7,6 +7,6 @@ services:
|
|||||||
- "9999:9999" # HTTP port (host:container)
|
- "9999:9999" # HTTP port (host:container)
|
||||||
image: liwei2633/gopeed
|
image: liwei2633/gopeed
|
||||||
volumes:
|
volumes:
|
||||||
- ~/gopeed/Downloads:/root/Downloads # mount download path
|
- ~/gopeed/Downloads:/app/Downloads # mount download path
|
||||||
#- ~/gopeed/storage:/app/storage # if you need to mount storage path, uncomment this line
|
#- ~/gopeed/storage:/app/storage # if you need to mount storage path, uncomment this line
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
module github.com/GopeedLab/gopeed
|
module github.com/GopeedLab/gopeed
|
||||||
|
|
||||||
go 1.22
|
go 1.23.0
|
||||||
|
|
||||||
|
toolchain go1.23.1
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/anacrolix/missinggo/v2 v2.7.3
|
github.com/anacrolix/missinggo/v2 v2.8.0
|
||||||
github.com/anacrolix/torrent v1.56.1
|
github.com/anacrolix/torrent v1.57.2-0.20241017235801-4d8437a05621
|
||||||
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
|
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
|
||||||
github.com/dop251/goja v0.0.0-20240806095544-3491d4a58fbe
|
github.com/dop251/goja v0.0.0-20240919115326-6c7d1df7ff05
|
||||||
github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc
|
github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc
|
||||||
github.com/go-git/go-git/v5 v5.8.1
|
github.com/go-git/go-git/v5 v5.8.1
|
||||||
github.com/gorilla/handlers v1.5.1
|
github.com/gorilla/handlers v1.5.1
|
||||||
@@ -16,11 +18,10 @@ require (
|
|||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529
|
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529
|
||||||
github.com/rs/zerolog v1.31.0
|
github.com/rs/zerolog v1.31.0
|
||||||
github.com/virtuald/go-paniclog v0.0.0-20190812204905-43a7fa316459
|
|
||||||
github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
|
github.com/xiaoqidun/setft v0.0.0-20220310121541-be86327699ad
|
||||||
go.etcd.io/bbolt v1.3.10
|
go.etcd.io/bbolt v1.3.11
|
||||||
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
|
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
|
||||||
golang.org/x/sync v0.8.0
|
golang.org/x/sync v0.9.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@@ -31,48 +32,48 @@ require (
|
|||||||
github.com/acomagu/bufpipe v1.0.4 // indirect
|
github.com/acomagu/bufpipe v1.0.4 // indirect
|
||||||
github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
|
github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect
|
||||||
github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
|
github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
|
||||||
github.com/anacrolix/chansync v0.5.1 // indirect
|
github.com/anacrolix/chansync v0.6.0 // indirect
|
||||||
github.com/anacrolix/dht/v2 v2.21.1 // indirect
|
github.com/anacrolix/dht/v2 v2.22.0 // indirect
|
||||||
github.com/anacrolix/envpprof v1.3.0 // indirect
|
github.com/anacrolix/envpprof v1.4.0 // indirect
|
||||||
github.com/anacrolix/generics v0.0.2 // indirect
|
github.com/anacrolix/generics v0.0.3-0.20240902042256-7fb2702ef0ca // indirect
|
||||||
github.com/anacrolix/go-libutp v1.3.1 // indirect
|
github.com/anacrolix/go-libutp v1.3.1 // indirect
|
||||||
github.com/anacrolix/log v0.15.2 // indirect
|
github.com/anacrolix/log v0.16.0 // indirect
|
||||||
github.com/anacrolix/missinggo v1.3.0 // indirect
|
github.com/anacrolix/missinggo v1.3.0 // indirect
|
||||||
github.com/anacrolix/missinggo/perf v1.0.0 // indirect
|
github.com/anacrolix/missinggo/perf v1.0.0 // indirect
|
||||||
github.com/anacrolix/mmsg v1.0.0 // indirect
|
github.com/anacrolix/mmsg v1.1.1 // indirect
|
||||||
github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect
|
github.com/anacrolix/multiless v0.4.0 // indirect
|
||||||
github.com/anacrolix/stm v0.5.0 // indirect
|
github.com/anacrolix/stm v0.5.0 // indirect
|
||||||
github.com/anacrolix/sync v0.5.1 // indirect
|
github.com/anacrolix/sync v0.5.3 // indirect
|
||||||
github.com/anacrolix/upnp v0.1.4 // indirect
|
github.com/anacrolix/upnp v0.1.4 // indirect
|
||||||
github.com/anacrolix/utp v0.2.0 // indirect
|
github.com/anacrolix/utp v0.2.0 // indirect
|
||||||
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
||||||
github.com/benbjohnson/immutable v0.4.3 // indirect
|
github.com/benbjohnson/immutable v0.4.3 // indirect
|
||||||
github.com/bits-and-blooms/bitset v1.13.0 // indirect
|
github.com/bits-and-blooms/bitset v1.15.0 // indirect
|
||||||
github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
|
github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
|
||||||
github.com/cespare/xxhash v1.1.0 // indirect
|
github.com/cespare/xxhash v1.1.0 // indirect
|
||||||
github.com/cloudflare/circl v1.3.3 // indirect
|
github.com/cloudflare/circl v1.3.3 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/dlclark/regexp2 v1.11.4 // indirect
|
github.com/dlclark/regexp2 v1.11.4 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/edsrzf/mmap-go v1.1.0 // indirect
|
github.com/edsrzf/mmap-go v1.2.0 // indirect
|
||||||
github.com/emirpasic/gods v1.18.1 // indirect
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
github.com/felixge/httpsnoop v1.0.1 // indirect
|
github.com/felixge/httpsnoop v1.0.1 // indirect
|
||||||
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
||||||
github.com/go-git/go-billy/v5 v5.4.1 // indirect
|
github.com/go-git/go-billy/v5 v5.4.1 // indirect
|
||||||
github.com/go-llsqlite/adapter v0.1.0 // indirect
|
github.com/go-llsqlite/adapter v0.1.0 // indirect
|
||||||
github.com/go-llsqlite/crawshaw v0.5.3 // indirect
|
github.com/go-llsqlite/crawshaw v0.5.5 // indirect
|
||||||
github.com/go-logr/logr v1.4.2 // indirect
|
github.com/go-logr/logr v1.4.2 // indirect
|
||||||
github.com/go-logr/stdr v1.2.2 // indirect
|
github.com/go-logr/stdr v1.2.2 // indirect
|
||||||
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
|
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
|
||||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||||
github.com/google/btree v1.1.2 // indirect
|
github.com/google/btree v1.1.3 // indirect
|
||||||
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
|
github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/gorilla/websocket v1.5.3 // indirect
|
github.com/gorilla/websocket v1.5.3 // indirect
|
||||||
github.com/huandu/xstrings v1.5.0 // indirect
|
github.com/huandu/xstrings v1.5.0 // indirect
|
||||||
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
||||||
github.com/kevinburke/ssh_config v1.2.0 // indirect
|
github.com/kevinburke/ssh_config v1.2.0 // indirect
|
||||||
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
|
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
github.com/minio/sha256-simd v1.0.1 // indirect
|
github.com/minio/sha256-simd v1.0.1 // indirect
|
||||||
@@ -81,48 +82,46 @@ require (
|
|||||||
github.com/multiformats/go-multihash v0.2.3 // indirect
|
github.com/multiformats/go-multihash v0.2.3 // indirect
|
||||||
github.com/multiformats/go-varint v0.0.7 // indirect
|
github.com/multiformats/go-varint v0.0.7 // indirect
|
||||||
github.com/ncruces/go-strftime v0.1.9 // indirect
|
github.com/ncruces/go-strftime v0.1.9 // indirect
|
||||||
github.com/pion/datachannel v1.5.8 // indirect
|
github.com/pion/datachannel v1.5.9 // indirect
|
||||||
github.com/pion/dtls/v2 v2.2.12 // indirect
|
github.com/pion/dtls/v3 v3.0.4 // indirect
|
||||||
github.com/pion/ice/v2 v2.3.31 // indirect
|
github.com/pion/ice/v4 v4.0.2 // indirect
|
||||||
github.com/pion/interceptor v0.1.29 // indirect
|
github.com/pion/interceptor v0.1.37 // indirect
|
||||||
github.com/pion/logging v0.2.2 // indirect
|
github.com/pion/logging v0.2.2 // indirect
|
||||||
github.com/pion/mdns v0.0.12 // indirect
|
github.com/pion/mdns/v2 v2.0.7 // indirect
|
||||||
github.com/pion/randutil v0.1.0 // indirect
|
github.com/pion/randutil v0.1.0 // indirect
|
||||||
github.com/pion/rtcp v1.2.14 // indirect
|
github.com/pion/rtcp v1.2.14 // indirect
|
||||||
github.com/pion/rtp v1.8.7 // indirect
|
github.com/pion/rtp v1.8.9 // indirect
|
||||||
github.com/pion/sctp v1.8.19 // indirect
|
github.com/pion/sctp v1.8.33 // indirect
|
||||||
github.com/pion/sdp/v3 v3.0.9 // indirect
|
github.com/pion/sdp/v3 v3.0.9 // indirect
|
||||||
github.com/pion/srtp/v2 v2.0.20 // indirect
|
github.com/pion/srtp/v3 v3.0.4 // indirect
|
||||||
github.com/pion/stun v0.6.1 // indirect
|
github.com/pion/stun/v3 v3.0.0 // indirect
|
||||||
github.com/pion/transport/v2 v2.2.9 // indirect
|
github.com/pion/transport/v3 v3.0.7 // indirect
|
||||||
github.com/pion/turn/v2 v2.1.6 // indirect
|
github.com/pion/turn/v4 v4.0.0 // indirect
|
||||||
github.com/pion/webrtc/v3 v3.2.50 // indirect
|
github.com/pion/webrtc/v4 v4.0.2 // indirect
|
||||||
github.com/pjbgf/sha1cd v0.3.0 // indirect
|
github.com/pjbgf/sha1cd v0.3.0 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/protolambda/ctxlock v0.1.0 // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
github.com/sergi/go-diff v1.1.0 // indirect
|
github.com/sergi/go-diff v1.1.0 // indirect
|
||||||
github.com/skeema/knownhosts v1.2.0 // indirect
|
github.com/skeema/knownhosts v1.2.0 // indirect
|
||||||
github.com/spaolacci/murmur3 v1.1.0 // indirect
|
github.com/spaolacci/murmur3 v1.1.0 // indirect
|
||||||
github.com/stretchr/testify v1.9.0 // indirect
|
|
||||||
github.com/tidwall/btree v1.7.0 // indirect
|
github.com/tidwall/btree v1.7.0 // indirect
|
||||||
github.com/wlynxg/anet v0.0.3 // indirect
|
github.com/wlynxg/anet v0.0.5 // indirect
|
||||||
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
||||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
go.opentelemetry.io/otel v1.32.0 // indirect
|
||||||
go.opentelemetry.io/otel/metric v1.28.0 // indirect
|
go.opentelemetry.io/otel/metric v1.32.0 // indirect
|
||||||
go.opentelemetry.io/otel/trace v1.28.0 // indirect
|
go.opentelemetry.io/otel/trace v1.32.0 // indirect
|
||||||
golang.org/x/crypto v0.25.0 // indirect
|
golang.org/x/crypto v0.29.0 // indirect
|
||||||
golang.org/x/mod v0.19.0 // indirect
|
golang.org/x/mod v0.22.0 // indirect
|
||||||
golang.org/x/net v0.27.0 // indirect
|
golang.org/x/net v0.31.0 // indirect
|
||||||
golang.org/x/sys v0.22.0 // indirect
|
golang.org/x/sys v0.27.0 // indirect
|
||||||
golang.org/x/text v0.17.0 // indirect
|
golang.org/x/text v0.20.0 // indirect
|
||||||
golang.org/x/time v0.5.0 // indirect
|
golang.org/x/time v0.8.0 // indirect
|
||||||
golang.org/x/tools v0.23.0 // indirect
|
golang.org/x/tools v0.27.0 // indirect
|
||||||
gopkg.in/warnings.v0 v0.1.2 // indirect
|
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
|
||||||
lukechampine.com/blake3 v1.3.0 // indirect
|
lukechampine.com/blake3 v1.3.0 // indirect
|
||||||
modernc.org/libc v1.55.6 // indirect
|
modernc.org/libc v1.61.0 // indirect
|
||||||
modernc.org/mathutil v1.6.0 // indirect
|
modernc.org/mathutil v1.6.0 // indirect
|
||||||
modernc.org/memory v1.8.0 // indirect
|
modernc.org/memory v1.8.0 // indirect
|
||||||
modernc.org/sqlite v1.31.1 // indirect
|
modernc.org/sqlite v1.33.1 // indirect
|
||||||
zombiezen.com/go/sqlite v1.3.0 // indirect
|
zombiezen.com/go/sqlite v1.4.0 // indirect
|
||||||
)
|
)
|
||||||
@@ -295,7 +295,7 @@ func (f *Fetcher) doUpload(fromUpload bool) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
stats := f.torrent.Stats()
|
stats := f.torrentStats()
|
||||||
f.data.SeedBytes = lastData.SeedBytes + stats.BytesWrittenData.Int64()
|
f.data.SeedBytes = lastData.SeedBytes + stats.BytesWrittenData.Int64()
|
||||||
|
|
||||||
// Check is download complete, if not don't check and stop seeding
|
// Check is download complete, if not don't check and stop seeding
|
||||||
@@ -332,6 +332,17 @@ func (f *Fetcher) doUpload(fromUpload bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get torrent stats maybe panic, see https://github.com/anacrolix/torrent/issues/972
|
||||||
|
func (f *Fetcher) torrentStats() torrent.TorrentStats {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
// ignore panic
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
return f.torrent.Stats()
|
||||||
|
}
|
||||||
|
|
||||||
func (f *Fetcher) UploadedBytes() int64 {
|
func (f *Fetcher) UploadedBytes() int64 {
|
||||||
return f.data.SeedBytes
|
return f.data.SeedBytes
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
package bt
|
package bt
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/anacrolix/torrent/storage"
|
"github.com/anacrolix/torrent/storage"
|
||||||
"io"
|
"io"
|
||||||
@@ -53,7 +54,7 @@ func (fs fileClientImpl) Close() error {
|
|||||||
return fs.opts.PieceCompletion.Close()
|
return fs.opts.PieceCompletion.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (fs fileClientImpl) OpenTorrent(info *metainfo.Info, infoHash metainfo.Hash) (_ storage.TorrentImpl, err error) {
|
func (fs fileClientImpl) OpenTorrent(ctx context.Context, info *metainfo.Info, infoHash metainfo.Hash) (_ storage.TorrentImpl, err error) {
|
||||||
upvertedFiles := info.UpvertedFiles()
|
upvertedFiles := info.UpvertedFiles()
|
||||||
files := make([]file, 0, len(upvertedFiles))
|
files := make([]file, 0, len(upvertedFiles))
|
||||||
for _, fileInfo := range upvertedFiles {
|
for _, fileInfo := range upvertedFiles {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package http
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/tls"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
@@ -449,6 +450,9 @@ func (f *Fetcher) splitChunk() (chunks []*chunk) {
|
|||||||
func (f *Fetcher) buildClient() *http.Client {
|
func (f *Fetcher) buildClient() *http.Client {
|
||||||
transport := &http.Transport{
|
transport := &http.Transport{
|
||||||
Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
|
Proxy: f.ctl.GetProxy(f.meta.Req.Proxy),
|
||||||
|
TLSClientConfig: &tls.Config{
|
||||||
|
InsecureSkipVerify: f.meta.Req.SkipVerifyCert,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
// Cookie handle
|
// Cookie handle
|
||||||
jar, _ := cookiejar.New(nil)
|
jar, _ := cookiejar.New(nil)
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
package base
|
|
||||||
|
|
||||||
import "errors"
|
|
||||||
|
|
||||||
var (
|
|
||||||
NotFound = errors.New("not found")
|
|
||||||
BadParams = errors.New("bad params")
|
|
||||||
)
|
|
||||||
+14
-2
@@ -7,6 +7,7 @@ import (
|
|||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -18,6 +19,8 @@ type Request struct {
|
|||||||
Labels map[string]string `json:"labels"`
|
Labels map[string]string `json:"labels"`
|
||||||
// Proxy is special proxy config for request
|
// Proxy is special proxy config for request
|
||||||
Proxy *RequestProxy `json:"proxy"`
|
Proxy *RequestProxy `json:"proxy"`
|
||||||
|
// SkipVerifyCert is the flag that skip verify cert
|
||||||
|
SkipVerifyCert bool `json:"skipVerifyCert"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Request) Validate() error {
|
func (r *Request) Validate() error {
|
||||||
@@ -221,7 +224,7 @@ func (cfg *DownloaderProxyConfig) ToHandler() func(r *http.Request) (*url.URL, e
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if cfg.System {
|
if cfg.System {
|
||||||
ieproxy.ReloadConf()
|
safeProxyReloadConf()
|
||||||
return ieproxy.GetProxyFunc()
|
return ieproxy.GetProxyFunc()
|
||||||
}
|
}
|
||||||
if cfg.Scheme == "" || cfg.Host == "" {
|
if cfg.Scheme == "" || cfg.Host == "" {
|
||||||
@@ -236,7 +239,7 @@ func (cfg *DownloaderProxyConfig) ToUrl() *url.URL {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if cfg.System {
|
if cfg.System {
|
||||||
ieproxy.ReloadConf()
|
safeProxyReloadConf()
|
||||||
static := ieproxy.GetConf().Static
|
static := ieproxy.GetConf().Static
|
||||||
if static.Active && len(static.Protocols) > 0 {
|
if static.Active && len(static.Protocols) > 0 {
|
||||||
// If only one protocol, use it
|
// If only one protocol, use it
|
||||||
@@ -262,6 +265,15 @@ func (cfg *DownloaderProxyConfig) ToUrl() *url.URL {
|
|||||||
return util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd)
|
return util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var prcLock sync.Mutex
|
||||||
|
|
||||||
|
func safeProxyReloadConf() {
|
||||||
|
prcLock.Lock()
|
||||||
|
defer prcLock.Unlock()
|
||||||
|
|
||||||
|
ieproxy.ReloadConf()
|
||||||
|
}
|
||||||
|
|
||||||
func parseUrlSafe(rawUrl string) *url.URL {
|
func parseUrlSafe(rawUrl string) *url.URL {
|
||||||
u, err := url.Parse(rawUrl)
|
u, err := url.Parse(rawUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
+161
-75
@@ -11,11 +11,12 @@ import (
|
|||||||
gonanoid "github.com/matoous/go-nanoid/v2"
|
gonanoid "github.com/matoous/go-nanoid/v2"
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"github.com/rs/zerolog/pkgerrors"
|
"github.com/rs/zerolog/pkgerrors"
|
||||||
"github.com/virtuald/go-paniclog"
|
"math"
|
||||||
gohttp "net/http"
|
gohttp "net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime/debug"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -371,48 +372,28 @@ func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err
|
|||||||
return d.doCreate(fetcher, opts)
|
return d.doCreate(fetcher, opts)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) Pause(id string) (err error) {
|
func (d *Downloader) Pause(filter *TaskFilter) (err error) {
|
||||||
task := d.GetTask(id)
|
if filter == nil || filter.IsEmpty() {
|
||||||
if task == nil {
|
return d.pauseAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
filter.NotStatuses = []base.Status{base.DownloadStatusPause, base.DownloadStatusError, base.DownloadStatusDone}
|
||||||
|
pauseTasks := d.GetTasksByFilter(filter)
|
||||||
|
if len(pauseTasks) == 0 {
|
||||||
return ErrTaskNotFound
|
return ErrTaskNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for _, task := range pauseTasks {
|
||||||
if err = d.doPause(task); err != nil {
|
if err = d.doPause(task); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
}
|
||||||
d.notifyRunning()
|
d.notifyRunning()
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) Continue(id string) (err error) {
|
func (d *Downloader) pauseAll() (err error) {
|
||||||
task := d.GetTask(id)
|
|
||||||
if task == nil {
|
|
||||||
return ErrTaskNotFound
|
|
||||||
}
|
|
||||||
|
|
||||||
func() {
|
|
||||||
d.lock.Lock()
|
|
||||||
defer d.lock.Unlock()
|
|
||||||
|
|
||||||
remainRunningCount := d.remainRunningCount()
|
|
||||||
if remainRunningCount == 0 {
|
|
||||||
for _, t := range d.tasks {
|
|
||||||
if t.Status == base.DownloadStatusRunning {
|
|
||||||
if err = d.doPause(t); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
t.Status = base.DownloadStatusWait
|
|
||||||
d.waitTasks = append(d.waitTasks, t)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
return d.doStart(task)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *Downloader) PauseAll() (err error) {
|
|
||||||
func() {
|
func() {
|
||||||
d.lock.Lock()
|
d.lock.Lock()
|
||||||
defer d.lock.Unlock()
|
defer d.lock.Unlock()
|
||||||
@@ -430,7 +411,65 @@ func (d *Downloader) PauseAll() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) ContinueAll() (err error) {
|
// Continue specific tasks, if continue tasks will exceed maxRunning, it needs pause some running tasks before that
|
||||||
|
func (d *Downloader) Continue(filter *TaskFilter) (err error) {
|
||||||
|
if filter == nil || filter.IsEmpty() {
|
||||||
|
return d.continueAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
filter.NotStatuses = []base.Status{base.DownloadStatusRunning, base.DownloadStatusDone}
|
||||||
|
continueTasks := d.GetTasksByFilter(filter)
|
||||||
|
if len(continueTasks) == 0 {
|
||||||
|
return ErrTaskNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
realContinueTasks := make([]*Task, 0)
|
||||||
|
func() {
|
||||||
|
d.lock.Lock()
|
||||||
|
defer d.lock.Unlock()
|
||||||
|
|
||||||
|
continueCount := len(continueTasks)
|
||||||
|
remainRunningCount := d.remainRunningCount()
|
||||||
|
needRunningCount := int(math.Min(float64(d.cfg.MaxRunning), float64(continueCount)))
|
||||||
|
needPauseCount := needRunningCount - remainRunningCount
|
||||||
|
if needPauseCount > 0 {
|
||||||
|
pausedCount := 0
|
||||||
|
for _, task := range d.tasks {
|
||||||
|
if task.Status == base.DownloadStatusRunning {
|
||||||
|
if err = d.doPause(task); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
task.Status = base.DownloadStatusWait
|
||||||
|
d.waitTasks = append(d.waitTasks, task)
|
||||||
|
pausedCount++
|
||||||
|
}
|
||||||
|
if pausedCount == needPauseCount {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, task := range continueTasks {
|
||||||
|
if len(realContinueTasks) < needRunningCount {
|
||||||
|
realContinueTasks = append(realContinueTasks, task)
|
||||||
|
} else {
|
||||||
|
task.Status = base.DownloadStatusWait
|
||||||
|
d.waitTasks = append(d.waitTasks, task)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
for _, task := range realContinueTasks {
|
||||||
|
if err = d.doStart(task); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// continueAll continue all tasks but does not affect tasks already running
|
||||||
|
func (d *Downloader) continueAll() (err error) {
|
||||||
continuedTasks := make([]*Task, 0)
|
continuedTasks := make([]*Task, 0)
|
||||||
|
|
||||||
func() {
|
func() {
|
||||||
@@ -451,8 +490,7 @@ func (d *Downloader) ContinueAll() (err error) {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
for _, task := range continuedTasks {
|
for _, task := range continuedTasks {
|
||||||
tt := task
|
if err = d.doStart(task); err != nil {
|
||||||
if err = d.doStart(tt); err != nil {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -460,40 +498,26 @@ func (d *Downloader) ContinueAll() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) Delete(id string, force bool) (err error) {
|
func (d *Downloader) ContinueBatch(filter *TaskFilter) (err error) {
|
||||||
task := d.GetTask(id)
|
if filter == nil || filter.IsEmpty() {
|
||||||
if task == nil {
|
return d.continueAll()
|
||||||
return ErrTaskNotFound
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func() {
|
continueTasks := d.GetTasksByFilter(filter)
|
||||||
d.lock.Lock()
|
for _, task := range continueTasks {
|
||||||
defer d.lock.Unlock()
|
if err = d.doStart(task); err != nil {
|
||||||
|
|
||||||
for i, t := range d.tasks {
|
|
||||||
if t.ID == id {
|
|
||||||
d.tasks = append(d.tasks[:i], d.tasks[i+1:]...)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for i, t := range d.waitTasks {
|
|
||||||
if t.ID == id {
|
|
||||||
d.waitTasks = append(d.waitTasks[:i], d.waitTasks[i+1:]...)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
err = d.doDelete(task, force)
|
|
||||||
if err != nil {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
d.notifyRunning()
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) DeleteByStatues(statues []base.Status, force bool) (err error) {
|
func (d *Downloader) Delete(filter *TaskFilter, force bool) (err error) {
|
||||||
deleteTasks := d.GetTasksByStatues(statues)
|
if filter == nil || filter.IsEmpty() {
|
||||||
|
return d.deleteAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteTasks := d.GetTasksByFilter(filter)
|
||||||
if len(deleteTasks) == 0 {
|
if len(deleteTasks) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -535,6 +559,23 @@ func (d *Downloader) DeleteByStatues(statues []base.Status, force bool) (err err
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *Downloader) deleteAll() (err error) {
|
||||||
|
func() {
|
||||||
|
d.lock.Lock()
|
||||||
|
defer d.lock.Unlock()
|
||||||
|
|
||||||
|
d.tasks = make([]*Task, 0)
|
||||||
|
d.waitTasks = make([]*Task, 0)
|
||||||
|
}()
|
||||||
|
|
||||||
|
for _, task := range d.tasks {
|
||||||
|
if err = d.doDelete(task, true); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func (d *Downloader) Stats(id string) (sr any, err error) {
|
func (d *Downloader) Stats(id string) (sr any, err error) {
|
||||||
task := d.GetTask(id)
|
task := d.GetTask(id)
|
||||||
if task == nil {
|
if task == nil {
|
||||||
@@ -557,9 +598,6 @@ func (d *Downloader) Stats(id string) (sr any, err error) {
|
|||||||
|
|
||||||
func (d *Downloader) doDelete(task *Task, force bool) (err error) {
|
func (d *Downloader) doDelete(task *Task, force bool) (err error) {
|
||||||
err = func() error {
|
err = func() error {
|
||||||
d.lock.Lock()
|
|
||||||
defer d.lock.Unlock()
|
|
||||||
|
|
||||||
if err := d.storage.Delete(bucketTask, task.ID); err != nil {
|
if err := d.storage.Delete(bucketTask, task.ID); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -587,10 +625,10 @@ func (d *Downloader) doDelete(task *Task, force bool) (err error) {
|
|||||||
task = nil
|
task = nil
|
||||||
return nil
|
return nil
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
d.Logger.Error().Stack().Err(err).Msgf("delete task failed, task id: %s", task.ID)
|
d.Logger.Error().Stack().Err(err).Msgf("delete task failed, task id: %s", task.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -598,7 +636,7 @@ func (d *Downloader) Close() error {
|
|||||||
d.closed.Store(true)
|
d.closed.Store(true)
|
||||||
|
|
||||||
closeArr := []func() error{
|
closeArr := []func() error{
|
||||||
d.PauseAll,
|
d.pauseAll,
|
||||||
}
|
}
|
||||||
for _, fm := range d.cfg.FetchManagers {
|
for _, fm := range d.cfg.FetchManagers {
|
||||||
closeArr = append(closeArr, fm.Close)
|
closeArr = append(closeArr, fm.Close)
|
||||||
@@ -660,17 +698,51 @@ func (d *Downloader) GetTasks() []*Task {
|
|||||||
return d.tasks
|
return d.tasks
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) GetTasksByStatues(statues []base.Status) []*Task {
|
// GetTasksByFilter get tasks by filter, if filter is nil, return all tasks
|
||||||
if len(statues) == 0 {
|
// return tasks and if match all tasks
|
||||||
|
func (d *Downloader) GetTasksByFilter(filter *TaskFilter) []*Task {
|
||||||
|
if filter == nil || filter.IsEmpty() {
|
||||||
return d.tasks
|
return d.tasks
|
||||||
}
|
}
|
||||||
|
|
||||||
|
idMatch := func(task *Task) bool {
|
||||||
|
if len(filter.IDs) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, id := range filter.IDs {
|
||||||
|
if task.ID == id {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
statusMatch := func(task *Task) bool {
|
||||||
|
if len(filter.Statuses) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, status := range filter.Statuses {
|
||||||
|
if task.Status == status {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
notStatusMatch := func(task *Task) bool {
|
||||||
|
if len(filter.NotStatuses) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, status := range filter.NotStatuses {
|
||||||
|
if task.Status == status {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
tasks := make([]*Task, 0)
|
tasks := make([]*Task, 0)
|
||||||
for _, task := range d.tasks {
|
for _, task := range d.tasks {
|
||||||
for _, status := range statues {
|
if idMatch(task) && statusMatch(task) && notStatusMatch(task) {
|
||||||
if task.Status == status {
|
|
||||||
tasks = append(tasks, task)
|
tasks = append(tasks, task)
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return tasks
|
return tasks
|
||||||
@@ -857,6 +929,20 @@ func (d *Downloader) doCreate(f fetcher.Fetcher, opts *base.Options) (taskId str
|
|||||||
opts.Path = storeConfig.DownloadDir
|
opts.Path = storeConfig.DownloadDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if enable white download directory, check if the download directory is in the white list
|
||||||
|
if len(d.cfg.DownloadDirWhiteList) > 0 {
|
||||||
|
inWhiteList := false
|
||||||
|
for _, dir := range d.cfg.DownloadDirWhiteList {
|
||||||
|
if match, err := filepath.Match(dir, opts.Path); match && err == nil {
|
||||||
|
inWhiteList = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !inWhiteList {
|
||||||
|
return "", errors.New("download directory is not in white list")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fm, err := d.parseFm(f.Meta().Req.URL)
|
fm, err := d.parseFm(f.Meta().Req.URL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
@@ -1044,7 +1130,7 @@ func logPanic(logDir string) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
paniclog.RedirectStderr(f)
|
debug.SetCrashOutput(f, debug.CrashOptions{})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
|
func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
|
||||||
|
|||||||
@@ -82,7 +82,45 @@ func TestDownloader_Create(t *testing.T) {
|
|||||||
want := test.FileMd5(test.BuildFile)
|
want := test.FileMd5(test.BuildFile)
|
||||||
got := test.FileMd5(test.DownloadFile)
|
got := test.FileMd5(test.DownloadFile)
|
||||||
if want != got {
|
if want != got {
|
||||||
t.Errorf("Download() got = %v, want %v", got, want)
|
t.Errorf("Downloader_Create() got = %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDownloader_CreateNotInWhite(t *testing.T) {
|
||||||
|
listener := test.StartTestFileServer()
|
||||||
|
defer listener.Close()
|
||||||
|
|
||||||
|
downloader := NewDownloader(&DownloaderConfig{
|
||||||
|
DownloadDirWhiteList: []string{"./downloads"},
|
||||||
|
})
|
||||||
|
if err := downloader.Setup(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer downloader.Clear()
|
||||||
|
req := &base.Request{
|
||||||
|
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||||
|
}
|
||||||
|
rr, err := downloader.Resolve(req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(1)
|
||||||
|
downloader.Listener(func(event *Event) {
|
||||||
|
if event.Key == EventKeyDone {
|
||||||
|
wg.Done()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
_, err = downloader.Create(rr.ID, &base.Options{
|
||||||
|
Path: test.Dir,
|
||||||
|
Name: test.DownloadName,
|
||||||
|
Extra: http.OptsExtra{
|
||||||
|
Connections: 4,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
if !strings.Contains(err.Error(), "white") {
|
||||||
|
t.Errorf("TestDownloader_CreateNotInWhite() got = %v, want %v", err.Error(), "not in white list")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,7 +133,7 @@ func TestDownloader_CreateDirectBatch(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
downloader.DeleteByStatues(nil, true)
|
downloader.Delete(nil, true)
|
||||||
downloader.Clear()
|
downloader.Clear()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -362,7 +400,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 1001)
|
time.Sleep(time.Millisecond * 1001)
|
||||||
err = downloader.Pause(id)
|
err = downloader.Pause(&TaskFilter{IDs: []string{id}})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
@@ -386,7 +424,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
|
|||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
err = downloader.Continue(id)
|
err = downloader.Continue(&TaskFilter{IDs: []string{id}})
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@@ -447,3 +485,151 @@ func TestDownloader_Protocol_Config(t *testing.T) {
|
|||||||
t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg))
|
t.Errorf("GetConfig() got = %v, want %v", test.ToJson(storeCfg), test.ToJson(newStoreCfg))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDownloader_GetTasksByFilter(t *testing.T) {
|
||||||
|
listener := test.StartTestFileServer()
|
||||||
|
defer listener.Close()
|
||||||
|
|
||||||
|
downloader := NewDownloader(nil)
|
||||||
|
if err := downloader.Setup(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
downloader.Delete(nil, true)
|
||||||
|
downloader.Clear()
|
||||||
|
}()
|
||||||
|
|
||||||
|
reqs := make([]*base.Request, 0)
|
||||||
|
fileNames := make([]string, 0)
|
||||||
|
for i := 0; i < 10; i++ {
|
||||||
|
req := &base.Request{
|
||||||
|
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||||
|
}
|
||||||
|
reqs = append(reqs, req)
|
||||||
|
if i == 0 {
|
||||||
|
fileNames = append(fileNames, test.DownloadName)
|
||||||
|
} else {
|
||||||
|
arr := strings.Split(test.DownloadName, ".")
|
||||||
|
fileNames = append(fileNames, arr[0]+" ("+strconv.Itoa(i)+")."+arr[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(len(reqs))
|
||||||
|
downloader.Listener(func(event *Event) {
|
||||||
|
if event.Key == EventKeyDone {
|
||||||
|
wg.Done()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
taskIds, err := downloader.CreateDirectBatch(reqs, &base.Options{
|
||||||
|
Path: test.Dir,
|
||||||
|
Name: test.DownloadName,
|
||||||
|
Extra: http.OptsExtra{
|
||||||
|
Connections: 4,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter nil", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(nil)
|
||||||
|
if len(tasks) != len(reqs) {
|
||||||
|
t.Errorf("GetTasksByFilter nil task got = %v, want %v", len(tasks), len(reqs))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter empty", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{})
|
||||||
|
if len(tasks) != len(reqs) {
|
||||||
|
t.Errorf("GetTasksByFilter empty task got = %v, want %v", len(tasks), len(reqs))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter ids", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
IDs: taskIds,
|
||||||
|
})
|
||||||
|
if len(tasks) != len(reqs) {
|
||||||
|
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), len(reqs))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter match ids", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
IDs: []string{taskIds[0]},
|
||||||
|
})
|
||||||
|
if len(tasks) != 1 {
|
||||||
|
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 1)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter not match ids", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
IDs: []string{"xxx"},
|
||||||
|
})
|
||||||
|
if len(tasks) != 0 {
|
||||||
|
t.Errorf("GetTasksByFilter ids task got = %v, want %v", len(tasks), 0)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter status", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
Statuses: []base.Status{base.DownloadStatusDone},
|
||||||
|
})
|
||||||
|
if len(tasks) != len(reqs) {
|
||||||
|
t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), len(reqs))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter not match status", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
Statuses: []base.Status{base.DownloadStatusError},
|
||||||
|
})
|
||||||
|
if len(tasks) != 0 {
|
||||||
|
t.Errorf("GetTasksByFilter status task got = %v, want %v", len(tasks), 0)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter match notStatus", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
NotStatuses: []base.Status{base.DownloadStatusRunning, base.DownloadStatusPause},
|
||||||
|
})
|
||||||
|
if len(tasks) != len(reqs) {
|
||||||
|
t.Errorf("GetTasksByFilter match notStatus task got = %v, want %v", len(tasks), len(reqs))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter not match notStatus", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
NotStatuses: []base.Status{base.DownloadStatusDone},
|
||||||
|
})
|
||||||
|
if len(tasks) != 0 {
|
||||||
|
t.Errorf("GetTasksByFilter not match notStatus task got = %v, want %v", len(tasks), 0)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter match ids and status", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
IDs: []string{taskIds[0]},
|
||||||
|
Statuses: []base.Status{base.DownloadStatusDone},
|
||||||
|
})
|
||||||
|
if len(tasks) != 1 {
|
||||||
|
t.Errorf("GetTasksByFilter match ids and status task got = %v, want %v", len(tasks), 1)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GetTasksByFilter not match ids and status", func(t *testing.T) {
|
||||||
|
tasks := downloader.GetTasksByFilter(&TaskFilter{
|
||||||
|
IDs: []string{taskIds[0]},
|
||||||
|
Statuses: []base.Status{base.DownloadStatusError},
|
||||||
|
})
|
||||||
|
if len(tasks) != 0 {
|
||||||
|
t.Errorf("GetTasksByFilter not match ids and status task got = %v, want %v", len(tasks), 0)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
@@ -720,11 +720,15 @@ func NewExtensionTask(download *Downloader, task *Task) *ExtensionTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t *ExtensionTask) Continue() error {
|
func (t *ExtensionTask) Continue() error {
|
||||||
return t.download.Continue(t.ID)
|
return t.download.Continue(&TaskFilter{
|
||||||
|
IDs: []string{t.ID},
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ExtensionTask) Pause() error {
|
func (t *ExtensionTask) Pause() error {
|
||||||
return t.download.Pause(t.ID)
|
return t.download.Pause(&TaskFilter{
|
||||||
|
IDs: []string{t.ID},
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseSettings(settings []*Setting) map[string]any {
|
func parseSettings(settings []*Setting) map[string]any {
|
||||||
|
|||||||
@@ -112,6 +112,16 @@ func (t *Task) calcSpeed(speedArr []int64, downloaded int64, usedTime float64) i
|
|||||||
return int64(float64(total) / float64(len(speedArr)) / usedTime)
|
return int64(float64(total) / float64(len(speedArr)) / usedTime)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TaskFilter struct {
|
||||||
|
IDs []string
|
||||||
|
Statuses []base.Status
|
||||||
|
NotStatuses []base.Status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *TaskFilter) IsEmpty() bool {
|
||||||
|
return len(f.IDs) == 0 && len(f.Statuses) == 0 && len(f.NotStatuses) == 0
|
||||||
|
}
|
||||||
|
|
||||||
type DownloaderConfig struct {
|
type DownloaderConfig struct {
|
||||||
Controller *controller.Controller
|
Controller *controller.Controller
|
||||||
FetchManagers []fetcher.FetcherManager
|
FetchManagers []fetcher.FetcherManager
|
||||||
@@ -119,6 +129,7 @@ type DownloaderConfig struct {
|
|||||||
RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
|
RefreshInterval int `json:"refreshInterval"` // RefreshInterval time duration to refresh task progress(ms)
|
||||||
Storage Storage
|
Storage Storage
|
||||||
StorageDir string
|
StorageDir string
|
||||||
|
DownloadDirWhiteList []string `json:"downloadDirWhiteList"`
|
||||||
|
|
||||||
ProductionMode bool
|
ProductionMode bool
|
||||||
|
|
||||||
|
|||||||
+75
-29
@@ -74,13 +74,27 @@ func CreateTaskBatch(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func PauseTask(w http.ResponseWriter, r *http.Request) {
|
func PauseTask(w http.ResponseWriter, r *http.Request) {
|
||||||
vars := mux.Vars(r)
|
filter, errResult := parseIdFilter(r)
|
||||||
taskId := vars["id"]
|
if errResult != nil {
|
||||||
if taskId == "" {
|
WriteJson(w, errResult)
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := Downloader.Pause(taskId); err != nil {
|
|
||||||
|
if err := Downloader.Pause(filter); err != nil {
|
||||||
|
WriteJson(w, model.NewErrorResult(err.Error()))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
WriteJson(w, model.NewNilResult())
|
||||||
|
}
|
||||||
|
|
||||||
|
func PauseTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
|
filter, errResult := parseFilter(r)
|
||||||
|
if errResult != nil {
|
||||||
|
WriteJson(w, errResult)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := Downloader.Pause(filter); err != nil {
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
WriteJson(w, model.NewErrorResult(err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -88,29 +102,27 @@ func PauseTask(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ContinueTask(w http.ResponseWriter, r *http.Request) {
|
func ContinueTask(w http.ResponseWriter, r *http.Request) {
|
||||||
vars := mux.Vars(r)
|
filter, errResult := parseIdFilter(r)
|
||||||
taskId := vars["id"]
|
if errResult != nil {
|
||||||
if taskId == "" {
|
WriteJson(w, errResult)
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := Downloader.Continue(taskId); err != nil {
|
|
||||||
|
if err := Downloader.Continue(filter); err != nil {
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
WriteJson(w, model.NewErrorResult(err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
WriteJson(w, model.NewNilResult())
|
WriteJson(w, model.NewNilResult())
|
||||||
}
|
}
|
||||||
|
|
||||||
func PauseAllTask(w http.ResponseWriter, r *http.Request) {
|
func ContinueTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
if err := Downloader.PauseAll(); err != nil {
|
filter, errResult := parseFilter(r)
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
if errResult != nil {
|
||||||
|
WriteJson(w, errResult)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
WriteJson(w, model.NewNilResult())
|
|
||||||
}
|
|
||||||
|
|
||||||
func ContinueAllTask(w http.ResponseWriter, r *http.Request) {
|
if err := Downloader.Continue(filter); err != nil {
|
||||||
if err := Downloader.ContinueAll(); err != nil {
|
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
WriteJson(w, model.NewErrorResult(err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -118,14 +130,14 @@ func ContinueAllTask(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DeleteTask(w http.ResponseWriter, r *http.Request) {
|
func DeleteTask(w http.ResponseWriter, r *http.Request) {
|
||||||
vars := mux.Vars(r)
|
filter, errResult := parseIdFilter(r)
|
||||||
taskId := vars["id"]
|
if errResult != nil {
|
||||||
force := r.FormValue("force")
|
WriteJson(w, errResult)
|
||||||
if taskId == "" {
|
|
||||||
WriteJson(w, model.NewErrorResult("param invalid: id", model.CodeInvalidParam))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := Downloader.Delete(taskId, force == "true"); err != nil {
|
force := r.FormValue("force")
|
||||||
|
|
||||||
|
if err := Downloader.Delete(filter, force == "true"); err != nil {
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
WriteJson(w, model.NewErrorResult(err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -133,10 +145,14 @@ func DeleteTask(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DeleteTasks(w http.ResponseWriter, r *http.Request) {
|
func DeleteTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
r.ParseForm()
|
filter, errResult := parseFilter(r)
|
||||||
status := r.Form["status"]
|
if errResult != nil {
|
||||||
|
WriteJson(w, errResult)
|
||||||
|
return
|
||||||
|
}
|
||||||
force := r.FormValue("force")
|
force := r.FormValue("force")
|
||||||
if err := Downloader.DeleteByStatues(convertStatues(status), force == "true"); err != nil {
|
|
||||||
|
if err := Downloader.Delete(filter, force == "true"); err != nil {
|
||||||
WriteJson(w, model.NewErrorResult(err.Error()))
|
WriteJson(w, model.NewErrorResult(err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -159,9 +175,13 @@ func GetTask(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetTasks(w http.ResponseWriter, r *http.Request) {
|
func GetTasks(w http.ResponseWriter, r *http.Request) {
|
||||||
r.ParseForm()
|
filter, errResult := parseFilter(r)
|
||||||
status := r.Form["status"]
|
if errResult != nil {
|
||||||
tasks := Downloader.GetTasksByStatues(convertStatues(status))
|
WriteJson(w, errResult)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks := Downloader.GetTasksByFilter(filter)
|
||||||
WriteJson(w, model.NewOkResult(tasks))
|
WriteJson(w, model.NewOkResult(tasks))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -324,6 +344,32 @@ func GetStats(w http.ResponseWriter, r *http.Request) {
|
|||||||
WriteJson(w, model.NewOkResult(statsResult))
|
WriteJson(w, model.NewOkResult(statsResult))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseIdFilter(r *http.Request) (*download.TaskFilter, any) {
|
||||||
|
vars := mux.Vars(r)
|
||||||
|
taskId := vars["id"]
|
||||||
|
if taskId == "" {
|
||||||
|
return nil, model.NewErrorResult("param invalid: id", model.CodeInvalidParam)
|
||||||
|
}
|
||||||
|
|
||||||
|
filter := &download.TaskFilter{
|
||||||
|
IDs: []string{taskId},
|
||||||
|
}
|
||||||
|
return filter, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseFilter(r *http.Request) (*download.TaskFilter, any) {
|
||||||
|
if err := r.ParseForm(); err != nil {
|
||||||
|
return nil, model.NewErrorResult(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
filter := &download.TaskFilter{
|
||||||
|
IDs: r.Form["id"],
|
||||||
|
Statuses: convertStatues(r.Form["status"]),
|
||||||
|
NotStatuses: convertStatues(r.Form["notStatus"]),
|
||||||
|
}
|
||||||
|
return filter, nil
|
||||||
|
}
|
||||||
|
|
||||||
func convertStatues(statues []string) []base.Status {
|
func convertStatues(statues []string) []base.Status {
|
||||||
result := make([]base.Status, 0)
|
result := make([]base.Status, 0)
|
||||||
for _, status := range statues {
|
for _, status := range statues {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ type StartConfig struct {
|
|||||||
RefreshInterval int `json:"refreshInterval"`
|
RefreshInterval int `json:"refreshInterval"`
|
||||||
Storage Storage `json:"storage"`
|
Storage Storage `json:"storage"`
|
||||||
StorageDir string `json:"storageDir"`
|
StorageDir string `json:"storageDir"`
|
||||||
|
WhiteDownloadDirs []string `json:"whiteDownloadDirs"`
|
||||||
ApiToken string `json:"apiToken"`
|
ApiToken string `json:"apiToken"`
|
||||||
DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
|
DownloadConfig *base.DownloaderStoreConfig `json:"downloadConfig"`
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -104,9 +104,9 @@ func BuildServer(startCfg *model.StartConfig) (*http.Server, net.Listener, error
|
|||||||
r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
|
r.Methods(http.MethodPost).Path("/api/v1/tasks").HandlerFunc(CreateTask)
|
||||||
r.Methods(http.MethodPost).Path("/api/v1/tasks/batch").HandlerFunc(CreateTaskBatch)
|
r.Methods(http.MethodPost).Path("/api/v1/tasks/batch").HandlerFunc(CreateTaskBatch)
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/pause").HandlerFunc(PauseTask)
|
||||||
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseTasks)
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/{id}/continue").HandlerFunc(ContinueTask)
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/pause").HandlerFunc(PauseAllTask)
|
r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueTasks)
|
||||||
r.Methods(http.MethodPut).Path("/api/v1/tasks/continue").HandlerFunc(ContinueAllTask)
|
|
||||||
r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
|
r.Methods(http.MethodDelete).Path("/api/v1/tasks/{id}").HandlerFunc(DeleteTask)
|
||||||
r.Methods(http.MethodDelete).Path("/api/v1/tasks").HandlerFunc(DeleteTasks)
|
r.Methods(http.MethodDelete).Path("/api/v1/tasks").HandlerFunc(DeleteTasks)
|
||||||
r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
|
r.Methods(http.MethodGet).Path("/api/v1/tasks/{id}").HandlerFunc(GetTask)
|
||||||
|
|||||||
@@ -582,8 +582,8 @@ func doTest(handler func()) {
|
|||||||
Downloader.Clear()
|
Downloader.Clear()
|
||||||
}()
|
}()
|
||||||
defer func() {
|
defer func() {
|
||||||
Downloader.PauseAll()
|
Downloader.Pause(nil)
|
||||||
Downloader.DeleteByStatues(nil, true)
|
Downloader.Delete(nil, true)
|
||||||
os.RemoveAll(cfg.StorageDir)
|
os.RemoveAll(cfg.StorageDir)
|
||||||
}()
|
}()
|
||||||
taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
|
taskReq.URL = "http://" + fileListener.Addr().String() + "/" + test.BuildName
|
||||||
|
|||||||
@@ -8,12 +8,14 @@ class Request {
|
|||||||
Object? extra;
|
Object? extra;
|
||||||
Map<String, String>? labels = {};
|
Map<String, String>? labels = {};
|
||||||
RequestProxy? proxy;
|
RequestProxy? proxy;
|
||||||
|
bool skipVerifyCert = false;
|
||||||
|
|
||||||
Request({
|
Request({
|
||||||
required this.url,
|
required this.url,
|
||||||
this.extra,
|
this.extra,
|
||||||
this.labels,
|
this.labels,
|
||||||
this.proxy,
|
this.proxy,
|
||||||
|
this.skipVerifyCert = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory Request.fromJson(Map<String, dynamic> json) =>
|
factory Request.fromJson(Map<String, dynamic> json) =>
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ Request _$RequestFromJson(Map<String, dynamic> json) => Request(
|
|||||||
proxy: json['proxy'] == null
|
proxy: json['proxy'] == null
|
||||||
? null
|
? null
|
||||||
: RequestProxy.fromJson(json['proxy'] as Map<String, dynamic>),
|
: RequestProxy.fromJson(json['proxy'] as Map<String, dynamic>),
|
||||||
|
skipVerifyCert: json['skipVerifyCert'] as bool? ?? false,
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$RequestToJson(Request instance) {
|
Map<String, dynamic> _$RequestToJson(Request instance) {
|
||||||
@@ -31,6 +32,7 @@ Map<String, dynamic> _$RequestToJson(Request instance) {
|
|||||||
writeNotNull('extra', instance.extra);
|
writeNotNull('extra', instance.extra);
|
||||||
writeNotNull('labels', instance.labels);
|
writeNotNull('labels', instance.labels);
|
||||||
writeNotNull('proxy', instance.proxy?.toJson());
|
writeNotNull('proxy', instance.proxy?.toJson());
|
||||||
|
val['skipVerifyCert'] = instance.skipVerifyCert;
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 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 _toCreate(uri);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import 'package:file_picker/file_picker.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:gopeed/api/model/downloader_config.dart';
|
|
||||||
import 'package:path/path.dart' as path;
|
import 'package:path/path.dart' as path;
|
||||||
import 'package:rounded_loading_button_plus/rounded_loading_button.dart';
|
import 'package:rounded_loading_button_plus/rounded_loading_button.dart';
|
||||||
|
|
||||||
@@ -44,6 +43,8 @@ class CreateView extends GetView<CreateController> {
|
|||||||
|
|
||||||
final _availableSchemes = ["http:", "https:", "magnet:"];
|
final _availableSchemes = ["http:", "https:", "magnet:"];
|
||||||
|
|
||||||
|
final _skipVerifyCertController = false.obs;
|
||||||
|
|
||||||
CreateView({Key? key}) : super(key: key);
|
CreateView({Key? key}) : super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -211,7 +212,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.colorScheme
|
.colorScheme
|
||||||
.background,
|
.surface,
|
||||||
borderRadius:
|
borderRadius:
|
||||||
BorderRadius.circular(
|
BorderRadius.circular(
|
||||||
10.0),
|
10.0),
|
||||||
@@ -455,6 +456,22 @@ class CreateView extends GetView<CreateController> {
|
|||||||
decoration: const InputDecoration(
|
decoration: const InputDecoration(
|
||||||
labelText: 'Referer',
|
labelText: 'Referer',
|
||||||
)),
|
)),
|
||||||
|
Padding(
|
||||||
|
padding:
|
||||||
|
const EdgeInsets.only(top: 10),
|
||||||
|
child: CompactCheckbox(
|
||||||
|
label: 'skipVerifyCert'.tr,
|
||||||
|
value:
|
||||||
|
_skipVerifyCertController.value,
|
||||||
|
onChanged: (bool? value) {
|
||||||
|
_skipVerifyCertController.value =
|
||||||
|
value ?? false;
|
||||||
|
},
|
||||||
|
textStyle: const TextStyle(
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
Column(
|
Column(
|
||||||
@@ -579,7 +596,11 @@ class CreateView extends GetView<CreateController> {
|
|||||||
await Future.wait(urls.map((url) {
|
await Future.wait(urls.map((url) {
|
||||||
return createTask(CreateTask(
|
return createTask(CreateTask(
|
||||||
req: Request(
|
req: Request(
|
||||||
url: url, extra: parseReqExtra(url), proxy: parseProxy()),
|
url: url,
|
||||||
|
extra: parseReqExtra(url),
|
||||||
|
proxy: parseProxy(),
|
||||||
|
skipVerifyCert: _skipVerifyCertController.value,
|
||||||
|
),
|
||||||
opt: Options(
|
opt: Options(
|
||||||
name: isMultiLine ? "" : _renameController.text,
|
name: isMultiLine ? "" : _renameController.text,
|
||||||
path: _pathController.text,
|
path: _pathController.text,
|
||||||
@@ -593,6 +614,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
url: submitUrl,
|
url: submitUrl,
|
||||||
extra: parseReqExtra(_urlController.text),
|
extra: parseReqExtra(_urlController.text),
|
||||||
proxy: parseProxy(),
|
proxy: parseProxy(),
|
||||||
|
skipVerifyCert: _skipVerifyCertController.value,
|
||||||
));
|
));
|
||||||
await _showResolveDialog(rr);
|
await _showResolveDialog(rr);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,5 +107,6 @@ const enUS = {
|
|||||||
'taskName': 'Task Name',
|
'taskName': 'Task Name',
|
||||||
'taskUrl': 'Task URL',
|
'taskUrl': 'Task URL',
|
||||||
'downloadPath': 'Download Path',
|
'downloadPath': 'Download Path',
|
||||||
|
'skipVerifyCert': 'Skip Certificate Verification',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -103,5 +103,6 @@ const esES = {
|
|||||||
'taskName': 'Nombre de la Tarea',
|
'taskName': 'Nombre de la Tarea',
|
||||||
'taskUrl': 'URL de la Tarea',
|
'taskUrl': 'URL de la Tarea',
|
||||||
'downloadPath': 'Ruta de Descarga',
|
'downloadPath': 'Ruta de Descarga',
|
||||||
|
'skipVerifyCert': 'Omitir Verificación de Certificado',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -61,5 +61,6 @@ const faIR = {
|
|||||||
'thanksDesc':
|
'thanksDesc':
|
||||||
'از تمامی افرادی که در ساخت و توسعهی جامعهی Gopeed مشارکت کردهاند، سپاسگزاری میکنیم!',
|
'از تمامی افرادی که در ساخت و توسعهی جامعهی Gopeed مشارکت کردهاند، سپاسگزاری میکنیم!',
|
||||||
'browserExtension': 'فایل های دانلود شده را نگه دارد',
|
'browserExtension': 'فایل های دانلود شده را نگه دارد',
|
||||||
|
'skipVerifyCert': 'رد کردن تأیید گواهینامه',
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -92,5 +92,6 @@ const frFR = {
|
|||||||
'thanksDesc': 'Merci à tous les contributeurs qui ont aidé à construire et développer la communauté Gopeed !',
|
'thanksDesc': 'Merci à tous les contributeurs qui ont aidé à construire et développer la communauté Gopeed !',
|
||||||
'browserExtension': 'Extension du navigateur',
|
'browserExtension': 'Extension du navigateur',
|
||||||
'launchAtStartup': 'Lancer au démarrage',
|
'launchAtStartup': 'Lancer au démarrage',
|
||||||
|
'skipVerifyCert': 'Bypass Verifikasi Sertifikat',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -17,6 +17,7 @@ const idID = {
|
|||||||
'create': 'Membuat Tugas',
|
'create': 'Membuat Tugas',
|
||||||
'directDownload': 'Unduhan Langsung',
|
'directDownload': 'Unduhan Langsung',
|
||||||
'advancedOptions': 'Pengaturan Lanjutan',
|
'advancedOptions': 'Pengaturan Lanjutan',
|
||||||
|
'followSettings': 'Mengikuti Pengaturan',
|
||||||
'downloadLink': 'Tautan Unduhan',
|
'downloadLink': 'Tautan Unduhan',
|
||||||
'downloadLinkValid': 'Silakan masukkan tautan unduhan',
|
'downloadLinkValid': 'Silakan masukkan tautan unduhan',
|
||||||
'downloadLinkHit':
|
'downloadLinkHit':
|
||||||
@@ -35,6 +36,7 @@ const idID = {
|
|||||||
'connections': 'Koneksi',
|
'connections': 'Koneksi',
|
||||||
'useServerCtime': 'Gunakan waktu server untuk pembuatan file',
|
'useServerCtime': 'Gunakan waktu server untuk pembuatan file',
|
||||||
'maxRunning': 'Tugas Maksimum yang Berjalan',
|
'maxRunning': 'Tugas Maksimum yang Berjalan',
|
||||||
|
'defaultDirectDownload': 'Pilih unduhan langsung sebagai opsi standar',
|
||||||
'items': '@count items',
|
'items': '@count items',
|
||||||
'subscribeTracker': 'Berlangganan Tracker',
|
'subscribeTracker': 'Berlangganan Tracker',
|
||||||
'subscribeFail':
|
'subscribeFail':
|
||||||
@@ -60,6 +62,8 @@ const idID = {
|
|||||||
'set': 'ATUR',
|
'set': 'ATUR',
|
||||||
'portInUse': 'Port [@port] sedang digunakan, silakan ubah port',
|
'portInUse': 'Port [@port] sedang digunakan, silakan ubah port',
|
||||||
'effectAfterRestart': 'Berlaku setelah restart',
|
'effectAfterRestart': 'Berlaku setelah restart',
|
||||||
|
'developer': 'Pengembang',
|
||||||
|
'logDirectory': 'Direktori Log',
|
||||||
'show': 'Tampilkan',
|
'show': 'Tampilkan',
|
||||||
'startAll': 'Mulai Semua',
|
'startAll': 'Mulai Semua',
|
||||||
'pauseAll': 'Jeda Semua',
|
'pauseAll': 'Jeda Semua',
|
||||||
@@ -95,5 +99,14 @@ const idID = {
|
|||||||
'Terima kasih kepada semua kontributor yang telah membantu membangun dan mengembangkan komunitas Gopeed!',
|
'Terima kasih kepada semua kontributor yang telah membantu membangun dan mengembangkan komunitas Gopeed!',
|
||||||
'browserExtension': 'Ekstensi Perambanan',
|
'browserExtension': 'Ekstensi Perambanan',
|
||||||
'launchAtStartup': 'Luncurkan saat Startup',
|
'launchAtStartup': 'Luncurkan saat Startup',
|
||||||
|
'seedConfig': 'Konfigurasi Seed',
|
||||||
|
'seedKeep': 'Terus seeding hingga dihentikan secara manual',
|
||||||
|
'seedRatio': 'Rasio Seed',
|
||||||
|
'seedTime': 'Waktu Seed (menit)',
|
||||||
|
'taskDetail': 'Detail Tugas',
|
||||||
|
'taskName': 'Nama Tugas',
|
||||||
|
'taskUrl': 'URL Tugas',
|
||||||
|
'downloadPath': 'Direktori Unduhan',
|
||||||
|
'skipVerifyCert': 'Lupakan verifikasi sertifikat',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -96,5 +96,6 @@ const itIT = {
|
|||||||
'Grazie a tutti i contributori che hanno contribuito a costruire e sviluppare la comunità Gopeed!',
|
'Grazie a tutti i contributori che hanno contribuito a costruire e sviluppare la comunità Gopeed!',
|
||||||
'browserExtension': 'Estensione del browser',
|
'browserExtension': 'Estensione del browser',
|
||||||
'launchAtStartup': "Lancia all'avvio",
|
'launchAtStartup': "Lancia all'avvio",
|
||||||
|
'skipVerifyCert': 'Salta la verifica del certificato',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -62,5 +62,6 @@ const jaJP = {
|
|||||||
'thanks': '感謝',
|
'thanks': '感謝',
|
||||||
'thanksDesc': 'Gopeedコミュニティの建設に協力してくださったすべての貢献者の方々に感謝します!',
|
'thanksDesc': 'Gopeedコミュニティの建設に協力してくださったすべての貢献者の方々に感謝します!',
|
||||||
'browserExtension': 'ブラウザ拡張機能',
|
'browserExtension': 'ブラウザ拡張機能',
|
||||||
|
'skipVerifyCert': '証明書の検証をスキップ',
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -94,5 +94,6 @@ const plPL = {
|
|||||||
'Dziękuję wszystkim za pomoc przy powstawaniu aplikacji Gopeed!',
|
'Dziękuję wszystkim za pomoc przy powstawaniu aplikacji Gopeed!',
|
||||||
'browserExtension': 'Wtyczka dla przeglądarki',
|
'browserExtension': 'Wtyczka dla przeglądarki',
|
||||||
'launchAtStartup': 'Uruchom na starcie',
|
'launchAtStartup': 'Uruchom na starcie',
|
||||||
|
'skipVerifyCert': 'Pomiń weryfikację certyfikatu',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -77,5 +77,6 @@ const ruRU = {
|
|||||||
'thanksDesc':
|
'thanksDesc':
|
||||||
'Благодарим всех участников за их вклад в строительство и развитие сообщества Gopeed!',
|
'Благодарим всех участников за их вклад в строительство и развитие сообщества Gopeed!',
|
||||||
'browserExtension': 'Расширение браузера',
|
'browserExtension': 'Расширение браузера',
|
||||||
|
'skipVerifyCert': 'Пропустить проверку сертификата',
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -95,5 +95,6 @@ const taTA = {
|
|||||||
'Gopeed சமூகத்தை உருவாக்கவும் மற்றும் மேம்படுத்த உதவிய அனைத்து பங்களிப்பாளர்களுக்கும் நன்றி!',
|
'Gopeed சமூகத்தை உருவாக்கவும் மற்றும் மேம்படுத்த உதவிய அனைத்து பங்களிப்பாளர்களுக்கும் நன்றி!',
|
||||||
'browserExtension': 'உலாவி நீட்டிப்பு',
|
'browserExtension': 'உலாவி நீட்டிப்பு',
|
||||||
'launchAtStartup': 'தொடக்கத்தின் போது இயங்கு',
|
'launchAtStartup': 'தொடக்கத்தின் போது இயங்கு',
|
||||||
|
'skipVerifyCert': 'திருத்தி சான்று சரிபார்க்கவும்',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -17,10 +17,10 @@ const trTR = {
|
|||||||
'create': 'Görev oluştur',
|
'create': 'Görev oluştur',
|
||||||
'directDownload': 'Doğrudan indir',
|
'directDownload': 'Doğrudan indir',
|
||||||
'advancedOptions': 'Gelişmiş ayarlar',
|
'advancedOptions': 'Gelişmiş ayarlar',
|
||||||
|
'followSettings': 'Ayarları takip et',
|
||||||
'downloadLink': 'İndirme bağlantısı',
|
'downloadLink': 'İndirme bağlantısı',
|
||||||
'downloadLinkValid': 'Lütfen indirme bağlantısını girin',
|
'downloadLinkValid': 'Lütfen indirme bağlantısını girin',
|
||||||
'downloadLinkHit':
|
'downloadLinkHit': 'Lütfen indirme bağlantısını girin, HTTP/HTTPS/MAGNET desteklenir@append',
|
||||||
'Lütfen indirme bağlantısını girin, HTTP/HTTPS/MAGNET desteklenir@append',
|
|
||||||
'downloadLinkHitDesktop': ', veya torrent dosyasını doğrudan buraya sürükleyin',
|
'downloadLinkHitDesktop': ', veya torrent dosyasını doğrudan buraya sürükleyin',
|
||||||
'download': 'İndir',
|
'download': 'İndir',
|
||||||
'noFileSelected': 'Devam etmek için lütfen en az bir dosya seçin.',
|
'noFileSelected': 'Devam etmek için lütfen en az bir dosya seçin.',
|
||||||
@@ -35,10 +35,10 @@ const trTR = {
|
|||||||
'connections': 'Bağlantılar',
|
'connections': 'Bağlantılar',
|
||||||
'useServerCtime': 'Dosya oluşturma için sunucu saatini kullan',
|
'useServerCtime': 'Dosya oluşturma için sunucu saatini kullan',
|
||||||
'maxRunning': 'Maksimum çalışan görev sayısı',
|
'maxRunning': 'Maksimum çalışan görev sayısı',
|
||||||
|
'defaultDirectDownload': 'Doğrudan indir seçili olsun',
|
||||||
'items': '@count tane',
|
'items': '@count tane',
|
||||||
'subscribeTracker': 'İzleyiciye abone ol',
|
'subscribeTracker': 'İzleyiciye abone ol',
|
||||||
'subscribeFail':
|
'subscribeFail': 'Abone olunamadı, lütfen ağı kontrol edin veya daha sonra tekrar deneyin',
|
||||||
'Abone olunamadı, lütfen ağı kontrol edin veya daha sonra tekrar deneyin',
|
|
||||||
'update': 'Güncelle',
|
'update': 'Güncelle',
|
||||||
'updateDaily': 'Günlük olarak güncelle',
|
'updateDaily': 'Günlük olarak güncelle',
|
||||||
'lastUpdate': 'Son güncellenme tarihi: @time',
|
'lastUpdate': 'Son güncellenme tarihi: @time',
|
||||||
@@ -60,6 +60,8 @@ const trTR = {
|
|||||||
'set': 'AYARLI',
|
'set': 'AYARLI',
|
||||||
'portInUse': 'Bağlantı noktası [@port] kullanımda, lütfen bağlantı noktasını değiştirin',
|
'portInUse': 'Bağlantı noktası [@port] kullanımda, lütfen bağlantı noktasını değiştirin',
|
||||||
'effectAfterRestart': 'Yeniden başlatma sonrası etki edecektir',
|
'effectAfterRestart': 'Yeniden başlatma sonrası etki edecektir',
|
||||||
|
'developer': 'Geliştirici',
|
||||||
|
'logDirectory': 'Kayıt dizini',
|
||||||
'show': 'Göster',
|
'show': 'Göster',
|
||||||
'startAll': 'Hepsini başlat',
|
'startAll': 'Hepsini başlat',
|
||||||
'pauseAll': 'Hepsini durdur',
|
'pauseAll': 'Hepsini durdur',
|
||||||
@@ -91,9 +93,17 @@ const trTR = {
|
|||||||
'username': 'Kullanıcı adı',
|
'username': 'Kullanıcı adı',
|
||||||
'password': 'Şifre',
|
'password': 'Şifre',
|
||||||
'thanks': 'Teşekkürler',
|
'thanks': 'Teşekkürler',
|
||||||
'thanksDesc':
|
'thanksDesc': 'Gopeed topluluğunun oluşmasına ve gelişmesine yardımcı olan tüm katılımcılara teşekkürler!',
|
||||||
'Gopeed topluluğunun oluşmasına ve gelişmesine yardımcı olan tüm katılımcılara teşekkürler!',
|
|
||||||
'browserExtension': 'Tarayıcı uzantısı',
|
'browserExtension': 'Tarayıcı uzantısı',
|
||||||
'launchAtStartup': 'Başlangıçta başlat',
|
'launchAtStartup': 'Başlangıçta başlat',
|
||||||
|
'seedConfig': 'Seed ayarları',
|
||||||
|
'seedKeep': 'Manuel durdurulana kadar seed etmeye devam et',
|
||||||
|
'seedRatio': 'Seed oranı',
|
||||||
|
'seedTime': 'Seed süresi (dakika)',
|
||||||
|
'taskDetail': 'Görev detayı',
|
||||||
|
'taskName': 'Görev adı',
|
||||||
|
'taskUrl': 'Görev URL',
|
||||||
|
'downloadPath': 'İndirme yolu',
|
||||||
|
'skipVerifyCert': 'Sertifika doğrulamasını atla',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -89,5 +89,6 @@ const viVN = {
|
|||||||
'thanksDesc':
|
'thanksDesc':
|
||||||
'Cảm ơn tất cả những người đóng góp đã giúp xây dựng và phát triển cộng đồng Gopeed!',
|
'Cảm ơn tất cả những người đóng góp đã giúp xây dựng và phát triển cộng đồng Gopeed!',
|
||||||
'browserExtension': 'Tiện ích mở rộng trình duyệt',
|
'browserExtension': 'Tiện ích mở rộng trình duyệt',
|
||||||
|
'skipVerifyCert': 'Bỏ qua xác thực chứng chỉ',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -104,5 +104,6 @@ const zhCN = {
|
|||||||
'taskName': '任务名称',
|
'taskName': '任务名称',
|
||||||
'taskUrl': '任务链接',
|
'taskUrl': '任务链接',
|
||||||
'downloadPath': '下载路径',
|
'downloadPath': '下载路径',
|
||||||
|
'skipVerifyCert': '跳过证书验证',
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -104,5 +104,6 @@ const zhTW = {
|
|||||||
'taskName': '任務名稱',
|
'taskName': '任務名稱',
|
||||||
'taskUrl': '任務連結',
|
'taskUrl': '任務連結',
|
||||||
'downloadPath': '下載路徑',
|
'downloadPath': '下載路徑',
|
||||||
|
'skipVerifyCert': '跳過憑證驗證',
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -21,29 +21,33 @@ class FileExplorer {
|
|||||||
} else if (Platform.isMacOS) {
|
} else if (Platform.isMacOS) {
|
||||||
Process.run('open', ['-R', filePath]);
|
Process.run('open', ['-R', filePath]);
|
||||||
} else if (Platform.isLinux) {
|
} else if (Platform.isLinux) {
|
||||||
if (await _isUbuntuOrDebian()) {
|
_linuxOpen(filePath);
|
||||||
Process.run('xdg-open', [filePath]);
|
|
||||||
} else if (await _isCentOS()) {
|
|
||||||
Process.run('nautilus', ['--select', filePath]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<bool> _isUbuntuOrDebian() async {
|
static Future<void> _linuxOpen(String filePath) async {
|
||||||
final result = await Process.run('lsb_release', ['-i']);
|
if (await Process.run('which', ['xdg-open'])
|
||||||
|
.then((value) => value.exitCode == 0)) {
|
||||||
|
final result = await Process.run('xdg-open', [filePath]);
|
||||||
if (result.exitCode != 0) {
|
if (result.exitCode != 0) {
|
||||||
return false;
|
_openWithFileManager(filePath);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_openWithFileManager(filePath);
|
||||||
}
|
}
|
||||||
final output = result.stdout.toString().toLowerCase();
|
|
||||||
return output.contains('ubuntu') || output.contains('debian');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<bool> _isCentOS() async {
|
static Future<void> _openWithFileManager(String filePath) async {
|
||||||
final result = await Process.run('cat', ['/etc/os-release']);
|
final desktop = Platform.environment['XDG_CURRENT_DESKTOP'];
|
||||||
if (result.exitCode != 0) {
|
if (desktop == null) {
|
||||||
return false;
|
throw Exception('XDG_CURRENT_DESKTOP is not set');
|
||||||
|
}
|
||||||
|
if (desktop == 'GNOME') {
|
||||||
|
await Process.run('nautilus', ['--select', filePath]);
|
||||||
|
} else if (desktop == 'KDE') {
|
||||||
|
await Process.run('dolphin', ['--select', filePath]);
|
||||||
|
} else {
|
||||||
|
throw Exception('Unsupported desktop environment');
|
||||||
}
|
}
|
||||||
final output = result.stdout.toString().toLowerCase();
|
|
||||||
return output.contains('centos');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,8 @@ PODS:
|
|||||||
- FlutterMacOS
|
- FlutterMacOS
|
||||||
- desktop_drop (0.0.1):
|
- desktop_drop (0.0.1):
|
||||||
- FlutterMacOS
|
- FlutterMacOS
|
||||||
|
- device_info_plus (0.0.1):
|
||||||
|
- FlutterMacOS
|
||||||
- FlutterMacOS (1.0.0)
|
- FlutterMacOS (1.0.0)
|
||||||
- macos_secure_bookmarks (0.0.3):
|
- macos_secure_bookmarks (0.0.3):
|
||||||
- FlutterMacOS
|
- FlutterMacOS
|
||||||
@@ -28,6 +30,7 @@ PODS:
|
|||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
|
- app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
|
||||||
- desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
|
- desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
|
||||||
|
- device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
|
||||||
- FlutterMacOS (from `Flutter/ephemeral`)
|
- FlutterMacOS (from `Flutter/ephemeral`)
|
||||||
- macos_secure_bookmarks (from `Flutter/ephemeral/.symlinks/plugins/macos_secure_bookmarks/macos`)
|
- macos_secure_bookmarks (from `Flutter/ephemeral/.symlinks/plugins/macos_secure_bookmarks/macos`)
|
||||||
- package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
|
- package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
|
||||||
@@ -44,6 +47,8 @@ EXTERNAL SOURCES:
|
|||||||
:path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
|
:path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
|
||||||
desktop_drop:
|
desktop_drop:
|
||||||
:path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
|
:path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
|
||||||
|
device_info_plus:
|
||||||
|
:path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
|
||||||
FlutterMacOS:
|
FlutterMacOS:
|
||||||
:path: Flutter/ephemeral
|
:path: Flutter/ephemeral
|
||||||
macos_secure_bookmarks:
|
macos_secure_bookmarks:
|
||||||
@@ -68,15 +73,16 @@ EXTERNAL SOURCES:
|
|||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
|
app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
|
||||||
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
|
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
|
||||||
|
device_info_plus: 74e614483d05c89290d30a4c8feae15d555f7427
|
||||||
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
|
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
|
||||||
macos_secure_bookmarks: cff041c4b377fa00941bb901aaec4d27fac5edf2
|
macos_secure_bookmarks: cff041c4b377fa00941bb901aaec4d27fac5edf2
|
||||||
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
|
package_info_plus: f5790acc797bf17c3e959e9d6cf162cc68ff7523
|
||||||
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
|
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
|
||||||
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
|
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
|
||||||
share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
|
share_plus: fd717ef89a2801d3491e737630112b80c310640e
|
||||||
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
|
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
|
||||||
tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
|
tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
|
||||||
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
|
url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
|
||||||
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
|
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
|
||||||
|
|
||||||
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
|
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
|
||||||
|
|||||||
@@ -206,7 +206,7 @@
|
|||||||
isa = PBXProject;
|
isa = PBXProject;
|
||||||
attributes = {
|
attributes = {
|
||||||
LastSwiftUpdateCheck = 0920;
|
LastSwiftUpdateCheck = 0920;
|
||||||
LastUpgradeCheck = 1430;
|
LastUpgradeCheck = 1510;
|
||||||
ORGANIZATIONNAME = "";
|
ORGANIZATIONNAME = "";
|
||||||
TargetAttributes = {
|
TargetAttributes = {
|
||||||
33CC10EC2044A3C60003C045 = {
|
33CC10EC2044A3C60003C045 = {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Scheme
|
<Scheme
|
||||||
LastUpgradeVersion = "1430"
|
LastUpgradeVersion = "1510"
|
||||||
version = "1.3">
|
version = "1.3">
|
||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import Cocoa
|
import Cocoa
|
||||||
import FlutterMacOS
|
import FlutterMacOS
|
||||||
|
|
||||||
@NSApplicationMain
|
@main
|
||||||
class AppDelegate: FlutterAppDelegate {
|
class AppDelegate: FlutterAppDelegate {
|
||||||
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
|
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
|
||||||
return false
|
return false
|
||||||
|
|||||||
+222
-152
File diff suppressed because it is too large.
Load diff
Loaded 50 of 51 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user