Compare commits

..
Author SHA1 Message Date
liwei c7fefd2b9b fix: test 2024-05-01 18:39:24 +08:00
liwei b8e36b483e fix: test 2024-05-01 18:38:13 +08:00
liwei 91ac841b9d setting ui 2024-05-01 18:35:32 +08:00
liwei 5134446c3f fix: test 2024-05-01 18:35:32 +08:00
liwei 82b6ebd6f1 feat: support proxy from system env 2024-05-01 18:35:32 +08:00
liwei f8ea009fe9 temp 2024-05-01 18:35:32 +08:00
Levi 070db64ca9 fix: http request cookie incremented indefinitely on retries (#514) 2024-05-01 17:45:59 +08:00
Levi 6a8956b04d docs: fix linux download link 2024-05-01 04:16:56 +00:00
Deepansh Singh Arya 057504bb81 feat: updated iOS icons (#512) 2024-05-01 10:48:35 +08:00
madoka773 470b488824 ci: build gopeed with libayatana-appindicator (#508) 2024-04-26 15:41:47 +08:00
madoka773 c8c9df1ae8 ci: build linux with ubuntu latest (#501) 2024-04-23 08:57:23 +08:00
invictus1032 33d787c74e docs: fix Linux download links (#465)
Fix filename discrepancies for .deb and .AppImage
2024-04-12 14:45:09 +08:00
liwei 67338a5e83 docs: add browser extension link 2024-04-03 17:52:37 +08:00
Levi 723697192d fix: command panic before resolve resource (#451) 2024-04-03 16:56:20 +08:00
Zack 4294d07d6a fix: Fix the issue of installing apk files(Android) (#448) (#449) 2024-04-03 09:23:05 +08:00
WINZORT 3936fd786f feat: Update tr_tr.dart (#445) 2024-04-01 09:07:44 +08:00
ilkeiii 45197e9a3b fix: docker entrypoint_sh (#434) 2024-03-30 12:35:00 +08:00
liwei c9692e76e5 fix: build flags type 2024-03-30 11:10:34 +08:00
liwei 0a9e39ed75 ci: fix Dockerfile InDocker flag 2024-03-30 11:00:14 +08:00
liwei 1971f582b5 ci: fix Dockerfile build 2024-03-30 10:50:53 +08:00
liwei c62d6be3da ci: fix Dockerfile build args 2024-03-30 10:39:46 +08:00
liwei 7d5e503894 fix: bump rounded_loading_button 2024-03-30 10:21:19 +08:00
liwei 6c4066fde4 ci: fix Dockerfile 2024-03-30 10:05:45 +08:00
liwei ffdf3e717f ci: fix docker build args format 2024-03-30 09:57:21 +08:00
liwei f66814b4ae ci: fix docker build args 2024-03-30 09:50:41 +08:00
Levi 0c3e201a51 release: v1.5.6 2024-03-30 09:35:20 +08:00
liwei c32a5d750f ci: update change log template 2024-03-30 09:32:43 +08:00
Levi 207c287c97 feat: add browser extension link (#433) 2024-03-30 09:12:24 +08:00
Levi 56ef25065e fix: task lock by unreachable torrent (#431) 2024-03-29 22:11:21 +08:00
Levi bd6d6be71f feat: web config add stroage dir item (#428) 2024-03-29 17:10:25 +08:00
Zack 1d3a028bae docs: Optimize compile commands (#420) 2024-03-27 22:18:52 +08:00
Zack 27011fb96b feat: Support Via Download task, require via version 5.5.0 or above(Android) (#412) (#419) 2024-03-27 21:58:16 +08:00
ilkeiii c696b59c4b feat: add docker permission related settings (#380) 2024-03-25 08:51:07 +08:00
WINZORT 78b5b8a78b feat: Create tr_tr.dart (#402) 2024-03-12 13:57:11 +08:00
Levi c81ca7f5cd feat: docker download dir move to /app/Download (#398) 2024-03-12 13:39:56 +08:00
liwei e39d50fe09 docs: add Flathub link 2024-02-23 08:53:20 +08:00
David Nguyen 086269f8bd feat: add Vietnamese translate (#389) 2024-02-22 15:54:35 +08:00
liwei 00d2183961 docs: fix download link 2024-02-18 20:45:07 +08:00
liwei 5f914dc4c4 docs: fix mac download link 2024-02-18 12:47:27 +08:00
MonoYan 9bf204cf04 Update README_zh-CN.md (#381)
Fixed MacOS download link
2024-02-18 01:14:56 +08:00
Levi a816b9ccc8 fix: create task with default select files (#374) 2024-02-02 09:44:00 +08:00
liwei d60d370463 docs: remove linux portable link 2024-02-01 15:11:41 +08:00
Levi 84d054b494 fix: start duplicate server on mobile when the app is closed by swiping (#370) 2024-01-31 18:45:09 +08:00
Elliot 1aa96e147f feat: improve zh-TW translation (#369) 2024-01-31 18:23:25 +08:00
85 changed files with 1351 additions and 591 deletions

No files matched your search

+2 -2
View File
@@ -16,7 +16,7 @@ categories:
- title: '🧰 Maintenance' - title: '🧰 Maintenance'
label: 'chore' label: 'chore'
- title: '📖 Document' - title: '📖 Document'
label: 'doc' label: 'docs'
- title: '🚀 CI/CD' - title: '🚀 CI/CD'
label: 'ci' label: 'ci'
- title: '🌎 Internationalization' - title: '🌎 Internationalization'
@@ -34,7 +34,7 @@ version-resolver:
- 'patch' - 'patch'
default: patch default: patch
template: | template: |
# Changes # Release notes
$CHANGES $CHANGES
+5 -5
View File
@@ -215,7 +215,7 @@ jobs:
overwrite: true overwrite: true
build-linux: build-linux:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }} if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }}
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
needs: [ get-release ] needs: [ get-release ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@@ -228,9 +228,7 @@ jobs:
- run: | - run: |
sudo apt update -y sudo apt update -y
# flutter build dependencies # flutter build dependencies
sudo apt install -y ninja-build libgtk-3-dev libappindicator3-dev sudo apt install -y ninja-build libgtk-3-dev libayatana-appindicator3-1 libayatana-appindicator3-dev
# rpm build dependencies
sudo apt install -y rpm patchelf
# appimage build dependencies # appimage build dependencies
sudo apt install -y libfuse2 locate sudo apt install -y libfuse2 locate
wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
@@ -471,7 +469,9 @@ jobs:
VERSION: ${{ needs.get-release.outputs.version }} VERSION: ${{ needs.get-release.outputs.version }}
with: with:
push: ${{ github.event.inputs.test == 'true' && 'false' || 'true' }} push: ${{ github.event.inputs.test == 'true' && 'false' || 'true' }}
build-args: VERSION=${{ env.VERSION }} build-args: |
VERSION=${{ env.VERSION }}
IN_DOCKER=true
platforms: | platforms: |
linux/386 linux/386
linux/amd64 linux/amd64
+29
View File
@@ -0,0 +1,29 @@
# Hướng dẫn đóng góp cho Gopeed
Trước tiên, cảm ơn bạn đã quan tâm đến việc đóng góp cho Gopeed. Hướng dẫn này sẽ giúp bạn tham gia
phát triển Gopeed một cách tốt hơn.
## Mô tả nhánh
Dự án này chỉ có một nhánh chính duy nhất, đó là nhánh `main`. Nếu bạn muốn tham gia vào
phát triển Gopeed, hãy fork dự án này trước, sau đó phát triển trong dự án fork của bạn. Sau khi
hoàn thành phát triển, gửi một PR đến dự án này và merge vào nhánh `main`.
## Phát triển cục bộ
Đề nghị phát triển và gỡ lỗi thông qua web. Đầu tiên, khởi động dịch vụ backend bằng cách chạy
lệnh `go run cmd/api/main.go` trong dòng lệnh, cổng mặc định của dịch vụ là `9999`, sau đó
khởi động dự án flutter frontend trong chế độ `debug` để chạy.
## Dịch thuật
Các tệp quốc tế hóa của Gopeed được đặt trong thư mục `ui/flutter/lib/i18n/langs`.
Bạn chỉ cần thêm tệp ngôn ngữ tương ứng trong thư mục này.
Vui lòng tham khảo `en_us.dart` để biết cách dịch thuật.
## Phát triển flutter
Đừng quên chạy `dart format ./ui/flutter` trước khi commit để giữ mã của bạn theo định dạng dart chuẩn.
Bật build_runner watcher nếu bạn muốn chỉnh sửa api/models:
+11 -2
View File
@@ -12,12 +12,21 @@ RUN go mod download
COPY . . COPY . .
COPY --from=flutter /app/build/web ./cmd/web/dist COPY --from=flutter /app/build/web ./cmd/web/dist
ARG VERSION=dev ARG VERSION=dev
RUN CGO_ENABLED=0 go build -tags nosqlite,web -ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=${VERSION}" -o dist/gopeed github.com/GopeedLab/gopeed/cmd/web RUN CGO_ENABLED=0 go build -tags nosqlite,web \
-ldflags="-s -w -X github.com/GopeedLab/gopeed/pkg/base.Version=$VERSION -X github.com/GopeedLab/gopeed/pkg/base.InDocker=true" \
-o dist/gopeed github.com/GopeedLab/gopeed/cmd/web
FROM alpine:3.14.2 FROM alpine:3.14.2
LABEL maintainer="monkeyWie" LABEL maintainer="monkeyWie"
WORKDIR /app WORKDIR /app
COPY --from=go /app/dist/gopeed ./ COPY --from=go /app/dist/gopeed ./
COPY entrypoint.sh ./entrypoint.sh
RUN apk update && \
apk upgrade --no-cache && \
apk add --no-cache bash su-exec; \
chmod +x ./entrypoint.sh && \
rm -rf /var/cache/apk/*
VOLUME ["/app/storage"] VOLUME ["/app/storage"]
ENV PUID=0 PGID=0 UMASK=022
EXPOSE 9999 EXPOSE 9999
ENTRYPOINT ["./gopeed"] ENTRYPOINT ["./entrypoint.sh"]
+13 -9
View File
@@ -9,7 +9,7 @@
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) [English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
## Introduction ## Introduction
@@ -40,24 +40,24 @@ Visit ✈ [Official Website](https://gopeed.com) | 📖 [Official Docs](https://
<tr> <tr>
<td>MacOS</td> <td>MacOS</td>
<td><code>DMG Installer</code></td> <td><code>DMG Installer</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
</tr> </tr>
<tr> <tr>
<td rowspan=4>Linux</td> <td rowspan=4>Linux</td>
<td><code>Flathub</code></td>
<td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
</tr>
<tr>
<td><code>SNAP</code></td> <td><code>SNAP</code></td>
<td><a href="https://snapcraft.io/gopeed">Link</a></td> <td><a href="https://snapcraft.io/gopeed">Link</a></td>
</tr> </tr>
<tr> <tr>
<td><code>DEB</code></td> <td><code>DEB</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux.deb">Link</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
</tr> </tr>
<tr> <tr>
<td><code>AppImage</code></td> <td><code>AppImage</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.AppImage">Link</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
</tr>
<tr>
<td><code>Portable TAR</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64-portable.tar.gz">Link</a></td>
</tr> </tr>
<tr> <tr>
<td>Android</td> <td>Android</td>
@@ -92,6 +92,10 @@ use `go install`:
go install github.com/GopeedLab/gopeed/cmd/gopeed@latest go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
``` ```
## Browser Extension
Gopeed also provides a browser extension to take over browser downloads, supporting browsers such as Chrome, Edge, Firefox, etc., please refer to: [https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
## Donate ## Donate
If you like this project, please consider [donating](https://docs.gopeed.com/donate.html) to support the development of this project, thank you! If you like this project, please consider [donating](https://docs.gopeed.com/donate.html) to support the development of this project, thank you!
@@ -168,7 +172,7 @@ command:
- android - android
```bash ```bash
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
cd ui/flutter cd ui/flutter
flutter build apk flutter build apk
``` ```
+9 -9
View File
@@ -9,7 +9,7 @@
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) [English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
## はじめに ## はじめに
@@ -40,24 +40,24 @@ Gopeed (正式名 Go Speed) は `Golang` + `Flutter` によって開発された
<tr> <tr>
<td>MacOS</td> <td>MacOS</td>
<td><code>DMG Installer</code></td> <td><code>DMG Installer</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Link</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Link</a></td>
</tr> </tr>
<tr> <tr>
<td rowspan=4>Linux</td> <td rowspan=4>Linux</td>
<td><code>Flathub</code></td>
<td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Link</a></td>
</tr>
<tr>
<td><code>SNAP</code></td> <td><code>SNAP</code></td>
<td><a href="https://snapcraft.io/gopeed">Link</a></td> <td><a href="https://snapcraft.io/gopeed">Link</a></td>
</tr> </tr>
<tr> <tr>
<td><code>DEB</code></td> <td><code>DEB</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux.deb">Link</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Link</a></td>
</tr> </tr>
<tr> <tr>
<td><code>AppImage</code></td> <td><code>AppImage</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.AppImage">Link</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Link</a></td>
</tr>
<tr>
<td><code>Portable TAR</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64-portable.tar.gz">Link</a></td>
</tr> </tr>
<tr> <tr>
<td>Android</td> <td>Android</td>
@@ -160,7 +160,7 @@ gomobile init
- android - android
```bash ```bash
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
cd ui/flutter cd ui/flutter
flutter build apk flutter build apk
``` ```
+211
View File
@@ -0,0 +1,211 @@
[![Trạng thái kiểm tra](https://github.com/GopeedLab/gopeed/workflows/test/badge.svg)](https://github.com/GopeedLab/gopeed/actions?query=workflow%3Atest)
[![Codecov](https://codecov.io/gh/GopeedLab/gopeed/branch/main/graph/badge.svg)](https://codecov.io/gh/GopeedLab/gopeed)
[![Phiên bản](https://img.shields.io/github/release/GopeedLab/gopeed.svg)](https://github.com/GopeedLab/gopeed/releases)
[![Tải về](https://img.shields.io/github/downloads/GopeedLab/gopeed/total.svg)](https://github.com/GopeedLab/gopeed/releases)
[![Ủng hộ](https://img.shields.io/badge/%24-ủng%20hộ-ff69b4.svg)](https://docs.gopeed.com/donate.html)
[![Discord](https://img.shields.io/discord/1037992631881449472?label=Discord&logo=discord&style=social)](https://discord.gg/ZUJqJrwCGB)
![](_docs/img/banner.png)
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](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)
## Giới thiệu
Gopeed (tên đầy đủ Go Speed), một công cụ tải xuống tốc độ cao được phát triển bởi `Golang` + `Flutter`, hỗ trợ giao thức (HTTP, BitTorrent, Magnet) và hỗ trợ tất cả các nền tảng. Ngoài các chức năng tải xuống cơ bản, Gopeed còn là một công cụ tải xuống có thể tùy chỉnh cao cho phép triển khai thêm tính năng thông qua việc tích hợp với [APIs](https://docs.gopeed.com/dev-api.html) hoặc cài đặt và phát triển các [tiện ích mở rộng](https://docs.gopeed.com/dev-extension.html).
Truy cập ✈ [Trang web chính thức](https://gopeed.com) | 📖 [Tài liệu chính thức](https://docs.gopeed.com)
## Tải về
<table>
<thead>
<tr>
<th>Nền tảng</th>
<th>Loại gói</th>
<th>Liên kết tải xuống</th>
</tr>
</thead>
<tbody>
<tr>
<td rowspan=2>Windows</td>
<td><code>Bộ cài đặt EXE</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64.zip">Liên kết</a></td>
</tr>
<tr>
<td><code>ZIP Portable</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">Liên kết</a></td>
</tr>
<tr>
<td>MacOS</td>
<td><code>Bộ cài đặt DMG</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">Liên kết</a></td>
</tr>
<tr>
<td rowspan=4>Linux</td>
<td><code>Flathub</code></td>
<td><a href="https://flathub.org/apps/com.gopeed.Gopeed">Liên kết</a></td>
</tr>
<tr>
<td><code>SNAP</code></td>
<td><a href="https://snapcraft.io/gopeed">Liên kết</a></td>
</tr>
<tr>
<td><code>DEB</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">Liên kết</a></td>
</tr>
<tr>
<td><code>AppImage</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">Liên kết</a></td>
</tr>
<tr>
<td>Android</td>
<td><code>APK</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-android.apk">Liên kết</a></td>
</tr>
<tr>
<td>iOS</td>
<td><code>IPA</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-ios.ipa">Liên kết</a></td>
</tr>
<tr>
<td>Web</td>
<td></td>
<td><a href="https://github.com/GopeedLab/gopeed/releases/latest">Liên kết</a></td>
</tr>
<tr>
<td>Docker</td>
<td></td>
<td><a href="https://hub.docker.com/r/liwei2633/gopeed">Liên kết</a></td>
</tr>
</tbody>
</table>
Thêm thông tin về cài đặt, vui lòng tham khảo [Cài đặt](https://docs.gopeed.com/install.html)
### Command tool
Sử dụng `go install`:
```bash
go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
```
## Quyên góp
Nếu bạn thích dự án này, xin vui lòng xem xét [quyên góp](https://docs.gopeed.com/donate.html) để hỗ trợ phát triển dự án này, cảm ơn bạn!
## Trưng bày
![](_docs/img/ui-demo.png)
## Development
Dự án này được chia thành hai phần, phần giao diện sử dụng `flutter`, phần backend sử dụng `Golang`, và hai phía giao tiếp thông qua giao thức `http`. Trên hệ thống unix, sử dụng `unix socket`, và trên hệ thống windows, sử dụng giao thức `tcp`.
> Mã giao diện nằm trong thư mục `ui/flutter`.
### Environment
1. Golang 1.21+
2. Flutter 3.16+
### Clone
```bash
git clone [email protected]:GopeedLab/gopeed.git
```
### Đóng góp
Vui lòng tham khảo [CONTRIBUTING_vi-VN.md](/CONTRIBUTING_vi-VN.md)
### Xây dựng
#### Desktop
Trước tiên, bạn cần cấu hình môi trường theo tài liệu chính thức của [Tài liệu trang web máy tính để bàn Flutter](https://docs.flutter.dev/development/platform-integration/desktop), sau đó bạn cần đảm bảo môi trường cgo được thiết lập đúng. Để biết hướng dẫn chi tiết về cách thiết lập môi trường cgo, vui lòng tham khảo các tài liệu tương ứng có sẵn trực tuyến.
command:
- windows
```bash
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
```
- macos
```bash
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
```
- linux
```bash
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
```
#### Mobile
Giống như trước đây, bạn cũng cần chuẩn bị môi trường `cgo` và sau đó cài đặt `gomobile`:
```bash
go install golang.org/x/mobile/cmd/gomobile@latest
go get golang.org/x/mobile/bind
gomobile init
```
command:
- android
```bash
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
cd ui/flutter
flutter build apk
```
- ios
```bash
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 ios --no-codesign
```
#### Web
command:
```bash
cd ui/flutter
flutter build web
cd ../../
rm -rf cmd/web/dist
cp -r ui/flutter/build/web cmd/web/dist
go build -tags nosqlite,web -ldflags="-s -w" -o bin/ github.com/GopeedLab/gopeed/cmd/web
```
## Tín dụng
### Người đóng góp
<a href="https://github.com/GopeedLab/gopeed/graphs/contributors">
<img src="https://contrib.rocks/image?repo=GopeedLab/gopeed" />
</a>
### JetBrains
[![goland](_docs/img/goland.svg)](https://www.jetbrains.com/?from=gopeed)
## Giấy phép
[GPLv3](LICENSE)
+13 -9
View File
@@ -9,7 +9,7 @@
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) [English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
## 介绍 ## 介绍
@@ -40,24 +40,24 @@ Gopeed(全称 Go Speed),直译过来中文名叫做`够快下载器`(不
<tr> <tr>
<td>MacOS</td> <td>MacOS</td>
<td><code>DMG Installer</code></td> <td><code>DMG Installer</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">前往</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">前往</a></td>
</tr> </tr>
<tr> <tr>
<td rowspan=4>Linux</td> <td rowspan=4>Linux</td>
<td><code>Flathub</code></td>
<td><a href="https://flathub.org/apps/com.gopeed.Gopeed">前往</a></td>
</tr>
<tr>
<td><code>SNAP</code></td> <td><code>SNAP</code></td>
<td><a href="https://snapcraft.io/gopeed">前往</a></td> <td><a href="https://snapcraft.io/gopeed">前往</a></td>
</tr> </tr>
<tr> <tr>
<td><code>DEB</code></td> <td><code>DEB</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux.deb">前往</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">前往</a></td>
</tr> </tr>
<tr> <tr>
<td><code>AppImage</code></td> <td><code>AppImage</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.AppImage">前往</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">前往</a></td>
</tr>
<tr>
<td><code>Portable TAR</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64-portable.tar.gz">前往</a></td>
</tr> </tr>
<tr> <tr>
<td>Android</td> <td>Android</td>
@@ -92,6 +92,10 @@ Gopeed(全称 Go Speed),直译过来中文名叫做`够快下载器`(不
go install github.com/GopeedLab/gopeed/cmd/gopeed@latest go install github.com/GopeedLab/gopeed/cmd/gopeed@latest
``` ```
## 浏览器扩展
Gopeed 还提供了浏览器扩展用于接管浏览器下载,支持 Chrome、Edge、Firefox 等浏览器,具体请参考:[https://github.com/GopeedLab/browser-extension](https://github.com/GopeedLab/browser-extension)
## 赞助 ## 赞助
如果觉得项目对你有帮助,请考虑[赞助](https://docs.gopeed.com/zh/donate)以支持这个项目的发展,非常感谢! 如果觉得项目对你有帮助,请考虑[赞助](https://docs.gopeed.com/zh/donate)以支持这个项目的发展,非常感谢!
@@ -168,7 +172,7 @@ gomobile init
- android - android
```bash ```bash
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
cd ui/flutter cd ui/flutter
flutter build apk flutter build apk
``` ```
+9 -9
View File
@@ -9,7 +9,7 @@
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R6IJGN6)
[English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) [English](/README.md) | [中文](/README_zh-CN.md) | [日本語](/README_ja-JP.md) | [正體中文](/README_zh-TW.md) | [Tiếng Việt](/README_vi-VN.md)
## 簡介 ## 簡介
@@ -40,24 +40,24 @@ Gopeed(全稱 Go Speed),是一款使用`Golang`+`Flutter`編寫的高速
<tr> <tr>
<td>MacOS</td> <td>MacOS</td>
<td><code>DMG Installer</code></td> <td><code>DMG Installer</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-windows-amd64-portable.zip">前往</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-macos.dmg">前往</a></td>
</tr> </tr>
<tr> <tr>
<td rowspan=4>Linux</td> <td rowspan=4>Linux</td>
<td><code>Flathub</code></td>
<td><a href="https://flathub.org/apps/com.gopeed.Gopeed">前往</a></td>
</tr>
<tr>
<td><code>SNAP</code></td> <td><code>SNAP</code></td>
<td><a href="https://snapcraft.io/gopeed">前往</a></td> <td><a href="https://snapcraft.io/gopeed">前往</a></td>
</tr> </tr>
<tr> <tr>
<td><code>DEB</code></td> <td><code>DEB</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux.deb">前往</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.deb">前往</a></td>
</tr> </tr>
<tr> <tr>
<td><code>AppImage</code></td> <td><code>AppImage</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64.AppImage">前往</a></td> <td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-x86_64.AppImage">前往</a></td>
</tr>
<tr>
<td><code>Portable TAR</code></td>
<td><a href="https://gopeed.com/api/download?tpl=Gopeed-$version-linux-amd64-portable.tar.gz">前往</a></td>
</tr> </tr>
<tr> <tr>
<td>Android</td> <td>Android</td>
@@ -168,7 +168,7 @@ gomobile init
- android - android
```bash ```bash
gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg=com.gopeed github.com/GopeedLab/gopeed/bind/mobile gomobile bind -tags nosqlite -ldflags="-w -s" -o ui/flutter/android/app/libs/libgopeed.aar -target=android -androidapi 19 -javapkg="com.gopeed" github.com/GopeedLab/gopeed/bind/mobile
cd ui/flutter cd ui/flutter
flutter build apk flutter build apk
``` ```
Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 309 KiB

+3
View File
@@ -65,6 +65,9 @@ var (
func printProgress(task *download.Task, title string) { func printProgress(task *download.Task, title string) {
var rate float64 var rate float64
if task.Meta.Res == nil {
task = emptyTask
}
if task.Meta.Res.Size <= 0 { if task.Meta.Res.Size <= 0 {
rate = 0 rate = 0
} else { } else {
+12 -5
View File
@@ -3,6 +3,7 @@ package cmd
import ( import (
_ "embed" _ "embed"
"fmt" "fmt"
"github.com/GopeedLab/gopeed/pkg/base"
"github.com/GopeedLab/gopeed/pkg/rest" "github.com/GopeedLab/gopeed/pkg/rest"
"github.com/GopeedLab/gopeed/pkg/rest/model" "github.com/GopeedLab/gopeed/pkg/rest/model"
"net/http" "net/http"
@@ -24,14 +25,20 @@ func Start(cfg *model.StartConfig) {
panic(err) panic(err)
} }
if downloadCfg.FirstLoad { if downloadCfg.FirstLoad {
// Set default download dir to user download dir // Set default download dir, in docker, it will be ${exe}/Downloads, else it will be ${user}/Downloads
userDir, err := os.UserHomeDir() var downloadDir string
if err == nil { if base.InDocker == "true" {
downloadDir := filepath.Join(userDir, "Downloads") downloadDir = filepath.Join(filepath.Dir(cfg.StorageDir), "Downloads")
} else {
userDir, err := os.UserHomeDir()
if err == nil {
downloadDir = filepath.Join(userDir, "Downloads")
}
}
if downloadDir != "" {
downloadCfg.DownloadDir = downloadDir downloadCfg.DownloadDir = downloadDir
rest.Downloader.PutConfig(downloadCfg) rest.Downloader.PutConfig(downloadCfg)
} }
} }
fmt.Printf("Server start success on http://%s\n", listener.Addr().String()) fmt.Printf("Server start success on http://%s\n", listener.Addr().String())
if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed { if err := srv.Serve(listener); err != nil && err != http.ErrServerClosed {
+10 -5
View File
@@ -9,11 +9,12 @@ import (
) )
type args struct { type args struct {
Address *string `json:"address"` Address *string `json:"address"`
Port *int `json:"port"` Port *int `json:"port"`
Username *string `json:"username"` Username *string `json:"username"`
Password *string `json:"password"` Password *string `json:"password"`
ApiToken *string `json:"apiToken"` ApiToken *string `json:"apiToken"`
StorageDir *string `json:"storageDir"`
configPath *string configPath *string
} }
@@ -25,6 +26,7 @@ func parse() *args {
cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username") cliArgs.Username = flag.String("u", "gopeed", "HTTP Basic Auth Username")
cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd") cliArgs.Password = flag.String("p", "", "HTTP Basic Auth Pwd")
cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.") cliArgs.ApiToken = flag.String("T", "", "API token, that can only be used when basic authentication is enabled.")
cliArgs.StorageDir = flag.String("d", "", "Storage directory")
cliArgs.configPath = flag.String("c", "./config.json", "Config file path") cliArgs.configPath = flag.String("c", "./config.json", "Config file path")
flag.Parse() flag.Parse()
@@ -45,6 +47,9 @@ func parse() *args {
if cfgArgs.ApiToken == nil { if cfgArgs.ApiToken == nil {
cfgArgs.ApiToken = cliArgs.ApiToken cfgArgs.ApiToken = cliArgs.ApiToken
} }
if cfgArgs.StorageDir == nil {
cfgArgs.StorageDir = cliArgs.StorageDir
}
return cfgArgs return cfgArgs
} }
+9 -4
View File
@@ -31,11 +31,16 @@ func main() {
} }
} }
exe, err := os.Executable() var dir string
if err != nil { if args.StorageDir != nil && *args.StorageDir != "" {
panic(err) dir = *args.StorageDir
} else {
exe, err := os.Executable()
if err != nil {
panic(err)
}
dir = filepath.Dir(exe)
} }
dir := filepath.Dir(exe)
cfg := &model.StartConfig{ cfg := &model.StartConfig{
Network: "tcp", Network: "tcp",
+7
View File
@@ -0,0 +1,7 @@
#!/bin/bash
chown -R ${PUID}:${PGID} /app
umask ${UMASK}
exec su-exec ${PUID}:${PGID} ./gopeed "$@"
+1
View File
@@ -69,6 +69,7 @@ require (
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/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-ieproxy v0.0.11 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mschoch/smat v0.2.0 // indirect github.com/mschoch/smat v0.2.0 // indirect
github.com/pion/datachannel v1.5.5 // indirect github.com/pion/datachannel v1.5.5 // indirect
+2
View File
@@ -270,6 +270,8 @@ github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-ieproxy v0.0.11 h1:MQ/5BuGSgDAHZOJe6YY80IF2UVCfGkwfo6AeD7HtHYo=
github.com/mattn/go-ieproxy v0.0.11/go.mod h1:/NsJd+kxZBmjMc5hrJCKMbP57B84rvq9BiDRbtO9AS0=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+3 -3
View File
@@ -1,14 +1,14 @@
package controller package controller
import ( import (
"net/url" "github.com/GopeedLab/gopeed/pkg/base"
"os" "os"
"path/filepath" "path/filepath"
) )
type Controller struct { type Controller struct {
GetConfig func(v any) bool GetConfig func(v any) bool
ProxyUrl *url.URL ProxyConfig *base.DownloaderProxyConfig
FileController FileController
//ContextDialer() (proxy.Dialer, error) //ContextDialer() (proxy.Dialer, error)
} }
+6 -4
View File
@@ -10,7 +10,6 @@ import (
"github.com/GopeedLab/gopeed/pkg/util" "github.com/GopeedLab/gopeed/pkg/util"
"github.com/anacrolix/torrent" "github.com/anacrolix/torrent"
"github.com/anacrolix/torrent/metainfo" "github.com/anacrolix/torrent/metainfo"
"net/http"
"path/filepath" "path/filepath"
"strings" "strings"
"sync" "sync"
@@ -33,6 +32,7 @@ type Fetcher struct {
meta *fetcher.FetcherMeta meta *fetcher.FetcherMeta
torrentReady atomic.Bool torrentReady atomic.Bool
torrentDrop atomic.Bool
create atomic.Bool create atomic.Bool
progress fetcher.Progress progress fetcher.Progress
} }
@@ -68,9 +68,7 @@ func (f *Fetcher) initClient() (err error) {
cfg.Bep20 = fmt.Sprintf("-GP%s-", parseBep20()) cfg.Bep20 = fmt.Sprintf("-GP%s-", parseBep20())
cfg.ExtendedHandshakeClientVersion = fmt.Sprintf("Gopeed %s", base.Version) cfg.ExtendedHandshakeClientVersion = fmt.Sprintf("Gopeed %s", base.Version)
cfg.ListenPort = f.config.ListenPort cfg.ListenPort = f.config.ListenPort
if f.ctl.ProxyUrl != nil { cfg.HTTPProxy = f.ctl.ProxyConfig.ToHandler()
cfg.HTTPProxy = http.ProxyURL(f.ctl.ProxyUrl)
}
cfg.DefaultStorage = newFileOpts(newFileClientOpts{ cfg.DefaultStorage = newFileOpts(newFileClientOpts{
ClientBaseDir: cfg.DataDir, ClientBaseDir: cfg.DataDir,
HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) { HandleFileTorrent: func(infoHash metainfo.Hash, ft *fileTorrentImpl) {
@@ -143,6 +141,7 @@ func (f *Fetcher) Pause() (err error) {
} }
func (f *Fetcher) Close() (err error) { func (f *Fetcher) Close() (err error) {
f.torrentDrop.Store(false)
f.safeDrop() f.safeDrop()
return nil return nil
} }
@@ -158,6 +157,9 @@ func (f *Fetcher) safeDrop() {
func (f *Fetcher) Wait() (err error) { func (f *Fetcher) Wait() (err error) {
for { for {
if f.torrentDrop.Load() {
break
}
if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 { if f.torrentReady.Load() && len(f.meta.Opts.SelectFiles) > 0 {
done := true done := true
for _, selectIndex := range f.meta.Opts.SelectFiles { for _, selectIndex := range f.meta.Opts.SelectFiles {
+10 -5
View File
@@ -8,8 +8,6 @@ import (
"github.com/GopeedLab/gopeed/internal/test" "github.com/GopeedLab/gopeed/internal/test"
"github.com/GopeedLab/gopeed/pkg/base" "github.com/GopeedLab/gopeed/pkg/base"
"github.com/GopeedLab/gopeed/pkg/protocol/bt" "github.com/GopeedLab/gopeed/pkg/protocol/bt"
"github.com/GopeedLab/gopeed/pkg/util"
"net/url"
"os" "os"
"reflect" "reflect"
"testing" "testing"
@@ -60,7 +58,14 @@ func TestFetcher_ResolveWithProxy(t *testing.T) {
proxyListener := test.StartSocks5Server(usr, pwd) proxyListener := test.StartSocks5Server(usr, pwd)
defer proxyListener.Close() defer proxyListener.Close()
doResolve(t, buildConfigFetcher(util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd))) doResolve(t, buildConfigFetcher(&base.DownloaderProxyConfig{
Enable: true,
System: false,
Scheme: "socks5",
Host: proxyListener.Addr().String(),
Usr: usr,
Pwd: pwd,
}))
} }
func doResolve(t *testing.T, fetcher fetcher.Fetcher) { func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
@@ -100,7 +105,7 @@ func buildFetcher() fetcher.Fetcher {
return fetcher return fetcher
} }
func buildConfigFetcher(proxyUrl *url.URL) fetcher.Fetcher { func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
fetcher := new(FetcherBuilder).Build() fetcher := new(FetcherBuilder).Build()
newController := controller.NewController() newController := controller.NewController()
mockCfg := config{ mockCfg := config{
@@ -114,7 +119,7 @@ func buildConfigFetcher(proxyUrl *url.URL) fetcher.Fetcher {
} }
return true return true
} }
newController.ProxyUrl = proxyUrl newController.ProxyConfig = proxyConfig
fetcher.Setup(newController) fetcher.Setup(newController)
return fetcher return fetcher
} }
+9 -9
View File
@@ -280,10 +280,6 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
chunk := f.chunks[index] chunk := f.chunks[index]
chunk.retryTimes = 0 chunk.retryTimes = 0
httpReq, err := f.buildRequest(ctx, f.meta.Req)
if err != nil {
return err
}
var ( var (
client = f.buildClient() client = f.buildClient()
buf = make([]byte, 8192) buf = make([]byte, 8192)
@@ -314,8 +310,13 @@ func (f *Fetcher) fetchChunk(index int, ctx context.Context) (err error) {
} }
var ( var (
resp *http.Response httpReq *http.Request
resp *http.Response
) )
httpReq, err = f.buildRequest(ctx, f.meta.Req)
if err != nil {
return
}
if f.meta.Res.Range { if f.meta.Res.Range {
httpReq.Header.Set(base.HttpHeaderRange, httpReq.Header.Set(base.HttpHeaderRange,
fmt.Sprintf(base.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End)) fmt.Sprintf(base.HttpHeaderRangeFormat, chunk.Begin+chunk.Downloaded, chunk.End))
@@ -450,12 +451,11 @@ 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.ProxyConfig.ToHandler(),
}
// Cookie handle // Cookie handle
jar, _ := cookiejar.New(nil) jar, _ := cookiejar.New(nil)
if f.ctl.ProxyUrl != nil {
transport.Proxy = http.ProxyURL(f.ctl.ProxyUrl)
}
return &http.Client{ return &http.Client{
Transport: transport, Transport: transport,
Jar: jar, Jar: jar,
+5 -2
View File
@@ -8,7 +8,6 @@ import (
"github.com/GopeedLab/gopeed/internal/test" "github.com/GopeedLab/gopeed/internal/test"
"github.com/GopeedLab/gopeed/pkg/base" "github.com/GopeedLab/gopeed/pkg/base"
"github.com/GopeedLab/gopeed/pkg/protocol/http" "github.com/GopeedLab/gopeed/pkg/protocol/http"
"github.com/GopeedLab/gopeed/pkg/util"
"net" "net"
"testing" "testing"
"time" "time"
@@ -338,7 +337,11 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) { func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t *testing.T) {
fetcher := downloadReady(httpListener, 4, t) fetcher := downloadReady(httpListener, 4, t)
ctl := controller.NewController() ctl := controller.NewController()
ctl.ProxyUrl = util.BuildProxyUrl("socks5", proxyListener.Addr().String(), "", "") ctl.ProxyConfig = &base.DownloaderProxyConfig{
Enable: true,
Scheme: "socks5",
Host: proxyListener.Addr().String(),
}
fetcher.Setup(ctl) fetcher.Setup(ctl)
err := fetcher.Start() err := fetcher.Start()
if err != nil { if err != nil {
+5
View File
@@ -24,6 +24,11 @@ const (
Dir = "./" Dir = "./"
BuildFile = Dir + BuildName BuildFile = Dir + BuildName
ExternalDownloadUrl = "https://raw.githubusercontent.com/GopeedLab/gopeed/v1.5.6/_docs/img/banner.png"
ExternalDownloadName = "banner.png"
ExternalDownloadSize = 26416
//ExternalDownloadMd5 = "c67c6e3cae79a95342485676571e8a5c"
DownloadName = "download.data" DownloadName = "download.data"
DownloadRename = "download (1).data" DownloadRename = "download (1).data"
DownloadFile = Dir + DownloadName DownloadFile = Dir + DownloadName
+1
View File
@@ -2,6 +2,7 @@ package base
// Version is the build version, set at build time, using `go build -ldflags "-X github.com/GopeedLab/gopeed/pkg/base.Version=1.0.0"`. // Version is the build version, set at build time, using `go build -ldflags "-X github.com/GopeedLab/gopeed/pkg/base.Version=1.0.0"`.
var Version string var Version string
var InDocker string
func init() { func init() {
if Version == "" { if Version == "" {
+88
View File
@@ -3,7 +3,10 @@ package base
import ( import (
"fmt" "fmt"
"github.com/GopeedLab/gopeed/pkg/util" "github.com/GopeedLab/gopeed/pkg/util"
"github.com/mattn/go-ieproxy"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"net/http"
"net/url"
"time" "time"
) )
@@ -128,3 +131,88 @@ func ParseOptsExtra[E any](opts *Options) error {
opts.Extra = &t opts.Extra = &t
return nil return nil
} }
// DownloaderStoreConfig is the config that can restore the downloader.
type DownloaderStoreConfig struct {
FirstLoad bool `json:"-"` // FirstLoad is the flag that the config is first time init and not from store
DownloadDir string `json:"downloadDir"` // DownloadDir is the default directory to save the downloaded files
MaxRunning int `json:"maxRunning"` // MaxRunning is the max running download count
ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
Extra map[string]any `json:"extra"`
Proxy *DownloaderProxyConfig `json:"proxy"`
}
func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
if cfg.MaxRunning == 0 {
cfg.MaxRunning = 5
}
if cfg.Proxy == nil {
cfg.Proxy = &DownloaderProxyConfig{}
}
return cfg
}
type DownloaderProxyConfig struct {
Enable bool `json:"enable"`
// System is the flag that use system proxy
System bool `json:"system"`
Scheme string `json:"scheme"`
Host string `json:"host"`
Usr string `json:"usr"`
Pwd string `json:"pwd"`
}
func (cfg *DownloaderProxyConfig) ToHandler() func(r *http.Request) (*url.URL, error) {
if cfg == nil || cfg.Enable == false {
return nil
}
if cfg.System {
ieproxy.ReloadConf()
return ieproxy.GetProxyFunc()
}
if cfg.Scheme == "" || cfg.Host == "" {
return nil
}
return http.ProxyURL(util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd))
}
// ToUrl returns the proxy url, just for git clone
func (cfg *DownloaderProxyConfig) ToUrl() *url.URL {
if cfg == nil || cfg.Enable == false {
return nil
}
if cfg.System {
ieproxy.ReloadConf()
static := ieproxy.GetConf().Static
if static.Active && len(static.Protocols) > 0 {
// If only one protocol, use it
if len(static.Protocols) == 1 {
for _, v := range static.Protocols {
return parseUrlSafe(v)
}
}
// Check https
if v, ok := static.Protocols["https"]; ok {
return parseUrlSafe(v)
}
// Check http
if v, ok := static.Protocols["http"]; ok {
return parseUrlSafe(v)
}
}
return nil
}
if cfg.Scheme == "" || cfg.Host == "" {
return nil
}
return util.BuildProxyUrl(cfg.Scheme, cfg.Host, cfg.Usr, cfg.Pwd)
}
func parseUrlSafe(rawUrl string) *url.URL {
u, err := url.Parse(rawUrl)
if err != nil {
return nil
}
return u
}
+90 -72
View File
@@ -110,7 +110,7 @@ func (d *Downloader) Setup() error {
return err return err
} }
// load config from storage // load config from storage
var cfg DownloaderStoreConfig var cfg base.DownloaderStoreConfig
exist, err := d.storage.Get(bucketConfig, "config", &cfg) exist, err := d.storage.Get(bucketConfig, "config", &cfg)
if err != nil { if err != nil {
return err return err
@@ -118,7 +118,7 @@ func (d *Downloader) Setup() error {
if exist { if exist {
d.cfg.DownloaderStoreConfig = &cfg d.cfg.DownloaderStoreConfig = &cfg
} else { } else {
d.cfg.DownloaderStoreConfig = &DownloaderStoreConfig{ d.cfg.DownloaderStoreConfig = &base.DownloaderStoreConfig{
FirstLoad: true, FirstLoad: true,
} }
} }
@@ -172,8 +172,8 @@ func (d *Downloader) Setup() error {
if len(d.tasks) > 0 { if len(d.tasks) > 0 {
for _, task := range d.tasks { for _, task := range d.tasks {
func() { func() {
task.lock.Lock() task.statusLock.Lock()
defer task.lock.Unlock() defer task.statusLock.Unlock()
if task.Status != base.DownloadStatusRunning { if task.Status != base.DownloadStatusRunning {
return return
} }
@@ -225,7 +225,7 @@ func (d *Downloader) setupFetcher(fetcher fetcher.Fetcher) {
ctl.GetConfig = func(v any) bool { ctl.GetConfig = func(v any) bool {
return d.getProtocolConfig(fetcher.Name(), v) return d.getProtocolConfig(fetcher.Name(), v)
} }
ctl.ProxyUrl = d.cfg.ProxyUrl() ctl.ProxyConfig = d.cfg.Proxy
fetcher.Setup(ctl) fetcher.Setup(ctl)
} }
@@ -302,9 +302,6 @@ func (d *Downloader) CreateDirect(req *base.Request, opts *base.Options) (taskId
} }
func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err error) { func (d *Downloader) Create(rrId string, opts *base.Options) (taskId string, err error) {
if opts == nil {
opts = &base.Options{}
}
d.fetcherMapLock.RLock() d.fetcherMapLock.RLock()
fetcher, ok := d.fetcherCache[rrId] fetcher, ok := d.fetcherCache[rrId]
d.fetcherMapLock.RUnlock() d.fetcherMapLock.RUnlock()
@@ -332,8 +329,7 @@ func (d *Downloader) Pause(id string) (err error) {
if task.Status == base.DownloadStatusPause { if task.Status == base.DownloadStatusPause {
return return
} }
err = d.doPause(task) if err = d.doPause(task); err != nil {
if err != nil {
return return
} }
d.notifyRunning() d.notifyRunning()
@@ -366,19 +362,7 @@ func (d *Downloader) Continue(id string) (err error) {
} }
}() }()
func() { return d.doStart(task)
task.lock.Lock()
defer task.lock.Unlock()
if task.Status == base.DownloadStatusRunning {
return
}
if err = d.doStart(task); err != nil {
return
}
}()
return
} }
func (d *Downloader) PauseAll() (err error) { func (d *Downloader) PauseAll() (err error) {
@@ -391,13 +375,7 @@ func (d *Downloader) PauseAll() (err error) {
}() }()
for _, task := range d.tasks { for _, task := range d.tasks {
err = func() error { if err = d.doPause(task); err != nil {
task.lock.Lock()
defer task.lock.Unlock()
return d.doPause(task)
}()
if err != nil {
return return
} }
} }
@@ -427,13 +405,7 @@ func (d *Downloader) ContinueAll() (err error) {
for _, task := range continuedTasks { for _, task := range continuedTasks {
tt := task tt := task
err = func() error { if err = d.doStart(tt); err != nil {
tt.lock.Lock()
defer tt.lock.Unlock()
return d.doStart(tt)
}()
if err != nil {
return return
} }
} }
@@ -525,17 +497,21 @@ 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 {
if task.fetcher != nil { d.lock.Lock()
if err := task.fetcher.Close(); err != nil { defer d.lock.Unlock()
return err
}
}
if err := d.storage.Delete(bucketTask, task.ID); err != nil { if err := d.storage.Delete(bucketTask, task.ID); err != nil {
return err return err
} }
if err := d.storage.Delete(bucketSave, task.ID); err != nil { if err := d.storage.Delete(bucketSave, task.ID); err != nil {
return err return err
} }
if task.fetcher != nil {
if err := task.fetcher.Close(); err != nil {
return err
}
}
if force && task.Meta.Res != nil { if force && task.Meta.Res != nil {
if task.Meta.Res.Name != "" { if task.Meta.Res.Name != "" {
if err := os.RemoveAll(task.Meta.FolderPath()); err != nil { if err := os.RemoveAll(task.Meta.FolderPath()); err != nil {
@@ -627,11 +603,11 @@ func (d *Downloader) GetTasksByStatues(statues []base.Status) []*Task {
return tasks return tasks
} }
func (d *Downloader) GetConfig() (*DownloaderStoreConfig, error) { func (d *Downloader) GetConfig() (*base.DownloaderStoreConfig, error) {
return d.cfg.DownloaderStoreConfig, nil return d.cfg.DownloaderStoreConfig, nil
} }
func (d *Downloader) PutConfig(v *DownloaderStoreConfig) error { func (d *Downloader) PutConfig(v *base.DownloaderStoreConfig) error {
d.cfg.DownloaderStoreConfig = v d.cfg.DownloaderStoreConfig = v
return d.storage.Put(bucketConfig, "config", v) return d.storage.Put(bucketConfig, "config", v)
} }
@@ -750,6 +726,9 @@ func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (task
if opts == nil { if opts == nil {
opts = &base.Options{} opts = &base.Options{}
} }
if opts.SelectFiles == nil {
opts.SelectFiles = make([]int, 0)
}
meta := fetcher.Meta() meta := fetcher.Meta()
meta.Opts = opts meta.Opts = opts
@@ -794,31 +773,52 @@ func (d *Downloader) doCreate(fetcher fetcher.Fetcher, opts *base.Options) (task
return return
} }
d.doStart(task) err = d.doStart(task)
}() }()
go d.watch(task) go d.watch(task)
return return
} }
func (d *Downloader) statusMut(task *Task, fn func() (bool, error)) (bool, error) {
task.statusLock.Lock()
defer task.statusLock.Unlock()
return fn()
}
func (d *Downloader) doStart(task *Task) (err error) { func (d *Downloader) doStart(task *Task) (err error) {
if task.Status != base.DownloadStatusRunning && task.Status != base.DownloadStatusDone { var isCreate bool
err := d.restoreFetcher(task) isReturn, err := d.statusMut(task, func() (isReturn bool, err error) {
if task.Status == base.DownloadStatusRunning || task.Status == base.DownloadStatusDone {
isReturn = true
return
}
err = d.restoreFetcher(task)
if err != nil { if err != nil {
d.Logger.Error().Stack().Err(err).Msgf("restore fetcher failed, task id: %s", task.ID) d.Logger.Error().Stack().Err(err).Msgf("restore fetcher failed, task id: %s", task.ID)
return err return
} }
} isCreate = task.Status == base.DownloadStatusReady
isCreate := task.Status == base.DownloadStatusReady
doStart := func() error {
task.lock.Lock()
defer task.lock.Unlock()
d.triggerOnStart(task) d.triggerOnStart(task)
task.updateStatus(base.DownloadStatusRunning) task.updateStatus(base.DownloadStatusRunning)
return
})
if err != nil {
d.Logger.Error().Stack().Err(err).Msgf("start task failed, task id: %s", task.ID)
return
}
if isReturn {
return
}
handler := func() error {
task.lock.Lock()
defer task.lock.Unlock()
if task.Meta.Res == nil { if task.Meta.Res == nil {
err := task.fetcher.Resolve(task.Meta.Req) err := task.fetcher.Resolve(task.Meta.Req)
if err != nil { if err != nil {
@@ -865,8 +865,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
return nil return nil
} }
go func() { go func() {
err := doStart() if err := handler(); err != nil {
if err != nil {
d.doOnError(task, err) d.doOnError(task, err)
} }
}() }()
@@ -875,27 +874,44 @@ func (d *Downloader) doStart(task *Task) (err error) {
} }
func (d *Downloader) doPause(task *Task) (err error) { func (d *Downloader) doPause(task *Task) (err error) {
err = func() error { isReturn, err := d.statusMut(task, func() (isReturn bool, err error) {
if task.Status != base.DownloadStatusDone { if task.Status == base.DownloadStatusPause || task.Status == base.DownloadStatusDone {
task.updateStatus(base.DownloadStatusPause) isReturn = true
task.timer.Pause() return
if task.fetcher != nil {
if err := task.fetcher.Pause(); err != nil {
return err
}
}
if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
return err
}
d.emit(EventKeyPause, task)
} }
return nil
}() task.updateStatus(base.DownloadStatusPause)
task.timer.Pause()
return
})
if err != nil { if err != nil {
d.Logger.Error().Stack().Err(err).Msgf("pause task failed, task id: %s", task.ID) d.Logger.Error().Stack().Err(err).Msgf("pause task failed, task id: %s", task.ID)
return return
} }
if isReturn {
return
}
handler := func() error {
task.lock.Lock()
defer task.lock.Unlock()
if task.fetcher != nil {
if err := task.fetcher.Pause(); err != nil {
return err
}
}
if err := d.storage.Put(bucketTask, task.ID, task.clone()); err != nil {
return err
}
d.emit(EventKeyPause, task)
return nil
}
go func() {
if err := handler(); err != nil {
d.Logger.Error().Stack().Err(err).Msgf("pause task handle failed, task id: %s", task.ID)
}
}()
return return
} }
@@ -923,6 +939,8 @@ func (d *Downloader) buildFetcher(url string) (fetcher.Fetcher, error) {
func initTask(task *Task) { func initTask(task *Task) {
task.timer = util.NewTimer(task.Progress.Used) task.timer = util.NewTimer(task.Progress.Used)
task.statusLock = &sync.Mutex{}
task.lock = &sync.Mutex{} task.lock = &sync.Mutex{}
task.speedArr = make([]int64, 0) task.speedArr = make([]int64, 0)
} }
+47 -21
View File
@@ -4,6 +4,7 @@ import (
"github.com/GopeedLab/gopeed/internal/test" "github.com/GopeedLab/gopeed/internal/test"
"github.com/GopeedLab/gopeed/pkg/base" "github.com/GopeedLab/gopeed/pkg/base"
"github.com/GopeedLab/gopeed/pkg/protocol/http" "github.com/GopeedLab/gopeed/pkg/protocol/http"
"os"
"sync" "sync"
"testing" "testing"
"time" "time"
@@ -85,37 +86,58 @@ func TestDownloader_Create(t *testing.T) {
func TestDownloader_CreateWithProxy(t *testing.T) { func TestDownloader_CreateWithProxy(t *testing.T) {
// No proxy // No proxy
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig { doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
return nil return nil
}) }, nil)
// Disable proxy // Disable proxy
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig { doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
proxyCfg.Enable = false proxyCfg.Enable = false
return proxyCfg return proxyCfg
}, nil)
// Enable system proxy but not set proxy environment variable
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
proxyCfg.System = true
return proxyCfg
}, nil)
// Enable proxy but error proxy environment variable
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
os.Setenv("HTTP_PROXY", "http://127.0.0.1:1234")
os.Setenv("HTTPS_PROXY", "http://127.0.0.1:1234")
proxyCfg.System = true
return proxyCfg
}, func(err error) {
if err == nil {
t.Fatal("doTestDownloaderCreateWithProxy() got = nil, want error")
}
}) })
// Enable system proxy and set proxy environment variable
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
os.Setenv("HTTP_PROXY", proxyCfg.ToUrl().String())
os.Setenv("HTTPS_PROXY", proxyCfg.ToUrl().String())
proxyCfg.System = true
return proxyCfg
}, nil)
// Invalid proxy scheme // Invalid proxy scheme
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig { doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
proxyCfg.Scheme = "" proxyCfg.Scheme = ""
return proxyCfg return proxyCfg
}) }, nil)
// Invalid proxy host // Invalid proxy host
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig { doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
proxyCfg.Host = "" proxyCfg.Host = ""
return proxyCfg return proxyCfg
}) }, nil)
// Use proxy without auth // Use proxy without auth
doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig { doTestDownloaderCreateWithProxy(t, false, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
return proxyCfg return proxyCfg
}) }, nil)
// Use proxy with auth // Use proxy with auth
doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig { doTestDownloaderCreateWithProxy(t, true, func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig {
return proxyCfg return proxyCfg
}) }, nil)
} }
func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig func(proxyCfg *DownloaderProxyConfig) *DownloaderProxyConfig) { func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig, errHandler func(err error)) {
httpListener := test.StartTestFileServer()
defer httpListener.Close()
usr, pwd := "", "" usr, pwd := "", ""
if auth { if auth {
usr, pwd = "admin", "123" usr, pwd = "admin", "123"
@@ -128,7 +150,7 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig f
t.Fatal(err) t.Fatal(err)
} }
defer downloader.Clear() defer downloader.Clear()
downloader.cfg.DownloaderStoreConfig.Proxy = buildProxyConfig(&DownloaderProxyConfig{ downloader.cfg.DownloaderStoreConfig.Proxy = buildProxyConfig(&base.DownloaderProxyConfig{
Enable: true, Enable: true,
Scheme: "socks5", Scheme: "socks5",
Host: proxyListener.Addr().String(), Host: proxyListener.Addr().String(),
@@ -137,20 +159,24 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildProxyConfig f
}) })
req := &base.Request{ req := &base.Request{
URL: "http://" + httpListener.Addr().String() + "/" + test.BuildName, URL: test.ExternalDownloadUrl,
} }
rr, err := downloader.Resolve(req) rr, err := downloader.Resolve(req)
if err != nil { if err != nil {
t.Fatal(err) if errHandler == nil {
t.Fatal(err)
}
errHandler(err)
return
} }
want := &base.Resource{ want := &base.Resource{
Size: test.BuildSize, Size: test.ExternalDownloadSize,
Range: true, Range: true,
Files: []*base.FileInfo{ Files: []*base.FileInfo{
{ {
Name: test.BuildName, Name: test.ExternalDownloadName,
Path: "", Path: "",
Size: test.BuildSize, Size: test.ExternalDownloadSize,
}, },
}, },
} }
@@ -285,7 +311,7 @@ func TestDownloader_Protocol_Config(t *testing.T) {
t.Errorf("getProtocolConfig() got = %v, want %v", exits, false) t.Errorf("getProtocolConfig() got = %v, want %v", exits, false)
} }
storeCfg := &DownloaderStoreConfig{ storeCfg := &base.DownloaderStoreConfig{
DownloadDir: "./downloads", DownloadDir: "./downloads",
ProtocolConfig: map[string]any{ ProtocolConfig: map[string]any{
"http": map[string]any{ "http": map[string]any{
+3 -3
View File
@@ -3,6 +3,7 @@ package engine
import ( import (
_ "embed" _ "embed"
"errors" "errors"
"github.com/GopeedLab/gopeed/pkg/base"
gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error" gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file" "github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata" "github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
@@ -11,7 +12,6 @@ import (
"github.com/dop251/goja" "github.com/dop251/goja"
"github.com/dop251/goja_nodejs/eventloop" "github.com/dop251/goja_nodejs/eventloop"
gojaurl "github.com/dop251/goja_nodejs/url" gojaurl "github.com/dop251/goja_nodejs/url"
"net/url"
"time" "time"
) )
@@ -110,7 +110,7 @@ func (e *Engine) Close() {
} }
type Config struct { type Config struct {
ProxyURL *url.URL ProxyConfig *base.DownloaderProxyConfig
} }
func NewEngine(cfg *Config) *Engine { func NewEngine(cfg *Config) *Engine {
@@ -135,7 +135,7 @@ func NewEngine(cfg *Config) *Engine {
if err := formdata.Enable(runtime); err != nil { if err := formdata.Enable(runtime); err != nil {
return return
} }
if err := xhr.Enable(runtime, cfg.ProxyURL); err != nil { if err := xhr.Enable(runtime, cfg.ProxyConfig.ToHandler()); err != nil {
return return
} }
if _, err := runtime.RunString(polyfillScript); err != nil { if _, err := runtime.RunString(polyfillScript); err != nil {
+11 -3
View File
@@ -7,10 +7,10 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/GopeedLab/gopeed/internal/test" "github.com/GopeedLab/gopeed/internal/test"
"github.com/GopeedLab/gopeed/pkg/base"
gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error" gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file" "github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util" gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
"github.com/GopeedLab/gopeed/pkg/util"
"github.com/dop251/goja" "github.com/dop251/goja"
"io" "io"
"net" "net"
@@ -217,8 +217,16 @@ func doTestFetchWithProxy(t *testing.T, usr, pwd string) {
proxyListener := test.StartSocks5Server(usr, pwd) proxyListener := test.StartSocks5Server(usr, pwd)
defer proxyListener.Close() defer proxyListener.Close()
engine := NewEngine(&Config{
engine := NewEngine(&Config{ProxyURL: util.BuildProxyUrl("socks5", proxyListener.Addr().String(), usr, pwd)}) ProxyConfig: &base.DownloaderProxyConfig{
Enable: true,
System: false,
Scheme: "socks5",
Host: proxyListener.Addr().String(),
Usr: usr,
Pwd: pwd,
},
})
if _, err := engine.RunString(fmt.Sprintf("var host = 'http://%s';", httpListener.Addr().String())); err != nil { if _, err := engine.RunString(fmt.Sprintf("var host = 'http://%s';", httpListener.Addr().String())); err != nil {
t.Fatal(err) t.Fatal(err)
+8 -7
View File
@@ -2,6 +2,7 @@ package xhr
import ( import (
"bytes" "bytes"
"errors"
"github.com/GopeedLab/gopeed/pkg/download/engine/inject/file" "github.com/GopeedLab/gopeed/pkg/download/engine/inject/file"
"github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata" "github.com/GopeedLab/gopeed/pkg/download/engine/inject/formdata"
"github.com/GopeedLab/gopeed/pkg/download/engine/util" "github.com/GopeedLab/gopeed/pkg/download/engine/util"
@@ -120,7 +121,7 @@ type XMLHttpRequest struct {
requestHeaders map[string]string requestHeaders map[string]string
responseHeaders map[string]string responseHeaders map[string]string
aborted bool aborted bool
proxyUrl *url.URL proxyHandler func(r *http.Request) (*url.URL, error)
Upload *XMLHttpRequestUpload `json:"upload"` Upload *XMLHttpRequestUpload `json:"upload"`
Timeout int `json:"timeout"` Timeout int `json:"timeout"`
@@ -202,9 +203,8 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
for k, v := range xhr.requestHeaders { for k, v := range xhr.requestHeaders {
req.Header.Set(k, v) req.Header.Set(k, v)
} }
transport := &http.Transport{} transport := &http.Transport{
if xhr.proxyUrl != nil { Proxy: xhr.proxyHandler,
transport.Proxy = http.ProxyURL(xhr.proxyUrl)
} }
client := &http.Client{ client := &http.Client{
Transport: transport, Transport: transport,
@@ -213,7 +213,8 @@ func (xhr *XMLHttpRequest) Send(data goja.Value) {
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
// handle timeout error // handle timeout error
if err, ok := err.(net.Error); ok && err.Timeout() { var ne net.Error
if errors.As(err, &ne) && ne.Timeout() {
if xhr.Timeout > 0 { if xhr.Timeout > 0 {
xhr.Upload.callOntimeout() xhr.Upload.callOntimeout()
xhr.callOntimeout() xhr.callOntimeout()
@@ -313,7 +314,7 @@ func (xhr *XMLHttpRequest) parseData(data goja.Value) any {
return data.String() return data.String()
} }
func Enable(runtime *goja.Runtime, proxyUrl *url.URL) error { func Enable(runtime *goja.Runtime, proxyHandler func(r *http.Request) (*url.URL, error)) error {
progressEvent := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object { progressEvent := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
if len(call.Arguments) < 1 { if len(call.Arguments) < 1 {
util.ThrowTypeError(runtime, "Failed to construct 'ProgressEvent': 1 argument required, but only 0 present.") util.ThrowTypeError(runtime, "Failed to construct 'ProgressEvent': 1 argument required, but only 0 present.")
@@ -327,7 +328,7 @@ func Enable(runtime *goja.Runtime, proxyUrl *url.URL) error {
}) })
xhr := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object { xhr := runtime.ToValue(func(call goja.ConstructorCall) *goja.Object {
instance := &XMLHttpRequest{ instance := &XMLHttpRequest{
proxyUrl: proxyUrl, proxyHandler: proxyHandler,
Upload: &XMLHttpRequestUpload{ Upload: &XMLHttpRequestUpload{
EventProp: &EventProp{ EventProp: &EventProp{
eventListeners: make(map[string]func(event *ProgressEvent)), eventListeners: make(map[string]func(event *ProgressEvent)),
+2 -2
View File
@@ -199,7 +199,7 @@ func (d *Downloader) fetchExtensionByGit(url string, handler func(tempExtPath st
return nil, err return nil, err
} }
proxyOptions := transport.ProxyOptions{} proxyOptions := transport.ProxyOptions{}
proxyUrl := d.cfg.ProxyUrl() proxyUrl := d.cfg.DownloaderStoreConfig.Proxy.ToUrl()
if proxyUrl != nil { if proxyUrl != nil {
proxyOptions.URL = proxyUrl.Scheme + "://" + proxyUrl.Host proxyOptions.URL = proxyUrl.Scheme + "://" + proxyUrl.Host
proxyOptions.Username = proxyUrl.User.Username() proxyOptions.Username = proxyUrl.User.Username()
@@ -341,7 +341,7 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
req.Labels = make(map[string]string) req.Labels = make(map[string]string)
} }
engine := engine.NewEngine(&engine.Config{ engine := engine.NewEngine(&engine.Config{
ProxyURL: d.cfg.ProxyUrl(), ProxyConfig: d.cfg.Proxy,
}) })
defer engine.Close() defer engine.Close()
err = engine.Runtime.Set("gopeed", gopeed) err = engine.Runtime.Set("gopeed", gopeed)
+2 -42
View File
@@ -7,9 +7,7 @@ import (
"github.com/GopeedLab/gopeed/internal/protocol/http" "github.com/GopeedLab/gopeed/internal/protocol/http"
"github.com/GopeedLab/gopeed/pkg/base" "github.com/GopeedLab/gopeed/pkg/base"
"github.com/GopeedLab/gopeed/pkg/util" "github.com/GopeedLab/gopeed/pkg/util"
gonanoid "github.com/matoous/go-nanoid/v2" gonanoid "github.com/matoous/go-nanoid/v2"
"net/url"
"sync" "sync"
"time" "time"
) )
@@ -31,6 +29,7 @@ type Task struct {
fetcherBuilder fetcher.FetcherBuilder fetcherBuilder fetcher.FetcherBuilder
fetcher fetcher.Fetcher fetcher fetcher.Fetcher
timer *util.Timer timer *util.Timer
statusLock *sync.Mutex
lock *sync.Mutex lock *sync.Mutex
speedArr []int64 speedArr []int64
} }
@@ -86,7 +85,7 @@ type DownloaderConfig struct {
ProductionMode bool ProductionMode bool
*DownloaderStoreConfig *base.DownloaderStoreConfig
} }
func (cfg *DownloaderConfig) Init() *DownloaderConfig { func (cfg *DownloaderConfig) Init() *DownloaderConfig {
@@ -107,42 +106,3 @@ func (cfg *DownloaderConfig) Init() *DownloaderConfig {
} }
return cfg return cfg
} }
// DownloaderStoreConfig is the config that can restore the downloader.
type DownloaderStoreConfig struct {
FirstLoad bool `json:"-"` // FirstLoad is the flag that the config is first time init and not from store
DownloadDir string `json:"downloadDir"` // DownloadDir is the default directory to save the downloaded files
MaxRunning int `json:"maxRunning"` // MaxRunning is the max running download count
ProtocolConfig map[string]any `json:"protocolConfig"` // ProtocolConfig is special config for each protocol
Extra map[string]any `json:"extra"`
Proxy *DownloaderProxyConfig `json:"proxy"`
}
func (cfg *DownloaderStoreConfig) Init() *DownloaderStoreConfig {
if cfg.MaxRunning == 0 {
cfg.MaxRunning = 5
}
if cfg.Proxy == nil {
cfg.Proxy = &DownloaderProxyConfig{}
}
return cfg
}
func (cfg *DownloaderStoreConfig) ProxyUrl() *url.URL {
if cfg.Proxy == nil {
return nil
}
if cfg.Proxy.Enable == false || cfg.Proxy.Scheme == "" || cfg.Proxy.Host == "" {
return nil
}
return util.BuildProxyUrl(cfg.Proxy.Scheme, cfg.Proxy.Host, cfg.Proxy.Usr, cfg.Proxy.Pwd)
}
type DownloaderProxyConfig struct {
Enable bool `json:"enable"`
Scheme string `json:"scheme"`
Host string `json:"host"`
Usr string `json:"usr"`
Pwd string `json:"pwd"`
}
+2 -2
View File
@@ -142,7 +142,7 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
} }
func PutConfig(w http.ResponseWriter, r *http.Request) { func PutConfig(w http.ResponseWriter, r *http.Request) {
var cfg download.DownloaderStoreConfig var cfg base.DownloaderStoreConfig
if ReadJson(r, w, &cfg) { if ReadJson(r, w, &cfg) {
if err := Downloader.PutConfig(&cfg); err != nil { if err := Downloader.PutConfig(&cfg); err != nil {
WriteJson(w, model.NewErrorResult(err.Error())) WriteJson(w, model.NewErrorResult(err.Error()))
@@ -309,7 +309,7 @@ func writeError(w http.ResponseWriter, msg string) {
w.Write([]byte(msg)) w.Write([]byte(msg))
} }
func getServerConfig() *download.DownloaderStoreConfig { func getServerConfig() *base.DownloaderStoreConfig {
cfg, _ := Downloader.GetConfig() cfg, _ := Downloader.GetConfig()
return cfg return cfg
} }
+2 -2
View File
@@ -324,7 +324,7 @@ func TestGetTasks(t *testing.T) {
func TestGetAndPutConfig(t *testing.T) { func TestGetAndPutConfig(t *testing.T) {
doTest(func() { doTest(func() {
cfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil) cfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
cfg.DownloadDir = "./download" cfg.DownloadDir = "./download"
cfg.Extra = map[string]any{ cfg.Extra = map[string]any{
"serverConfig": &Config{ "serverConfig": &Config{
@@ -335,7 +335,7 @@ func TestGetAndPutConfig(t *testing.T) {
} }
httpRequestCheckOk[any](http.MethodPut, "/api/v1/config", cfg) httpRequestCheckOk[any](http.MethodPut, "/api/v1/config", cfg)
newCfg := httpRequestCheckOk[*download.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil) newCfg := httpRequestCheckOk[*base.DownloaderStoreConfig](http.MethodGet, "/api/v1/config", nil)
if !test.JsonEqual(cfg, newCfg) { if !test.JsonEqual(cfg, newCfg) {
t.Errorf("GetAndPutConfig() got = %v, want %v", test.ToJson(newCfg), test.ToJson(cfg)) t.Errorf("GetAndPutConfig() got = %v, want %v", test.ToJson(newCfg), test.ToJson(cfg))
} }
+12
View File
@@ -2,6 +2,7 @@ package util
import ( import (
"encoding/base64" "encoding/base64"
"net/http"
"net/url" "net/url"
"regexp" "regexp"
"strings" "strings"
@@ -51,3 +52,14 @@ func BuildProxyUrl(scheme, host, usr, pwd string) *url.URL {
Host: host, Host: host,
} }
} }
// ProxyUrlToHandler gets the proxy handler from the proxy url.
func ProxyUrlToHandler(proxyUrl *url.URL) func(*http.Request) (*url.URL, error) {
if proxyUrl == nil {
return nil
}
if proxyUrl.Scheme == "system" {
return http.ProxyFromEnvironment
}
return http.ProxyURL(proxyUrl)
}
@@ -2,6 +2,7 @@
package="com.gopeed"> package="com.gopeed">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<application <application
android:name="${applicationName}" android:name="${applicationName}"
@@ -71,6 +72,13 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="*/*" />
</intent-filter>
</activity> </activity>
<!-- Add android:stopWithTask option only when necessary. --> <!-- Add android:stopWithTask option only when necessary. -->
Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 890 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

@@ -78,6 +78,7 @@ class ExtraConfig {
@JsonSerializable() @JsonSerializable()
class ProxyConfig { class ProxyConfig {
bool enable; bool enable;
bool system;
String scheme; String scheme;
String host; String host;
String usr; String usr;
@@ -85,6 +86,7 @@ class ProxyConfig {
ProxyConfig({ ProxyConfig({
this.enable = false, this.enable = false,
this.system = false,
this.scheme = '', this.scheme = '',
this.host = '', this.host = '',
this.usr = '', this.usr = '',
@@ -9,7 +9,7 @@ part of 'downloader_config.dart';
DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) => DownloaderConfig _$DownloaderConfigFromJson(Map<String, dynamic> json) =>
DownloaderConfig( DownloaderConfig(
downloadDir: json['downloadDir'] as String? ?? '', downloadDir: json['downloadDir'] as String? ?? '',
maxRunning: json['maxRunning'] as int? ?? 0, maxRunning: (json['maxRunning'] as num?)?.toInt() ?? 0,
) )
..protocolConfig = ProtocolConfig.fromJson( ..protocolConfig = ProtocolConfig.fromJson(
json['protocolConfig'] as Map<String, dynamic>?) json['protocolConfig'] as Map<String, dynamic>?)
@@ -39,7 +39,7 @@ Map<String, dynamic> _$ProtocolConfigToJson(ProtocolConfig instance) =>
HttpConfig _$HttpConfigFromJson(Map<String, dynamic> json) => HttpConfig( HttpConfig _$HttpConfigFromJson(Map<String, dynamic> json) => HttpConfig(
userAgent: json['userAgent'] as String? ?? userAgent: json['userAgent'] as String? ??
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36',
connections: json['connections'] as int? ?? 16, connections: (json['connections'] as num?)?.toInt() ?? 16,
useServerCtime: json['useServerCtime'] as bool? ?? false, useServerCtime: json['useServerCtime'] as bool? ?? false,
); );
@@ -51,7 +51,7 @@ Map<String, dynamic> _$HttpConfigToJson(HttpConfig instance) =>
}; };
BtConfig _$BtConfigFromJson(Map<String, dynamic> json) => BtConfig() BtConfig _$BtConfigFromJson(Map<String, dynamic> json) => BtConfig()
..listenPort = json['listenPort'] as int ..listenPort = (json['listenPort'] as num).toInt()
..trackers = ..trackers =
(json['trackers'] as List<dynamic>).map((e) => e as String).toList(); (json['trackers'] as List<dynamic>).map((e) => e as String).toList();
@@ -74,6 +74,7 @@ Map<String, dynamic> _$ExtraConfigToJson(ExtraConfig instance) =>
ProxyConfig _$ProxyConfigFromJson(Map<String, dynamic> json) => ProxyConfig( ProxyConfig _$ProxyConfigFromJson(Map<String, dynamic> json) => ProxyConfig(
enable: json['enable'] as bool? ?? false, enable: json['enable'] as bool? ?? false,
system: json['system'] as bool? ?? false,
scheme: json['scheme'] as String? ?? '', scheme: json['scheme'] as String? ?? '',
host: json['host'] as String? ?? '', host: json['host'] as String? ?? '',
usr: json['usr'] as String? ?? '', usr: json['usr'] as String? ?? '',
@@ -83,6 +84,7 @@ ProxyConfig _$ProxyConfigFromJson(Map<String, dynamic> json) => ProxyConfig(
Map<String, dynamic> _$ProxyConfigToJson(ProxyConfig instance) => Map<String, dynamic> _$ProxyConfigToJson(ProxyConfig instance) =>
<String, dynamic>{ <String, dynamic>{
'enable': instance.enable, 'enable': instance.enable,
'system': instance.system,
'scheme': instance.scheme, 'scheme': instance.scheme,
'host': instance.host, 'host': instance.host,
'usr': instance.usr, 'usr': instance.usr,
+1 -1
View File
@@ -12,7 +12,7 @@ class Options {
Options({ Options({
required this.name, required this.name,
required this.path, required this.path,
required this.selectFiles, this.selectFiles = const [],
this.extra, this.extra,
}); });
+5 -3
View File
@@ -9,8 +9,10 @@ part of 'options.dart';
Options _$OptionsFromJson(Map<String, dynamic> json) => Options( Options _$OptionsFromJson(Map<String, dynamic> json) => Options(
name: json['name'] as String, name: json['name'] as String,
path: json['path'] as String, path: json['path'] as String,
selectFiles: selectFiles: (json['selectFiles'] as List<dynamic>?)
(json['selectFiles'] as List<dynamic>).map((e) => e as int).toList(), ?.map((e) => (e as num).toInt())
.toList() ??
const [],
extra: json['extra'], extra: json['extra'],
); );
@@ -33,7 +35,7 @@ Map<String, dynamic> _$OptionsToJson(Options instance) {
OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) => OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) =>
OptsExtraHttp() OptsExtraHttp()
..connections = json['connections'] as int ..connections = (json['connections'] as num).toInt()
..autoTorrent = json['autoTorrent'] as bool; ..autoTorrent = json['autoTorrent'] as bool;
Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) => Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
+2 -2
View File
@@ -8,7 +8,7 @@ part of 'resource.dart';
Resource _$ResourceFromJson(Map<String, dynamic> json) => Resource( Resource _$ResourceFromJson(Map<String, dynamic> json) => Resource(
name: json['name'] as String? ?? "", name: json['name'] as String? ?? "",
size: json['size'] as int? ?? 0, size: (json['size'] as num?)?.toInt() ?? 0,
range: json['range'] as bool? ?? false, range: json['range'] as bool? ?? false,
files: (json['files'] as List<dynamic>) files: (json['files'] as List<dynamic>)
.map((e) => FileInfo.fromJson(e as Map<String, dynamic>)) .map((e) => FileInfo.fromJson(e as Map<String, dynamic>))
@@ -27,7 +27,7 @@ Map<String, dynamic> _$ResourceToJson(Resource instance) => <String, dynamic>{
FileInfo _$FileInfoFromJson(Map<String, dynamic> json) => FileInfo( FileInfo _$FileInfoFromJson(Map<String, dynamic> json) => FileInfo(
path: json['path'] as String? ?? "", path: json['path'] as String? ?? "",
name: json['name'] as String, name: json['name'] as String,
size: json['size'] as int? ?? 0, size: (json['size'] as num?)?.toInt() ?? 0,
req: json['req'] == null req: json['req'] == null
? null ? null
: Request.fromJson(json['req'] as Map<String, dynamic>), : Request.fromJson(json['req'] as Map<String, dynamic>),
+1 -1
View File
@@ -11,7 +11,7 @@ Result<T> _$ResultFromJson<T>(
T Function(Object? json) fromJsonT, T Function(Object? json) fromJsonT,
) => ) =>
Result<T>( Result<T>(
code: json['code'] as int, code: (json['code'] as num).toInt(),
msg: json['msg'] as String?, msg: json['msg'] as String?,
data: _$nullableGenericFromJson(json['data'], fromJsonT), data: _$nullableGenericFromJson(json['data'], fromJsonT),
); );
+3 -3
View File
@@ -34,9 +34,9 @@ const _$StatusEnumMap = {
}; };
Progress _$ProgressFromJson(Map<String, dynamic> json) => Progress( Progress _$ProgressFromJson(Map<String, dynamic> json) => Progress(
used: json['used'] as int, used: (json['used'] as num).toInt(),
speed: json['speed'] as int, speed: (json['speed'] as num).toInt(),
downloaded: json['downloaded'] as int, downloaded: (json['downloaded'] as num).toInt(),
); );
Map<String, dynamic> _$ProgressToJson(Progress instance) => <String, dynamic>{ Map<String, dynamic> _$ProgressToJson(Progress instance) => <String, dynamic>{
@@ -274,7 +274,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
} }
Future<void> _toCreate(Uri uri) async { Future<void> _toCreate(Uri uri) async {
final path = uri.scheme == "magnet" final path = (uri.scheme == "magnet" || uri.scheme == "http" || uri.scheme == "https")
? uri.toString() ? uri.toString()
: (await toFile(uri.toString())).path; : (await toFile(uri.toString())).path;
await Get.rootDelegate.offAndToNamed(Routes.CREATE, arguments: path); await Get.rootDelegate.offAndToNamed(Routes.CREATE, arguments: path);
@@ -5,7 +5,7 @@ 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:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:rounded_loading_button/rounded_loading_button.dart'; import 'package:rounded_loading_button_plus/rounded_loading_button.dart';
import '../../../../api/api.dart'; import '../../../../api/api.dart';
import '../../../../api/model/create_task.dart'; import '../../../../api/model/create_task.dart';
@@ -7,21 +7,21 @@ import 'package:flutter/services.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:gopeed/app/views/text_button_loading.dart';
import '../../../../api/model/update_extension_settings.dart';
import '../../../../util/mac_secure_util.dart';
import '../../../../util/message.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:rounded_loading_button/rounded_loading_button.dart'; import 'package:rounded_loading_button_plus/rounded_loading_button.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../../../api/api.dart'; import '../../../../api/api.dart';
import '../../../../api/model/extension.dart'; import '../../../../api/model/extension.dart';
import '../../../../api/model/install_extension.dart'; import '../../../../api/model/install_extension.dart';
import '../../../../api/model/switch_extension.dart'; import '../../../../api/model/switch_extension.dart';
import '../../../../api/model/update_extension_settings.dart';
import '../../../../util/mac_secure_util.dart';
import '../../../../util/message.dart';
import '../../../../util/util.dart'; import '../../../../util/util.dart';
import '../../../views/icon_button_loading.dart'; import '../../../views/icon_button_loading.dart';
import '../../../views/responsive_builder.dart'; import '../../../views/responsive_builder.dart';
import '../../../views/text_button_loading.dart';
import '../controllers/extension_controller.dart'; import '../controllers/extension_controller.dart';
class ExtensionView extends GetView<ExtensionController> { class ExtensionView extends GetView<ExtensionController> {
@@ -7,6 +7,7 @@ import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../../../api/model/downloader_config.dart';
import '../../../../i18n/message.dart'; import '../../../../i18n/message.dart';
import '../../../../util/input_formatter.dart'; import '../../../../util/input_formatter.dart';
import '../../../../util/locale_manager.dart'; import '../../../../util/locale_manager.dart';
@@ -15,6 +16,7 @@ import '../../../../util/package_info.dart';
import '../../../../util/util.dart'; import '../../../../util/util.dart';
import '../../../views/check_list_view.dart'; import '../../../views/check_list_view.dart';
import '../../../views/directory_selector.dart'; import '../../../views/directory_selector.dart';
import '../../../views/open_in_new.dart';
import '../../../views/outlined_button_loading.dart'; import '../../../views/outlined_button_loading.dart';
import '../../app/controllers/app_controller.dart'; import '../../app/controllers/app_controller.dart';
import '../controllers/setting_controller.dart'; import '../controllers/setting_controller.dart';
@@ -93,6 +95,15 @@ class SettingView extends GetView<SettingController> {
], ],
); );
}); });
buildBrowserExtension() {
return ListTile(
title: Text('browserExtension'.tr),
subtitle: const OpenInNew(
text: "Chrome",
url:
"https://chromewebstore.google.com/detail/gopeed/mijpgljlfcapndmchhjffkpckknofcnd",
));
}
// http config items start // http config items start
final httpConfig = downloaderCfg.value.protocolConfig.http; final httpConfig = downloaderCfg.value.protocolConfig.http;
@@ -398,29 +409,53 @@ class SettingView extends GetView<SettingController> {
} }
// advanced config proxy items start // advanced config proxy items start
final proxy = downloaderCfg.value.proxy;
final buildProxy = _buildConfigItem( final buildProxy = _buildConfigItem(
'proxy', 'proxy',
() => downloaderCfg.value.proxy.enable () {
? '${downloaderCfg.value.proxy.scheme}://${downloaderCfg.value.proxy.host}' switch (proxy.proxyMode) {
: 'notSet'.tr, case ProxyModeEnum.noProxy:
return 'noProxy'.tr;
case ProxyModeEnum.systemProxy:
return 'systemProxy'.tr;
case ProxyModeEnum.customProxy:
return '${downloaderCfg.value.proxy.scheme}://${downloaderCfg.value.proxy.host}';
}
},
(Key key) { (Key key) {
final proxy = downloaderCfg.value.proxy; final mode = SizedBox(
width: 150,
child: DropdownButtonFormField<ProxyModeEnum>(
value: proxy.proxyMode,
onChanged: (value) async {
if (value != null && value != proxy.proxyMode) {
proxy.proxyMode = value;
downloaderCfg.update((val) {
val!.proxy = proxy;
});
final switcher = Switch( await debounceSave();
value: proxy.enable, }
onChanged: (bool value) async { },
if (value != proxy.enable) { items: [
downloaderCfg.update((val) { DropdownMenuItem<ProxyModeEnum>(
val!.proxy.enable = value; value: ProxyModeEnum.noProxy,
}); child: Text('noProxy'.tr),
),
await debounceSave(); DropdownMenuItem<ProxyModeEnum>(
} value: ProxyModeEnum.systemProxy,
}, child: Text('systemProxy'.tr),
),
DropdownMenuItem<ProxyModeEnum>(
value: ProxyModeEnum.customProxy,
child: Text('customProxy'.tr),
),
],
),
); );
final scheme = SizedBox( final scheme = SizedBox(
width: 100, width: 150,
child: DropdownButtonFormField<String>( child: DropdownButtonFormField<String>(
value: proxy.scheme, value: proxy.scheme,
onChanged: (value) async { onChanged: (value) async {
@@ -468,7 +503,7 @@ class SettingView extends GetView<SettingController> {
ipController.addListener(updateAddress); ipController.addListener(updateAddress);
portController.addListener(updateAddress); portController.addListener(updateAddress);
final server = [ final server = Row(children: [
Flexible( Flexible(
child: TextFormField( child: TextFormField(
controller: ipController, controller: ipController,
@@ -493,12 +528,12 @@ class SettingView extends GetView<SettingController> {
], ],
), ),
), ),
]; ]);
final usrController = TextEditingController(text: proxy.usr); final usrController = TextEditingController(text: proxy.usr);
final pwdController = TextEditingController(text: proxy.pwd); final pwdController = TextEditingController(text: proxy.pwd);
final auth = [ final auth = Row(children: [
Flexible( Flexible(
child: TextFormField( child: TextFormField(
controller: usrController, controller: usrController,
@@ -518,20 +553,21 @@ class SettingView extends GetView<SettingController> {
), ),
), ),
), ),
]; ]);
List<Widget> customView() {
if (proxy.proxyMode != ProxyModeEnum.customProxy) {
return [];
}
return [scheme, server, auth];
}
return Form( return Form(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: _addPadding([ children: _addPadding([
switcher, mode,
scheme, ...customView(),
Row(
children: server,
),
Row(
children: auth,
),
]), ]),
), ),
); );
@@ -687,8 +723,11 @@ class SettingView extends GetView<SettingController> {
Text('general'.tr), Text('general'.tr),
Card( Card(
child: Column( child: Column(
children: _addDivider( children: _addDivider([
[buildDownloadDir(), buildMaxRunning()]), buildDownloadDir(),
buildMaxRunning(),
buildBrowserExtension()
]),
)), )),
const Text('HTTP'), const Text('HTTP'),
Card( Card(
@@ -844,3 +883,37 @@ class SettingView extends GetView<SettingController> {
} }
} }
} }
enum ProxyModeEnum {
noProxy,
systemProxy,
customProxy,
}
extension ProxyMode on ProxyConfig {
ProxyModeEnum get proxyMode {
if (!enable) {
return ProxyModeEnum.noProxy;
}
if (system) {
return ProxyModeEnum.systemProxy;
}
return ProxyModeEnum.customProxy;
}
set proxyMode(ProxyModeEnum value) {
switch (value) {
case ProxyModeEnum.noProxy:
enable = false;
break;
case ProxyModeEnum.systemProxy:
enable = true;
system = true;
break;
case ProxyModeEnum.customProxy:
enable = true;
system = false;
break;
}
}
}
+39
View File
@@ -0,0 +1,39 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:url_launcher/url_launcher.dart';
class OpenInNew extends StatelessWidget {
final String text;
final String url;
const OpenInNew({super.key, required this.text, required this.url});
@override
Widget build(BuildContext context) {
return Stack(
children: [
ElevatedButton(
onPressed: () {
launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);
},
style: ElevatedButton.styleFrom(
backgroundColor: Get.theme.colorScheme.background,
),
child: Row(
mainAxisSize: MainAxisSize
.min, // Set the row's size to be as small as possible
children: <Widget>[
Text(text),
const SizedBox(
width: 4), // Add some space between the text and the icon
const Icon(
Icons.open_in_new,
size: 14,
), // The icon is after the text
],
),
)
],
);
}
}
@@ -11,7 +11,7 @@ StartConfig _$StartConfigFromJson(Map<String, dynamic> json) => StartConfig()
..address = json['address'] as String ..address = json['address'] as String
..storage = json['storage'] as String ..storage = json['storage'] as String
..storageDir = json['storageDir'] as String ..storageDir = json['storageDir'] as String
..refreshInterval = json['refreshInterval'] as int ..refreshInterval = (json['refreshInterval'] as num).toInt()
..apiToken = json['apiToken'] as String; ..apiToken = json['apiToken'] as String;
Map<String, dynamic> _$StartConfigToJson(StartConfig instance) => Map<String, dynamic> _$StartConfigToJson(StartConfig instance) =>
+10
View File
@@ -6,6 +6,7 @@ import 'package:hive/hive.dart';
import 'entity.dart'; import 'entity.dart';
const String _startConfig = 'startConfig'; const String _startConfig = 'startConfig';
const String _lastRunningConfig = 'lastRunningConfig';
const String _windowState = 'windowState'; const String _windowState = 'windowState';
const String _bookmark = 'bookmark'; const String _bookmark = 'bookmark';
const String _createHistory = 'createHistory'; const String _createHistory = 'createHistory';
@@ -53,6 +54,15 @@ class Database {
_startConfig, (json) => StartConfigEntity.fromJson(json)); _startConfig, (json) => StartConfigEntity.fromJson(json));
} }
void saveLastRunningConfig(StartConfigEntity entity) {
save<StartConfigEntity>(_lastRunningConfig, entity);
}
StartConfigEntity? getLastRunningConfig() {
return get<StartConfigEntity>(
_lastRunningConfig, (json) => StartConfigEntity.fromJson(json));
}
/// Patch non-null fields with the original value /// Patch non-null fields with the original value
void saveWindowState(WindowStateEntity entity) { void saveWindowState(WindowStateEntity entity) {
final state = getWindowState(); final state = getWindowState();
+4
View File
@@ -82,11 +82,15 @@ const enUS = {
'serviceText': 'Running', 'serviceText': 'Running',
'network': 'Network', 'network': 'Network',
'proxy': 'Proxy', 'proxy': 'Proxy',
'noProxy': 'No Proxy',
'systemProxy': 'System Proxy',
'customProxy': 'Custom Proxy',
'server': 'Server', 'server': 'Server',
'username': 'Username', 'username': 'Username',
'password': 'Password', 'password': 'Password',
'thanks': 'Thanks', 'thanks': 'Thanks',
'thanksDesc': 'thanksDesc':
'Thanks to all the contributors who have helped build and develop the Gopeed community!', 'Thanks to all the contributors who have helped build and develop the Gopeed community!',
'browserExtension': 'Browser Extension',
}, },
}; };
+1
View File
@@ -60,5 +60,6 @@ const faIR = {
'thanks': 'تشکر', 'thanks': 'تشکر',
'thanksDesc': 'thanksDesc':
'از تمامی افرادی که در ساخت و توسعه‌ی جامعه‌ی Gopeed مشارکت کرده‌اند، سپاسگزاری می‌کنیم!', 'از تمامی افرادی که در ساخت و توسعه‌ی جامعه‌ی Gopeed مشارکت کرده‌اند، سپاسگزاری می‌کنیم!',
'browserExtension': 'فایل های دانلود شده را نگه دارد',
} }
}; };
+1
View File
@@ -61,5 +61,6 @@ const jaJP = {
'newVersionLater': '後で', 'newVersionLater': '後で',
'thanks': '感謝', 'thanks': '感謝',
'thanksDesc': 'Gopeedコミュニティの建設に協力してくださったすべての貢献者の方々に感謝します!', 'thanksDesc': 'Gopeedコミュニティの建設に協力してくださったすべての貢献者の方々に感謝します!',
'browserExtension': 'ブラウザ拡張機能',
} }
}; };
+1
View File
@@ -76,5 +76,6 @@ const ruRU = {
'thanks': 'Благодарности', 'thanks': 'Благодарности',
'thanksDesc': 'thanksDesc':
'Благодарим всех участников за их вклад в строительство и развитие сообщества Gopeed!', 'Благодарим всех участников за их вклад в строительство и развитие сообщества Gopeed!',
'browserExtension': 'Расширение браузера',
} }
}; };
+95
View File
@@ -0,0 +1,95 @@
const trTR = {
'tr_TR': {
'label': 'Türkçe',
'error': 'Hata',
'tip': 'İpucu',
'confirm': 'Onayla',
'cancel': 'İptal',
'on': 'Açık',
'off': 'Kapalı',
'selectAll': 'Hepsini seç',
'task': 'Görevler',
'downloading': 'indiriliyor',
'downloaded': 'indirildi',
'setting': 'Ayarlar',
'donate': 'Bağış',
'exit': 'Çık',
'create': 'Görev oluştur',
'directDownload': 'Doğrudan indir',
'advancedOptions': 'Gelişmiş ayarlar',
'downloadLink': 'İndirme bağlantısı',
'downloadLinkValid': 'Lütfen indirme bağlantısını girin',
'downloadLinkHit':
'Lütfen indirme bağlantısını girin, HTTP/HTTPS/MAGNET desteklenir@append',
'downloadLinkHitDesktop':
', veya torrent dosyasını doğrudan buraya sürükleyin',
'download': 'İndir',
'noFileSelected': 'Devam etmek için lütfen en az bir dosya seçin.',
'noStoragePermission': 'Depolama izni gerekli',
'selectFile': 'Dosya seç',
'rename': 'Yeniden adlandır',
'basic': 'Temel',
'advanced': 'Gelişmiş',
'general': 'Genel',
'downloadDir': 'İndirme dizini',
'downloadDirValid': 'Lütfen indirme dizinini seçin',
'connections': 'Bağlantılar',
'useServerCtime': 'Dosya oluşturma için sunucu saatini kullan',
'maxRunning': 'Maksimum çalışan görev sayısı',
'items': '@count tane',
'subscribeTracker': 'İzleyiciye abone ol',
'subscribeFail':
'Abone olunamadı, lütfen ağı kontrol edin veya daha sonra tekrar deneyin',
'update': 'Güncelle',
'updateDaily': 'Günlük olarak güncelle',
'lastUpdate': 'Son güncellenme tarihi: @time',
'addTracker': 'İzleyici ekle',
'addTrackerHit':
'Lütfen her satıra bir tane olmak üzere izleyici sunucusu bağlantısını girin',
'ui': 'Arayüz',
'theme': 'Tema',
'themeSystem': 'Sistem',
'themeLight': 'Açık',
'themeDark': 'Koyu',
'locale': 'Dil',
'about': 'Hakkında',
'homepage': 'Anasayfa',
'version': 'Sürüm',
'protocol': 'Protokol',
'port': 'Bağlantı noktası',
'apiToken': 'API anahtarı',
'notSet': 'AYARLI',
'set': 'AYARLI DEĞİL',
'effectAfterRestart': 'Yeniden başlatma sonrası etki edecektir',
'startAll': 'Hepsini başlat',
'pauseAll': 'Hepsini durdur',
'deleteTask': 'Görevleri sil',
'deleteTaskTip': 'İndirilen dosyaları sakla',
'delete': 'Sil',
'newVersionTitle': 'Yeni sürümü keşfet @version',
'newVersionUpdate': 'Şimdi güncelle',
'newVersionLater': 'Sonra',
'extensions': 'Uzantılar',
'extensionInstallUrl': 'İndirme bağlantısı',
'extensionInstallSuccess': 'Başarıyla indirildi',
'extensionUpdateSuccess': 'Başarıyla güncellendi',
'extensionDelete': 'Uzantıyı sil',
'extensionAlreadyLatest': 'Bu zaten en son sürüm',
'extensionFind': 'Uzantı ara',
'extensionDevelop': 'Uzantı geliştir',
'history': 'Geçmiş',
'clearHistory': 'Geçmişi temizle',
'noHistoryFound': 'Geçmiş bulunamadı',
'serviceTitle': 'Hizmet indir',
'serviceText': 'Çalışıyor',
'network': 'Ağ',
'proxy': 'Vekil',
'server': 'Sunucu',
'username': 'Kullanıcı adı',
'password': 'Şifre',
'thanks': 'Teşekkürler',
'thanksDesc':
'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ı',
},
};
+93
View File
@@ -0,0 +1,93 @@
const viVN = {
'vi_VN': {
'label': 'Tiếng Việt',
'error': 'Lỗi',
'tip': 'Mẹo',
'confirm': 'Xác nhận',
'cancel': 'Hủy',
'on': 'Bật',
'off': 'Tắt',
'selectAll': 'Chọn tất cả',
'task': 'Nhiệm vụ',
'downloading': 'đang tải',
'downloaded': 'đã tải',
'setting': 'Cài đặt',
'donate': 'Ủng hộ',
'exit': 'Thoát',
'create': 'Tạo nhiệm vụ',
'directDownload': 'Tải trực tiếp',
'advancedOptions': 'Tùy chọn nâng cao',
'downloadLink': 'Liên kết tải về',
'downloadLinkValid': 'Vui lòng nhập liên kết tải về',
'downloadLinkHit':
'Vui lòng nhập liên kết tải về, hỗ trợ HTTP/HTTPS/MAGNET@append',
'downloadLinkHitDesktop': ', hoặc kéo tệp torrent vào đây trực tiếp',
'download': 'Tải về',
'noFileSelected': 'Vui lòng chọn ít nhất một tệp để tiếp tục.',
'noStoragePermission': 'Yêu cầu quyền lưu trữ',
'selectFile': 'Chọn tệp',
'rename': 'Đổi tên',
'basic': 'Cơ bản',
'advanced': 'Nâng cao',
'general': 'Chung',
'downloadDir': 'Thư mục tải về',
'downloadDirValid': 'Vui lòng chọn thư mục tải về',
'connections': 'Kết nối',
'useServerCtime': 'Sử dụng thời gian máy chủ cho việc tạo tệp',
'maxRunning': 'Số nhiệm vụ tối đa',
'items': '@count mục',
'subscribeTracker': 'Theo dõi Tracker',
'subscribeFail':
'Theo dõi thất bại, vui lòng kiểm tra kết nối mạng hoặc thử lại sau',
'update': 'Cập nhật',
'updateDaily': 'Cập nhật hàng ngày',
'lastUpdate': 'Cập nhật lần cuối: @time',
'addTracker': 'Thêm Tracker',
'addTrackerHit': 'Vui lòng nhập địa chỉ máy chủ tracker, mỗi dòng một',
'ui': 'Giao diện',
'theme': 'Chủ đề',
'themeSystem': 'Hệ thống',
'themeLight': 'Sáng',
'themeDark': 'Tối',
'locale': 'Ngôn ngữ',
'about': 'Về chúng tôi',
'homepage': 'Trang chủ',
'version': 'Phiên bản',
'protocol': 'Giao thức',
'port': 'Cổng',
'apiToken': 'Mã API',
'notSet': 'Chưa đặt',
'set': 'Đặt',
'effectAfterRestart': 'Hiệu lực sau khi khởi động lại',
'startAll': 'Bắt đầu tất cả',
'pauseAll': 'Tạm dừng tất cả',
'deleteTask': 'Xóa nhiệm vụ',
'deleteTaskTip': 'Giữ các tệp đã tải về',
'delete': 'Xóa',
'newVersionTitle': 'Khám phá phiên bản mới @version',
'newVersionUpdate': 'Cập nhật ngay',
'newVersionLater': 'Sau',
'extensions': 'Tiện ích mở rộng',
'extensionInstallUrl': 'Liên kết cài đặt',
'extensionInstallSuccess': 'Cài đặt thành công',
'extensionUpdateSuccess': 'Cập nhật thành công',
'extensionDelete': 'Xóa tiện ích mở rộng',
'extensionAlreadyLatest': 'Đây đã là phiên bản mới nhất',
'extensionFind': 'Tìm tiện ích mở rộng',
'extensionDevelop': 'Phát triển tiện ích mở rộng',
'history': 'Lịch sử',
'clearHistory': 'Xóa lịch sử',
'noHistoryFound': 'Không tìm thấy lịch sử',
'serviceTitle': 'Dịch vụ Tải xuống',
'serviceText': 'Đang chạy',
'network': 'Mạng',
'proxy': 'Proxy',
'server': 'Máy chủ',
'username': 'Tên đăng nhập',
'password': 'Mật khẩu',
'thanks': 'Cảm ơn',
'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!',
'browserExtension': 'Tiện ích mở rộng trình duyệt',
},
};
+4
View File
@@ -80,10 +80,14 @@ const zhCN = {
'serviceText': '运行中', 'serviceText': '运行中',
'network': '网络', 'network': '网络',
'proxy': '代理', 'proxy': '代理',
'noProxy': '不使用代理',
'systemProxy': '系统代理',
'customProxy': '自定义代理',
'server': '服务器', 'server': '服务器',
'username': '用户名', 'username': '用户名',
'password': '密码', 'password': '密码',
'thanks': '鸣谢', 'thanks': '鸣谢',
'thanksDesc': '感谢所有为 Gopeed 社区建设添砖加瓦的贡献者们!', 'thanksDesc': '感谢所有为 Gopeed 社区建设添砖加瓦的贡献者们!',
'browserExtension': '浏览器扩展',
} }
}; };
+30 -26
View File
@@ -1,6 +1,6 @@
const zhTW = { const zhTW = {
"zh_TW": { "zh_TW": {
'label': '中文 (繁體) ', 'label': '中文 (正體) ',
'error': '錯誤', 'error': '錯誤',
'tip': '提示', 'tip': '提示',
'confirm': '確定', 'confirm': '確定',
@@ -12,38 +12,38 @@ const zhTW = {
'downloading': '下載中', 'downloading': '下載中',
'downloaded': '已完成', 'downloaded': '已完成',
'setting': '設定', 'setting': '設定',
'donate': '斗內', 'donate': '鬥內',
'exit': '離開', 'exit': '離開',
'create': '新增任務', 'create': '新增任務',
'directDownload': '直接下載', 'directDownload': '直接下載',
'advancedOptions': '進階選項', 'advancedOptions': '進階選項',
'downloadLink': '下載鏈接', 'downloadLink': '下載連結',
'downloadLinkValid': '請輸入下載鏈接', 'downloadLinkValid': '請輸入下載連結',
'downloadLinkHit': '請輸入下載鏈接,支援 HTTP/HTTPS/MAGNET@append', 'downloadLinkHit': '請輸入下載連結,支援 HTTP/HTTPS/MAGNET@append',
'downloadLinkHitDesktop': ',也可以通過拖拽Torrent文件至此以新增任務', 'downloadLinkHitDesktop': ',也可以通過拖拽Torrent檔至此以新增任務',
'download': '下載', 'download': '下載',
'noFileSelected': '沒有選取的文件', 'noFileSelected': '沒有選取的檔案',
'noStoragePermission': '沒有存儲權限', 'noStoragePermission': '沒有存儲權',
'selectFile': '選擇文件', 'selectFile': '選擇檔案',
'rename': '重命名', 'rename': '重命名',
'basic': '一般', 'basic': '一般',
'advanced': '進階', 'advanced': '進階',
'general': '通用設定', 'general': '通用設定',
'downloadDir': '下載目録', 'downloadDir': '下載目錄',
'downloadDirValid': '請選擇下載目録', 'downloadDirValid': '請選擇下載目錄',
'connections': '同時連接數', 'connections': '同時連接數',
'useServerCtime': '使用伺服器時間作為檔案建立時間', 'useServerCtime': '使用伺服器時間作為檔案建立時間',
'maxRunning': '最大同時下載數', 'maxRunning': '最大同時下載數',
'items': '@count 項', 'items': '@count 項',
'subscribeTracker': '已訂閲的追蹤者列表', 'subscribeTracker': '已訂閱的追蹤者列表',
'subscribeFail': '訂閲失敗', 'subscribeFail': '訂閱失敗',
'update': '更新', 'update': '更新',
'updateDaily': '每天自動更新', 'updateDaily': '每天自動更新',
'lastUpdate': '上次更新時間: @time', 'lastUpdate': '上次更新時間: @time',
'addTracker': '增加新的追蹤者', 'addTracker': '增加新的追蹤者',
'addTrackerHit': '請輸入追蹤者服務器地址,每行一條', 'addTrackerHit': '請輸入追蹤者伺服器地址,每行一條',
'ui': '介面', 'ui': '介面',
'theme': '佈景主題', 'theme': '主題',
'themeSystem': '跟隨系統', 'themeSystem': '跟隨系統',
'themeLight': '亮色主題', 'themeLight': '亮色主題',
'themeDark': '深色主題', 'themeDark': '深色主題',
@@ -51,28 +51,28 @@ const zhTW = {
'about': '關於', 'about': '關於',
'homepage': '訪問主頁', 'homepage': '訪問主頁',
'version': '版本資訊', 'version': '版本資訊',
'protocol': '端口設定', 'protocol': '通信協定',
'port': '端口', 'port': '埠',
'apiToken': '接口秘鑰', 'apiToken': 'API令牌',
'notSet': '未設定', 'notSet': '未設定',
'set': '已設定', 'set': '已設定',
'effectAfterRestart': '重啟後生效', 'effectAfterRestart': '重啟後生效',
'startAll': '全部開始', 'startAll': '全部開始',
'pauseAll': '全部暫停', 'pauseAll': '全部暫停',
'deleteTask': '刪除任務', 'deleteTask': '刪除任務',
'deleteTaskTip': '保留已經下載的文件', 'deleteTaskTip': '保留已經下載的檔案',
'delete': '刪除', 'delete': '刪除',
'newVersionTitle': '現新版本 @version 已發佈', 'newVersionTitle': '新版本 @version 已發佈',
'newVersionUpdate': '下載', 'newVersionUpdate': '下載',
'newVersionLater': '取消', 'newVersionLater': '取消',
'extensions': '擴充程序', 'extensions': '擴充程式',
'extensionInstallUrl': '安裝URL', 'extensionInstallUrl': '安裝連結',
'extensionInstallSuccess': '安裝成功', 'extensionInstallSuccess': '安裝成功',
'extensionUpdateSuccess': '更新完成', 'extensionUpdateSuccess': '更新完成',
'extensionDelete': '解除安裝', 'extensionDelete': '解除安裝',
'extensionAlreadyLatest': '已是最新版本', 'extensionAlreadyLatest': '已是最新版本',
'extensionFind': '取得擴充程序', 'extensionFind': '取得擴充程式',
'extensionDevelop': '開發擴充程序', 'extensionDevelop': '開發擴充程式',
'history': '歷史記錄', 'history': '歷史記錄',
'clearHistory': '清空記錄', 'clearHistory': '清空記錄',
'noHistoryFound': '還沒有記錄', 'noHistoryFound': '還沒有記錄',
@@ -80,10 +80,14 @@ const zhTW = {
'serviceText': '執行中', 'serviceText': '執行中',
'network': '網路', 'network': '網路',
'proxy': '代理', 'proxy': '代理',
'noProxy': '不使用代理',
'systemProxy': '系統代理',
'customProxy': '自定義代理',
'server': '伺服器', 'server': '伺服器',
'username': '名稱', 'username': '名稱',
'password': '密碼', 'password': '密碼',
'thanks': '鳴謝', 'thanks': '感謝',
'thanksDesc': '感謝所有為 Gopeed 社群建設添磚加瓦的貢獻者們!' 'thanksDesc': '感謝所有為 Gopeed 社區建設添磚加瓦的貢獻者們!',
'browserExtension': '瀏覽器擴充程式',
} }
}; };
+4
View File
@@ -6,6 +6,8 @@ import 'package:gopeed/i18n/langs/zh_tw.dart';
import 'langs/en_us.dart'; import 'langs/en_us.dart';
import 'langs/ru_ru.dart'; import 'langs/ru_ru.dart';
import 'langs/zh_cn.dart'; import 'langs/zh_cn.dart';
import 'langs/vi_vn.dart';
import 'langs/tr_tr.dart';
final messages = _Messages(); final messages = _Messages();
@@ -19,5 +21,7 @@ class _Messages extends Translations {
...zhTW, ...zhTW,
...faIR, ...faIR,
...jaJP, ...jaJP,
...viVN,
...trTR,
}; };
} }
+19 -2
View File
@@ -1,5 +1,6 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
@@ -8,6 +9,7 @@ import 'app/modules/app/controllers/app_controller.dart';
import 'app/modules/app/views/app_view.dart'; import 'app/modules/app/views/app_view.dart';
import 'core/libgopeed_boot.dart'; import 'core/libgopeed_boot.dart';
import 'database/database.dart'; import 'database/database.dart';
import 'database/entity.dart';
import 'i18n/message.dart'; import 'i18n/message.dart';
import 'util/locale_manager.dart'; import 'util/locale_manager.dart';
import 'util/log_util.dart'; import 'util/log_util.dart';
@@ -52,8 +54,23 @@ Future<void> init() async {
try { try {
await controller.loadStartConfig(); await controller.loadStartConfig();
final startCfg = controller.startConfig.value; final startCfg = controller.startConfig.value;
controller.runningPort.value = await LibgopeedBoot.instance.start(startCfg); // When the app is closed by swiping on the mobile, the backend server is actually still running, don't need to start again.
api.init(startCfg.network, controller.runningAddress(), startCfg.apiToken); final isRunning =
Util.isMobile() && (await FlutterForegroundTask.isRunningService);
if (!isRunning) {
controller.runningPort.value =
await LibgopeedBoot.instance.start(startCfg);
api.init(
startCfg.network, controller.runningAddress(), startCfg.apiToken);
Database.instance.saveLastRunningConfig(StartConfigEntity(
network: startCfg.network,
address: controller.runningAddress(),
apiToken: startCfg.apiToken));
} else {
final lastRunningConfig = Database.instance.getLastRunningConfig()!;
api.init(lastRunningConfig.network, lastRunningConfig.address,
lastRunningConfig.apiToken);
}
} catch (e) { } catch (e) {
logger.e("libgopeed init fail", e); logger.e("libgopeed init fail", e);
} }
@@ -13,8 +13,8 @@ essential: false
icon: assets/icon/icon.svg icon: assets/icon/icon.svg
dependencies: dependencies:
- libappindicator3-1 | libayatana-appindicator3-1 - libayatana-appindicator3-1
- gir1.2-appindicator3-0.1 | gir1.2-ayatanaappindicator3-0.1 - gir1.2-ayatanaappindicator3-0.1
keywords: keywords:
- Application - Application
@@ -1,24 +0,0 @@
display_name: Gopeed
icon: assets/icon/icon.svg
summary: A modern download manager that supports all platforms. Built with Golang and Flutter.
group: Applications/Internet
vendor: monkeyWie
packager: madoka773
packagerEmail: [email protected]
license: GPL-3.0-or-later
url: https://github.com/GopeedLab/gopeed
description: A modern download manager that supports all platforms. Built with Golang and Flutter.
keywords:
- Application
- DownloadManager
- Network
- Utility
generic_name: Download Manager
categories:
- Network
- Utility
startup_notify: true
+256 -248
View File
File diff suppressed because it is too large. Load diff
+2 -2
View File
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.5.5+1 version: 1.5.6+1
environment: environment:
sdk: '>=3.0.0 <4.0.0' sdk: '>=3.0.0 <4.0.0'
@@ -44,7 +44,7 @@ dependencies:
path_provider: ^2.1.1 path_provider: ^2.1.1
file_picker: 5.3.1 file_picker: 5.3.1
macos_secure_bookmarks: ^0.2.1 macos_secure_bookmarks: ^0.2.1
rounded_loading_button: ^2.1.0 rounded_loading_button_plus: ^3.0.1
url_launcher: ^6.1.6 url_launcher: ^6.1.6
logger: ^1.3.0 logger: ^1.3.0
desktop_drop: ^0.4.3 desktop_drop: ^0.4.3