mirror of
https://github.com/venera-app/venera.git
synced 2025-09-27 15:57:25 +00:00
Compare commits
117 Commits
Author | SHA1 | Date | |
---|---|---|---|
50c6bec4cd | |||
![]() |
8c44f83d6c | ||
![]() |
103b6b2832 | ||
4129349c70 | |||
77a9aa5457 | |||
97940b9492 | |||
7945c0e54f | |||
dfee65c3af | |||
fa2dbd79f6 | |||
9a9f539906 | |||
d7331f36e9 | |||
![]() |
d0b76de465 | ||
894a922b8f | |||
a91d7fff2d | |||
![]() |
926a3a530e | ||
d308c2ac60 | |||
ac13807ef4 | |||
38a5b2b8cf | |||
3a7c8d5e38 | |||
![]() |
ce0d10aeb2 | ||
![]() |
0ac857ef9a | ||
3928f5afe7 | |||
8a61a4750b | |||
![]() |
1bc3fef47b | ||
![]() |
4dac132bee | ||
![]() |
7c60c00962 | ||
9d8ade6fe0 | |||
6245399810 | |||
c074e7f9d1 | |||
f822e198ea | |||
7035f11eb5 | |||
f2f5a4f573 | |||
2acf234f7d | |||
9ed8f351c7 | |||
7c35dc7cf7 | |||
![]() |
17b8b9ea8f | ||
ccb03343f4 | |||
![]() |
951bcae603 | ||
![]() |
0b9de68c86 | ||
![]() |
81b27fd941 | ||
![]() |
b9817ec030 | ||
![]() |
5ebb554e54 | ||
![]() |
d5d72911ed | ||
![]() |
838d5c9c3e | ||
23ee79fe9d | |||
![]() |
85baac657a | ||
![]() |
cceca6b96f | ||
![]() |
b5b0dc85e3 | ||
![]() |
50044c4372 | ||
![]() |
5fd7f1b880 | ||
![]() |
058fde3f5a | ||
![]() |
a2d46123dd | ||
![]() |
01acc4f9de | ||
![]() |
856aae0769 | ||
![]() |
8eda8adcc8 | ||
defd4b8624 | |||
b2a164e066 | |||
a46ceebf19 | |||
cc08445f13 | |||
93f7f72d07 | |||
20f7ab4866 | |||
54363919cd | |||
182a821fc5 | |||
8868c6edb3 | |||
![]() |
fffbb4ed23 | ||
![]() |
b057be0311 | ||
![]() |
fc5fed1707 | ||
![]() |
8525f5318f | ||
![]() |
d58cafc4a0 | ||
23afafd1d6 | |||
![]() |
3b6e0adbbb | ||
20a57c7a36 | |||
665f50ed2a | |||
55733ef505 | |||
0c46214619 | |||
749a1a47fb | |||
76e9ef87d4 | |||
dcd6466547 | |||
ed70fdba93 | |||
ded0068ea6 | |||
![]() |
7dc6be622a | ||
![]() |
88f093f7e5 | ||
8f357b3e6c | |||
9ee82975e8 | |||
![]() |
9f048685e4 | ||
![]() |
bc1f5e11b5 | ||
1f2147ef72 | |||
fba365fd93 | |||
a5e3fbaee5 | |||
190e645a12 | |||
![]() |
8a83ff5367 | ||
6e14942dab | |||
146fc70143 | |||
b37ea01aca | |||
bf7b90313a | |||
929c1a9d91 | |||
9ff68d0701 | |||
dfd15ed34a | |||
![]() |
dfe2a0db6a | ||
c6714f79b6 | |||
552a42fb27 | |||
af456c52f1 | |||
f38129133a | |||
17e2696ca4 | |||
9d6999af33 | |||
ae5548918c | |||
92d22c977c | |||
8cc3702e1a | |||
3131ce52a7 | |||
62e4056f4a | |||
a29a7cbaf3 | |||
7bdab7ade7 | |||
ea99e87afb | |||
0d3fde9457 | |||
aa9f4dae82 | |||
6877aa120f | |||
d25d72a5f7 |
4
.github/workflows/fastlane.yml
vendored
4
.github/workflows/fastlane.yml
vendored
@@ -4,8 +4,12 @@ on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ "master" ]
|
||||
paths:
|
||||
- 'fastlane/**'
|
||||
pull_request:
|
||||
branches: [ "master" ]
|
||||
paths:
|
||||
- 'fastlane/**'
|
||||
|
||||
jobs:
|
||||
go:
|
||||
|
90
.github/workflows/main.yml
vendored
90
.github/workflows/main.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
channel: "stable"
|
||||
flutter-version-file: pubspec.yaml
|
||||
architecture: x64
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_16.0.app
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_16.4.app
|
||||
- run: flutter pub get
|
||||
# Step 1: Decode and install the certificate
|
||||
- name: Decode and install certificate
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
channel: "stable"
|
||||
flutter-version-file: pubspec.yaml
|
||||
architecture: x64
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_16.0.app
|
||||
- run: sudo xcode-select --switch /Applications/Xcode_16.4.app
|
||||
- run: flutter pub get
|
||||
- run: flutter build ios --release --no-codesign
|
||||
- run: |
|
||||
@@ -149,45 +149,6 @@ jobs:
|
||||
sudo rm -rf build/linux/arch/pkg
|
||||
sudo rm -rf build/linux/arch/src
|
||||
sudo rm -rf build/linux/arch/PKGBUILD
|
||||
- name: Build AppImage
|
||||
run: |
|
||||
sudo apt-get install -y libfuse2
|
||||
wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||
chmod +x appimagetool
|
||||
|
||||
mkdir -p Venera.AppDir
|
||||
cp -r build/linux/x64/release/bundle/* Venera.AppDir/
|
||||
|
||||
cat > Venera.AppDir/venera.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Name=Venera
|
||||
Exec=venera
|
||||
Icon=venera
|
||||
Type=Application
|
||||
Categories=Utility;
|
||||
EOF
|
||||
|
||||
cp assets/app_icon.png Venera.AppDir/venera.png
|
||||
|
||||
cat > Venera.AppDir/AppRun << EOF
|
||||
#!/bin/sh
|
||||
HERE=\$(dirname \$(readlink -f "\${0}"))
|
||||
export PATH="\${HERE}"/usr/bin/:"\${HERE}"/usr/sbin/:"\${HERE}"/usr/games/:"\${HERE}"/bin/:"\${HERE}"/sbin/:\${PATH}
|
||||
export LD_LIBRARY_PATH="\${HERE}"/usr/lib/:\${LD_LIBRARY_PATH}
|
||||
export XDG_DATA_DIRS="\${HERE}"/usr/share/:\${XDG_DATA_DIRS}
|
||||
exec "\${HERE}"/venera "\$@"
|
||||
EOF
|
||||
chmod +x Venera.AppDir/AppRun
|
||||
|
||||
APP_VERSION=$(grep "version:" pubspec.yaml | cut -d':' -f2 | tr -d ' ')
|
||||
./appimagetool Venera.AppDir Venera-${APP_VERSION}-x86_64.AppImage
|
||||
|
||||
mkdir -p build/linux/appimage
|
||||
mv Venera-${APP_VERSION}-x86_64.AppImage build/linux/appimage/
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: appimage_build
|
||||
path: build/linux/appimage
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: deb_build
|
||||
@@ -210,45 +171,6 @@ jobs:
|
||||
sudo apt-get install -y ninja-build libgtk-3-dev webkit2gtk-4.1
|
||||
dart pub global activate flutter_to_debian
|
||||
- run: python3 debian/build.py arm64
|
||||
- name: Build AppImage
|
||||
run: |
|
||||
sudo apt-get install -y libfuse2
|
||||
wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-aarch64.AppImage"
|
||||
chmod +x appimagetool
|
||||
|
||||
mkdir -p Venera.AppDir
|
||||
cp -r build/linux/arm64/release/bundle/* Venera.AppDir/
|
||||
|
||||
cat > Venera.AppDir/venera.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Name=Venera
|
||||
Exec=venera
|
||||
Icon=venera
|
||||
Type=Application
|
||||
Categories=Utility;
|
||||
EOF
|
||||
|
||||
cp assets/app_icon.png Venera.AppDir/venera.png
|
||||
|
||||
cat > Venera.AppDir/AppRun << EOF
|
||||
#!/bin/sh
|
||||
HERE=\$(dirname \$(readlink -f "\${0}"))
|
||||
export PATH="\${HERE}"/usr/bin/:"\${HERE}"/usr/sbin/:"\${HERE}"/usr/games/:"\${HERE}"/bin/:"\${HERE}"/sbin/:\${PATH}
|
||||
export LD_LIBRARY_PATH="\${HERE}"/usr/lib/:\${LD_LIBRARY_PATH}
|
||||
export XDG_DATA_DIRS="\${HERE}"/usr/share/:\${XDG_DATA_DIRS}
|
||||
exec "\${HERE}"/venera "\$@"
|
||||
EOF
|
||||
chmod +x Venera.AppDir/AppRun
|
||||
|
||||
APP_VERSION=$(grep "version:" pubspec.yaml | cut -d':' -f2 | tr -d ' ')
|
||||
./appimagetool Venera.AppDir Venera-${APP_VERSION}-aarch64.AppImage
|
||||
|
||||
mkdir -p build/linux/appimage
|
||||
mv Venera-${APP_VERSION}-aarch64.AppImage build/linux/appimage/
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: appimage_arm64_build
|
||||
path: build/linux/appimage
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: deb_arm64_build
|
||||
@@ -287,14 +209,6 @@ jobs:
|
||||
with:
|
||||
name: deb_arm64_build
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: appimage_build
|
||||
path: outputs
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: appimage_arm64_build
|
||||
path: outputs
|
||||
- uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
|
76
.github/workflows/update_alt_store.yml
vendored
Normal file
76
.github/workflows/update_alt_store.yml
vendored
Normal file
@@ -0,0 +1,76 @@
|
||||
name: Update AltStore Source
|
||||
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: ["Build ALL"]
|
||||
types: [completed]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
update-source:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install requests
|
||||
|
||||
- name: Record job start time
|
||||
id: job_start_time
|
||||
run: echo "start_time=$(date +%s)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Update AltStore source
|
||||
id: update_source
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
python update_alt_store.py
|
||||
git config --global user.name 'GitHub Action'
|
||||
git config --global user.email 'action@github.com'
|
||||
git add alt_store.json
|
||||
if git diff --staged --quiet; then
|
||||
echo "changes=false" >> $GITHUB_OUTPUT
|
||||
else
|
||||
git commit -m "Updated source with latest release"
|
||||
git push
|
||||
echo "changes=true" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Calculate job duration
|
||||
id: duration
|
||||
if: always()
|
||||
run: |
|
||||
end_time=$(date +%s)
|
||||
duration=$((end_time - ${{ steps.job_start_time.outputs.start_time }}))
|
||||
echo "duration=$duration seconds" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create job summary
|
||||
run: |
|
||||
if [[ "${{ steps.update_source.outputs.changes }}" == "true" ]]; then
|
||||
echo "## Update Altstore Source Summary 🚀" >> $GITHUB_STEP_SUMMARY
|
||||
echo "✅ Changes Detected and Applied" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "The alt_store.json file has been updated with the latest release information." >> $GITHUB_STEP_SUMMARY
|
||||
else
|
||||
echo "## Update Altstore Source Summary 🚀" >> $GITHUB_STEP_SUMMARY
|
||||
echo "🔍 No Changes Detected" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "The alt_store.json file is up to date. No changes were necessary." >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "🕐 Execution Time" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "This job took ${{ steps.duration.outputs.duration }} to complete." >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "📆 Next Scheduled Run" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "The next scheduled run will be tomorrow at midnight UTC." >> $GITHUB_STEP_SUMMARY
|
14
README.md
14
README.md
@@ -1,16 +1,15 @@
|
||||
# venera
|
||||
[](https://flutter.dev/)
|
||||
[](https://github.com/venera-app/venera/blob/master/LICENSE)
|
||||
[](https://github.com/venera-app/venera/releases)
|
||||
[](https://github.com/venera-app/venera/stargazers)
|
||||
[](https://t.me/+Ws-IpmUutzkxMjhl)
|
||||
[](https://t.me/venera_release)
|
||||
|
||||
[](https://github.com/venera-app/venera/releases)
|
||||
[](https://aur.archlinux.org/packages/venera-bin)
|
||||
[](https://f-droid.org/packages/com.github.wgh136.venera/)
|
||||
|
||||
A comic reader that support reading local and network comics.
|
||||
|
||||
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
|
||||
alt="Get it on F-Droid"
|
||||
height="75">](https://f-droid.org/packages/com.github.wgh136.venera/)
|
||||
|
||||
## Features
|
||||
- Read local comics
|
||||
- Use javascript to create comic sources
|
||||
@@ -34,4 +33,7 @@ See [Comic Source](doc/comic_source.md)
|
||||
### Tags Translation
|
||||
[](https://github.com/EhTagTranslation/Database)
|
||||
|
||||
## Headless Mode
|
||||
See [Headless Doc](doc/headless_doc.md)
|
||||
|
||||
The Chinese translation of the manga tags is from this project.
|
||||
|
64
alt_store.json
Normal file
64
alt_store.json
Normal file
@@ -0,0 +1,64 @@
|
||||
{
|
||||
"name": "Venera",
|
||||
"identifier": "com.github.wgh136.venera.source",
|
||||
"website": "https://github.com/venera-app/venera",
|
||||
"subtitle": "Venera official AltStore Source.",
|
||||
"description": "This is the official AltStore Source for Venera.\n\n A comic reader that supports reading local and network comics",
|
||||
"tintColor": "#0784FC",
|
||||
"iconURL": "https://raw.githubusercontent.com/venera-app/venera/master/assets/app_icon.png",
|
||||
"apps": [
|
||||
{
|
||||
"beta": false,
|
||||
"name": "Venera",
|
||||
"bundleIdentifier": "com.github.wgh136.venera",
|
||||
"developerName": "wgh136",
|
||||
"subtitle": "A comic reader that supports reading local and network comics",
|
||||
"version": "1.4.5",
|
||||
"versionDate": "2025-06-18",
|
||||
"versionDescription": "1. Fixed an abnormal single image height issue when \"imagesPerPage > 1\". 379 \r\n2. Fixed an invalid page calculation issue when \"showSingleImageOnFirstPage\" is enabled. \r\n3. Fixed an issue with incorrect reading history when displaying a single image on the first page. \r\n4. Fixed abnormal history recording when pages are not flipped. 392 \r\n5. Fixed an issue where the download task would stop after exiting the reader. 387 \r\n6. Fixed a \"RangeError\" when translating tags. 356 \r\n7. Reset the current folder to null on the favorites page if the folder is invalid. 389 \r\n8. Fixed various issues when using a custom download path on Android. 400 \r\n9. Set the initial chapter to the first downloaded chapter if no history exists when starting to read a local comic. 405 \r\n10. Removed the config file repository URL from the app.",
|
||||
"downloadURL": "https://github.com/venera-app/venera/releases/download/v1.4.5/venera-ios-1.4.5%2B145.ipa",
|
||||
"localizedDescription": "A comic reader that supports reading local and network comics",
|
||||
"iconURL": "https://raw.githubusercontent.com/venera-app/venera/master/assets/app_icon.png",
|
||||
"tintColor": "#0784FC",
|
||||
"category": "utilities",
|
||||
"size": 14960268,
|
||||
"appPermissions": {
|
||||
"entitlements": [
|
||||
"application-identifier",
|
||||
"com.apple.security.application-groups",
|
||||
"get-task-allow",
|
||||
"keychain-access-groups",
|
||||
"com.apple.developer.kernel.extended-virtual-addressing",
|
||||
"com.apple.developer.kernel.increased-memory-limit",
|
||||
"com.apple.developer.healthkit.background-delivery"
|
||||
],
|
||||
"privacy": {
|
||||
"NSFaceIDUsageDescription": "Face ID or Touch ID is used to protect your privacy when opening the app, ensuring secure access to your reading content.",
|
||||
"NSPhotoLibraryAddUsageDescription": "Used to save comic images you've favorited or downloaded to your photo library for easy access and sharing.",
|
||||
"NSPhotoLibraryUsageDescription": "Used to select images from your photo library when needed, and to save comic images you've collected to your device."
|
||||
}
|
||||
},
|
||||
"versions": [
|
||||
{
|
||||
"version": "1.4.5",
|
||||
"date": "2025-06-18",
|
||||
"localizedDescription": "1. Fixed an abnormal single image height issue when \"imagesPerPage > 1\". 379 \r\n2. Fixed an invalid page calculation issue when \"showSingleImageOnFirstPage\" is enabled. \r\n3. Fixed an issue with incorrect reading history when displaying a single image on the first page. \r\n4. Fixed abnormal history recording when pages are not flipped. 392 \r\n5. Fixed an issue where the download task would stop after exiting the reader. 387 \r\n6. Fixed a \"RangeError\" when translating tags. 356 \r\n7. Reset the current folder to null on the favorites page if the folder is invalid. 389 \r\n8. Fixed various issues when using a custom download path on Android. 400 \r\n9. Set the initial chapter to the first downloaded chapter if no history exists when starting to read a local comic. 405 \r\n10. Removed the config file repository URL from the app.",
|
||||
"downloadURL": "https://github.com/venera-app/venera/releases/download/v1.4.5/venera-ios-1.4.5%2B145.ipa",
|
||||
"size": 14960268
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"news": [
|
||||
{
|
||||
"appID": "com.github.wgh136.venera",
|
||||
"caption": "Update of Venera just got released!",
|
||||
"date": "2025-06-18T09:02:01Z",
|
||||
"identifier": "release-v1.4.5",
|
||||
"notify": true,
|
||||
"tintColor": "#0784FC",
|
||||
"title": "v1.4.5 - Venera 18/06/25",
|
||||
"url": "https://github.com/venera-app/venera/releases/tag/v1.4.5"
|
||||
}
|
||||
]
|
||||
}
|
@@ -78,6 +78,9 @@ android {
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
// Temporarily solution to fix crash
|
||||
minifyEnabled false
|
||||
shrinkResources false
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "arm64-v8a", "x86_64"
|
||||
}
|
||||
|
@@ -19,7 +19,7 @@ pluginManagement {
|
||||
plugins {
|
||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||
id "com.android.application" version '8.9.0' apply false
|
||||
id "org.jetbrains.kotlin.android" version "1.8.10" apply false
|
||||
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
|
||||
}
|
||||
|
||||
include ":app"
|
||||
|
@@ -4,6 +4,18 @@ Venera JavaScript Library
|
||||
This library provides a set of APIs for interacting with the Venera app.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @function sendMessage
|
||||
* @global
|
||||
* @param {Object} message
|
||||
* @returns {any}
|
||||
*/
|
||||
|
||||
/**
|
||||
* Set a timeout to execute a callback function after a specified delay.
|
||||
* @param callback {Function}
|
||||
* @param delay {number} - delay in milliseconds
|
||||
*/
|
||||
function setTimeout(callback, delay) {
|
||||
sendMessage({
|
||||
method: 'delay',
|
||||
@@ -39,6 +51,32 @@ let Convert = {
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* @param str {string}
|
||||
* @returns {ArrayBuffer}
|
||||
*/
|
||||
encodeGbk: (str) => {
|
||||
return sendMessage({
|
||||
method: "convert",
|
||||
type: "gbk",
|
||||
value: str,
|
||||
isEncode: true
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* @param value {ArrayBuffer}
|
||||
* @returns {string}
|
||||
*/
|
||||
decodeGbk: (value) => {
|
||||
return sendMessage({
|
||||
method: "convert",
|
||||
type: "gbk",
|
||||
value: value,
|
||||
isEncode: false
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* @param {ArrayBuffer} value
|
||||
* @returns {string}
|
||||
@@ -176,7 +214,7 @@ let Convert = {
|
||||
decryptAesCbc: (value, key, iv) => {
|
||||
return sendMessage({
|
||||
method: "convert",
|
||||
type: "aes-ecb",
|
||||
type: "aes-cbc",
|
||||
value: value,
|
||||
key: key,
|
||||
iv: iv,
|
||||
@@ -1296,13 +1334,15 @@ let UI = {
|
||||
* Show an input dialog
|
||||
* @param title {string}
|
||||
* @param validator {(string) => string | null | undefined} - A function that validates the input. If the function returns a string, the dialog will show the error message.
|
||||
* @param image {string?} - Available since 1.4.6. An optional image to show in the dialog. You can use this to show a captcha.
|
||||
* @returns {Promise<string | null>} - The input value. If the dialog is canceled, return null.
|
||||
*/
|
||||
showInputDialog: (title, validator) => {
|
||||
showInputDialog: (title, validator, image) => {
|
||||
return sendMessage({
|
||||
method: 'UI',
|
||||
function: 'showInputDialog',
|
||||
title: title,
|
||||
image: image,
|
||||
validator: validator
|
||||
})
|
||||
},
|
||||
@@ -1383,4 +1423,19 @@ function getClipboard() {
|
||||
return sendMessage({
|
||||
method: 'getClipboard'
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute a function with arguments. The function will be executed in the engine pool which is not in the main thread.
|
||||
* @param func {string} - A js code string which can be evaluated to a function. The function will receive the args as its only argument.
|
||||
* @param args {any[]} - The arguments to pass to the function.
|
||||
* @returns {Promise<any>} - The result of the function.
|
||||
* @since 1.5.0
|
||||
*/
|
||||
function compute(func, ...args) {
|
||||
return sendMessage({
|
||||
method: 'compute',
|
||||
function: func,
|
||||
args: args
|
||||
})
|
||||
}
|
3982
assets/opencc.txt
Normal file
3982
assets/opencc.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -234,8 +234,10 @@
|
||||
"Please add some sources": "请添加一些源",
|
||||
"Please check your settings": "请检查您的设置",
|
||||
"No Category Pages": "没有分类页面",
|
||||
"Group @group": "第 @group 组",
|
||||
"Chapter @ep": "第 @ep 章",
|
||||
"Page @page": "第 @page 页",
|
||||
"Remove local favorite and history": "删除本地收藏和历史记录",
|
||||
"Also remove files on disk": "同时删除磁盘上的文件",
|
||||
"Copy to app local path": "将漫画复制到本地存储目录中",
|
||||
"Delete all unavailable local favorite items": "删除所有无效的本地收藏",
|
||||
@@ -387,7 +389,29 @@
|
||||
"Screen center": "屏幕中心",
|
||||
"Suggestions": "建议",
|
||||
"Do not report any issues related to sources to App repo.": "请不要向App仓库报告任何与源相关的问题",
|
||||
"Click the setting icon to change the source list url.": "点击设置图标更改源列表URL"
|
||||
"Show single image on first page": "在首页显示单张图片",
|
||||
"Show system status bar": "显示系统状态栏",
|
||||
"Click to select an image": "点击选择一张图片",
|
||||
"Repo URL": "仓库地址",
|
||||
"The URL should point to a 'index.json' file": "该URL应指向一个'index.json'文件",
|
||||
"Double tap to zoom": "双击缩放",
|
||||
"Clear Unfavorited": "清除未收藏",
|
||||
"Reverse": "反转",
|
||||
"Delete Chapters": "删除章节",
|
||||
"Open Folder": "打开文件夹",
|
||||
"Path copied to clipboard": "路径已复制到剪贴板",
|
||||
"Reverse default chapter order": "反转默认章节顺序",
|
||||
"Reload Configs": "重新加载配置文件",
|
||||
"Reload": "重载",
|
||||
"Disable Length Limitation": "禁用长度限制",
|
||||
"Only valid for this run": "仅对本次运行有效",
|
||||
"Logs": "日志",
|
||||
"Export logs": "导出日志",
|
||||
"Clear specific reader settings for all comics": "清除所有漫画的特殊阅读设置",
|
||||
"Clear specific reader settings for this comic": "清除该漫画的特殊阅读设置",
|
||||
"Enable comic specific settings": "启用此漫画特定设置",
|
||||
"Ignore Certificate Errors": "忽略证书错误",
|
||||
"Mouse scroll speed": "鼠标滚动速度"
|
||||
},
|
||||
"zh_TW": {
|
||||
"Home": "首頁",
|
||||
@@ -624,8 +648,10 @@
|
||||
"Please add some sources": "請添加一些源",
|
||||
"Please check your settings": "請檢查您的設定",
|
||||
"No Category Pages": "沒有分類頁面",
|
||||
"Group @group": "第 @group 組",
|
||||
"Chapter @ep": "第 @ep 章",
|
||||
"Page @page": "第 @page 頁",
|
||||
"Remove local favorite and history": "刪除本機收藏和歷史記錄",
|
||||
"Also remove files on disk": "同時刪除磁碟上的文件",
|
||||
"Copy to app local path": "將漫畫複製到本機儲存目錄中",
|
||||
"Delete all unavailable local favorite items": "刪除所有無效的本機收藏",
|
||||
@@ -777,6 +803,28 @@
|
||||
"Screen center": "螢幕中心",
|
||||
"Suggestions": "建議",
|
||||
"Do not report any issues related to sources to App repo.": "請不要向App倉庫報告任何與源相關的問題",
|
||||
"Click the setting icon to change the source list url.": "點擊設定圖示更改源列表URL"
|
||||
"Show single image on first page": "在首頁顯示單張圖片",
|
||||
"Show system status bar": "顯示系統狀態欄",
|
||||
"Click to select an image": "點擊選擇一張圖片",
|
||||
"Repo URL": "倉庫地址",
|
||||
"The URL should point to a 'index.json' file": "該URL應指向一個'index.json'文件",
|
||||
"Double tap to zoom": "雙擊縮放",
|
||||
"Clear Unfavorited": "清除未收藏",
|
||||
"Reverse": "反轉",
|
||||
"Delete Chapters": "刪除章節",
|
||||
"Open Folder": "打開資料夾",
|
||||
"Path copied to clipboard": "路徑已複製到剪貼簿",
|
||||
"Reverse default chapter order": "反轉預設章節順序",
|
||||
"Reload Configs": "重新載入設定檔",
|
||||
"Reload": "重載",
|
||||
"Disable Length Limitation": "禁用長度限制",
|
||||
"Only valid for this run": "僅對本次運行有效",
|
||||
"Logs": "日誌",
|
||||
"Export logs": "匯出日誌",
|
||||
"Clear specific reader settings for all comics": "清除所有漫畫的特殊閱讀設定",
|
||||
"Clear specific reader settings for this comic": "清除該漫畫的特殊閱讀設定",
|
||||
"Enable comic specific settings": "啟用此漫畫特定設定",
|
||||
"Ignore Certificate Errors": "忽略證書錯誤",
|
||||
"Mouse scroll speed": "滑鼠滾動速度"
|
||||
}
|
||||
}
|
||||
}
|
@@ -9,13 +9,47 @@ Venera uses [flutter_qjs](https://github.com/wgh136/flutter_qjs) as js engine wh
|
||||
|
||||
This document will describe how to write a comic source for Venera.
|
||||
|
||||
## Preparation
|
||||
## Comic Source List
|
||||
|
||||
Venera can display a list of comic sources in the app.
|
||||
|
||||
You can use the following repo url:
|
||||
```
|
||||
https://git.nyne.dev/nyne/venera-configs/raw/branch/main/index.json
|
||||
```
|
||||
The repo is maintained by the Venera team.
|
||||
|
||||
> The link is a mirror of the original repo. To contribute your comic source, please visit the [original repo](https://github.com/venera-app/venera-configs)
|
||||
|
||||
You should provide a repository url to let the app load the comic source list.
|
||||
The url should point to a JSON file that contains the list of comic sources.
|
||||
|
||||
The JSON file should have the following format:
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"name": "Source Name",
|
||||
"url": "https://example.com/source.js",
|
||||
"filename": "Relative path to the source file",
|
||||
"version": "1.0.0",
|
||||
"description": "A brief description of the source"
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
Only one of `url` and `filename` should be provided.
|
||||
The description field is optional.
|
||||
|
||||
## Create a Comic Source
|
||||
|
||||
### Preparation
|
||||
|
||||
- Install Venera. Using flutter to run the project is recommended since it's easier to debug.
|
||||
- An editor that supports javascript.
|
||||
- Download template and venera javascript api from [here](https://github.com/venera-app/venera-configs).
|
||||
|
||||
## Start Writing
|
||||
### Start Writing
|
||||
|
||||
The template contains detailed comments and examples. You can refer to it when writing your own comic source.
|
||||
|
||||
@@ -23,7 +57,7 @@ Here is a brief introduction to the template:
|
||||
|
||||
> Note: Javascript api document is [here](js_api.md).
|
||||
|
||||
### Write basic information
|
||||
#### Write basic information
|
||||
|
||||
```javascript
|
||||
class NewComicSource extends ComicSource {
|
||||
@@ -49,7 +83,7 @@ In this part, you need to do the following:
|
||||
- Change the class name to your source name.
|
||||
- Fill in the name, key, version, minAppVersion, and url fields.
|
||||
|
||||
### init function
|
||||
#### init function
|
||||
|
||||
```javascript
|
||||
/**
|
||||
@@ -64,7 +98,7 @@ The function will be called when the source is initialized. You can do some init
|
||||
|
||||
Remove this function if not used.
|
||||
|
||||
### Account
|
||||
#### Account
|
||||
|
||||
```javascript
|
||||
// [Optional] account related
|
||||
@@ -140,7 +174,7 @@ In this part, you can implement login, logout, and register functions.
|
||||
|
||||
Remove this part if not used.
|
||||
|
||||
### Explore page
|
||||
#### Explore page
|
||||
|
||||
```javascript
|
||||
// explore page list
|
||||
@@ -185,7 +219,7 @@ There are three types of explore pages:
|
||||
- multiPageComicList: An explore page contains multiple comics, the comics are loaded page by page.
|
||||
- mixed: An explore page contains multiple parts, each part can be a list of comics or a block of comics which have a title and a view more button.
|
||||
|
||||
### Category Page
|
||||
#### Category Page
|
||||
|
||||
```javascript
|
||||
// categories
|
||||
@@ -227,7 +261,7 @@ Category page is a static page that contains multiple parts, each part contains
|
||||
|
||||
A comic source can only have one category page.
|
||||
|
||||
### Category Comics Page
|
||||
#### Category Comics Page
|
||||
|
||||
```javascript
|
||||
/// category comic loading related
|
||||
@@ -280,7 +314,7 @@ When user clicks on a category, the category comics page will be displayed.
|
||||
|
||||
This part is used to load comics of a category.
|
||||
|
||||
### Search
|
||||
#### Search
|
||||
|
||||
```javascript
|
||||
/// search related
|
||||
@@ -331,6 +365,11 @@ This part is used to load comics of a category.
|
||||
|
||||
// enable tags suggestions
|
||||
enableTagsSuggestions: false,
|
||||
// [Optional] handle tag suggestion click
|
||||
onTagSuggestionSelected: (namespace, tag) => {
|
||||
// return the text to insert into search box
|
||||
return `${namespace}:${tag}`
|
||||
},
|
||||
}
|
||||
```
|
||||
|
||||
@@ -339,7 +378,7 @@ This part is used to load search results.
|
||||
`load` and `loadNext` functions are used to load search results.
|
||||
If `load` function is implemented, `loadNext` function will be ignored.
|
||||
|
||||
### Favorites
|
||||
#### Favorites
|
||||
|
||||
```javascript
|
||||
// favorite related
|
||||
@@ -411,7 +450,7 @@ This part is used to manage network favorites of the source.
|
||||
`load` and `loadNext` functions are used to load search results.
|
||||
If `load` function is implemented, `loadNext` function will be ignored.
|
||||
|
||||
### Comic Details
|
||||
#### Comic Details
|
||||
|
||||
```javascript
|
||||
/// single comic related
|
||||
@@ -576,7 +615,7 @@ If `load` function is implemented, `loadNext` function will be ignored.
|
||||
|
||||
This part is used to load comic details.
|
||||
|
||||
### Settings
|
||||
#### Settings
|
||||
|
||||
```javascript
|
||||
/*
|
||||
@@ -635,7 +674,7 @@ This part is used to load comic details.
|
||||
This part is used to provide settings for the source.
|
||||
|
||||
|
||||
### Translations
|
||||
#### Translations
|
||||
|
||||
```javascript
|
||||
// [Optional] translations for the strings in this config
|
||||
|
180
doc/headless_doc.md
Normal file
180
doc/headless_doc.md
Normal file
@@ -0,0 +1,180 @@
|
||||
# Venera Headless Mode
|
||||
|
||||
Venera's headless mode allows you to run key features from the command line, making it easy to automate tasks and integrate with other tools. This document outlines the available commands and their usage.
|
||||
|
||||
## How to Use
|
||||
|
||||
To activate headless mode, use the `--headless` flag when running the Venera executable, followed by the desired command.
|
||||
|
||||
```bash
|
||||
venera --headless <command> [subcommand] [options]
|
||||
```
|
||||
|
||||
## Global Options
|
||||
|
||||
- **`--ignore-disheadless-log`**: Suppresses log output, providing a cleaner output for scripting.
|
||||
|
||||
## Commands
|
||||
|
||||
### `webdav`
|
||||
|
||||
Manage WebDAV data synchronization.
|
||||
|
||||
- **`webdav up`**: Uploads your local configuration to the WebDAV server.
|
||||
- **`webdav down`**: Downloads and applies the remote configuration from the WebDAV server.
|
||||
|
||||
**Example:**
|
||||
|
||||
```bash
|
||||
venera --headless webdav up
|
||||
```
|
||||
|
||||
### `updatescript`
|
||||
|
||||
Update comic source scripts.
|
||||
|
||||
- **`updatescript all`**: Checks for and applies all available updates for your comic source scripts.
|
||||
|
||||
**Example:**
|
||||
|
||||
```bash
|
||||
venera --headless updatescript all
|
||||
```
|
||||
|
||||
**Output Format:**
|
||||
|
||||
The `updatescript` command provides detailed progress and a final summary.
|
||||
|
||||
**Progress Logs:**
|
||||
|
||||
- **`Progress`**: Indicates a successful update for a single script.
|
||||
- **`ProgressError`**: Indicates a failure during a script update.
|
||||
|
||||
**Example `Progress` Log:**
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "running",
|
||||
"message": "Progress",
|
||||
"data": {
|
||||
"current": 1,
|
||||
"total": 5,
|
||||
"source": {
|
||||
"key": "source-key",
|
||||
"name": "Source Name",
|
||||
"version": "1.0.0",
|
||||
"url": "https://example.com/source.js"
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Final Summary:**
|
||||
|
||||
A summary is provided at the end, detailing the total number of scripts, how many were updated, and how many failed.
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "success",
|
||||
"message": "All scripts updated.",
|
||||
"data": {
|
||||
"total": 5,
|
||||
"updated": 4,
|
||||
"errors": 1
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### `updatesubscribe`
|
||||
|
||||
Update your subscribed comics and retrieve a list of updated comics.
|
||||
|
||||
- **`updatesubscribe`**: Checks all subscribed comics for updates.
|
||||
- **`updatesubscribe --update-comic-by-id-type <id> <type>`**: Updates a single comic specified by its `id` and `type`.
|
||||
|
||||
**Example:**
|
||||
|
||||
```bash
|
||||
# Update all subscriptions
|
||||
venera --headless updatesubscribe
|
||||
|
||||
# Update a single comic
|
||||
venera --headless updatesubscribe --update-comic-by-id-type "comic-id" "source-key"
|
||||
```
|
||||
|
||||
## Output Format
|
||||
|
||||
All headless commands output JSON objects prefixed with `[CLI PRINT]`. This structured format allows for easy parsing in automated scripts. The JSON object always contains a `status` and a `message`. For commands that return data, a `data` field will also be present.
|
||||
|
||||
### `updatesubscribe` Output
|
||||
|
||||
The `updatesubscribe` command provides detailed progress and final results in JSON format.
|
||||
|
||||
**Progress Logs:**
|
||||
|
||||
During an update, you will receive `Progress` or `ProgressError` messages.
|
||||
|
||||
- **`Progress`**: Indicates a successful step in the update process.
|
||||
- **`ProgressError`**: Indicates an error occurred while updating a specific comic.
|
||||
|
||||
**Example `Progress` Log:**
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "running",
|
||||
"message": "Progress",
|
||||
"data": {
|
||||
"current": 1,
|
||||
"total": 10,
|
||||
"comic": {
|
||||
"id": "some-comic-id",
|
||||
"name": "Some Comic Name",
|
||||
"coverUrl": "https://example.com/cover.jpg",
|
||||
"author": "Author Name",
|
||||
"type": "source-key",
|
||||
"updateTime": "2023-10-27T12:00:00Z",
|
||||
"tags": ["tag1", "tag2"]
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Example `ProgressError` Log:**
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "running",
|
||||
"message": "ProgressError",
|
||||
"data": {
|
||||
"current": 2,
|
||||
"total": 10,
|
||||
"comic": {
|
||||
"id": "another-comic-id",
|
||||
"name": "Another Comic Name",
|
||||
...
|
||||
},
|
||||
"error": "Error message here"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Final Output:**
|
||||
|
||||
Once the update process is complete, a final JSON object is returned with a list of all comics that have been updated.
|
||||
|
||||
```json
|
||||
{
|
||||
"status": "success",
|
||||
"message": "Updated comics list.",
|
||||
"data": [
|
||||
{
|
||||
"id": "some-comic-id",
|
||||
"name": "Some Comic Name",
|
||||
"coverUrl": "https://example.com/cover.jpg",
|
||||
"author": "Author Name",
|
||||
"type": "source-key",
|
||||
"updateTime": "2023-10-27T12:00:00Z",
|
||||
"tags": ["tag1", "tag2"]
|
||||
}
|
||||
]
|
||||
}
|
@@ -46,12 +46,14 @@
|
||||
<key>UIApplicationSupportsIndirectInputEvents</key>
|
||||
<true/>
|
||||
<key>NSPhotoLibraryUsageDescription</key>
|
||||
<string>Choose images</string>
|
||||
<string>Choose images</string>
|
||||
<key>UIFileSharingEnabled</key>
|
||||
<true/>
|
||||
<key>LSSupportsOpeningDocumentsInPlace</key>
|
||||
<true/>
|
||||
<key>NSFaceIDUsageDescription</key>
|
||||
<string>Ensure that the operation is being performed by the user themselves.</string>
|
||||
<string>Ensure that the operation is being performed by the user themselves.</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.books</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@@ -1,5 +1,6 @@
|
||||
import 'dart:async';
|
||||
import 'dart:collection';
|
||||
import 'dart:convert';
|
||||
import 'dart:math' as math;
|
||||
import 'dart:ui' as ui;
|
||||
|
||||
@@ -21,11 +22,13 @@ import 'package:venera/foundation/image_provider/cached_image.dart';
|
||||
import 'package:venera/foundation/image_provider/history_image_provider.dart';
|
||||
import 'package:venera/foundation/image_provider/local_comic_image.dart';
|
||||
import 'package:venera/foundation/local.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/foundation/res.dart';
|
||||
import 'package:venera/network/cloudflare.dart';
|
||||
import 'package:venera/pages/comic_details_page/comic_page.dart';
|
||||
import 'package:venera/pages/favorites/favorites_page.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
import 'package:venera/utils/io.dart';
|
||||
import 'package:venera/utils/tags_translation.dart';
|
||||
import 'package:venera/utils/translations.dart';
|
||||
|
||||
|
@@ -37,9 +37,11 @@ mixin class JsUiApi {
|
||||
case 'showInputDialog':
|
||||
var title = message['title'];
|
||||
var validator = message['validator'];
|
||||
var image = message['image'];
|
||||
if (title is! String) return;
|
||||
if (validator != null && validator is! JSInvokable) return;
|
||||
return _showInputDialog(title, validator);
|
||||
if (image != null && image is! String) return;
|
||||
return _showInputDialog(title, validator, image);
|
||||
case 'showSelectDialog':
|
||||
var title = message['title'];
|
||||
var options = message['options'];
|
||||
@@ -124,12 +126,13 @@ mixin class JsUiApi {
|
||||
controller?.close();
|
||||
}
|
||||
|
||||
Future<String?> _showInputDialog(String title, JSInvokable? validator) async {
|
||||
Future<String?> _showInputDialog(String title, JSInvokable? validator, String? image) async {
|
||||
String? result;
|
||||
var func = validator == null ? null : JSAutoFreeFunction(validator);
|
||||
await showInputDialog(
|
||||
context: App.rootContext,
|
||||
title: title,
|
||||
image: image,
|
||||
onConfirm: (v) {
|
||||
if (func != null) {
|
||||
var res = func.call([v]);
|
||||
|
@@ -41,18 +41,22 @@ class NetworkError extends StatelessWidget {
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
cfe == null ? message : "Cloudflare verification required".tl,
|
||||
textAlign: TextAlign.center,
|
||||
maxLines: 3,
|
||||
),
|
||||
if (retry != null)
|
||||
const SizedBox(
|
||||
height: 12,
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
saveFile(
|
||||
data: utf8.encode(Log().toString()),
|
||||
filename: 'log.txt',
|
||||
);
|
||||
},
|
||||
child: Text("Export logs".tl),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
if (retry != null)
|
||||
if (cfe != null)
|
||||
FilledButton(
|
||||
@@ -74,15 +78,11 @@ class NetworkError extends StatelessWidget {
|
||||
body = Column(
|
||||
children: [
|
||||
const Appbar(title: Text("")),
|
||||
Expanded(
|
||||
child: body,
|
||||
)
|
||||
Expanded(child: body),
|
||||
],
|
||||
);
|
||||
}
|
||||
return Material(
|
||||
child: body,
|
||||
);
|
||||
return Material(child: body);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,9 +94,7 @@ class ListLoadingIndicator extends StatelessWidget {
|
||||
return const SizedBox(
|
||||
width: double.infinity,
|
||||
height: 80,
|
||||
child: Center(
|
||||
child: FiveDotLoadingAnimation(),
|
||||
),
|
||||
child: Center(child: FiveDotLoadingAnimation()),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -108,10 +106,9 @@ class SliverListLoadingIndicator extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
// SliverToBoxAdapter can not been lazy loaded.
|
||||
// Use SliverList to make sure the animation can be lazy loaded.
|
||||
return SliverList.list(children: const [
|
||||
SizedBox(),
|
||||
ListLoadingIndicator(),
|
||||
]);
|
||||
return SliverList.list(
|
||||
children: const [SizedBox(), ListLoadingIndicator()],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -178,10 +175,7 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object>
|
||||
}
|
||||
|
||||
Widget buildError() {
|
||||
return NetworkError(
|
||||
message: error!,
|
||||
retry: retry,
|
||||
);
|
||||
return NetworkError(message: error!, retry: retry);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -323,11 +317,7 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
|
||||
}
|
||||
|
||||
Widget buildError(BuildContext context, String error) {
|
||||
return NetworkError(
|
||||
withAppbar: false,
|
||||
message: error,
|
||||
retry: reset,
|
||||
);
|
||||
return NetworkError(withAppbar: false, message: error, retry: reset);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -388,7 +378,7 @@ class _FiveDotLoadingAnimationState extends State<FiveDotLoadingAnimation>
|
||||
Colors.green,
|
||||
Colors.blue,
|
||||
Colors.yellow,
|
||||
Colors.purple
|
||||
Colors.purple,
|
||||
];
|
||||
|
||||
static const _padding = 12.0;
|
||||
@@ -400,16 +390,15 @@ class _FiveDotLoadingAnimationState extends State<FiveDotLoadingAnimation>
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AnimatedBuilder(
|
||||
animation: _controller,
|
||||
builder: (context, child) {
|
||||
return SizedBox(
|
||||
width: _dotSize * 5 + _padding * 6,
|
||||
height: _height,
|
||||
child: Stack(
|
||||
children: List.generate(5, (index) => buildDot(index)),
|
||||
),
|
||||
);
|
||||
});
|
||||
animation: _controller,
|
||||
builder: (context, child) {
|
||||
return SizedBox(
|
||||
width: _dotSize * 5 + _padding * 6,
|
||||
height: _height,
|
||||
child: Stack(children: List.generate(5, (index) => buildDot(index))),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildDot(int index) {
|
||||
@@ -417,7 +406,8 @@ class _FiveDotLoadingAnimationState extends State<FiveDotLoadingAnimation>
|
||||
var startValue = index * 0.8;
|
||||
return Positioned(
|
||||
left: index * _dotSize + (index + 1) * _padding,
|
||||
bottom: (math.sin(math.pi / 2 * (value - startValue).clamp(0, 2))) *
|
||||
bottom:
|
||||
(math.sin(math.pi / 2 * (value - startValue).clamp(0, 2))) *
|
||||
(_height - _dotSize),
|
||||
child: Container(
|
||||
width: _dotSize,
|
||||
|
@@ -290,28 +290,30 @@ class ContentDialog extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var content = Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
title != null
|
||||
? Appbar(
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.close),
|
||||
onPressed: dismissible ? context.pop : null,
|
||||
),
|
||||
title: Text(title!),
|
||||
backgroundColor: Colors.transparent,
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
this.content,
|
||||
const SizedBox(height: 16),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: actions,
|
||||
).paddingRight(12),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
var content = SingleChildScrollView(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
title != null
|
||||
? Appbar(
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.close),
|
||||
onPressed: dismissible ? context.pop : null,
|
||||
),
|
||||
title: Text(title!),
|
||||
backgroundColor: Colors.transparent,
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
this.content,
|
||||
const SizedBox(height: 16),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: actions,
|
||||
).paddingRight(12),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
),
|
||||
);
|
||||
return Dialog(
|
||||
shape: RoundedRectangleBorder(
|
||||
@@ -357,6 +359,7 @@ Future<void> showInputDialog({
|
||||
String confirmText = "Confirm",
|
||||
String cancelText = "Cancel",
|
||||
RegExp? inputValidator,
|
||||
String? image,
|
||||
}) {
|
||||
var controller = TextEditingController(text: initialValue);
|
||||
bool isLoading = false;
|
||||
@@ -369,14 +372,23 @@ Future<void> showInputDialog({
|
||||
builder: (context, setState) {
|
||||
return ContentDialog(
|
||||
title: title,
|
||||
content: TextField(
|
||||
controller: controller,
|
||||
decoration: InputDecoration(
|
||||
hintText: hintText,
|
||||
border: const OutlineInputBorder(),
|
||||
errorText: error,
|
||||
),
|
||||
).paddingHorizontal(12),
|
||||
content: Column(
|
||||
children: [
|
||||
if (image != null)
|
||||
SizedBox(
|
||||
height: 108,
|
||||
child: Image.network(image, fit: BoxFit.none),
|
||||
).paddingBottom(8),
|
||||
TextField(
|
||||
controller: controller,
|
||||
decoration: InputDecoration(
|
||||
hintText: hintText,
|
||||
border: const OutlineInputBorder(),
|
||||
errorText: error,
|
||||
),
|
||||
).paddingHorizontal(12),
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
Button.filled(
|
||||
isLoading: isLoading,
|
||||
|
@@ -117,16 +117,25 @@ class _SmoothScrollProviderState extends State<SmoothScrollProvider> {
|
||||
_futurePosition ??= currentLocation;
|
||||
double k = (_futurePosition! - currentLocation).abs() / 1600 + 1;
|
||||
_futurePosition = _futurePosition! + pointerSignal.scrollDelta.dy * k;
|
||||
var beforeOffset = (_futurePosition! - currentLocation).abs();
|
||||
_futurePosition = _futurePosition!.clamp(
|
||||
_controller.position.minScrollExtent,
|
||||
_controller.position.maxScrollExtent,
|
||||
);
|
||||
var afterOffset = (_futurePosition! - currentLocation).abs();
|
||||
if (_futurePosition == old) return;
|
||||
var target = _futurePosition!;
|
||||
var duration = _fastAnimationDuration;
|
||||
if (afterOffset < beforeOffset) {
|
||||
duration = duration * (afterOffset / beforeOffset);
|
||||
if (duration < Duration(milliseconds: 10)) {
|
||||
duration = Duration(milliseconds: 10);
|
||||
}
|
||||
}
|
||||
_controller
|
||||
.animateTo(
|
||||
_futurePosition!,
|
||||
duration: _fastAnimationDuration,
|
||||
duration: duration,
|
||||
curve: Curves.linear,
|
||||
)
|
||||
.then((_) {
|
||||
|
@@ -13,7 +13,7 @@ export "widget_utils.dart";
|
||||
export "context.dart";
|
||||
|
||||
class _App {
|
||||
final version = "1.4.0";
|
||||
final version = "1.5.0";
|
||||
|
||||
bool get isAndroid => Platform.isAndroid;
|
||||
|
||||
@@ -30,6 +30,10 @@ class _App {
|
||||
|
||||
bool get isMobile => Platform.isAndroid || Platform.isIOS;
|
||||
|
||||
// Whether the app has been initialized.
|
||||
// If current Isolate is main Isolate, this value is always true.
|
||||
bool isInitialized = false;
|
||||
|
||||
Locale get locale {
|
||||
Locale deviceLocale = PlatformDispatcher.instance.locale;
|
||||
if (deviceLocale.languageCode == "zh" &&
|
||||
@@ -81,6 +85,7 @@ class _App {
|
||||
if (isAndroid) {
|
||||
externalStoragePath = (await getExternalStorageDirectory())!.path;
|
||||
}
|
||||
isInitialized = true;
|
||||
}
|
||||
|
||||
Future<void> initComponents() async {
|
||||
|
@@ -3,6 +3,7 @@ import 'dart:convert';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/utils/data_sync.dart';
|
||||
import 'package:venera/utils/init.dart';
|
||||
import 'package:venera/utils/io.dart';
|
||||
@@ -25,8 +26,7 @@ class Appdata with Init {
|
||||
var data = jsonEncode(toJson());
|
||||
var file = File(FilePath.join(App.dataPath, 'appdata.json'));
|
||||
await file.writeAsString(data);
|
||||
}
|
||||
finally {
|
||||
} finally {
|
||||
_isSavingData = false;
|
||||
}
|
||||
if (sync) {
|
||||
@@ -56,10 +56,7 @@ class Appdata with Init {
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {
|
||||
'settings': settings._data,
|
||||
'searchHistory': searchHistory,
|
||||
};
|
||||
return {'settings': settings._data, 'searchHistory': searchHistory};
|
||||
}
|
||||
|
||||
/// Following fields are related to device-specific data and should not be synced.
|
||||
@@ -94,8 +91,7 @@ class Appdata with Init {
|
||||
try {
|
||||
var file = File(FilePath.join(App.dataPath, 'implicitData.json'));
|
||||
await file.writeAsString(jsonEncode(implicitData));
|
||||
}
|
||||
finally {
|
||||
} finally {
|
||||
_isSavingData = false;
|
||||
}
|
||||
}
|
||||
@@ -103,28 +99,33 @@ class Appdata with Init {
|
||||
@override
|
||||
Future<void> doInit() async {
|
||||
var dataPath = (await getApplicationSupportDirectory()).path;
|
||||
var file = File(FilePath.join(
|
||||
dataPath,
|
||||
'appdata.json',
|
||||
));
|
||||
var file = File(FilePath.join(dataPath, 'appdata.json'));
|
||||
if (!await file.exists()) {
|
||||
return;
|
||||
}
|
||||
var json = jsonDecode(await file.readAsString());
|
||||
for (var key in (json['settings'] as Map<String, dynamic>).keys) {
|
||||
if (json['settings'][key] != null) {
|
||||
settings[key] = json['settings'][key];
|
||||
try {
|
||||
var json = jsonDecode(await file.readAsString());
|
||||
for (var key in (json['settings'] as Map<String, dynamic>).keys) {
|
||||
if (json['settings'][key] != null) {
|
||||
settings[key] = json['settings'][key];
|
||||
}
|
||||
}
|
||||
searchHistory = List.from(json['searchHistory']);
|
||||
} catch (e) {
|
||||
Log.error("Appdata", "Failed to load appdata", e);
|
||||
Log.info("Appdata", "Resetting appdata");
|
||||
file.deleteIgnoreError();
|
||||
}
|
||||
searchHistory = List.from(json['searchHistory']);
|
||||
var implicitDataFile = File(FilePath.join(dataPath, 'implicitData.json'));
|
||||
if (await implicitDataFile.exists()) {
|
||||
try {
|
||||
try {
|
||||
var implicitDataFile = File(FilePath.join(dataPath, 'implicitData.json'));
|
||||
if (await implicitDataFile.exists()) {
|
||||
implicitData = jsonDecode(await implicitDataFile.readAsString());
|
||||
}
|
||||
catch(_) {
|
||||
// ignore
|
||||
}
|
||||
} catch (e) {
|
||||
Log.error("Appdata", "Failed to load implicit data", e);
|
||||
Log.info("Appdata", "Resetting implicit data");
|
||||
var implicitDataFile = File(FilePath.join(dataPath, 'implicitData.json'));
|
||||
implicitDataFile.deleteIgnoreError();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -178,13 +179,19 @@ class Settings with ChangeNotifier {
|
||||
'customImageProcessing': defaultCustomImageProcessing,
|
||||
'sni': true,
|
||||
'autoAddLanguageFilter': 'none', // none, chinese, english, japanese
|
||||
'comicSourceListUrl':
|
||||
"https://cdn.jsdelivr.net/gh/venera-app/venera-configs@latest/index.json",
|
||||
'comicSourceListUrl': _defaultSourceListUrl,
|
||||
'preloadImageCount': 4,
|
||||
'followUpdatesFolder': null,
|
||||
'initialPage': '0',
|
||||
'comicListDisplayMode': 'paging', // paging, continuous
|
||||
'showPageNumberInReader': true,
|
||||
'showSingleImageOnFirstPage': false,
|
||||
'enableDoubleTapToZoom': true,
|
||||
'reverseChapterOrder': false,
|
||||
'showSystemStatusBar': false,
|
||||
'comicSpecificSettings': <String, Map<String, dynamic>>{},
|
||||
'ignoreBadCertificate': false,
|
||||
'readerScrollSpeed': 1.0, // 0.5 - 3.0
|
||||
};
|
||||
|
||||
operator [](String key) {
|
||||
@@ -193,6 +200,45 @@ class Settings with ChangeNotifier {
|
||||
|
||||
operator []=(String key, dynamic value) {
|
||||
_data[key] = value;
|
||||
if (key != "dataVersion") {
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
void setEnabledComicSpecificSettings(String comicId, String sourceKey, bool enabled) {
|
||||
setReaderSetting(comicId, sourceKey, "enabled", enabled);
|
||||
}
|
||||
|
||||
bool isComicSpecificSettingsEnabled(String? comicId, String? sourceKey) {
|
||||
if (comicId == null || sourceKey == null) {
|
||||
return false;
|
||||
}
|
||||
return _data['comicSpecificSettings']["$comicId@$sourceKey"]?["enabled"] == true;
|
||||
}
|
||||
|
||||
dynamic getReaderSetting(String comicId, String sourceKey, String key) {
|
||||
if (!isComicSpecificSettingsEnabled(comicId, sourceKey)) {
|
||||
return _data[key];
|
||||
}
|
||||
return _data['comicSpecificSettings']["$comicId@$sourceKey"]?[key] ??
|
||||
_data[key];
|
||||
}
|
||||
|
||||
void setReaderSetting(
|
||||
String comicId,
|
||||
String sourceKey,
|
||||
String key,
|
||||
dynamic value,
|
||||
) {
|
||||
(_data['comicSpecificSettings'] as Map<String, dynamic>).putIfAbsent(
|
||||
"$comicId@$sourceKey",
|
||||
() => <String, dynamic>{},
|
||||
)[key] = value;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void resetComicReaderSettings(String key) {
|
||||
(_data['comicSpecificSettings'] as Map).remove(key);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@@ -219,3 +265,6 @@ function processImage(image, cid, eid, page, sourceKey) {
|
||||
return futureImage;
|
||||
}
|
||||
''';
|
||||
|
||||
const _defaultSourceListUrl =
|
||||
"https://git.nyne.dev/nyne/venera-configs/raw/branch/main/index.json";
|
||||
|
@@ -1,5 +1,7 @@
|
||||
import 'dart:ffi';
|
||||
import 'dart:isolate';
|
||||
|
||||
import 'package:crypto/crypto.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:sqlite3/sqlite3.dart';
|
||||
import 'package:venera/utils/io.dart';
|
||||
|
||||
@@ -21,7 +23,52 @@ class CacheManager {
|
||||
|
||||
int _limitSize = 2 * 1024 * 1024 * 1024;
|
||||
|
||||
CacheManager._create(){
|
||||
static Future<int> _scanDir(Pointer<void> dbP, String dir) async {
|
||||
var res = await Isolate.run(() async {
|
||||
int totalSize = 0;
|
||||
List<String> unmanagedFiles = [];
|
||||
var db = sqlite3.fromPointer(dbP);
|
||||
await for (var file in Directory(dir).list(recursive: true)) {
|
||||
if (file is File) {
|
||||
var size = await file.length();
|
||||
var segments = file.uri.pathSegments;
|
||||
var name = segments.last;
|
||||
var dir = segments.elementAtOrNull(segments.length - 2) ?? "*";
|
||||
var res = db.select('''
|
||||
SELECT * FROM cache
|
||||
WHERE dir = ? AND name = ?
|
||||
''', [dir, name]);
|
||||
if (res.isEmpty) {
|
||||
unmanagedFiles.add(file.path);
|
||||
} else {
|
||||
totalSize += size;
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
'totalSize': totalSize,
|
||||
'unmanagedFiles': unmanagedFiles,
|
||||
};
|
||||
});
|
||||
// delete unmanaged files
|
||||
// Only modify the database in the main isolate to avoid deadlock
|
||||
for (var filePath in res['unmanagedFiles'] as List<String>) {
|
||||
var file = File(filePath);
|
||||
if (await file.exists()) {
|
||||
await file.delete();
|
||||
}
|
||||
var segments = file.uri.pathSegments;
|
||||
var name = segments.last;
|
||||
var dir = segments.elementAtOrNull(segments.length - 2) ?? "*";
|
||||
CacheManager()._db.execute('''
|
||||
DELETE FROM cache
|
||||
WHERE dir = ? AND name = ?
|
||||
''', [dir, name]);
|
||||
}
|
||||
return res['totalSize'] as int;
|
||||
}
|
||||
|
||||
CacheManager._create() {
|
||||
Directory(cachePath).createSync(recursive: true);
|
||||
_db = sqlite3.open('${App.dataPath}/cache.db');
|
||||
_db.execute('''
|
||||
@@ -33,100 +80,103 @@ class CacheManager {
|
||||
type TEXT
|
||||
)
|
||||
''');
|
||||
compute((path) => Directory(path).size, cachePath)
|
||||
.then((value) => _currentSize = value);
|
||||
_scanDir(_db.handle, cachePath).then((value) {
|
||||
_currentSize = value;
|
||||
checkCache();
|
||||
});
|
||||
}
|
||||
|
||||
/// Get the singleton instance of CacheManager.
|
||||
factory CacheManager() => instance ??= CacheManager._create();
|
||||
|
||||
/// set cache size limit in MB
|
||||
void setLimitSize(int size){
|
||||
void setLimitSize(int size) {
|
||||
_limitSize = size * 1024 * 1024;
|
||||
}
|
||||
|
||||
void setType(String key, String? type){
|
||||
_db.execute('''
|
||||
UPDATE cache
|
||||
SET type = ?
|
||||
WHERE key = ?
|
||||
''', [type, key]);
|
||||
}
|
||||
|
||||
String? getType(String key){
|
||||
var res = _db.select('''
|
||||
SELECT type FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
if(res.isEmpty){
|
||||
return null;
|
||||
}
|
||||
return res.first[0];
|
||||
}
|
||||
|
||||
Future<void> writeCache(String key, List<int> data, [int duration = 7 * 24 * 60 * 60 * 1000]) async{
|
||||
/// Write cache to disk.
|
||||
Future<void> writeCache(String key, List<int> data,
|
||||
[int duration = 7 * 24 * 60 * 60 * 1000]) async {
|
||||
await delete(key);
|
||||
this.dir++;
|
||||
this.dir %= 100;
|
||||
var dir = this.dir;
|
||||
var name = md5.convert(Uint8List.fromList(key.codeUnits)).toString();
|
||||
var name = md5.convert(key.codeUnits).toString();
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
while(await file.exists()){
|
||||
name = md5.convert(Uint8List.fromList(name.codeUnits)).toString();
|
||||
file = File('$cachePath/$dir/$name');
|
||||
}
|
||||
await file.create(recursive: true);
|
||||
await file.writeAsBytes(data);
|
||||
var expires = DateTime.now().millisecondsSinceEpoch + duration;
|
||||
_db.execute('''
|
||||
INSERT OR REPLACE INTO cache (key, dir, name, expires) VALUES (?, ?, ?, ?)
|
||||
''', [key, dir.toString(), name, expires]);
|
||||
if(_currentSize != null) {
|
||||
if (_currentSize != null) {
|
||||
_currentSize = _currentSize! + data.length;
|
||||
}
|
||||
checkCacheIfRequired();
|
||||
}
|
||||
|
||||
Future<CachingFile> openWrite(String key) async{
|
||||
this.dir++;
|
||||
this.dir %= 100;
|
||||
var dir = this.dir;
|
||||
var name = md5.convert(Uint8List.fromList(key.codeUnits)).toString();
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
while(await file.exists()){
|
||||
name = md5.convert(Uint8List.fromList(name.codeUnits)).toString();
|
||||
file = File('$cachePath/$dir/$name');
|
||||
}
|
||||
await file.create(recursive: true);
|
||||
return CachingFile._(key, dir.toString(), name, file);
|
||||
}
|
||||
|
||||
Future<File?> findCache(String key) async{
|
||||
/// Find cache by key.
|
||||
/// If cache is expired, it will be deleted and return null.
|
||||
/// If cache is not found, it will return null.
|
||||
/// If cache is found, it will return the file, and update the expires time.
|
||||
Future<File?> findCache(String key) async {
|
||||
var res = _db.select('''
|
||||
SELECT * FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
if(res.isEmpty){
|
||||
if (res.isEmpty) {
|
||||
return null;
|
||||
}
|
||||
var row = res.first;
|
||||
var dir = row[1] as String;
|
||||
var name = row[2] as String;
|
||||
var expires = row[3] as int;
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
if(await file.exists()){
|
||||
var now = DateTime.now().millisecondsSinceEpoch;
|
||||
if (expires < now) {
|
||||
// expired
|
||||
_db.execute('''
|
||||
DELETE FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
if (await file.exists()) {
|
||||
await file.delete();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
if (await file.exists()) {
|
||||
// update time
|
||||
var expires = now + 7 * 24 * 60 * 60 * 1000;
|
||||
_db.execute('''
|
||||
UPDATE cache
|
||||
SET expires = ?
|
||||
WHERE key = ?
|
||||
''', [expires, key]);
|
||||
return file;
|
||||
} else {
|
||||
_db.execute('''
|
||||
DELETE FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
bool _isChecking = false;
|
||||
|
||||
/// Check cache size and delete expired cache.
|
||||
/// Only check cache if current size is greater than limit size.
|
||||
void checkCacheIfRequired() {
|
||||
if(_currentSize != null && _currentSize! > _limitSize){
|
||||
if (_currentSize != null && _currentSize! > _limitSize) {
|
||||
checkCache();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> checkCache() async{
|
||||
if(_isChecking){
|
||||
/// Check cache size and delete expired cache.
|
||||
/// If current size is greater than limit size,
|
||||
/// delete cache until current size is less than limit size.
|
||||
Future<void> checkCache() async {
|
||||
if (_isChecking) {
|
||||
return;
|
||||
}
|
||||
_isChecking = true;
|
||||
@@ -134,39 +184,42 @@ class CacheManager {
|
||||
SELECT * FROM cache
|
||||
WHERE expires < ?
|
||||
''', [DateTime.now().millisecondsSinceEpoch]);
|
||||
for(var row in res){
|
||||
for (var row in res) {
|
||||
var dir = row[1] as String;
|
||||
var name = row[2] as String;
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
if(await file.exists()){
|
||||
if (await file.exists()) {
|
||||
var size = await file.length();
|
||||
_currentSize = _currentSize! - size;
|
||||
await file.delete();
|
||||
}
|
||||
}
|
||||
_db.execute('''
|
||||
if (res.isNotEmpty) {
|
||||
_db.execute('''
|
||||
DELETE FROM cache
|
||||
WHERE expires < ?
|
||||
''', [DateTime.now().millisecondsSinceEpoch]);
|
||||
|
||||
int count = 0;
|
||||
var res2 = _db.select('''
|
||||
SELECT COUNT(*) FROM cache
|
||||
''');
|
||||
if(res2.isNotEmpty){
|
||||
count = res2.first[0] as int;
|
||||
}
|
||||
|
||||
while((_currentSize != null && _currentSize! > _limitSize) || count > 2000){
|
||||
while (_currentSize != null && _currentSize! > _limitSize) {
|
||||
var res = _db.select('''
|
||||
SELECT * FROM cache
|
||||
ORDER BY expires ASC
|
||||
limit 10
|
||||
''');
|
||||
for(var row in res){
|
||||
if (res.isEmpty) {
|
||||
// There are many files unmanaged by the cache manager.
|
||||
// Clear all cache.
|
||||
await Directory(cachePath).delete(recursive: true);
|
||||
Directory(cachePath).createSync(recursive: true);
|
||||
break;
|
||||
}
|
||||
for (var row in res) {
|
||||
var key = row[0] as String;
|
||||
var dir = row[1] as String;
|
||||
var name = row[2] as String;
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
if(await file.exists()){
|
||||
if (await file.exists()) {
|
||||
var size = await file.length();
|
||||
await file.delete();
|
||||
_db.execute('''
|
||||
@@ -174,7 +227,7 @@ class CacheManager {
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
_currentSize = _currentSize! - size;
|
||||
if(_currentSize! <= _limitSize){
|
||||
if (_currentSize! <= _limitSize) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
@@ -183,18 +236,18 @@ class CacheManager {
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
}
|
||||
count--;
|
||||
}
|
||||
}
|
||||
_isChecking = false;
|
||||
}
|
||||
|
||||
Future<void> delete(String key) async{
|
||||
/// Delete cache by key.
|
||||
Future<void> delete(String key) async {
|
||||
var res = _db.select('''
|
||||
SELECT * FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
if(res.isEmpty){
|
||||
if (res.isEmpty) {
|
||||
return;
|
||||
}
|
||||
var row = res.first;
|
||||
@@ -202,7 +255,7 @@ class CacheManager {
|
||||
var name = row[2] as String;
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
var fileSize = 0;
|
||||
if(await file.exists()){
|
||||
if (await file.exists()) {
|
||||
fileSize = await file.length();
|
||||
await file.delete();
|
||||
}
|
||||
@@ -210,11 +263,12 @@ class CacheManager {
|
||||
DELETE FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
if(_currentSize != null) {
|
||||
if (_currentSize != null) {
|
||||
_currentSize = _currentSize! - fileSize;
|
||||
}
|
||||
}
|
||||
|
||||
/// Delete all cache.
|
||||
Future<void> clear() async {
|
||||
await Directory(cachePath).delete(recursive: true);
|
||||
Directory(cachePath).createSync(recursive: true);
|
||||
@@ -223,75 +277,4 @@ class CacheManager {
|
||||
''');
|
||||
_currentSize = 0;
|
||||
}
|
||||
|
||||
Future<void> deleteKeyword(String keyword) async{
|
||||
var res = _db.select('''
|
||||
SELECT * FROM cache
|
||||
WHERE key LIKE ?
|
||||
''', ['%$keyword%']);
|
||||
for(var row in res){
|
||||
var key = row[0] as String;
|
||||
var dir = row[1] as String;
|
||||
var name = row[2] as String;
|
||||
var file = File('$cachePath/$dir/$name');
|
||||
var fileSize = 0;
|
||||
if(await file.exists()){
|
||||
fileSize = await file.length();
|
||||
try {
|
||||
await file.delete();
|
||||
}
|
||||
finally {}
|
||||
}
|
||||
_db.execute('''
|
||||
DELETE FROM cache
|
||||
WHERE key = ?
|
||||
''', [key]);
|
||||
if(_currentSize != null) {
|
||||
_currentSize = _currentSize! - fileSize;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class CachingFile{
|
||||
CachingFile._(this.key, this.dir, this.name, this.file);
|
||||
|
||||
final String key;
|
||||
|
||||
final String dir;
|
||||
|
||||
final String name;
|
||||
|
||||
final File file;
|
||||
|
||||
final List<int> _buffer = [];
|
||||
|
||||
Future<void> writeBytes(List<int> data) async{
|
||||
_buffer.addAll(data);
|
||||
if(_buffer.length > 1024 * 1024){
|
||||
await file.writeAsBytes(_buffer, mode: FileMode.append);
|
||||
_buffer.clear();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> close() async{
|
||||
if(_buffer.isNotEmpty){
|
||||
await file.writeAsBytes(_buffer, mode: FileMode.append);
|
||||
}
|
||||
CacheManager()._db.execute('''
|
||||
INSERT OR REPLACE INTO cache (key, dir, name, expires) VALUES (?, ?, ?, ?)
|
||||
''', [key, dir, name, DateTime.now().millisecondsSinceEpoch + 7 * 24 * 60 * 60 * 1000]);
|
||||
CacheManager().checkCacheIfRequired();
|
||||
}
|
||||
|
||||
Future<void> cancel() async{
|
||||
await file.deleteIgnoreError();
|
||||
}
|
||||
|
||||
void reset() {
|
||||
_buffer.clear();
|
||||
if(file.existsSync()) {
|
||||
file.deleteSync();
|
||||
}
|
||||
}
|
||||
}
|
@@ -184,6 +184,9 @@ class ComicSource {
|
||||
|
||||
final HandleClickTagEvent? handleClickTagEvent;
|
||||
|
||||
/// Callback when a tag suggestion is selected in search.
|
||||
final TagSuggestionSelectFunc? onTagSuggestionSelected;
|
||||
|
||||
final LinkHandler? linkHandler;
|
||||
|
||||
final bool enableTagsSuggestions;
|
||||
@@ -259,6 +262,7 @@ class ComicSource {
|
||||
this.idMatcher,
|
||||
this.translations,
|
||||
this.handleClickTagEvent,
|
||||
this.onTagSuggestionSelected,
|
||||
this.linkHandler,
|
||||
this.enableTagsSuggestions,
|
||||
this.enableTagsTranslate,
|
||||
@@ -397,9 +401,14 @@ class SearchOptions {
|
||||
typedef CategoryComicsLoader = Future<Res<List<Comic>>> Function(
|
||||
String category, String? param, List<String> options, int page);
|
||||
|
||||
typedef CategoryOptionsLoader = Future<Res<List<CategoryComicsOptions>>> Function(
|
||||
String category, String? param);
|
||||
|
||||
class CategoryComicsData {
|
||||
/// options
|
||||
final List<CategoryComicsOptions> options;
|
||||
final List<CategoryComicsOptions>? options;
|
||||
|
||||
final CategoryOptionsLoader? optionsLoader;
|
||||
|
||||
/// [category] is the one clicked by the user on the category page.
|
||||
///
|
||||
@@ -410,7 +419,7 @@ class CategoryComicsData {
|
||||
|
||||
final RankingData? rankingData;
|
||||
|
||||
const CategoryComicsData(this.options, this.load, {this.rankingData});
|
||||
const CategoryComicsData({this.options, this.optionsLoader, required this.load, this.rankingData});
|
||||
}
|
||||
|
||||
class RankingData {
|
||||
@@ -425,6 +434,9 @@ class RankingData {
|
||||
}
|
||||
|
||||
class CategoryComicsOptions {
|
||||
// The label will not be displayed if it is empty.
|
||||
final String label;
|
||||
|
||||
/// Use a [LinkedHashMap] to describe an option list.
|
||||
/// key is for loading comics, value is the name displayed on screen.
|
||||
/// Default value will be the first of the Map.
|
||||
@@ -435,7 +447,7 @@ class CategoryComicsOptions {
|
||||
|
||||
final List<String>? showWhen;
|
||||
|
||||
const CategoryComicsOptions(this.options, this.notShowWhen, this.showWhen);
|
||||
const CategoryComicsOptions(this.label, this.options, this.notShowWhen, this.showWhen);
|
||||
}
|
||||
|
||||
class LinkHandler {
|
||||
|
@@ -116,6 +116,26 @@ class Comic {
|
||||
toString() => "$sourceKey@$id";
|
||||
}
|
||||
|
||||
class ComicID {
|
||||
final ComicType type;
|
||||
|
||||
final String id;
|
||||
|
||||
const ComicID(this.type, this.id);
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
if (other is! ComicID) return false;
|
||||
return other.type == type && other.id == id;
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => type.hashCode ^ id.hashCode;
|
||||
|
||||
@override
|
||||
String toString() => "$type@$id";
|
||||
}
|
||||
|
||||
class ComicDetails with HistoryMixin {
|
||||
@override
|
||||
final String title;
|
||||
|
@@ -64,8 +64,13 @@ class ComicSourceParser {
|
||||
if (file.existsSync()) {
|
||||
int i = 0;
|
||||
while (file.existsSync()) {
|
||||
file = File(FilePath.join(App.dataPath, "comic_source",
|
||||
"${fileName.split('.').first}($i).js"));
|
||||
file = File(
|
||||
FilePath.join(
|
||||
App.dataPath,
|
||||
"comic_source",
|
||||
"${fileName.split('.').first}($i).js",
|
||||
),
|
||||
);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
@@ -80,8 +85,9 @@ class ComicSourceParser {
|
||||
|
||||
Future<ComicSource> parse(String js, String filePath) async {
|
||||
js = js.replaceAll("\r\n", "\n");
|
||||
var line1 =
|
||||
js.split('\n').firstWhereOrNull((e) => e.trim().startsWith("class "));
|
||||
var line1 = js
|
||||
.split('\n')
|
||||
.firstWhereOrNull((e) => e.trim().startsWith("class "));
|
||||
if (line1 == null ||
|
||||
!line1.startsWith("class ") ||
|
||||
!line1.contains("extends ComicSource")) {
|
||||
@@ -89,24 +95,27 @@ class ComicSourceParser {
|
||||
}
|
||||
var className = line1.split("class")[1].split("extends ComicSource").first;
|
||||
className = className.trim();
|
||||
JsEngine().runCode("""
|
||||
(() => { $js
|
||||
JsEngine().runCode("""(() => { $js
|
||||
this['temp'] = new $className()
|
||||
}).call()
|
||||
""", className);
|
||||
_name = JsEngine().runCode("this['temp'].name") ??
|
||||
_name =
|
||||
JsEngine().runCode("this['temp'].name") ??
|
||||
(throw ComicSourceParseException('name is required'));
|
||||
var key = JsEngine().runCode("this['temp'].key") ??
|
||||
var key =
|
||||
JsEngine().runCode("this['temp'].key") ??
|
||||
(throw ComicSourceParseException('key is required'));
|
||||
var version = JsEngine().runCode("this['temp'].version") ??
|
||||
var version =
|
||||
JsEngine().runCode("this['temp'].version") ??
|
||||
(throw ComicSourceParseException('version is required'));
|
||||
var minAppVersion = JsEngine().runCode("this['temp'].minAppVersion");
|
||||
var url = JsEngine().runCode("this['temp'].url");
|
||||
if (minAppVersion != null) {
|
||||
if (compareSemVer(minAppVersion, App.version.split('-').first)) {
|
||||
throw ComicSourceParseException(
|
||||
"minAppVersion @version is required"
|
||||
.tlParams({"version": minAppVersion}),
|
||||
"minAppVersion @version is required".tlParams({
|
||||
"version": minAppVersion,
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -148,6 +157,7 @@ class ComicSourceParser {
|
||||
_parseIdMatch(),
|
||||
_parseTranslation(),
|
||||
_parseClickTagEvent(),
|
||||
_parseTagSuggestionSelectFunc(),
|
||||
_parseLinkHandler(),
|
||||
_getValue("search.enableTagsSuggestions") ?? false,
|
||||
_getValue("comic.enableTagsTranslate") ?? false,
|
||||
@@ -174,8 +184,10 @@ class ComicSourceParser {
|
||||
}
|
||||
|
||||
bool _checkExists(String index) {
|
||||
return JsEngine().runCode("ComicSource.sources.$_key.$index !== null "
|
||||
"&& ComicSource.sources.$_key.$index !== undefined");
|
||||
return JsEngine().runCode(
|
||||
"ComicSource.sources.$_key.$index !== null "
|
||||
"&& ComicSource.sources.$_key.$index !== undefined",
|
||||
);
|
||||
}
|
||||
|
||||
dynamic _getValue(String index) {
|
||||
@@ -276,16 +288,24 @@ class ComicSourceParser {
|
||||
if (type == "singlePageWithMultiPart") {
|
||||
loadMultiPart = () async {
|
||||
try {
|
||||
var res = await JsEngine()
|
||||
.runCode("ComicSource.sources.$_key.explore[$i].load()");
|
||||
return Res(List.from(res.keys
|
||||
.map((e) => ExplorePagePart(
|
||||
e,
|
||||
(res[e] as List)
|
||||
.map<Comic>((e) => Comic.fromJson(e, _key!))
|
||||
.toList(),
|
||||
null))
|
||||
.toList()));
|
||||
var res = await JsEngine().runCode(
|
||||
"ComicSource.sources.$_key.explore[$i].load()",
|
||||
);
|
||||
return Res(
|
||||
List.from(
|
||||
res.keys
|
||||
.map(
|
||||
(e) => ExplorePagePart(
|
||||
e,
|
||||
(res[e] as List)
|
||||
.map<Comic>((e) => Comic.fromJson(e, _key!))
|
||||
.toList(),
|
||||
null,
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Data Analysis", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
@@ -296,11 +316,15 @@ class ComicSourceParser {
|
||||
loadPage = (int page) async {
|
||||
try {
|
||||
var res = await JsEngine().runCode(
|
||||
"ComicSource.sources.$_key.explore[$i].load(${jsonEncode(page)})");
|
||||
"ComicSource.sources.$_key.explore[$i].load(${jsonEncode(page)})",
|
||||
);
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
subData: res["maxPage"]);
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["maxPage"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
@@ -310,10 +334,13 @@ class ComicSourceParser {
|
||||
loadNext = (next) async {
|
||||
try {
|
||||
var res = await JsEngine().runCode(
|
||||
"ComicSource.sources.$_key.explore[$i].loadNext(${jsonEncode(next)})");
|
||||
"ComicSource.sources.$_key.explore[$i].loadNext(${jsonEncode(next)})",
|
||||
);
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["next"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
@@ -325,8 +352,9 @@ class ComicSourceParser {
|
||||
} else if (type == "multiPartPage") {
|
||||
loadMultiPart = () async {
|
||||
try {
|
||||
var res = await JsEngine()
|
||||
.runCode("ComicSource.sources.$_key.explore[$i].load()");
|
||||
var res = await JsEngine().runCode(
|
||||
"ComicSource.sources.$_key.explore[$i].load()",
|
||||
);
|
||||
return Res(
|
||||
List.from(
|
||||
(res as List).map((e) {
|
||||
@@ -349,19 +377,22 @@ class ComicSourceParser {
|
||||
loadMixed = (index) async {
|
||||
try {
|
||||
var res = await JsEngine().runCode(
|
||||
"ComicSource.sources.$_key.explore[$i].load(${jsonEncode(index)})");
|
||||
"ComicSource.sources.$_key.explore[$i].load(${jsonEncode(index)})",
|
||||
);
|
||||
var list = <Object>[];
|
||||
for (var data in (res['data'] as List)) {
|
||||
if (data is List) {
|
||||
list.add(data.map((e) => Comic.fromJson(e, _key!)).toList());
|
||||
} else if (data is Map) {
|
||||
list.add(ExplorePagePart(
|
||||
data['title'],
|
||||
(data['comics'] as List).map((e) {
|
||||
return Comic.fromJson(e, _key!);
|
||||
}).toList(),
|
||||
data['viewMore'],
|
||||
));
|
||||
list.add(
|
||||
ExplorePagePart(
|
||||
data['title'],
|
||||
(data['comics'] as List).map((e) {
|
||||
return Comic.fromJson(e, _key!);
|
||||
}).toList(),
|
||||
data['viewMore'],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
return Res(list, subData: res['maxPage']);
|
||||
@@ -371,21 +402,25 @@ class ComicSourceParser {
|
||||
}
|
||||
};
|
||||
}
|
||||
pages.add(ExplorePageData(
|
||||
title,
|
||||
switch (type) {
|
||||
"singlePageWithMultiPart" => ExplorePageType.singlePageWithMultiPart,
|
||||
"multiPartPage" => ExplorePageType.singlePageWithMultiPart,
|
||||
"multiPageComicList" => ExplorePageType.multiPageComicList,
|
||||
"mixed" => ExplorePageType.mixed,
|
||||
_ =>
|
||||
throw ComicSourceParseException("Unknown explore page type $type")
|
||||
},
|
||||
loadPage,
|
||||
loadNext,
|
||||
loadMultiPart,
|
||||
loadMixed,
|
||||
));
|
||||
pages.add(
|
||||
ExplorePageData(
|
||||
title,
|
||||
switch (type) {
|
||||
"singlePageWithMultiPart" =>
|
||||
ExplorePageType.singlePageWithMultiPart,
|
||||
"multiPartPage" => ExplorePageType.singlePageWithMultiPart,
|
||||
"multiPageComicList" => ExplorePageType.multiPageComicList,
|
||||
"mixed" => ExplorePageType.mixed,
|
||||
_ => throw ComicSourceParseException(
|
||||
"Unknown explore page type $type",
|
||||
),
|
||||
},
|
||||
loadPage,
|
||||
loadNext,
|
||||
loadMultiPart,
|
||||
loadMixed,
|
||||
),
|
||||
);
|
||||
}
|
||||
return pages;
|
||||
}
|
||||
@@ -425,18 +460,17 @@ class ComicSourceParser {
|
||||
if (type == "fixed") {
|
||||
categoryParts.add(FixedCategoryPart(name, cs!));
|
||||
} else if (type == "random") {
|
||||
categoryParts
|
||||
.add(RandomCategoryPart(name, cs!, c["randomNumber"] ?? 1));
|
||||
categoryParts.add(
|
||||
RandomCategoryPart(name, cs!, c["randomNumber"] ?? 1),
|
||||
);
|
||||
} else if (type == "dynamic" && categories == null) {
|
||||
var loader = c["loader"];
|
||||
if (loader is! JSInvokable) {
|
||||
throw "DynamicCategoryPart loader must be a function";
|
||||
}
|
||||
categoryParts.add(DynamicCategoryPart(
|
||||
name,
|
||||
JSAutoFreeFunction(loader),
|
||||
_key!,
|
||||
));
|
||||
categoryParts.add(
|
||||
DynamicCategoryPart(name, JSAutoFreeFunction(loader), _key!),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// old format
|
||||
@@ -453,30 +487,16 @@ class ComicSourceParser {
|
||||
for (int i = 0; i < tags.length; i++) {
|
||||
PageJumpTarget target;
|
||||
if (itemType == 'category') {
|
||||
target = PageJumpTarget(
|
||||
_key!,
|
||||
'category',
|
||||
{
|
||||
"category": tags[i],
|
||||
"param": categoryParams?.elementAtOrNull(i),
|
||||
},
|
||||
);
|
||||
target = PageJumpTarget(_key!, 'category', {
|
||||
"category": tags[i],
|
||||
"param": categoryParams?.elementAtOrNull(i),
|
||||
});
|
||||
} else if (itemType == 'search') {
|
||||
target = PageJumpTarget(
|
||||
_key!,
|
||||
'search',
|
||||
{
|
||||
"keyword": tags[i],
|
||||
},
|
||||
);
|
||||
target = PageJumpTarget(_key!, 'search', {"keyword": tags[i]});
|
||||
} else if (itemType == 'search_with_namespace') {
|
||||
target = PageJumpTarget(
|
||||
_key!,
|
||||
'search',
|
||||
{
|
||||
"keyword": "$name:$tags[i]",
|
||||
},
|
||||
);
|
||||
target = PageJumpTarget(_key!, 'search', {
|
||||
"keyword": "$name:$tags[i]",
|
||||
});
|
||||
} else {
|
||||
target = PageJumpTarget(_key!, itemType, null);
|
||||
}
|
||||
@@ -485,38 +505,96 @@ class ComicSourceParser {
|
||||
if (type == "fixed") {
|
||||
categoryParts.add(FixedCategoryPart(name, cs));
|
||||
} else if (type == "random") {
|
||||
categoryParts
|
||||
.add(RandomCategoryPart(name, cs, c["randomNumber"] ?? 1));
|
||||
categoryParts.add(
|
||||
RandomCategoryPart(name, cs, c["randomNumber"] ?? 1),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return CategoryData(
|
||||
title: title,
|
||||
categories: categoryParts,
|
||||
enableRankingPage: enableRankingPage ?? false,
|
||||
key: title);
|
||||
title: title,
|
||||
categories: categoryParts,
|
||||
enableRankingPage: enableRankingPage ?? false,
|
||||
key: title,
|
||||
);
|
||||
}
|
||||
|
||||
CategoryComicsData? _loadCategoryComicsData() {
|
||||
if (!_checkExists("categoryComics")) return null;
|
||||
var options = <CategoryComicsOptions>[];
|
||||
for (var element in _getValue("categoryComics.optionList") ?? []) {
|
||||
LinkedHashMap<String, String> map = LinkedHashMap<String, String>();
|
||||
for (var option in element["options"]) {
|
||||
if (option.isEmpty || !option.contains("-")) {
|
||||
continue;
|
||||
|
||||
List<CategoryComicsOptions>? options;
|
||||
if (_checkExists("categoryComics.optionList")) {
|
||||
options = <CategoryComicsOptions>[];
|
||||
for (var element in _getValue("categoryComics.optionList") ?? []) {
|
||||
LinkedHashMap<String, String> map = LinkedHashMap<String, String>();
|
||||
for (var option in element["options"]) {
|
||||
if (option.isEmpty || !option.contains("-")) {
|
||||
continue;
|
||||
}
|
||||
var split = option.split("-");
|
||||
var key = split.removeAt(0);
|
||||
var value = split.join("-");
|
||||
map[key] = value;
|
||||
}
|
||||
var split = option.split("-");
|
||||
var key = split.removeAt(0);
|
||||
var value = split.join("-");
|
||||
map[key] = value;
|
||||
options.add(
|
||||
CategoryComicsOptions(
|
||||
element["label"] ?? "",
|
||||
map,
|
||||
List.from(element["notShowWhen"] ?? []),
|
||||
element["showWhen"] == null ? null : List.from(element["showWhen"]),
|
||||
),
|
||||
);
|
||||
}
|
||||
options.add(CategoryComicsOptions(
|
||||
map,
|
||||
List.from(element["notShowWhen"] ?? []),
|
||||
element["showWhen"] == null ? null : List.from(element["showWhen"])));
|
||||
}
|
||||
|
||||
CategoryOptionsLoader? optionLoader;
|
||||
if (_checkExists("categoryComics.optionLoader")) {
|
||||
optionLoader = (category, param) async {
|
||||
try {
|
||||
dynamic res = JsEngine().runCode("""
|
||||
ComicSource.sources.$_key.categoryComics.optionLoader(
|
||||
${jsonEncode(category)}, ${jsonEncode(param)})
|
||||
""");
|
||||
if (res is Future) {
|
||||
res = await res;
|
||||
}
|
||||
if (res is! List) {
|
||||
return Res.error("Invalid data:\nExpected: List\nGot: ${res.runtimeType}");
|
||||
}
|
||||
var options = <CategoryComicsOptions>[];
|
||||
for (var element in res) {
|
||||
if (element is! Map) {
|
||||
return Res.error("Invalid option data:\nExpected: Map\nGot: ${element.runtimeType}");
|
||||
}
|
||||
LinkedHashMap<String, String> map = LinkedHashMap<String, String>();
|
||||
for (var option in element["options"] ?? []) {
|
||||
if (option.isEmpty || !option.contains("-")) {
|
||||
continue;
|
||||
}
|
||||
var split = option.split("-");
|
||||
var key = split.removeAt(0);
|
||||
var value = split.join("-");
|
||||
map[key] = value;
|
||||
}
|
||||
options.add(
|
||||
CategoryComicsOptions(
|
||||
element["label"] ?? "",
|
||||
map,
|
||||
List.from(element["notShowWhen"] ?? []),
|
||||
element["showWhen"] == null ? null : List.from(element["showWhen"]),
|
||||
),
|
||||
);
|
||||
}
|
||||
return Res(options);
|
||||
}
|
||||
catch(e) {
|
||||
Log.error("Data Analysis", "Failed to load category options.\n$e");
|
||||
return Res.error(e.toString());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
RankingData? rankingData;
|
||||
if (_checkExists("categoryComics.ranking")) {
|
||||
var options = <String, String>{};
|
||||
@@ -531,7 +609,7 @@ class ComicSourceParser {
|
||||
}
|
||||
Future<Res<List<Comic>>> Function(String option, int page)? load;
|
||||
Future<Res<List<Comic>>> Function(String option, String? next)?
|
||||
loadWithNext;
|
||||
loadWithNext;
|
||||
if (_checkExists("categoryComics.ranking.load")) {
|
||||
load = (option, page) async {
|
||||
try {
|
||||
@@ -540,9 +618,12 @@ class ComicSourceParser {
|
||||
${jsonEncode(option)}, ${jsonEncode(page)})
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
subData: res["maxPage"]);
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["maxPage"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
@@ -556,8 +637,10 @@ class ComicSourceParser {
|
||||
${jsonEncode(option)}, ${jsonEncode(next)})
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["next"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
@@ -568,25 +651,38 @@ class ComicSourceParser {
|
||||
}
|
||||
rankingData = RankingData(options, load, loadWithNext);
|
||||
}
|
||||
return CategoryComicsData(options, (category, param, options, page) async {
|
||||
try {
|
||||
var res = await JsEngine().runCode("""
|
||||
ComicSource.sources.$_key.categoryComics.load(
|
||||
${jsonEncode(category)},
|
||||
${jsonEncode(param)},
|
||||
${jsonEncode(options)},
|
||||
${jsonEncode(page)}
|
||||
)
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
subData: res["maxPage"]);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
}
|
||||
}, rankingData: rankingData);
|
||||
|
||||
if (options == null && optionLoader == null) {
|
||||
options = [];
|
||||
}
|
||||
|
||||
return CategoryComicsData(
|
||||
options: options,
|
||||
optionsLoader: optionLoader,
|
||||
load: (category, param, options, page) async {
|
||||
try {
|
||||
var res = await JsEngine().runCode("""
|
||||
ComicSource.sources.$_key.categoryComics.load(
|
||||
${jsonEncode(category)},
|
||||
${jsonEncode(param)},
|
||||
${jsonEncode(options)},
|
||||
${jsonEncode(page)}
|
||||
)
|
||||
""");
|
||||
return Res(
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["maxPage"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
}
|
||||
},
|
||||
rankingData: rankingData,
|
||||
);
|
||||
}
|
||||
|
||||
SearchPageData? _loadSearchData() {
|
||||
@@ -603,12 +699,14 @@ class ComicSourceParser {
|
||||
var value = split.join("-");
|
||||
map[key] = value;
|
||||
}
|
||||
options.add(SearchOptions(
|
||||
map,
|
||||
element["label"],
|
||||
element['type'] ?? 'select',
|
||||
element['default'] == null ? null : jsonEncode(element['default']),
|
||||
));
|
||||
options.add(
|
||||
SearchOptions(
|
||||
map,
|
||||
element["label"],
|
||||
element['type'] ?? 'select',
|
||||
element['default'] == null ? null : jsonEncode(element['default']),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
SearchFunction? loadPage;
|
||||
@@ -623,9 +721,12 @@ class ComicSourceParser {
|
||||
${jsonEncode(keyword)}, ${jsonEncode(searchOption)}, ${jsonEncode(page)})
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
subData: res["maxPage"]);
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["maxPage"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
@@ -639,8 +740,10 @@ class ComicSourceParser {
|
||||
${jsonEncode(keyword)}, ${jsonEncode(searchOption)}, ${jsonEncode(next)})
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["next"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
@@ -689,8 +792,9 @@ class ComicSourceParser {
|
||||
|
||||
final bool multiFolder = _getValue("favorites.multiFolder");
|
||||
final bool? isOldToNewSort = _getValue("favorites.isOldToNewSort");
|
||||
final bool? singleFolderForSingleComic =
|
||||
_getValue("favorites.singleFolderForSingleComic");
|
||||
final bool? singleFolderForSingleComic = _getValue(
|
||||
"favorites.singleFolderForSingleComic",
|
||||
);
|
||||
|
||||
Future<Res<T>> retryZone<T>(Future<Res<T>> Function() func) async {
|
||||
if (!ComicSource.find(_key!)!.isLogged) {
|
||||
@@ -743,9 +847,12 @@ class ComicSourceParser {
|
||||
${jsonEncode(page)}, ${jsonEncode(folder)})
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
subData: res["maxPage"]);
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["maxPage"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
@@ -765,8 +872,10 @@ class ComicSourceParser {
|
||||
${jsonEncode(next)}, ${jsonEncode(folder)})
|
||||
""");
|
||||
return Res(
|
||||
List.generate(res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!)),
|
||||
List.generate(
|
||||
res["comics"].length,
|
||||
(index) => Comic.fromJson(res["comics"][index], _key!),
|
||||
),
|
||||
subData: res["next"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
@@ -857,8 +966,9 @@ class ComicSourceParser {
|
||||
${jsonEncode(id)}, ${jsonEncode(subId)}, ${jsonEncode(page)}, ${jsonEncode(replyTo)})
|
||||
""");
|
||||
return Res(
|
||||
(res["comments"] as List).map((e) => Comment.fromJson(e)).toList(),
|
||||
subData: res["maxPage"]);
|
||||
(res["comments"] as List).map((e) => Comment.fromJson(e)).toList(),
|
||||
subData: res["maxPage"],
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
@@ -1057,6 +1167,19 @@ class ComicSourceParser {
|
||||
};
|
||||
}
|
||||
|
||||
TagSuggestionSelectFunc? _parseTagSuggestionSelectFunc() {
|
||||
if (!_checkExists("search.onTagSuggestionSelected")) {
|
||||
return null;
|
||||
}
|
||||
return (namespace, tag) {
|
||||
var res = JsEngine().runCode("""
|
||||
ComicSource.sources.$_key.search.onTagSuggestionSelected(
|
||||
${jsonEncode(namespace)}, ${jsonEncode(tag)})
|
||||
""");
|
||||
return res is String ? res : "$namespace:$tag";
|
||||
};
|
||||
}
|
||||
|
||||
LinkHandler? _parseLinkHandler() {
|
||||
if (!_checkExists("comic.link")) {
|
||||
return null;
|
||||
@@ -1100,7 +1223,8 @@ class ComicSourceParser {
|
||||
ComicSource.sources.$_key.comic.archive.getArchives(${jsonEncode(cid)})
|
||||
""");
|
||||
return Res(
|
||||
(res as List).map((e) => ArchiveInfo.fromJson(e)).toList());
|
||||
(res as List).map((e) => ArchiveInfo.fromJson(e)).toList(),
|
||||
);
|
||||
} catch (e, s) {
|
||||
Log.error("Network", "$e\n$s");
|
||||
return Res.error(e.toString());
|
||||
|
@@ -44,5 +44,10 @@ typedef VoteCommentFunc = Future<Res<int?>> Function(
|
||||
typedef HandleClickTagEvent = PageJumpTarget? Function(
|
||||
String namespace, String tag);
|
||||
|
||||
/// Handle tag suggestion selection event. Should return the text to insert
|
||||
/// into the search field.
|
||||
typedef TagSuggestionSelectFunc = String Function(
|
||||
String namespace, String tag);
|
||||
|
||||
/// [rating] is the rating value, 0-10. 1 represents 0.5 star.
|
||||
typedef StarRatingFunc = Future<Res<bool>> Function(String comicId, int rating);
|
@@ -1,4 +1,6 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:ffi';
|
||||
import 'dart:isolate';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:sqlite3/sqlite3.dart';
|
||||
@@ -209,7 +211,22 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
|
||||
late Database _db;
|
||||
|
||||
late Map<String, int> counts;
|
||||
|
||||
int get totalComics {
|
||||
int total = 0;
|
||||
for (var t in counts.values) {
|
||||
total += t;
|
||||
}
|
||||
return total;
|
||||
}
|
||||
|
||||
int folderComics(String folder) {
|
||||
return counts[folder] ?? 0;
|
||||
}
|
||||
|
||||
Future<void> init() async {
|
||||
counts = {};
|
||||
_db = sqlite3.open("${App.dataPath}/local_favorite.db");
|
||||
_db.execute("""
|
||||
create table if not exists folder_order (
|
||||
@@ -234,7 +251,7 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
alter table "$folder"
|
||||
add column translated_tags TEXT;
|
||||
""");
|
||||
var comics = getAllComics(folder);
|
||||
var comics = getFolderComics(folder);
|
||||
for (var comic in comics) {
|
||||
var translatedTags = _translateTags(comic.tags);
|
||||
_db.execute("""
|
||||
@@ -256,6 +273,13 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
} else {
|
||||
appdata.settings['followUpdatesFolder'] = null;
|
||||
}
|
||||
initCounts();
|
||||
}
|
||||
|
||||
void initCounts() {
|
||||
for (var folder in folderNames) {
|
||||
counts[folder] = count(folder);
|
||||
}
|
||||
}
|
||||
|
||||
List<String> find(String id, ComicType type) {
|
||||
@@ -349,7 +373,7 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
""").firstOrNull?["min_value"] ?? 0;
|
||||
}
|
||||
|
||||
List<FavoriteItem> getAllComics(String folder) {
|
||||
List<FavoriteItem> getFolderComics(String folder) {
|
||||
var rows = _db.select("""
|
||||
select * from "$folder"
|
||||
ORDER BY display_order;
|
||||
@@ -357,6 +381,54 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
return rows.map((element) => FavoriteItem.fromRow(element)).toList();
|
||||
}
|
||||
|
||||
static Future<List<FavoriteItem>> _getFolderComicsAsync(
|
||||
String folder, Pointer<void> p) {
|
||||
return Isolate.run(() {
|
||||
var db = sqlite3.fromPointer(p);
|
||||
var rows = db.select("""
|
||||
select * from "$folder"
|
||||
ORDER BY display_order;
|
||||
""");
|
||||
return rows.map((element) => FavoriteItem.fromRow(element)).toList();
|
||||
});
|
||||
}
|
||||
|
||||
/// Start a new isolate to get the comics in the folder
|
||||
Future<List<FavoriteItem>> getFolderComicsAsync(String folder) {
|
||||
return _getFolderComicsAsync(folder, _db.handle);
|
||||
}
|
||||
|
||||
List<FavoriteItem> getAllComics() {
|
||||
var res = <FavoriteItem>{};
|
||||
for (final folder in folderNames) {
|
||||
var comics = _db.select("""
|
||||
select * from "$folder";
|
||||
""");
|
||||
res.addAll(comics.map((element) => FavoriteItem.fromRow(element)));
|
||||
}
|
||||
return res.toList();
|
||||
}
|
||||
|
||||
static Future<List<FavoriteItem>> _getAllComicsAsync(
|
||||
List<String> folders, Pointer<void> p) {
|
||||
return Isolate.run(() {
|
||||
var db = sqlite3.fromPointer(p);
|
||||
var res = <FavoriteItem>{};
|
||||
for (final folder in folders) {
|
||||
var comics = db.select("""
|
||||
select * from "$folder";
|
||||
""");
|
||||
res.addAll(comics.map((element) => FavoriteItem.fromRow(element)));
|
||||
}
|
||||
return res.toList();
|
||||
});
|
||||
}
|
||||
|
||||
/// Start a new isolate to get all the comics
|
||||
Future<List<FavoriteItem>> getAllComicsAsync() {
|
||||
return _getAllComicsAsync(folderNames, _db.handle);
|
||||
}
|
||||
|
||||
void addTagTo(String folder, String id, String tag) {
|
||||
_db.execute("""
|
||||
update "$folder"
|
||||
@@ -422,6 +494,7 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
);
|
||||
""");
|
||||
notifyListeners();
|
||||
counts[name] = 0;
|
||||
return name;
|
||||
}
|
||||
|
||||
@@ -536,6 +609,11 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
""", [updateTime, comic.id, comic.type.value]);
|
||||
}
|
||||
}
|
||||
if (counts[folder] == null) {
|
||||
counts[folder] = count(folder);
|
||||
} else {
|
||||
counts[folder] = counts[folder]! + 1;
|
||||
}
|
||||
notifyListeners();
|
||||
return true;
|
||||
}
|
||||
@@ -575,6 +653,102 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void batchMoveFavorites(
|
||||
String sourceFolder, String targetFolder, List<FavoriteItem> items) {
|
||||
_modifiedAfterLastCache = true;
|
||||
|
||||
if (!existsFolder(sourceFolder)) {
|
||||
throw Exception("Source folder does not exist");
|
||||
}
|
||||
if (!existsFolder(targetFolder)) {
|
||||
throw Exception("Target folder does not exist");
|
||||
}
|
||||
|
||||
_db.execute("BEGIN TRANSACTION");
|
||||
var displayOrder = maxValue(targetFolder) + 1;
|
||||
try {
|
||||
for (var item in items) {
|
||||
_db.execute("""
|
||||
insert or ignore into "$targetFolder" (id, name, author, type, tags, cover_path, time, display_order)
|
||||
select id, name, author, type, tags, cover_path, time, ?
|
||||
from "$sourceFolder"
|
||||
where id == ? and type == ?;
|
||||
""", [displayOrder, item.id, item.type.value]);
|
||||
|
||||
_db.execute("""
|
||||
delete from "$sourceFolder"
|
||||
where id == ? and type == ?;
|
||||
""", [item.id, item.type.value]);
|
||||
|
||||
displayOrder++;
|
||||
}
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
Log.error("Batch Move Favorites", e.toString());
|
||||
_db.execute("ROLLBACK");
|
||||
return;
|
||||
}
|
||||
_db.execute("COMMIT");
|
||||
|
||||
// Update counts
|
||||
if (counts[targetFolder] == null) {
|
||||
counts[targetFolder] = count(targetFolder);
|
||||
} else {
|
||||
counts[targetFolder] = counts[targetFolder]! + items.length;
|
||||
}
|
||||
|
||||
if (counts[sourceFolder] != null) {
|
||||
counts[sourceFolder] = counts[sourceFolder]! - items.length;
|
||||
} else {
|
||||
counts[sourceFolder] = count(sourceFolder);
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void batchCopyFavorites(
|
||||
String sourceFolder, String targetFolder, List<FavoriteItem> items) {
|
||||
_modifiedAfterLastCache = true;
|
||||
|
||||
if (!existsFolder(sourceFolder)) {
|
||||
throw Exception("Source folder does not exist");
|
||||
}
|
||||
if (!existsFolder(targetFolder)) {
|
||||
throw Exception("Target folder does not exist");
|
||||
}
|
||||
|
||||
_db.execute("BEGIN TRANSACTION");
|
||||
var displayOrder = maxValue(targetFolder) + 1;
|
||||
try {
|
||||
for (var item in items) {
|
||||
_db.execute("""
|
||||
insert or ignore into "$targetFolder" (id, name, author, type, tags, cover_path, time, display_order)
|
||||
select id, name, author, type, tags, cover_path, time, ?
|
||||
from "$sourceFolder"
|
||||
where id == ? and type == ?;
|
||||
""", [displayOrder, item.id, item.type.value]);
|
||||
|
||||
displayOrder++;
|
||||
}
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
Log.error("Batch Copy Favorites", e.toString());
|
||||
_db.execute("ROLLBACK");
|
||||
return;
|
||||
}
|
||||
|
||||
_db.execute("COMMIT");
|
||||
|
||||
// Update counts
|
||||
if (counts[targetFolder] == null) {
|
||||
counts[targetFolder] = count(targetFolder);
|
||||
} else {
|
||||
counts[targetFolder] = counts[targetFolder]! + items.length;
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// delete a folder
|
||||
void deleteFolder(String name) {
|
||||
_modifiedAfterLastCache = true;
|
||||
@@ -585,14 +759,10 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
delete from folder_order
|
||||
where folder_name == ?;
|
||||
""", [name]);
|
||||
counts.remove(name);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void deleteComic(String folder, FavoriteItem comic) {
|
||||
_modifiedAfterLastCache = true;
|
||||
deleteComicWithId(folder, comic.id, comic.type);
|
||||
}
|
||||
|
||||
void deleteComicWithId(String folder, String id, ComicType type) {
|
||||
_modifiedAfterLastCache = true;
|
||||
LocalFavoriteImageProvider.delete(id, type.value);
|
||||
@@ -600,6 +770,60 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
delete from "$folder"
|
||||
where id == ? and type == ?;
|
||||
""", [id, type.value]);
|
||||
if (counts[folder] != null) {
|
||||
counts[folder] = counts[folder]! - 1;
|
||||
} else {
|
||||
counts[folder] = count(folder);
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void batchDeleteComics(String folder, List<FavoriteItem> comics) {
|
||||
_modifiedAfterLastCache = true;
|
||||
_db.execute("BEGIN TRANSACTION");
|
||||
try {
|
||||
for (var comic in comics) {
|
||||
LocalFavoriteImageProvider.delete(comic.id, comic.type.value);
|
||||
_db.execute("""
|
||||
delete from "$folder"
|
||||
where id == ? and type == ?;
|
||||
""", [comic.id, comic.type.value]);
|
||||
}
|
||||
if (counts[folder] != null) {
|
||||
counts[folder] = counts[folder]! - comics.length;
|
||||
} else {
|
||||
counts[folder] = count(folder);
|
||||
}
|
||||
} catch (e) {
|
||||
Log.error("Batch Delete Comics", e.toString());
|
||||
_db.execute("ROLLBACK");
|
||||
return;
|
||||
}
|
||||
_db.execute("COMMIT");
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void batchDeleteComicsInAllFolders(List<ComicID> comics) {
|
||||
_modifiedAfterLastCache = true;
|
||||
_db.execute("BEGIN TRANSACTION");
|
||||
var folderNames = _getFolderNamesWithDB();
|
||||
try {
|
||||
for (var comic in comics) {
|
||||
LocalFavoriteImageProvider.delete(comic.id, comic.type.value);
|
||||
for (var folder in folderNames) {
|
||||
_db.execute("""
|
||||
delete from "$folder"
|
||||
where id == ? and type == ?;
|
||||
""", [comic.id, comic.type.value]);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
Log.error("Batch Delete Comics in All Folders", e.toString());
|
||||
_db.execute("ROLLBACK");
|
||||
return;
|
||||
}
|
||||
initCounts();
|
||||
_db.execute("COMMIT");
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@@ -630,11 +854,26 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
if (!existsFolder(folder)) {
|
||||
throw Exception("Failed to reorder: folder not found");
|
||||
}
|
||||
deleteFolder(folder);
|
||||
createFolder(folder);
|
||||
for (int i = 0; i < newFolder.length; i++) {
|
||||
addComic(folder, newFolder[i], i);
|
||||
_db.execute("BEGIN TRANSACTION");
|
||||
try {
|
||||
for (int i = 0; i < newFolder.length; i++) {
|
||||
_db.execute("""
|
||||
update "$folder"
|
||||
set display_order = ?
|
||||
where id == ? and type == ?;
|
||||
""", [
|
||||
i,
|
||||
newFolder[i].id,
|
||||
newFolder[i].type.value
|
||||
]);
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
Log.error("Reorder", e.toString());
|
||||
_db.execute("ROLLBACK");
|
||||
return;
|
||||
}
|
||||
_db.execute("COMMIT");
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@@ -659,6 +898,8 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
set folder_name = ?
|
||||
where folder_name == ?;
|
||||
""", [after, before]);
|
||||
counts[after] = counts[before] ?? 0;
|
||||
counts.remove(before);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
@@ -736,10 +977,10 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
return comics;
|
||||
}
|
||||
|
||||
List<FavoriteItemWithFolderInfo> search(String keyword) {
|
||||
List<FavoriteItem> search(String keyword) {
|
||||
var keywordList = keyword.split(" ");
|
||||
keyword = keywordList.first;
|
||||
var comics = <FavoriteItemWithFolderInfo>[];
|
||||
var comics = <FavoriteItem>{};
|
||||
for (var table in folderNames) {
|
||||
keyword = "%$keyword%";
|
||||
var res = _db.select("""
|
||||
@@ -747,15 +988,18 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
WHERE name LIKE ? OR author LIKE ? OR tags LIKE ? OR translated_tags LIKE ?;
|
||||
""", [keyword, keyword, keyword, keyword]);
|
||||
for (var comic in res) {
|
||||
comics.add(
|
||||
FavoriteItemWithFolderInfo(FavoriteItem.fromRow(comic), table));
|
||||
comics.add(FavoriteItem.fromRow(comic));
|
||||
}
|
||||
if (comics.length > 200) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bool test(FavoriteItemWithFolderInfo comic, String keyword) {
|
||||
bool test(FavoriteItem comic, String keyword) {
|
||||
keyword = keyword.trim();
|
||||
if (keyword.isEmpty) {
|
||||
return true;
|
||||
}
|
||||
if (comic.name.contains(keyword)) {
|
||||
return true;
|
||||
} else if (comic.author.contains(keyword)) {
|
||||
@@ -766,12 +1010,14 @@ class LocalFavoritesManager with ChangeNotifier {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (var i = 1; i < keywordList.length; i++) {
|
||||
comics =
|
||||
comics.where((element) => test(element, keywordList[i])).toList();
|
||||
}
|
||||
|
||||
return comics;
|
||||
return comics.where((element) {
|
||||
for (var i = 1; i < keywordList.length; i++) {
|
||||
if (!test(element, keywordList[i])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}).toList();
|
||||
}
|
||||
|
||||
void editTags(String id, String folder, List<String> tags) {
|
||||
|
162
lib/foundation/follow_updates.dart
Normal file
162
lib/foundation/follow_updates.dart
Normal file
@@ -0,0 +1,162 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'package:venera/foundation/favorites.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
|
||||
class ComicUpdateResult {
|
||||
final bool updated;
|
||||
final String? errorMessage;
|
||||
|
||||
ComicUpdateResult(this.updated, this.errorMessage);
|
||||
}
|
||||
|
||||
Future<ComicUpdateResult> updateComic(
|
||||
FavoriteItemWithUpdateInfo c, String folder) async {
|
||||
int retries = 3;
|
||||
while (true) {
|
||||
try {
|
||||
var comicSource = c.type.comicSource;
|
||||
if (comicSource == null) {
|
||||
return ComicUpdateResult(false, "Comic source not found");
|
||||
}
|
||||
var newInfo = (await comicSource.loadComicInfo!(c.id)).data;
|
||||
|
||||
var newTags = <String>[];
|
||||
for (var entry in newInfo.tags.entries) {
|
||||
const shouldIgnore = ['author', 'artist', 'time'];
|
||||
var namespace = entry.key;
|
||||
if (shouldIgnore.contains(namespace.toLowerCase())) {
|
||||
continue;
|
||||
}
|
||||
for (var tag in entry.value) {
|
||||
newTags.add("$namespace:$tag");
|
||||
}
|
||||
}
|
||||
|
||||
var item = FavoriteItem(
|
||||
id: c.id,
|
||||
name: newInfo.title,
|
||||
coverPath: newInfo.cover,
|
||||
author: newInfo.subTitle ??
|
||||
newInfo.tags['author']?.firstOrNull ??
|
||||
c.author,
|
||||
type: c.type,
|
||||
tags: newTags,
|
||||
);
|
||||
|
||||
LocalFavoritesManager().updateInfo(folder, item, false);
|
||||
|
||||
var updated = false;
|
||||
var updateTime = newInfo.findUpdateTime();
|
||||
if (updateTime != null && updateTime != c.updateTime) {
|
||||
LocalFavoritesManager().updateUpdateTime(
|
||||
folder,
|
||||
c.id,
|
||||
c.type,
|
||||
updateTime,
|
||||
);
|
||||
updated = true;
|
||||
} else {
|
||||
LocalFavoritesManager().updateCheckTime(folder, c.id, c.type);
|
||||
}
|
||||
return ComicUpdateResult(updated, null);
|
||||
} catch (e, s) {
|
||||
Log.error("Check Updates", e, s);
|
||||
retries--;
|
||||
if (retries == 0) {
|
||||
return ComicUpdateResult(false, e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class UpdateProgress {
|
||||
final int total;
|
||||
final int current;
|
||||
final int errors;
|
||||
final int updated;
|
||||
final FavoriteItemWithUpdateInfo? comic;
|
||||
final String? errorMessage;
|
||||
|
||||
UpdateProgress(this.total, this.current, this.errors, this.updated,
|
||||
[this.comic, this.errorMessage]);
|
||||
}
|
||||
|
||||
void updateFolderBase(
|
||||
String folder,
|
||||
StreamController<UpdateProgress> stream,
|
||||
bool ignoreCheckTime,
|
||||
) async {
|
||||
var comics = LocalFavoritesManager().getComicsWithUpdatesInfo(folder);
|
||||
int total = comics.length;
|
||||
int current = 0;
|
||||
int errors = 0;
|
||||
int updated = 0;
|
||||
|
||||
stream.add(UpdateProgress(total, current, errors, updated));
|
||||
|
||||
var comicsToUpdate = <FavoriteItemWithUpdateInfo>[];
|
||||
|
||||
for (var comic in comics) {
|
||||
if (!ignoreCheckTime) {
|
||||
var lastCheckTime = comic.lastCheckTime;
|
||||
if (lastCheckTime != null &&
|
||||
DateTime.now().difference(lastCheckTime).inDays < 1) {
|
||||
current++;
|
||||
stream.add(UpdateProgress(total, current, errors, updated));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
comicsToUpdate.add(comic);
|
||||
}
|
||||
|
||||
total = comicsToUpdate.length;
|
||||
current = 0;
|
||||
stream.add(UpdateProgress(total, current, errors, updated));
|
||||
|
||||
var futures = <Future>[];
|
||||
for (var comic in comicsToUpdate) {
|
||||
var future = updateComic(comic, folder).then((result) {
|
||||
current++;
|
||||
if (result.updated) {
|
||||
updated++;
|
||||
}
|
||||
if (result.errorMessage != null) {
|
||||
errors++;
|
||||
}
|
||||
stream.add(
|
||||
UpdateProgress(total, current, errors, updated, comic, result.errorMessage));
|
||||
});
|
||||
futures.add(future);
|
||||
}
|
||||
|
||||
await Future.wait(futures);
|
||||
|
||||
if (updated > 0) {
|
||||
LocalFavoritesManager().notifyChanges();
|
||||
}
|
||||
|
||||
stream.close();
|
||||
}
|
||||
|
||||
|
||||
Stream<UpdateProgress> updateFolder(String folder, bool ignoreCheckTime) {
|
||||
var stream = StreamController<UpdateProgress>();
|
||||
updateFolderBase(folder, stream, ignoreCheckTime);
|
||||
return stream.stream;
|
||||
}
|
||||
|
||||
Future<String> getUpdatedComicsAsJson(String folder) async {
|
||||
var comics = LocalFavoritesManager().getComicsWithUpdatesInfo(folder);
|
||||
var updatedComics = comics.where((c) => c.hasNewUpdate).toList();
|
||||
var jsonList = updatedComics.map((c) => {
|
||||
'id': c.id,
|
||||
'name': c.name,
|
||||
'coverUrl': c.coverPath,
|
||||
'author': c.author,
|
||||
'type': c.type.sourceKey,
|
||||
'updateTime': c.updateTime,
|
||||
'tags': c.tags,
|
||||
}).toList();
|
||||
return jsonEncode(jsonList);
|
||||
}
|
@@ -10,6 +10,7 @@ import 'package:flutter/widgets.dart' show ChangeNotifier;
|
||||
import 'package:sqlite3/sqlite3.dart';
|
||||
import 'package:venera/foundation/comic_source/comic_source.dart';
|
||||
import 'package:venera/foundation/comic_type.dart';
|
||||
import 'package:venera/foundation/favorites.dart';
|
||||
import 'package:venera/foundation/image_provider/image_favorites_provider.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
@@ -132,6 +133,11 @@ class History implements Comic {
|
||||
@override
|
||||
String get description {
|
||||
var res = "";
|
||||
if (group != null){
|
||||
res += "${"Group @group".tlParams({
|
||||
"group": group!,
|
||||
})} - ";
|
||||
}
|
||||
if (ep >= 1) {
|
||||
res += "Chapter @ep".tlParams({
|
||||
"ep": ep,
|
||||
@@ -305,6 +311,31 @@ class HistoryManager with ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void clearUnfavoritedHistory() {
|
||||
_db.execute('BEGIN TRANSACTION;');
|
||||
try {
|
||||
final idAndTypes = _db.select("""
|
||||
select id, type from history;
|
||||
""");
|
||||
for (var element in idAndTypes) {
|
||||
final id = element["id"] as String;
|
||||
final type = ComicType(element["type"] as int);
|
||||
if (!LocalFavoritesManager().isExist(id, type)) {
|
||||
_db.execute("""
|
||||
delete from history
|
||||
where id == ? and type == ?;
|
||||
""", [id, type.value]);
|
||||
}
|
||||
}
|
||||
_db.execute('COMMIT;');
|
||||
} catch (e) {
|
||||
_db.execute('ROLLBACK;');
|
||||
rethrow;
|
||||
}
|
||||
updateCache();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void remove(String id, ComicType type) async {
|
||||
_db.execute("""
|
||||
delete from history
|
||||
@@ -380,4 +411,23 @@ class HistoryManager with ChangeNotifier {
|
||||
isInitialized = false;
|
||||
_db.dispose();
|
||||
}
|
||||
|
||||
void batchDeleteHistories(List<ComicID> histories) {
|
||||
if (histories.isEmpty) return;
|
||||
_db.execute('BEGIN TRANSACTION;');
|
||||
try {
|
||||
for (var history in histories) {
|
||||
_db.execute("""
|
||||
delete from history
|
||||
where id == ? and type == ?;
|
||||
""", [history.id, history.type.value]);
|
||||
}
|
||||
_db.execute('COMMIT;');
|
||||
} catch (e) {
|
||||
_db.execute('ROLLBACK;');
|
||||
rethrow;
|
||||
}
|
||||
updateCache();
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
@@ -3,6 +3,7 @@ import 'dart:io';
|
||||
import 'dart:math' as math;
|
||||
import 'package:crypto/crypto.dart';
|
||||
import 'package:dio/io.dart';
|
||||
import 'package:enough_convert/enough_convert.dart';
|
||||
import 'package:flutter/foundation.dart' show protected;
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:html/parser.dart' as html;
|
||||
@@ -23,8 +24,10 @@ import 'package:pointycastle/block/modes/ofb.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
import 'package:venera/components/js_ui.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
import 'package:venera/foundation/js_pool.dart';
|
||||
import 'package:venera/network/app_dio.dart';
|
||||
import 'package:venera/network/cookie_jar.dart';
|
||||
import 'package:venera/network/proxy.dart';
|
||||
import 'package:venera/utils/init.dart';
|
||||
|
||||
import 'comic_source/comic_source.dart';
|
||||
@@ -66,6 +69,12 @@ class JsEngine with _JSEngineApi, JsUiApi, Init {
|
||||
responseType: ResponseType.plain, validateStatus: (status) => true));
|
||||
}
|
||||
|
||||
static Uint8List? _jsInitCache;
|
||||
|
||||
static void cacheJsInit(Uint8List jsInit) {
|
||||
_jsInitCache = jsInit;
|
||||
}
|
||||
|
||||
@override
|
||||
@protected
|
||||
Future<void> doInit() async {
|
||||
@@ -73,9 +82,11 @@ class JsEngine with _JSEngineApi, JsUiApi, Init {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (App.isInitialized) {
|
||||
_cookieJar ??= await SingleInstanceCookieJar.createInstance();
|
||||
}
|
||||
_dio ??= AppDio(BaseOptions(
|
||||
responseType: ResponseType.plain, validateStatus: (status) => true));
|
||||
_cookieJar ??= SingleInstanceCookieJar.instance!;
|
||||
_closed = false;
|
||||
_engine = FlutterQjs();
|
||||
_engine!.dispatch();
|
||||
@@ -84,9 +95,15 @@ class JsEngine with _JSEngineApi, JsUiApi, Init {
|
||||
(setGlobalFunc as JSInvokable)(["sendMessage", _messageReceiver]);
|
||||
setGlobalFunc(["appVersion", App.version]);
|
||||
setGlobalFunc.free();
|
||||
var jsInit = await rootBundle.load("assets/init.js");
|
||||
Uint8List jsInit;
|
||||
if (_jsInitCache != null) {
|
||||
jsInit = _jsInitCache!;
|
||||
} else {
|
||||
var buffer = await rootBundle.load("assets/init.js");
|
||||
jsInit = buffer.buffer.asUint8List();
|
||||
}
|
||||
_engine!
|
||||
.evaluate(utf8.decode(jsInit.buffer.asUint8List()), name: "<init>");
|
||||
.evaluate(utf8.decode(jsInit), name: "<init>");
|
||||
} catch (e, s) {
|
||||
Log.error('JS Engine', 'JS Engine Init Error:\n$e\n$s');
|
||||
}
|
||||
@@ -95,6 +112,7 @@ class JsEngine with _JSEngineApi, JsUiApi, Init {
|
||||
Object? _messageReceiver(dynamic message) {
|
||||
try {
|
||||
if (message is Map<dynamic, dynamic>) {
|
||||
if (message["method"] == null) return null;
|
||||
String method = message["method"] as String;
|
||||
switch (method) {
|
||||
case "log":
|
||||
@@ -170,6 +188,20 @@ class JsEngine with _JSEngineApi, JsUiApi, Init {
|
||||
var res = await Clipboard.getData(Clipboard.kTextPlain);
|
||||
return res?.text;
|
||||
});
|
||||
case "compute":
|
||||
final func = message["function"];
|
||||
final args = message["args"];
|
||||
if (func is JSInvokable) {
|
||||
func.free();
|
||||
throw "Function must be a string";
|
||||
}
|
||||
if (func is! String) {
|
||||
throw "Function must be a string";
|
||||
}
|
||||
if (args != null && args is! List) {
|
||||
throw "Args must be a list";
|
||||
}
|
||||
return JSPool().execute(func, args ?? []);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
@@ -194,7 +226,7 @@ class JsEngine with _JSEngineApi, JsUiApi, Init {
|
||||
responseType: ResponseType.plain,
|
||||
validateStatus: (status) => true,
|
||||
));
|
||||
var proxy = await AppDio.getProxy();
|
||||
var proxy = await getProxy();
|
||||
dio.httpClientAdapter = IOHttpClientAdapter(
|
||||
createHttpClient: () {
|
||||
return HttpClient()
|
||||
@@ -371,6 +403,11 @@ mixin class _JSEngineApi {
|
||||
switch (type) {
|
||||
case "utf8":
|
||||
return isEncode ? utf8.encode(value) : utf8.decode(value);
|
||||
case "gbk":
|
||||
final codec = const GbkCodec();
|
||||
return isEncode
|
||||
? Uint8List.fromList(codec.encode(value))
|
||||
: codec.decode(value);
|
||||
case "base64":
|
||||
return isEncode ? base64Encode(value) : base64Decode(value);
|
||||
case "md5":
|
||||
|
163
lib/foundation/js_pool.dart
Normal file
163
lib/foundation/js_pool.dart
Normal file
@@ -0,0 +1,163 @@
|
||||
import 'dart:async';
|
||||
import 'dart:isolate';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_qjs/flutter_qjs.dart';
|
||||
import 'package:venera/foundation/js_engine.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
|
||||
class JSPool {
|
||||
static final int _maxInstances = 4;
|
||||
final List<IsolateJsEngine> _instances = [];
|
||||
bool _isInitializing = false;
|
||||
|
||||
static final JSPool _singleton = JSPool._internal();
|
||||
factory JSPool() {
|
||||
return _singleton;
|
||||
}
|
||||
JSPool._internal();
|
||||
|
||||
Future<void> init() async {
|
||||
if (_isInitializing) return;
|
||||
_isInitializing = true;
|
||||
var jsInitBuffer = await rootBundle.load("assets/init.js");
|
||||
var jsInit = jsInitBuffer.buffer.asUint8List();
|
||||
for (int i = 0; i < _maxInstances; i++) {
|
||||
_instances.add(IsolateJsEngine(jsInit));
|
||||
}
|
||||
_isInitializing = false;
|
||||
}
|
||||
|
||||
Future<dynamic> execute(String jsFunction, List<dynamic> args) async {
|
||||
await init();
|
||||
var selectedInstance = _instances[0];
|
||||
for (var instance in _instances) {
|
||||
if (instance.pendingTasks < selectedInstance.pendingTasks) {
|
||||
selectedInstance = instance;
|
||||
}
|
||||
}
|
||||
return selectedInstance.execute(jsFunction, args);
|
||||
}
|
||||
}
|
||||
|
||||
class _IsolateJsEngineInitParam {
|
||||
final SendPort sendPort;
|
||||
|
||||
final Uint8List jsInit;
|
||||
|
||||
_IsolateJsEngineInitParam(this.sendPort, this.jsInit);
|
||||
}
|
||||
|
||||
class IsolateJsEngine {
|
||||
Isolate? _isolate;
|
||||
|
||||
SendPort? _sendPort;
|
||||
ReceivePort? _receivePort;
|
||||
|
||||
int _counter = 0;
|
||||
final Map<int, Completer<dynamic>> _tasks = {};
|
||||
|
||||
bool _isClosed = false;
|
||||
|
||||
int get pendingTasks => _tasks.length;
|
||||
|
||||
IsolateJsEngine(Uint8List jsInit) {
|
||||
_receivePort = ReceivePort();
|
||||
_receivePort!.listen(_onMessage);
|
||||
Isolate.spawn(_run, _IsolateJsEngineInitParam(_receivePort!.sendPort, jsInit));
|
||||
}
|
||||
|
||||
void _onMessage(dynamic message) {
|
||||
if (message is SendPort) {
|
||||
_sendPort = message;
|
||||
} else if (message is TaskResult) {
|
||||
final completer = _tasks.remove(message.id);
|
||||
if (completer != null) {
|
||||
if (message.error != null) {
|
||||
completer.completeError(message.error!);
|
||||
} else {
|
||||
completer.complete(message.result);
|
||||
}
|
||||
}
|
||||
} else if (message is Exception) {
|
||||
Log.error("IsolateJsEngine", message.toString());
|
||||
for (var completer in _tasks.values) {
|
||||
completer.completeError(message);
|
||||
}
|
||||
_tasks.clear();
|
||||
close();
|
||||
}
|
||||
}
|
||||
|
||||
static void _run(_IsolateJsEngineInitParam params) async {
|
||||
var sendPort = params.sendPort;
|
||||
final port = ReceivePort();
|
||||
sendPort.send(port.sendPort);
|
||||
final engine = JsEngine();
|
||||
try {
|
||||
JsEngine.cacheJsInit(params.jsInit);
|
||||
await engine.init();
|
||||
}
|
||||
catch(e, s) {
|
||||
sendPort.send(Exception("Failed to initialize JS engine: $e\n$s"));
|
||||
return;
|
||||
}
|
||||
await for (final message in port) {
|
||||
if (message is Task) {
|
||||
try {
|
||||
final jsFunc = engine.runCode(message.jsFunction);
|
||||
if (jsFunc is! JSInvokable) {
|
||||
throw Exception("The provided code does not evaluate to a function.");
|
||||
}
|
||||
final result = jsFunc.invoke(message.args);
|
||||
jsFunc.free();
|
||||
sendPort.send(TaskResult(message.id, result, null));
|
||||
} catch (e) {
|
||||
sendPort.send(TaskResult(message.id, null, e.toString()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<dynamic> execute(String jsFunction, List<dynamic> args) async {
|
||||
if (_isClosed) {
|
||||
throw Exception("IsolateJsEngine is closed.");
|
||||
}
|
||||
while (_sendPort == null) {
|
||||
await Future.delayed(const Duration(milliseconds: 10));
|
||||
}
|
||||
final completer = Completer<dynamic>();
|
||||
final taskId = _counter++;
|
||||
_tasks[taskId] = completer;
|
||||
final task = Task(taskId, jsFunction, args);
|
||||
_sendPort?.send(task);
|
||||
return completer.future;
|
||||
}
|
||||
|
||||
void close() async {
|
||||
if (!_isClosed) {
|
||||
_isClosed = true;
|
||||
while (_tasks.isNotEmpty) {
|
||||
await Future.delayed(const Duration(milliseconds: 100));
|
||||
}
|
||||
_receivePort?.close();
|
||||
_isolate?.kill(priority: Isolate.immediate);
|
||||
_isolate = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Task {
|
||||
final int id;
|
||||
final String jsFunction;
|
||||
final List<dynamic> args;
|
||||
|
||||
const Task(this.id, this.jsFunction, this.args);
|
||||
}
|
||||
|
||||
class TaskResult {
|
||||
final int id;
|
||||
final Object? result;
|
||||
final String? error;
|
||||
|
||||
const TaskResult(this.id, this.result, this.error);
|
||||
}
|
@@ -1,6 +1,8 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:isolate';
|
||||
|
||||
import 'package:flutter/widgets.dart' show ChangeNotifier;
|
||||
import 'package:flutter_saf/flutter_saf.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import 'package:sqlite3/sqlite3.dart';
|
||||
import 'package:venera/foundation/comic_source/comic_source.dart';
|
||||
@@ -107,15 +109,42 @@ class LocalComic with HistoryMixin implements Comic {
|
||||
|
||||
void read() {
|
||||
var history = HistoryManager().find(id, comicType);
|
||||
int? firstDownloadedChapter;
|
||||
int? firstDownloadedChapterGroup;
|
||||
if (downloadedChapters.isNotEmpty && chapters != null) {
|
||||
final chapters = this.chapters!;
|
||||
if (chapters.isGrouped) {
|
||||
for (int i=0; i<chapters.groupCount; i++) {
|
||||
var group = chapters.getGroupByIndex(i);
|
||||
var keys = group.keys.toList();
|
||||
for (int j=0; j<keys.length; j++) {
|
||||
var chapterId = keys[j];
|
||||
if (downloadedChapters.contains(chapterId)) {
|
||||
firstDownloadedChapter = j + 1;
|
||||
firstDownloadedChapterGroup = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
var keys = chapters.allChapters.keys;
|
||||
for (int i = 0; i < keys.length; i++) {
|
||||
if (downloadedChapters.contains(keys.elementAt(i))) {
|
||||
firstDownloadedChapter = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
App.rootContext.to(
|
||||
() => Reader(
|
||||
type: comicType,
|
||||
cid: id,
|
||||
name: title,
|
||||
chapters: chapters,
|
||||
initialChapter: history?.ep,
|
||||
initialChapter: history?.ep ?? firstDownloadedChapter,
|
||||
initialPage: history?.page,
|
||||
initialChapterGroup: history?.group,
|
||||
initialChapterGroup: history?.group ?? firstDownloadedChapterGroup,
|
||||
history: history ??
|
||||
History.fromModel(
|
||||
model: this,
|
||||
@@ -461,7 +490,7 @@ class LocalManager with ChangeNotifier {
|
||||
if (comic != null) {
|
||||
return Directory(FilePath.join(path, comic.directory));
|
||||
}
|
||||
const comicDirectoryMaxLength = 128;
|
||||
const comicDirectoryMaxLength = 80;
|
||||
if (name.length > comicDirectoryMaxLength) {
|
||||
name = name.substring(0, comicDirectoryMaxLength);
|
||||
}
|
||||
@@ -546,6 +575,99 @@ class LocalManager with ChangeNotifier {
|
||||
remove(c.id, c.comicType);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void deleteComicChapters(LocalComic c, List<String> chapters) {
|
||||
if (chapters.isEmpty) {
|
||||
return;
|
||||
}
|
||||
var newDownloadedChapters = c.downloadedChapters
|
||||
.where((e) => !chapters.contains(e))
|
||||
.toList();
|
||||
if (newDownloadedChapters.isNotEmpty) {
|
||||
_db.execute(
|
||||
'UPDATE comics SET downloadedChapters = ? WHERE id = ? AND comic_type = ?;',
|
||||
[
|
||||
jsonEncode(newDownloadedChapters),
|
||||
c.id,
|
||||
c.comicType.value,
|
||||
],
|
||||
);
|
||||
} else {
|
||||
_db.execute(
|
||||
'DELETE FROM comics WHERE id = ? AND comic_type = ?;',
|
||||
[c.id, c.comicType.value],
|
||||
);
|
||||
}
|
||||
var shouldRemovedDirs = <Directory>[];
|
||||
for (var chapter in chapters) {
|
||||
var dir = Directory(FilePath.join(c.baseDir, chapter));
|
||||
if (dir.existsSync()) {
|
||||
shouldRemovedDirs.add(dir);
|
||||
}
|
||||
}
|
||||
if (shouldRemovedDirs.isNotEmpty) {
|
||||
_deleteDirectories(shouldRemovedDirs);
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void batchDeleteComics(List<LocalComic> comics, [bool removeFileOnDisk = true, bool removeFavoriteAndHistory = true]) {
|
||||
if (comics.isEmpty) {
|
||||
return;
|
||||
}
|
||||
|
||||
var shouldRemovedDirs = <Directory>[];
|
||||
_db.execute('BEGIN TRANSACTION;');
|
||||
try {
|
||||
for (var c in comics) {
|
||||
if (removeFileOnDisk) {
|
||||
var dir = Directory(FilePath.join(path, c.directory));
|
||||
if (dir.existsSync()) {
|
||||
shouldRemovedDirs.add(dir);
|
||||
}
|
||||
}
|
||||
_db.execute(
|
||||
'DELETE FROM comics WHERE id = ? AND comic_type = ?;',
|
||||
[c.id, c.comicType.value],
|
||||
);
|
||||
}
|
||||
}
|
||||
catch(e, s) {
|
||||
Log.error("LocalManager", "Failed to batch delete comics: $e", s);
|
||||
_db.execute('ROLLBACK;');
|
||||
return;
|
||||
}
|
||||
_db.execute('COMMIT;');
|
||||
|
||||
var comicIDs = comics.map((e) => ComicID(e.comicType, e.id)).toList();
|
||||
|
||||
if (removeFavoriteAndHistory) {
|
||||
LocalFavoritesManager().batchDeleteComicsInAllFolders(comicIDs);
|
||||
HistoryManager().batchDeleteHistories(comicIDs);
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
|
||||
if (removeFileOnDisk) {
|
||||
_deleteDirectories(shouldRemovedDirs);
|
||||
}
|
||||
}
|
||||
|
||||
/// Deletes the directories in a separate isolate to avoid blocking the UI thread.
|
||||
static void _deleteDirectories(List<Directory> directories) {
|
||||
Isolate.run(() async {
|
||||
await SAFTaskWorker().init();
|
||||
for (var dir in directories) {
|
||||
try {
|
||||
if (dir.existsSync()) {
|
||||
await dir.delete(recursive: true);
|
||||
}
|
||||
} catch (e) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
enum LocalSortType {
|
||||
|
@@ -28,6 +28,8 @@ class Log {
|
||||
|
||||
static bool ignoreLimitation = false;
|
||||
|
||||
static bool isMuted = false;
|
||||
|
||||
static void printWarning(String text) {
|
||||
debugPrint('\x1B[33m$text\x1B[0m');
|
||||
}
|
||||
@@ -39,7 +41,8 @@ class Log {
|
||||
static IOSink? _file;
|
||||
|
||||
static void addLog(LogLevel level, String title, String content) {
|
||||
if (_file == null) {
|
||||
if (isMuted) return;
|
||||
if (_file == null && App.isInitialized) {
|
||||
Directory dir;
|
||||
if (App.isAndroid) {
|
||||
dir = Directory(App.externalStoragePath!);
|
||||
|
244
lib/headless.dart
Normal file
244
lib/headless.dart
Normal file
@@ -0,0 +1,244 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:venera/utils/data_sync.dart';
|
||||
import 'package:venera/foundation/comic_source/comic_source.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/pages/comic_source_page.dart';
|
||||
import 'package:venera/init.dart';
|
||||
import 'package:venera/foundation/follow_updates.dart';
|
||||
import 'package:venera/foundation/appdata.dart';
|
||||
import 'package:venera/foundation/favorites.dart';
|
||||
|
||||
void cliPrint(Map<String, dynamic> data) {
|
||||
print('[CLI PRINT] ${jsonEncode(data)}');
|
||||
}
|
||||
|
||||
Future<void> runHeadlessMode(List<String> args) async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
if (args.contains('--ignore-disheadless-log')) {
|
||||
Log.isMuted = true;
|
||||
}
|
||||
if(Platform.isLinux || Platform.isMacOS){
|
||||
Directory.current = Platform.environment['HOME']!;
|
||||
}
|
||||
// The first arg is '--headless', so we look at the next ones.
|
||||
var commandIndex = args.indexOf('--headless') + 1;
|
||||
if (commandIndex >= args.length) {
|
||||
cliPrint({'status': 'error', 'message': 'No command provided for headless mode.'});
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Need to initialize the app for some features to work
|
||||
await init();
|
||||
|
||||
var command = args[commandIndex];
|
||||
var subCommand = (commandIndex + 1 < args.length) ? args[commandIndex + 1] : null;
|
||||
|
||||
switch (command) {
|
||||
case 'webdav':
|
||||
if (subCommand == 'up') {
|
||||
cliPrint({'status': 'running', 'message': 'Uploading WebDAV data...'});
|
||||
await DataSync().uploadData();
|
||||
cliPrint({'status': 'success', 'message': 'Upload complete.'});
|
||||
} else if (subCommand == 'down') {
|
||||
cliPrint({'status': 'running', 'message': 'Downloading WebDAV data...'});
|
||||
await DataSync().downloadData();
|
||||
cliPrint({'status': 'success', 'message': 'Download complete.'});
|
||||
} else {
|
||||
cliPrint({'status': 'error', 'message': 'Invalid webdav command. Use "up" or "down".'});
|
||||
exit(1);
|
||||
}
|
||||
break;
|
||||
case 'updatescript':
|
||||
if (subCommand == 'all') {
|
||||
cliPrint({'status': 'running', 'message': 'Checking for comic source script updates...'});
|
||||
await ComicSourcePage.checkComicSourceUpdate();
|
||||
var updates = ComicSourceManager().availableUpdates;
|
||||
if (updates.isEmpty) {
|
||||
cliPrint({'status': 'success', 'message': 'No updates found.'});
|
||||
} else {
|
||||
var total = updates.length;
|
||||
var current = 0;
|
||||
var errors = 0;
|
||||
var updated = 0;
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': 'Updating all comic source scripts...',
|
||||
'data': {
|
||||
'total': total,
|
||||
'current': 0,
|
||||
'updated': 0,
|
||||
'errors': 0,
|
||||
}
|
||||
});
|
||||
for (var key in updates.keys) {
|
||||
var source = ComicSource.find(key);
|
||||
if (source != null) {
|
||||
current++;
|
||||
var data = {
|
||||
'current': current,
|
||||
'total': total,
|
||||
'source': {
|
||||
'key': source.key,
|
||||
'name': source.name,
|
||||
'version': source.version,
|
||||
'url': source.url,
|
||||
}
|
||||
};
|
||||
try {
|
||||
await ComicSourcePage.update(source, false);
|
||||
updated++;
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': 'Progress',
|
||||
'data': data,
|
||||
});
|
||||
} catch (e) {
|
||||
errors++;
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': 'ProgressError',
|
||||
'data': {
|
||||
...data,
|
||||
'error': e.toString(),
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
cliPrint({
|
||||
'status': 'success',
|
||||
'message': 'All scripts updated.',
|
||||
'data': {
|
||||
'total': total,
|
||||
'updated': updated,
|
||||
'errors': errors,
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
cliPrint({'status': 'error', 'message': 'Invalid updatescript command. Use "all".'});
|
||||
exit(1);
|
||||
}
|
||||
break;
|
||||
case 'updatesubscribe':
|
||||
cliPrint({'status': 'running', 'message': 'Updating subscribed comics...'});
|
||||
var folder = appdata.settings["followUpdatesFolder"];
|
||||
if (folder == null) {
|
||||
cliPrint({'status': 'error', 'message': 'Follow updates folder is not configured.'});
|
||||
exit(1);
|
||||
}
|
||||
|
||||
var updateIndex = args.indexOf('--update-comic-by-id-type');
|
||||
if (updateIndex != -1) {
|
||||
var id = args[updateIndex + 1];
|
||||
var type = args[updateIndex + 2];
|
||||
var comics = LocalFavoritesManager().getComicsWithUpdatesInfo(folder);
|
||||
var comic = comics.firstWhere((c) => c.id == id && c.type.sourceKey == type);
|
||||
|
||||
var result = await updateComic(comic, folder);
|
||||
|
||||
Map<String, dynamic> data = {
|
||||
'current': 1,
|
||||
'total': 1,
|
||||
'comic': {
|
||||
'id': comic.id,
|
||||
'name': comic.name,
|
||||
'coverUrl': comic.coverPath,
|
||||
'author': comic.author,
|
||||
'type': comic.type.sourceKey,
|
||||
'updateTime': comic.updateTime,
|
||||
'tags': comic.tags,
|
||||
}
|
||||
};
|
||||
|
||||
var message = 'Progress';
|
||||
if (result.errorMessage != null) {
|
||||
message = 'ProgressError';
|
||||
data['error'] = result.errorMessage;
|
||||
}
|
||||
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': message,
|
||||
'data': data,
|
||||
});
|
||||
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': 'Update check complete.',
|
||||
'data': {
|
||||
'total': 1,
|
||||
'updated': result.updated ? 1 : 0,
|
||||
'errors': result.errorMessage != null ? 1 : 0,
|
||||
}
|
||||
});
|
||||
|
||||
await Future.delayed(const Duration(milliseconds: 500));
|
||||
var json = await getUpdatedComicsAsJson(folder);
|
||||
cliPrint({
|
||||
'status': result.errorMessage != null ? 'error' : 'success',
|
||||
'message': 'Updated comics list.',
|
||||
'data': jsonDecode(json),
|
||||
});
|
||||
} else {
|
||||
int total = 0;
|
||||
int updated = 0;
|
||||
int errors = 0;
|
||||
await for (var progress in updateFolder(folder, true)) {
|
||||
total = progress.total;
|
||||
updated = progress.updated;
|
||||
errors = progress.errors;
|
||||
Map<String, dynamic> data = {
|
||||
'current': progress.current,
|
||||
'total': progress.total,
|
||||
};
|
||||
if (progress.comic != null) {
|
||||
data['comic'] = {
|
||||
'id': progress.comic!.id,
|
||||
'name': progress.comic!.name,
|
||||
'coverUrl': progress.comic!.coverPath,
|
||||
'author': progress.comic!.author,
|
||||
'type': progress.comic!.type.sourceKey,
|
||||
'updateTime': progress.comic!.updateTime,
|
||||
'tags': progress.comic!.tags,
|
||||
};
|
||||
}
|
||||
var message = 'Progress';
|
||||
if (progress.errorMessage != null) {
|
||||
message = 'ProgressError';
|
||||
data['error'] = progress.errorMessage;
|
||||
}
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': message,
|
||||
'data': data,
|
||||
});
|
||||
}
|
||||
cliPrint({
|
||||
'status': 'running',
|
||||
'message': 'Update check complete.',
|
||||
'data': {
|
||||
'total': total,
|
||||
'updated': updated,
|
||||
'errors': errors,
|
||||
}
|
||||
});
|
||||
await Future.delayed(const Duration(milliseconds: 500));
|
||||
var json = await getUpdatedComicsAsJson(folder);
|
||||
cliPrint({
|
||||
'status': errors > 0 ? 'error' : 'success',
|
||||
'message': 'Updated comics list.',
|
||||
'data': jsonDecode(json),
|
||||
});
|
||||
}
|
||||
break;
|
||||
default:
|
||||
cliPrint({'status': 'error', 'message': 'Unknown command: $command'});
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Exit after command execution
|
||||
exit(0);
|
||||
}
|
@@ -1,4 +1,8 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:display_mode/display_mode.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_saf/flutter_saf.dart';
|
||||
import 'package:rhttp/rhttp.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
@@ -12,6 +16,7 @@ import 'package:venera/pages/follow_updates_page.dart';
|
||||
import 'package:venera/pages/settings/settings_page.dart';
|
||||
import 'package:venera/utils/app_links.dart';
|
||||
import 'package:venera/utils/handle_text_share.dart';
|
||||
import 'package:venera/utils/opencc.dart';
|
||||
import 'package:venera/utils/tags_translation.dart';
|
||||
import 'package:venera/utils/translations.dart';
|
||||
import 'foundation/appdata.dart';
|
||||
@@ -32,25 +37,43 @@ extension _FutureInit<T> on Future<T> {
|
||||
Future<void> init() async {
|
||||
await App.init().wait();
|
||||
await SingleInstanceCookieJar.createInstance();
|
||||
var futures = [
|
||||
Rhttp.init(),
|
||||
App.initComponents(),
|
||||
SAFTaskWorker().init().wait(),
|
||||
AppTranslation.init().wait(),
|
||||
TagsTranslation.readData().wait(),
|
||||
JsEngine().init().wait(),
|
||||
ComicSourceManager().init().wait(),
|
||||
];
|
||||
await Future.wait(futures);
|
||||
try {
|
||||
var futures = [
|
||||
Rhttp.init(),
|
||||
App.initComponents(),
|
||||
SAFTaskWorker().init().wait(),
|
||||
AppTranslation.init().wait(),
|
||||
TagsTranslation.readData().wait(),
|
||||
JsEngine().init().wait(),
|
||||
ComicSourceManager().init().wait(),
|
||||
OpenCC.init(),
|
||||
];
|
||||
await Future.wait(futures);
|
||||
} catch (e, s) {
|
||||
Log.error("init", "$e\n$s");
|
||||
}
|
||||
CacheManager().setLimitSize(appdata.settings['cacheSize']);
|
||||
_checkOldConfigs();
|
||||
if (App.isAndroid) {
|
||||
handleLinks();
|
||||
handleTextShare();
|
||||
try {
|
||||
await FlutterDisplayMode.setHighRefreshRate();
|
||||
} catch(e) {
|
||||
Log.error("Display Mode", "Failed to set high refresh rate: $e");
|
||||
}
|
||||
}
|
||||
FlutterError.onError = (details) {
|
||||
Log.error("Unhandled Exception", "${details.exception}\n${details.stack}");
|
||||
};
|
||||
if (App.isWindows) {
|
||||
// Report to the monitor thread that the app is running
|
||||
// https://github.com/venera-app/venera/issues/343
|
||||
Timer.periodic(const Duration(seconds: 1), (_) {
|
||||
const methodChannel = MethodChannel('venera/method_channel');
|
||||
methodChannel.invokeMethod("heartBeat");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _checkOldConfigs() {
|
||||
@@ -84,8 +107,7 @@ Future<void> _checkAppUpdates() async {
|
||||
appdata.writeImplicitData();
|
||||
ComicSourcePage.checkComicSourceUpdate();
|
||||
if (appdata.settings['checkUpdateOnStart']) {
|
||||
await Future.delayed(const Duration(milliseconds: 300));
|
||||
await checkUpdateUi(false);
|
||||
await checkUpdateUi(false, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -14,9 +14,14 @@ import 'components/components.dart';
|
||||
import 'components/window_frame.dart';
|
||||
import 'foundation/app.dart';
|
||||
import 'foundation/appdata.dart';
|
||||
import 'headless.dart';
|
||||
import 'init.dart';
|
||||
|
||||
void main(List<String> args) {
|
||||
if (args.contains('--headless')) {
|
||||
runHeadlessMode(args);
|
||||
return;
|
||||
}
|
||||
if (runWebViewTitleBarWidget(args)) return;
|
||||
overrideIO(() {
|
||||
runZonedGuarded(() async {
|
||||
@@ -237,6 +242,27 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
|
||||
);
|
||||
};
|
||||
if (widget != null) {
|
||||
/// 如果无法检测到状态栏高度设定指定高度
|
||||
/// https://github.com/flutter/flutter/issues/161086
|
||||
var isPaddingCheckError =
|
||||
MediaQuery.of(context).viewPadding.top <= 0 ||
|
||||
MediaQuery.of(context).viewPadding.top > 50;
|
||||
|
||||
if (isPaddingCheckError) {
|
||||
widget = MediaQuery(
|
||||
data: MediaQuery.of(context).copyWith(
|
||||
viewPadding: const EdgeInsets.only(
|
||||
top: 15,
|
||||
bottom: 15,
|
||||
),
|
||||
padding: const EdgeInsets.only(
|
||||
top: 15,
|
||||
bottom: 15,
|
||||
),
|
||||
),
|
||||
child: widget);
|
||||
}
|
||||
|
||||
widget = OverlayWidget(widget);
|
||||
if (App.isDesktop) {
|
||||
widget = Shortcuts(
|
||||
|
@@ -7,7 +7,7 @@ import 'package:rhttp/rhttp.dart' as rhttp;
|
||||
import 'package:venera/foundation/appdata.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/network/cache.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
import 'package:venera/network/proxy.dart';
|
||||
|
||||
import '../foundation/app.dart';
|
||||
import 'cloudflare.dart';
|
||||
@@ -96,9 +96,11 @@ class MyLogInterceptor implements Interceptor {
|
||||
|
||||
@override
|
||||
void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
|
||||
Log.info("Network", "${options.method} ${options.uri}\n"
|
||||
"headers:\n${options.headers}\n"
|
||||
"data:\n${options.data}");
|
||||
Log.info(
|
||||
"Network",
|
||||
"${options.method} ${options.uri}\n"
|
||||
"headers:\n${options.headers}\n"
|
||||
"data:\n${options.data}");
|
||||
options.connectTimeout = const Duration(seconds: 15);
|
||||
options.receiveTimeout = const Duration(seconds: 15);
|
||||
options.sendTimeout = const Duration(seconds: 15);
|
||||
@@ -107,62 +109,15 @@ class MyLogInterceptor implements Interceptor {
|
||||
}
|
||||
|
||||
class AppDio with DioMixin {
|
||||
String? _proxy = proxy;
|
||||
|
||||
AppDio([BaseOptions? options]) {
|
||||
this.options = options ?? BaseOptions();
|
||||
httpClientAdapter = RHttpAdapter(rhttp.ClientSettings(
|
||||
proxySettings: proxy == null
|
||||
? const rhttp.ProxySettings.noProxy()
|
||||
: rhttp.ProxySettings.proxy(proxy!),
|
||||
));
|
||||
interceptors.add(CookieManagerSql(SingleInstanceCookieJar.instance!));
|
||||
interceptors.add(NetworkCacheManager());
|
||||
interceptors.add(CloudflareInterceptor());
|
||||
interceptors.add(MyLogInterceptor());
|
||||
}
|
||||
|
||||
static String? proxy;
|
||||
|
||||
static Future<String?> getProxy() async {
|
||||
if ((appdata.settings['proxy'] as String).removeAllBlank == "direct") {
|
||||
return null;
|
||||
httpClientAdapter = RHttpAdapter();
|
||||
if (App.isInitialized) {
|
||||
interceptors.add(CookieManagerSql(SingleInstanceCookieJar.instance!));
|
||||
interceptors.add(NetworkCacheManager());
|
||||
interceptors.add(CloudflareInterceptor());
|
||||
interceptors.add(MyLogInterceptor());
|
||||
}
|
||||
if (appdata.settings['proxy'] != "system") return appdata.settings['proxy'];
|
||||
|
||||
String res;
|
||||
if (!App.isLinux) {
|
||||
const channel = MethodChannel("venera/method_channel");
|
||||
try {
|
||||
res = await channel.invokeMethod("getProxy");
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
res = "No Proxy";
|
||||
}
|
||||
if (res == "No Proxy") return null;
|
||||
|
||||
if (res.contains(";")) {
|
||||
var proxies = res.split(";");
|
||||
for (String proxy in proxies) {
|
||||
proxy = proxy.removeAllBlank;
|
||||
if (proxy.startsWith('https=')) {
|
||||
return proxy.substring(6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
final RegExp regex = RegExp(
|
||||
r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$',
|
||||
caseSensitive: false,
|
||||
multiLine: false,
|
||||
);
|
||||
if (!regex.hasMatch(res)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static final Map<String, bool> _requests = {};
|
||||
@@ -184,16 +139,6 @@ class AppDio with DioMixin {
|
||||
_requests[path] = true;
|
||||
options!.headers!.remove('prevent-parallel');
|
||||
}
|
||||
proxy = await getProxy();
|
||||
if (_proxy != proxy) {
|
||||
Log.info("Network", "Proxy changed to $proxy");
|
||||
_proxy = proxy;
|
||||
httpClientAdapter = RHttpAdapter(rhttp.ClientSettings(
|
||||
proxySettings: proxy == null
|
||||
? const rhttp.ProxySettings.noProxy()
|
||||
: rhttp.ProxySettings.proxy(proxy!),
|
||||
));
|
||||
}
|
||||
try {
|
||||
return super.request<T>(
|
||||
path,
|
||||
@@ -213,7 +158,27 @@ class AppDio with DioMixin {
|
||||
}
|
||||
|
||||
class RHttpAdapter implements HttpClientAdapter {
|
||||
rhttp.ClientSettings settings;
|
||||
Future<rhttp.ClientSettings> get settings async {
|
||||
var proxy = await getProxy();
|
||||
|
||||
return rhttp.ClientSettings(
|
||||
proxySettings: proxy == null
|
||||
? const rhttp.ProxySettings.noProxy()
|
||||
: rhttp.ProxySettings.proxy(proxy),
|
||||
redirectSettings: const rhttp.RedirectSettings.limited(5),
|
||||
timeoutSettings: const rhttp.TimeoutSettings(
|
||||
connectTimeout: Duration(seconds: 15),
|
||||
keepAliveTimeout: Duration(seconds: 60),
|
||||
keepAlivePing: Duration(seconds: 30),
|
||||
),
|
||||
throwOnStatusCode: false,
|
||||
dnsSettings: rhttp.DnsSettings.static(overrides: _getOverrides()),
|
||||
tlsSettings: rhttp.TlsSettings(
|
||||
sni: appdata.settings['sni'] != false,
|
||||
verifyCertificates: appdata.settings['ignoreBadCertificate'] != true,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
static Map<String, List<String>> _getOverrides() {
|
||||
if (!appdata.settings['enableDnsOverrides'] == true) {
|
||||
@@ -231,22 +196,6 @@ class RHttpAdapter implements HttpClientAdapter {
|
||||
return result;
|
||||
}
|
||||
|
||||
RHttpAdapter([this.settings = const rhttp.ClientSettings()]) {
|
||||
settings = settings.copyWith(
|
||||
redirectSettings: const rhttp.RedirectSettings.limited(5),
|
||||
timeoutSettings: const rhttp.TimeoutSettings(
|
||||
connectTimeout: Duration(seconds: 15),
|
||||
keepAliveTimeout: Duration(seconds: 60),
|
||||
keepAlivePing: Duration(seconds: 30),
|
||||
),
|
||||
throwOnStatusCode: false,
|
||||
dnsSettings: rhttp.DnsSettings.static(overrides: _getOverrides()),
|
||||
tlsSettings: rhttp.TlsSettings(
|
||||
sni: appdata.settings['sni'] != false,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void close({bool force = false}) {}
|
||||
|
||||
@@ -256,10 +205,15 @@ class RHttpAdapter implements HttpClientAdapter {
|
||||
Stream<Uint8List>? requestStream,
|
||||
Future<void>? cancelFuture,
|
||||
) async {
|
||||
if (options.headers['User-Agent'] == null &&
|
||||
options.headers['user-agent'] == null) {
|
||||
options.headers['User-Agent'] = "venera/v${App.version}";
|
||||
}
|
||||
|
||||
var res = await rhttp.Rhttp.request(
|
||||
method: rhttp.HttpMethod(options.method),
|
||||
url: options.uri.toString(),
|
||||
settings: settings,
|
||||
settings: await settings,
|
||||
expectBody: rhttp.HttpExpectBody.stream,
|
||||
body: requestStream == null ? null : rhttp.HttpBody.stream(requestStream),
|
||||
headers: rhttp.HttpHeaders.rawMap(
|
||||
@@ -289,7 +243,7 @@ class RHttpAdapter implements HttpClientAdapter {
|
||||
}
|
||||
|
||||
static String _getStatusMessage(int statusCode) {
|
||||
return switch(statusCode) {
|
||||
return switch (statusCode) {
|
||||
200 => "OK",
|
||||
201 => "Created",
|
||||
202 => "Accepted",
|
||||
@@ -299,9 +253,11 @@ class RHttpAdapter implements HttpClientAdapter {
|
||||
302 => "Found",
|
||||
400 => "Invalid Status Code 400: The Request is invalid.",
|
||||
401 => "Invalid Status Code 401: The Request is unauthorized.",
|
||||
403 => "Invalid Status Code 403: No permission to access the resource. Check your account or network.",
|
||||
403 =>
|
||||
"Invalid Status Code 403: No permission to access the resource. Check your account or network.",
|
||||
404 => "Invalid Status Code 404: Not found.",
|
||||
429 => "Invalid Status Code 429: Too many requests. Please try again later.",
|
||||
429 =>
|
||||
"Invalid Status Code 429: Too many requests. Please try again later.",
|
||||
_ => "Invalid Status Code $statusCode",
|
||||
};
|
||||
}
|
||||
|
@@ -202,9 +202,13 @@ class SingleInstanceCookieJar extends CookieJarSql {
|
||||
|
||||
static SingleInstanceCookieJar? instance;
|
||||
|
||||
static Future<void> createInstance() async {
|
||||
static Future<SingleInstanceCookieJar> createInstance() async {
|
||||
if (instance != null) {
|
||||
return instance!;
|
||||
}
|
||||
var dataPath = (await getApplicationSupportDirectory()).path;
|
||||
instance = SingleInstanceCookieJar("$dataPath/cookie.db");
|
||||
return instance!;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -552,7 +552,7 @@ class _ImageDownloadWrapper {
|
||||
void start() async {
|
||||
int lastBytes = 0;
|
||||
try {
|
||||
await for (var p in ImageDownloader.loadComicImage(
|
||||
await for (var p in ImageDownloader.loadComicImageUnwrapped(
|
||||
image, task.source.key, task.comicId, chapter)) {
|
||||
if (isCancelled) {
|
||||
return;
|
||||
|
@@ -3,6 +3,7 @@ import 'dart:io';
|
||||
|
||||
import 'package:dio/io.dart';
|
||||
import 'package:venera/network/app_dio.dart';
|
||||
import 'package:venera/network/proxy.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
|
||||
class FileDownloader {
|
||||
@@ -105,7 +106,7 @@ class FileDownloader {
|
||||
|
||||
void _download(StreamController<DownloadingStatus> resultStream) async {
|
||||
try {
|
||||
var proxy = await AppDio.getProxy();
|
||||
var proxy = await getProxy();
|
||||
_dio.httpClientAdapter = IOHttpClientAdapter(
|
||||
createHttpClient: () {
|
||||
return HttpClient()
|
||||
|
@@ -1,3 +1,4 @@
|
||||
import 'dart:async';
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter_qjs/flutter_qjs.dart';
|
||||
@@ -8,7 +9,7 @@ import 'package:venera/utils/image.dart';
|
||||
|
||||
import 'app_dio.dart';
|
||||
|
||||
class ImageDownloader {
|
||||
abstract class ImageDownloader {
|
||||
static Stream<ImageDownloadProgress> loadThumbnail(
|
||||
String url, String? sourceKey,
|
||||
[String? cid]) async* {
|
||||
@@ -70,7 +71,8 @@ class ImageDownloader {
|
||||
}
|
||||
|
||||
if (configs['onResponse'] is JSInvokable) {
|
||||
buffer = (configs['onResponse'] as JSInvokable)([buffer]);
|
||||
final uint8List = Uint8List.fromList(buffer);
|
||||
buffer = (configs['onResponse'] as JSInvokable)([uint8List]);
|
||||
(configs['onResponse'] as JSInvokable).free();
|
||||
}
|
||||
|
||||
@@ -82,7 +84,40 @@ class ImageDownloader {
|
||||
);
|
||||
}
|
||||
|
||||
static final _loadingImages = <String, _StreamWrapper<ImageDownloadProgress>>{};
|
||||
|
||||
/// Cancel all loading images.
|
||||
static void cancelAllLoadingImages() {
|
||||
for (var wrapper in _loadingImages.values) {
|
||||
wrapper.cancel();
|
||||
}
|
||||
_loadingImages.clear();
|
||||
}
|
||||
|
||||
/// Load a comic image from the network or cache.
|
||||
/// The function will prevent multiple requests for the same image.
|
||||
static Stream<ImageDownloadProgress> loadComicImage(
|
||||
String imageKey, String? sourceKey, String cid, String eid) {
|
||||
final cacheKey = "$imageKey@$sourceKey@$cid@$eid";
|
||||
if (_loadingImages.containsKey(cacheKey)) {
|
||||
return _loadingImages[cacheKey]!.stream;
|
||||
}
|
||||
final stream = _StreamWrapper<ImageDownloadProgress>(
|
||||
_loadComicImage(imageKey, sourceKey, cid, eid),
|
||||
(wrapper) {
|
||||
_loadingImages.remove(cacheKey);
|
||||
},
|
||||
);
|
||||
_loadingImages[cacheKey] = stream;
|
||||
return stream.stream;
|
||||
}
|
||||
|
||||
static Stream<ImageDownloadProgress> loadComicImageUnwrapped(
|
||||
String imageKey, String? sourceKey, String cid, String eid) {
|
||||
return _loadComicImage(imageKey, sourceKey, cid, eid);
|
||||
}
|
||||
|
||||
static Stream<ImageDownloadProgress> _loadComicImage(
|
||||
String imageKey, String? sourceKey, String cid, String eid) async* {
|
||||
final cacheKey = "$imageKey@$sourceKey@$cid@$eid";
|
||||
final cache = await CacheManager().findCache(cacheKey);
|
||||
@@ -146,12 +181,17 @@ class ImageDownloader {
|
||||
}
|
||||
|
||||
if (configs['onResponse'] is JSInvokable) {
|
||||
buffer = (configs['onResponse'] as JSInvokable)([buffer]);
|
||||
buffer = (configs['onResponse'] as JSInvokable)([Uint8List.fromList(buffer)]);
|
||||
(configs['onResponse'] as JSInvokable).free();
|
||||
}
|
||||
|
||||
var data = Uint8List.fromList(buffer);
|
||||
buffer.clear();
|
||||
Uint8List data;
|
||||
if (buffer is Uint8List) {
|
||||
data = buffer;
|
||||
} else {
|
||||
data = Uint8List.fromList(buffer);
|
||||
buffer.clear();
|
||||
}
|
||||
|
||||
if (configs['modifyImage'] != null) {
|
||||
var newData = await modifyImageWithScript(
|
||||
@@ -189,6 +229,74 @@ class ImageDownloader {
|
||||
}
|
||||
}
|
||||
|
||||
/// A wrapper class for a stream that
|
||||
/// allows multiple listeners to listen to the same stream.
|
||||
class _StreamWrapper<T> {
|
||||
final Stream<T> _stream;
|
||||
|
||||
final List<StreamController> controllers = [];
|
||||
|
||||
final void Function(_StreamWrapper<T> wrapper) onClosed;
|
||||
|
||||
bool isClosed = false;
|
||||
|
||||
_StreamWrapper(this._stream, this.onClosed) {
|
||||
_listen();
|
||||
}
|
||||
|
||||
void _listen() async {
|
||||
try {
|
||||
await for (var data in _stream) {
|
||||
if (isClosed) {
|
||||
break;
|
||||
}
|
||||
for (var controller in controllers) {
|
||||
if (!controller.isClosed) {
|
||||
controller.add(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
for (var controller in controllers) {
|
||||
if (!controller.isClosed) {
|
||||
controller.addError(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
finally {
|
||||
for (var controller in controllers) {
|
||||
if (!controller.isClosed) {
|
||||
controller.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
controllers.clear();
|
||||
isClosed = true;
|
||||
onClosed(this);
|
||||
}
|
||||
|
||||
Stream<T> get stream {
|
||||
if (isClosed) {
|
||||
throw Exception('Stream is closed');
|
||||
}
|
||||
var controller = StreamController<T>();
|
||||
controllers.add(controller);
|
||||
controller.onCancel = () {
|
||||
controllers.remove(controller);
|
||||
};
|
||||
return controller.stream;
|
||||
}
|
||||
|
||||
void cancel() {
|
||||
for (var controller in controllers) {
|
||||
controller.close();
|
||||
}
|
||||
controllers.clear();
|
||||
isClosed = true;
|
||||
}
|
||||
}
|
||||
|
||||
class ImageDownloadProgress {
|
||||
final int currentBytes;
|
||||
|
||||
|
60
lib/network/proxy.dart
Normal file
60
lib/network/proxy.dart
Normal file
@@ -0,0 +1,60 @@
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
import 'package:venera/foundation/appdata.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
|
||||
String? _cachedProxy;
|
||||
|
||||
DateTime? _cachedProxyTime;
|
||||
|
||||
Future<String?> getProxy() async {
|
||||
if (_cachedProxyTime != null &&
|
||||
DateTime.now().difference(_cachedProxyTime!).inSeconds < 1) {
|
||||
return _cachedProxy;
|
||||
}
|
||||
String? proxy = await _getProxy();
|
||||
_cachedProxy = proxy;
|
||||
_cachedProxyTime = DateTime.now();
|
||||
return proxy;
|
||||
}
|
||||
|
||||
Future<String?> _getProxy() async {
|
||||
if ((appdata.settings['proxy'] as String).removeAllBlank == "direct") {
|
||||
return null;
|
||||
}
|
||||
if (appdata.settings['proxy'] != "system") return appdata.settings['proxy'];
|
||||
|
||||
String res;
|
||||
if (!App.isLinux) {
|
||||
const channel = MethodChannel("venera/method_channel");
|
||||
try {
|
||||
res = await channel.invokeMethod("getProxy");
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
res = "No Proxy";
|
||||
}
|
||||
if (res == "No Proxy") return null;
|
||||
|
||||
if (res.contains(";")) {
|
||||
var proxies = res.split(";");
|
||||
for (String proxy in proxies) {
|
||||
proxy = proxy.removeAllBlank;
|
||||
if (proxy.startsWith('https=')) {
|
||||
return proxy.substring(6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
final RegExp regex = RegExp(
|
||||
r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$',
|
||||
caseSensitive: false,
|
||||
multiLine: false,
|
||||
);
|
||||
if (!regex.hasMatch(res)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
@@ -27,9 +27,11 @@ class CategoryComicsPage extends StatefulWidget {
|
||||
|
||||
class _CategoryComicsPageState extends State<CategoryComicsPage> {
|
||||
late final CategoryComicsData data;
|
||||
late final List<CategoryComicsOptions> options;
|
||||
late List<CategoryComicsOptions>? options;
|
||||
late final CategoryOptionsLoader? optionsLoader;
|
||||
late List<String> optionsValue;
|
||||
late String sourceKey;
|
||||
String? error;
|
||||
|
||||
void findData() {
|
||||
for (final source in ComicSource.all()) {
|
||||
@@ -38,24 +40,23 @@ class _CategoryComicsPageState extends State<CategoryComicsPage> {
|
||||
throw "The comic source ${source.name} does not support category comics";
|
||||
}
|
||||
data = source.categoryComicsData!;
|
||||
options = data.options.where((element) {
|
||||
if (element.notShowWhen.contains(widget.category)) {
|
||||
return false;
|
||||
} else if (element.showWhen != null) {
|
||||
return element.showWhen!.contains(widget.category);
|
||||
}
|
||||
return true;
|
||||
}).toList();
|
||||
var defaultOptionsValue =
|
||||
options.map((e) => e.options.keys.first).toList();
|
||||
if (optionsValue.length != options.length) {
|
||||
var newOptionsValue = List<String>.filled(options.length, "");
|
||||
for (var i = 0; i < options.length; i++) {
|
||||
newOptionsValue[i] =
|
||||
optionsValue.elementAtOrNull(i) ?? defaultOptionsValue[i];
|
||||
}
|
||||
optionsValue = newOptionsValue;
|
||||
if (data.options != null) {
|
||||
options = data.options!.where((element) {
|
||||
if (element.notShowWhen.contains(widget.category)) {
|
||||
return false;
|
||||
} else if (element.showWhen != null) {
|
||||
return element.showWhen!.contains(widget.category);
|
||||
}
|
||||
return true;
|
||||
}).toList();
|
||||
} else {
|
||||
options = null;
|
||||
}
|
||||
if (data.optionsLoader != null) {
|
||||
optionsLoader = data.optionsLoader;
|
||||
loadOptions();
|
||||
}
|
||||
resetOptionsValue();
|
||||
sourceKey = source.key;
|
||||
return;
|
||||
}
|
||||
@@ -63,6 +64,36 @@ class _CategoryComicsPageState extends State<CategoryComicsPage> {
|
||||
throw "${widget.categoryKey} Not found";
|
||||
}
|
||||
|
||||
void resetOptionsValue() {
|
||||
if (options == null) return;
|
||||
var defaultOptionsValue = options!
|
||||
.map((e) => e.options.keys.first)
|
||||
.toList();
|
||||
if (optionsValue.length != options!.length) {
|
||||
var newOptionsValue = List<String>.filled(options!.length, "");
|
||||
for (var i = 0; i < options!.length; i++) {
|
||||
newOptionsValue[i] =
|
||||
optionsValue.elementAtOrNull(i) ?? defaultOptionsValue[i];
|
||||
}
|
||||
optionsValue = newOptionsValue;
|
||||
}
|
||||
}
|
||||
|
||||
void loadOptions() async {
|
||||
final res = await optionsLoader!(widget.category, widget.param);
|
||||
if (res.error) {
|
||||
setState(() {
|
||||
error = res.errorMessage;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
options = res.data;
|
||||
resetOptionsValue();
|
||||
error = null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
if (widget.options != null) {
|
||||
@@ -77,27 +108,44 @@ class _CategoryComicsPageState extends State<CategoryComicsPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var topPadding = context.padding.top + 56.0;
|
||||
|
||||
Widget body;
|
||||
|
||||
if (options == null) {
|
||||
body = Center(child: CircularProgressIndicator());
|
||||
} else if (error != null) {
|
||||
body = NetworkError(
|
||||
message: error!,
|
||||
retry: () {
|
||||
setState(() {
|
||||
error = null;
|
||||
});
|
||||
loadOptions();
|
||||
},
|
||||
);
|
||||
} else {
|
||||
body = ComicList(
|
||||
key: Key(widget.category + optionsValue.toString()),
|
||||
errorLeading: buildOptions().paddingTop(topPadding),
|
||||
leadingSliver: buildOptions().paddingTop(topPadding).toSliver(),
|
||||
loadPage: (i) =>
|
||||
data.load(widget.category, widget.param, optionsValue, i),
|
||||
);
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
extendBodyBehindAppBar: true,
|
||||
appBar: Appbar(
|
||||
title: Text(widget.category),
|
||||
),
|
||||
body: ComicList(
|
||||
key: Key(widget.category + optionsValue.toString()),
|
||||
errorLeading: SizedBox(height: topPadding),
|
||||
leadingSliver: buildOptions().paddingTop(topPadding).toSliver(),
|
||||
loadPage: (i) => data.load(
|
||||
widget.category,
|
||||
widget.param,
|
||||
optionsValue,
|
||||
i,
|
||||
),
|
||||
),
|
||||
appBar: Appbar(title: Text(widget.category)),
|
||||
body: body,
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildOptionItem(
|
||||
String text, String value, int group, BuildContext context) {
|
||||
String text,
|
||||
String value,
|
||||
int group,
|
||||
BuildContext context,
|
||||
) {
|
||||
return OptionChip(
|
||||
text: text.ts(sourceKey),
|
||||
isSelected: value == optionsValue[group],
|
||||
@@ -112,23 +160,57 @@ class _CategoryComicsPageState extends State<CategoryComicsPage> {
|
||||
|
||||
Widget buildOptions() {
|
||||
List<Widget> children = [];
|
||||
for (var optionList in options) {
|
||||
children.add(Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
for (var option in optionList.options.entries)
|
||||
buildOptionItem(
|
||||
option.value.tl,
|
||||
option.key,
|
||||
options.indexOf(optionList),
|
||||
context,
|
||||
)
|
||||
],
|
||||
));
|
||||
if (options.last != optionList) {
|
||||
var group = 0;
|
||||
for (var optionList in options!) {
|
||||
if (optionList.label.isNotEmpty) {
|
||||
children.add(Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
bottom: 8.0,
|
||||
left: 4.0,
|
||||
),
|
||||
child: Text(
|
||||
optionList.label.ts(sourceKey),
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
));
|
||||
}
|
||||
if (optionList.options.length <= 8) {
|
||||
children.add(
|
||||
Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
for (var option in optionList.options.entries)
|
||||
buildOptionItem(
|
||||
option.value.tl,
|
||||
option.key,
|
||||
group,
|
||||
context,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
} else {
|
||||
var g = group;
|
||||
children.add(Select(
|
||||
current: optionList.options[optionsValue[g]],
|
||||
values: optionList.options.values.toList(),
|
||||
onTap: (i) {
|
||||
var key = optionList.options.keys.elementAt(i);
|
||||
if (key == optionsValue[g]) return;
|
||||
setState(() {
|
||||
optionsValue[g] = key;
|
||||
});
|
||||
},
|
||||
));
|
||||
}
|
||||
if (options!.last != optionList) {
|
||||
children.add(const SizedBox(height: 8));
|
||||
}
|
||||
group++;
|
||||
}
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
|
@@ -27,7 +27,7 @@ class _NormalComicChapters extends StatefulWidget {
|
||||
class _NormalComicChaptersState extends State<_NormalComicChapters> {
|
||||
late _ComicPageState state;
|
||||
|
||||
bool reverse = false;
|
||||
late bool reverse;
|
||||
|
||||
bool showAll = false;
|
||||
|
||||
@@ -38,6 +38,7 @@ class _NormalComicChaptersState extends State<_NormalComicChapters> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
reverse = appdata.settings["reverseChapterOrder"] ?? false;
|
||||
history = widget.history;
|
||||
}
|
||||
|
||||
@@ -176,7 +177,7 @@ class _GroupedComicChaptersState extends State<_GroupedComicChapters>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late _ComicPageState state;
|
||||
|
||||
bool reverse = false;
|
||||
late bool reverse;
|
||||
|
||||
bool showAll = false;
|
||||
|
||||
@@ -191,6 +192,7 @@ class _GroupedComicChaptersState extends State<_GroupedComicChapters>
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
reverse = appdata.settings["reverseChapterOrder"] ?? false;
|
||||
history = widget.history;
|
||||
if (history?.group != null) {
|
||||
index = history!.group! - 1;
|
||||
|
@@ -410,20 +410,26 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
|
||||
String text;
|
||||
if (haveChapter) {
|
||||
var epName = "E$ep";
|
||||
String? groupName;
|
||||
try {
|
||||
epName = group == null
|
||||
? comic.chapters!.titles.elementAt(
|
||||
math.min(ep - 1, comic.chapters!.length - 1),
|
||||
)
|
||||
: comic.chapters!
|
||||
.getGroupByIndex(group - 1)
|
||||
.values
|
||||
.elementAt(ep - 1);
|
||||
if (group == null){
|
||||
epName = comic.chapters!.titles.elementAt(
|
||||
math.min(ep - 1, comic.chapters!.length - 1),
|
||||
);
|
||||
} else {
|
||||
groupName = comic.chapters!.groups.elementAt(group - 1);
|
||||
epName = comic.chapters!
|
||||
.getGroupByIndex(group - 1)
|
||||
.values
|
||||
.elementAt(ep - 1);
|
||||
}
|
||||
}
|
||||
catch(e) {
|
||||
// ignore
|
||||
}
|
||||
text = "${"Last Reading".tl}: $epName P$page";
|
||||
text = groupName == null
|
||||
? "${"Last Reading".tl}: $epName P$page"
|
||||
: "${"Last Reading".tl}: $groupName $epName P$page";
|
||||
} else {
|
||||
text = "${"Last Reading".tl}: P$page";
|
||||
}
|
||||
|
@@ -18,6 +18,57 @@ import 'package:venera/utils/translations.dart';
|
||||
class ComicSourcePage extends StatelessWidget {
|
||||
const ComicSourcePage({super.key});
|
||||
|
||||
static Future<void> update(
|
||||
ComicSource source, [
|
||||
bool showLoading = true,
|
||||
]) async {
|
||||
if (!source.url.isURL) {
|
||||
if (showLoading) {
|
||||
App.rootContext.showMessage(message: "Invalid url config");
|
||||
return;
|
||||
} else {
|
||||
throw Exception("Invalid url config");
|
||||
}
|
||||
}
|
||||
ComicSourceManager().remove(source.key);
|
||||
bool cancel = false;
|
||||
LoadingDialogController? controller;
|
||||
if (showLoading) {
|
||||
controller = showLoadingDialog(
|
||||
App.rootContext,
|
||||
onCancel: () => cancel = true,
|
||||
barrierDismissible: false,
|
||||
);
|
||||
}
|
||||
try {
|
||||
var res = await AppDio().get<String>(
|
||||
source.url,
|
||||
options: Options(
|
||||
responseType: ResponseType.plain,
|
||||
headers: {"cache-time": "no"},
|
||||
),
|
||||
);
|
||||
if (cancel) return;
|
||||
controller?.close();
|
||||
await ComicSourceParser().parse(res.data!, source.filePath);
|
||||
await io.File(source.filePath).writeAsString(res.data!);
|
||||
if (ComicSourceManager().availableUpdates.containsKey(source.key)) {
|
||||
ComicSourceManager().availableUpdates.remove(source.key);
|
||||
}
|
||||
} catch (e) {
|
||||
if (cancel) return;
|
||||
if (showLoading) {
|
||||
App.rootContext.showMessage(message: e.toString());
|
||||
} else {
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
await ComicSourceManager().reload();
|
||||
if (showLoading) {
|
||||
App.forceRebuild();
|
||||
}
|
||||
}
|
||||
|
||||
static Future<int> checkComicSourceUpdate() async {
|
||||
if (ComicSource.all().isEmpty) {
|
||||
return 0;
|
||||
@@ -51,9 +102,7 @@ class ComicSourcePage extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: const _Body(),
|
||||
);
|
||||
return Scaffold(body: const _Body());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,10 +136,7 @@ class _BodyState extends State<_Body> {
|
||||
Widget build(BuildContext context) {
|
||||
return SmoothCustomScrollView(
|
||||
slivers: [
|
||||
SliverAppbar(
|
||||
title: Text('Comic Source'.tl),
|
||||
style: AppbarStyle.shadow,
|
||||
),
|
||||
SliverAppbar(title: Text('Comic Source'.tl), style: AppbarStyle.shadow),
|
||||
buildCard(context),
|
||||
for (var source in ComicSource.all())
|
||||
_SliverComicSource(
|
||||
@@ -109,9 +155,7 @@ class _BodyState extends State<_Body> {
|
||||
showConfirmDialog(
|
||||
context: App.rootContext,
|
||||
title: "Delete".tl,
|
||||
content: "Delete comic source '@n' ?".tlParams({
|
||||
"n": source.name,
|
||||
}),
|
||||
content: "Delete comic source '@n' ?".tlParams({"n": source.name}),
|
||||
btnColor: context.colorScheme.error,
|
||||
onConfirm: () {
|
||||
var file = File(source.filePath);
|
||||
@@ -133,14 +177,16 @@ class _BodyState extends State<_Body> {
|
||||
title: const Text("Reload Configs"),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text("cancel")),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text("cancel"),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () async {
|
||||
await ComicSourceManager().reload();
|
||||
App.forceRebuild();
|
||||
},
|
||||
child: const Text("continue")),
|
||||
onPressed: () async {
|
||||
await ComicSourceManager().reload();
|
||||
App.forceRebuild();
|
||||
},
|
||||
child: const Text("continue"),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -157,49 +203,11 @@ class _BodyState extends State<_Body> {
|
||||
);
|
||||
}
|
||||
|
||||
static Future<void> update(ComicSource source,
|
||||
[bool showLoading = true]) async {
|
||||
if (!source.url.isURL) {
|
||||
App.rootContext.showMessage(message: "Invalid url config");
|
||||
return;
|
||||
}
|
||||
ComicSourceManager().remove(source.key);
|
||||
bool cancel = false;
|
||||
LoadingDialogController? controller;
|
||||
if (showLoading) {
|
||||
controller = showLoadingDialog(
|
||||
App.rootContext,
|
||||
onCancel: () => cancel = true,
|
||||
barrierDismissible: false,
|
||||
);
|
||||
}
|
||||
try {
|
||||
var res = await AppDio().get<String>(source.url,
|
||||
options: Options(responseType: ResponseType.plain));
|
||||
if (cancel) return;
|
||||
controller?.close();
|
||||
await ComicSourceParser().parse(res.data!, source.filePath);
|
||||
await File(source.filePath).writeAsString(res.data!);
|
||||
if (ComicSourceManager().availableUpdates.containsKey(source.key)) {
|
||||
ComicSourceManager().availableUpdates.remove(source.key);
|
||||
}
|
||||
} catch (e) {
|
||||
if (cancel) return;
|
||||
App.rootContext.showMessage(message: e.toString());
|
||||
}
|
||||
await ComicSourceManager().reload();
|
||||
App.forceRebuild();
|
||||
void update(ComicSource source, [bool showLoading = true]) {
|
||||
ComicSourcePage.update(source, showLoading);
|
||||
}
|
||||
|
||||
Widget buildCard(BuildContext context) {
|
||||
Widget buildButton(
|
||||
{required Widget child, required VoidCallback onPressed}) {
|
||||
return Button.normal(
|
||||
onPressed: onPressed,
|
||||
child: child,
|
||||
).fixHeight(32);
|
||||
}
|
||||
|
||||
return SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
width: double.infinity,
|
||||
@@ -213,47 +221,46 @@ class _BodyState extends State<_Body> {
|
||||
),
|
||||
TextField(
|
||||
decoration: InputDecoration(
|
||||
hintText: "URL",
|
||||
border: const UnderlineInputBorder(),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
suffix: IconButton(
|
||||
onPressed: () => handleAddSource(url),
|
||||
icon: const Icon(Icons.check))),
|
||||
hintText: "URL",
|
||||
border: const UnderlineInputBorder(),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
suffix: IconButton(
|
||||
onPressed: () => handleAddSource(url),
|
||||
icon: const Icon(Icons.check),
|
||||
),
|
||||
),
|
||||
onChanged: (value) {
|
||||
url = value;
|
||||
},
|
||||
onSubmitted: handleAddSource,
|
||||
).paddingHorizontal(16).paddingBottom(8),
|
||||
ListTile(
|
||||
title: Text("Comic Source list".tl),
|
||||
trailing: buildButton(
|
||||
child: Text("View".tl),
|
||||
onPressed: () {
|
||||
showPopUpWidget(
|
||||
App.rootContext,
|
||||
_ComicSourceList(handleAddSource),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
title: Text("Use a config file".tl),
|
||||
trailing: buildButton(
|
||||
onPressed: _selectFile,
|
||||
child: Text("Select".tl),
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
title: Text("Help".tl),
|
||||
trailing: buildButton(
|
||||
onPressed: help,
|
||||
child: Text("Open".tl),
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
title: Text("Check updates".tl),
|
||||
trailing: _CheckUpdatesButton(),
|
||||
),
|
||||
Wrap(
|
||||
spacing: 8,
|
||||
runSpacing: 8,
|
||||
children: [
|
||||
FilledButton.tonalIcon(
|
||||
icon: Icon(Icons.article_outlined),
|
||||
label: Text("Comic Source list".tl),
|
||||
onPressed: () {
|
||||
showPopUpWidget(
|
||||
App.rootContext,
|
||||
_ComicSourceList(handleAddSource),
|
||||
);
|
||||
},
|
||||
),
|
||||
FilledButton.tonalIcon(
|
||||
icon: Icon(Icons.file_open_outlined),
|
||||
label: Text("Use a config file".tl),
|
||||
onPressed: _selectFile,
|
||||
),
|
||||
FilledButton.tonalIcon(
|
||||
icon: Icon(Icons.help_outline),
|
||||
label: Text("Help".tl),
|
||||
onPressed: help,
|
||||
),
|
||||
_CheckUpdatesButton(),
|
||||
],
|
||||
).paddingHorizontal(12).paddingVertical(8),
|
||||
const SizedBox(height: 8),
|
||||
],
|
||||
),
|
||||
@@ -277,7 +284,8 @@ class _BodyState extends State<_Body> {
|
||||
|
||||
void help() {
|
||||
launchUrlString(
|
||||
"https://github.com/venera-app/venera/blob/master/doc/comic_source.md");
|
||||
"https://github.com/venera-app/venera/blob/master/doc/comic_source.md",
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> handleAddSource(String url) async {
|
||||
@@ -288,11 +296,19 @@ class _BodyState extends State<_Body> {
|
||||
splits.removeWhere((element) => element == "");
|
||||
var fileName = splits.last;
|
||||
bool cancel = false;
|
||||
var controller = showLoadingDialog(App.rootContext,
|
||||
onCancel: () => cancel = true, barrierDismissible: false);
|
||||
var controller = showLoadingDialog(
|
||||
App.rootContext,
|
||||
onCancel: () => cancel = true,
|
||||
barrierDismissible: false,
|
||||
);
|
||||
try {
|
||||
var res = await AppDio()
|
||||
.get<String>(url, options: Options(responseType: ResponseType.plain));
|
||||
var res = await AppDio().get<String>(
|
||||
url,
|
||||
options: Options(
|
||||
responseType: ResponseType.plain,
|
||||
headers: {"cache-time": "no"},
|
||||
),
|
||||
);
|
||||
if (cancel) return;
|
||||
controller.close();
|
||||
await addSource(res.data!, fileName);
|
||||
@@ -322,127 +338,178 @@ class _ComicSourceList extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _ComicSourceListState extends State<_ComicSourceList> {
|
||||
bool loading = true;
|
||||
List? json;
|
||||
bool changed = false;
|
||||
var controller = TextEditingController();
|
||||
|
||||
void load() async {
|
||||
var dio = AppDio();
|
||||
var res = await dio.get<String>(appdata.settings['comicSourceListUrl']);
|
||||
if (res.statusCode != 200) {
|
||||
context.showMessage(message: "Network error".tl);
|
||||
if (json != null) {
|
||||
setState(() {
|
||||
json = null;
|
||||
});
|
||||
}
|
||||
if (controller.text.isEmpty) {
|
||||
setState(() {
|
||||
json = [];
|
||||
});
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
json = jsonDecode(res.data!);
|
||||
loading = false;
|
||||
});
|
||||
var dio = AppDio();
|
||||
try {
|
||||
var res = await dio.get<String>(controller.text);
|
||||
if (res.statusCode != 200) {
|
||||
throw "error";
|
||||
}
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
json = jsonDecode(res.data!);
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
context.showMessage(message: "Network error".tl);
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
json = [];
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
controller.text = appdata.settings['comicSourceListUrl'];
|
||||
load();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
if (changed) {
|
||||
appdata.settings['comicSourceListUrl'] = controller.text;
|
||||
appdata.saveData();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PopUpWidgetScaffold(
|
||||
title: "Comic Source".tl,
|
||||
tailing: [
|
||||
IconButton(
|
||||
icon: Icon(Icons.settings),
|
||||
onPressed: () async {
|
||||
await showInputDialog(
|
||||
context: context,
|
||||
title: "Set comic source list url".tl,
|
||||
initialValue: appdata.settings['comicSourceListUrl'],
|
||||
onConfirm: (value) {
|
||||
appdata.settings['comicSourceListUrl'] = value;
|
||||
appdata.saveData();
|
||||
setState(() {
|
||||
loading = true;
|
||||
json = null;
|
||||
});
|
||||
return null;
|
||||
},
|
||||
);
|
||||
},
|
||||
)
|
||||
],
|
||||
body: buildBody(),
|
||||
);
|
||||
return PopUpWidgetScaffold(title: "Comic Source".tl, body: buildBody());
|
||||
}
|
||||
|
||||
Widget buildBody() {
|
||||
if (loading) {
|
||||
load();
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
} else {
|
||||
var currentKey = ComicSource.all().map((e) => e.key).toList();
|
||||
return ListView.builder(
|
||||
itemCount: json!.length + 1,
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0) {
|
||||
return Container(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 12),
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
color: context.colorScheme.primaryContainer,
|
||||
var currentKey = ComicSource.all().map((e) => e.key).toList();
|
||||
|
||||
return ListView.builder(
|
||||
itemCount: (json?.length ?? 1) + 1,
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0) {
|
||||
return Container(
|
||||
margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: Theme.of(context).colorScheme.outlineVariant,
|
||||
width: 0.6,
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.info_outline),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text("Do not report any issues related to sources to App repo.".tl),
|
||||
Text("Click the setting icon to change the source list url.".tl),
|
||||
],
|
||||
),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
ListTile(
|
||||
leading: Icon(Icons.source_outlined),
|
||||
title: Text("Repo URL".tl),
|
||||
),
|
||||
TextField(
|
||||
controller: controller,
|
||||
decoration: InputDecoration(
|
||||
hintText: "URL",
|
||||
border: const UnderlineInputBorder(),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
index--;
|
||||
|
||||
var key = json![index]["key"];
|
||||
var action = currentKey.contains(key)
|
||||
? const Icon(Icons.check, size: 20).paddingRight(8)
|
||||
: Button.filled(
|
||||
child: Text("Add".tl),
|
||||
onPressed: () async {
|
||||
var fileName = json![index]["fileName"];
|
||||
var url = json![index]["url"];
|
||||
if (url == null || !(url.toString()).isURL) {
|
||||
var listUrl =
|
||||
appdata.settings['comicSourceListUrl'] as String;
|
||||
if (listUrl
|
||||
.replaceFirst("https://", "")
|
||||
.replaceFirst("http://", "")
|
||||
.contains("/")) {
|
||||
url =
|
||||
listUrl.substring(0, listUrl.lastIndexOf("/") + 1) +
|
||||
fileName;
|
||||
} else {
|
||||
url = '$listUrl/$fileName';
|
||||
}
|
||||
}
|
||||
await widget.onAdd(url);
|
||||
setState(() {});
|
||||
onChanged: (value) {
|
||||
changed = true;
|
||||
},
|
||||
).fixHeight(32);
|
||||
|
||||
var description = json![index]["version"];
|
||||
if (json![index]["description"] != null) {
|
||||
description = "$description\n${json![index]["description"]}";
|
||||
}
|
||||
|
||||
return ListTile(
|
||||
title: Text(json![index]["name"]),
|
||||
subtitle: Text(description),
|
||||
trailing: action,
|
||||
).paddingHorizontal(16).paddingBottom(8),
|
||||
Text(
|
||||
"The URL should point to a 'index.json' file".tl,
|
||||
).paddingLeft(16),
|
||||
Text(
|
||||
"Do not report any issues related to sources to App repo.".tl,
|
||||
).paddingLeft(16),
|
||||
const SizedBox(height: 8),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
launchUrlString(
|
||||
"https://github.com/venera-app/venera/blob/master/doc/comic_source.md",
|
||||
);
|
||||
},
|
||||
child: Text("Help".tl),
|
||||
),
|
||||
FilledButton.tonal(
|
||||
onPressed: load,
|
||||
child: Text("Refresh".tl),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (index == 1 && json == null) {
|
||||
return Center(
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
).fixWidth(24).fixHeight(24),
|
||||
);
|
||||
}
|
||||
|
||||
index--;
|
||||
|
||||
var key = json![index]["key"];
|
||||
var action = currentKey.contains(key)
|
||||
? const Icon(Icons.check, size: 20).paddingRight(8)
|
||||
: Button.filled(
|
||||
child: Text("Add".tl),
|
||||
onPressed: () async {
|
||||
var fileName = json![index]["fileName"];
|
||||
var url = json![index]["url"];
|
||||
if (url == null || !(url.toString()).isURL) {
|
||||
var listUrl =
|
||||
appdata.settings['comicSourceListUrl'] as String;
|
||||
if (listUrl
|
||||
.replaceFirst("https://", "")
|
||||
.replaceFirst("http://", "")
|
||||
.contains("/")) {
|
||||
url =
|
||||
listUrl.substring(0, listUrl.lastIndexOf("/") + 1) +
|
||||
fileName;
|
||||
} else {
|
||||
url = '$listUrl/$fileName';
|
||||
}
|
||||
}
|
||||
await widget.onAdd(url);
|
||||
setState(() {});
|
||||
},
|
||||
).fixHeight(32);
|
||||
|
||||
var description = json![index]["version"];
|
||||
if (json![index]["description"] != null) {
|
||||
description = "$description\n${json![index]["description"]}";
|
||||
}
|
||||
|
||||
return ListTile(
|
||||
title: Text(json![index]["name"]),
|
||||
subtitle: Text(description),
|
||||
trailing: action,
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -510,8 +577,7 @@ void _addAllPagesWithComicSource(ComicSource source) {
|
||||
!networkFavorites.contains(source.favoriteData!.key)) {
|
||||
networkFavorites.add(source.favoriteData!.key);
|
||||
}
|
||||
if (source.searchPageData != null &&
|
||||
!searchPages.contains(source.key)) {
|
||||
if (source.searchPageData != null && !searchPages.contains(source.key)) {
|
||||
searchPages.add(source.key);
|
||||
}
|
||||
|
||||
@@ -553,15 +619,10 @@ class __EditFilePageState extends State<_EditFilePage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: Appbar(
|
||||
title: Text("Edit".tl),
|
||||
),
|
||||
appBar: Appbar(title: Text("Edit".tl)),
|
||||
body: Column(
|
||||
children: [
|
||||
Container(
|
||||
height: 0.6,
|
||||
color: context.colorScheme.outlineVariant,
|
||||
),
|
||||
Container(height: 0.6, color: context.colorScheme.outlineVariant),
|
||||
Expanded(
|
||||
child: CodeEditor(
|
||||
initialValue: current,
|
||||
@@ -602,9 +663,11 @@ class _CheckUpdatesButtonState extends State<_CheckUpdatesButton> {
|
||||
}
|
||||
|
||||
void showUpdateDialog() async {
|
||||
var text = ComicSourceManager().availableUpdates.entries.map((e) {
|
||||
return "${ComicSource.find(e.key)!.name}: ${e.value}";
|
||||
}).join("\n");
|
||||
var text = ComicSourceManager().availableUpdates.entries
|
||||
.map((e) {
|
||||
return "${ComicSource.find(e.key)!.name}: ${e.value}";
|
||||
})
|
||||
.join("\n");
|
||||
bool doUpdate = false;
|
||||
await showDialog(
|
||||
context: App.rootContext,
|
||||
@@ -636,7 +699,7 @@ class _CheckUpdatesButtonState extends State<_CheckUpdatesButton> {
|
||||
var shouldUpdate = ComicSourceManager().availableUpdates.keys.toList();
|
||||
for (var key in shouldUpdate) {
|
||||
var source = ComicSource.find(key)!;
|
||||
await _BodyState.update(source, false);
|
||||
await ComicSourcePage.update(source, false);
|
||||
current++;
|
||||
loadingController.setProgress(current / total);
|
||||
}
|
||||
@@ -649,11 +712,17 @@ class _CheckUpdatesButtonState extends State<_CheckUpdatesButton> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Button.normal(
|
||||
return FilledButton.tonalIcon(
|
||||
icon: isLoading
|
||||
? SizedBox(
|
||||
width: 18,
|
||||
height: 18,
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
)
|
||||
: Icon(Icons.update),
|
||||
label: Text("Check updates".tl),
|
||||
onPressed: check,
|
||||
isLoading: isLoading,
|
||||
child: Text("Check".tl),
|
||||
).fixHeight(32);
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -742,10 +811,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
child: ListTile(
|
||||
title: Row(
|
||||
children: [
|
||||
Text(
|
||||
source.name,
|
||||
style: ts.s18,
|
||||
),
|
||||
Text(source.name, style: ts.s18),
|
||||
const SizedBox(width: 6),
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
@@ -778,7 +844,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
style: const TextStyle(fontSize: 13),
|
||||
),
|
||||
),
|
||||
).paddingLeft(4)
|
||||
).paddingLeft(4),
|
||||
],
|
||||
),
|
||||
trailing: Row(
|
||||
@@ -823,15 +889,9 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
),
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: Column(
|
||||
children: buildSourceSettings().toList(),
|
||||
),
|
||||
),
|
||||
SliverToBoxAdapter(
|
||||
child: Column(
|
||||
children: _buildAccount().toList(),
|
||||
),
|
||||
child: Column(children: buildSourceSettings().toList()),
|
||||
),
|
||||
SliverToBoxAdapter(child: Column(children: _buildAccount().toList())),
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -857,8 +917,10 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
current = item.value['options']
|
||||
.firstWhere((e) => e['value'] == current)['text'] ??
|
||||
current =
|
||||
item.value['options'].firstWhere(
|
||||
(e) => e['value'] == current,
|
||||
)['text'] ??
|
||||
current;
|
||||
}
|
||||
yield ListTile(
|
||||
@@ -866,8 +928,9 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
trailing: Select(
|
||||
current: (current as String).ts(source.key),
|
||||
values: (item.value['options'] as List)
|
||||
.map<String>((e) =>
|
||||
((e['text'] ?? e['value']) as String).ts(source.key))
|
||||
.map<String>(
|
||||
(e) => ((e['text'] ?? e['value']) as String).ts(source.key),
|
||||
)
|
||||
.toList(),
|
||||
onTap: (i) {
|
||||
source.data['settings'][key] =
|
||||
@@ -895,8 +958,11 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
source.data['settings'][key] ?? item.value['default'] ?? '';
|
||||
yield ListTile(
|
||||
title: Text((item.value['title'] as String).ts(source.key)),
|
||||
subtitle:
|
||||
Text(current, maxLines: 1, overflow: TextOverflow.ellipsis),
|
||||
subtitle: Text(
|
||||
current,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
trailing: IconButton(
|
||||
icon: const Icon(Icons.edit),
|
||||
onPressed: () {
|
||||
@@ -937,10 +1003,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
trailing: const Icon(Icons.arrow_right),
|
||||
onTap: () async {
|
||||
await context.to(
|
||||
() => _LoginPage(
|
||||
config: source.account!,
|
||||
source: source,
|
||||
),
|
||||
() => _LoginPage(config: source.account!, source: source),
|
||||
);
|
||||
source.saveData();
|
||||
setState(() {});
|
||||
@@ -986,9 +1049,7 @@ class _SliverComicSourceState extends State<_SliverComicSource> {
|
||||
trailing: loading
|
||||
? const SizedBox.square(
|
||||
dimension: 24,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
child: CircularProgressIndicator(strokeWidth: 2),
|
||||
)
|
||||
: const Icon(Icons.refresh),
|
||||
);
|
||||
@@ -1029,9 +1090,7 @@ class _LoginPageState extends State<_LoginPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: const Appbar(
|
||||
title: Text(''),
|
||||
),
|
||||
appBar: const Appbar(title: Text('')),
|
||||
body: Center(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
@@ -1159,8 +1218,9 @@ class _LoginPageState extends State<_LoginPage> {
|
||||
setState(() {
|
||||
loading = true;
|
||||
});
|
||||
var cookies =
|
||||
widget.config.cookieFields!.map((e) => _cookies[e] ?? '').toList();
|
||||
var cookies = widget.config.cookieFields!
|
||||
.map((e) => _cookies[e] ?? '')
|
||||
.toList();
|
||||
widget.config.validateCookies!(cookies).then((value) {
|
||||
if (value) {
|
||||
widget.source.data['account'] = 'ok';
|
||||
|
@@ -133,7 +133,7 @@ void addFavorite(List<Comic> comics) {
|
||||
}
|
||||
|
||||
Future<List<FavoriteItem>> updateComicsInfo(String folder) async {
|
||||
var comics = LocalFavoritesManager().getAllComics(folder);
|
||||
var comics = LocalFavoritesManager().getFolderComics(folder);
|
||||
|
||||
Future<void> updateSingleComic(int index) async {
|
||||
int retry = 3;
|
||||
|
@@ -18,14 +18,16 @@ import 'package:venera/network/download.dart';
|
||||
import 'package:venera/pages/comic_details_page/comic_page.dart';
|
||||
import 'package:venera/pages/reader/reader.dart';
|
||||
import 'package:venera/pages/settings/settings_page.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
import 'package:venera/utils/io.dart';
|
||||
import 'package:venera/utils/opencc.dart';
|
||||
import 'package:venera/utils/tags_translation.dart';
|
||||
import 'package:venera/utils/translations.dart';
|
||||
|
||||
part 'favorite_actions.dart';
|
||||
part 'side_bar.dart';
|
||||
part 'local_favorites_page.dart';
|
||||
part 'network_favorites_page.dart';
|
||||
part 'local_search_page.dart';
|
||||
|
||||
const _kLeftBarWidth = 256.0;
|
||||
|
||||
@@ -65,6 +67,11 @@ class _FavoritesPageState extends State<FavoritesPage> {
|
||||
folder = data['name'];
|
||||
isNetwork = data['isNetwork'] ?? false;
|
||||
}
|
||||
if (folder != null
|
||||
&& !isNetwork
|
||||
&& !LocalFavoritesManager().existsFolder(folder!)) {
|
||||
folder = null;
|
||||
}
|
||||
super.initState();
|
||||
}
|
||||
|
||||
|
@@ -1,5 +1,11 @@
|
||||
part of 'favorites_page.dart';
|
||||
|
||||
const _localAllFolderLabel = '^_^[%local_all%]^_^';
|
||||
|
||||
/// If the number of comics in a folder exceeds this limit, it will be
|
||||
/// fetched asynchronously.
|
||||
const _asyncDataFetchLimit = 500;
|
||||
|
||||
class _LocalFavoritesPage extends StatefulWidget {
|
||||
const _LocalFavoritesPage({required this.folder, super.key});
|
||||
|
||||
@@ -31,25 +37,132 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
|
||||
int? lastSelectedIndex;
|
||||
|
||||
bool get isAllFolder => widget.folder == _localAllFolderLabel;
|
||||
|
||||
LocalFavoritesManager get manager => LocalFavoritesManager();
|
||||
|
||||
bool isLoading = false;
|
||||
|
||||
var searchResults = <FavoriteItem>[];
|
||||
|
||||
void updateSearchResult() {
|
||||
setState(() {
|
||||
if (keyword.trim().isEmpty) {
|
||||
searchResults = comics;
|
||||
} else {
|
||||
searchResults = [];
|
||||
for (var comic in comics) {
|
||||
if (matchKeyword(keyword, comic) ||
|
||||
matchKeywordT(keyword, comic) ||
|
||||
matchKeywordS(keyword, comic)) {
|
||||
searchResults.add(comic);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void updateComics() {
|
||||
if (keyword.isEmpty) {
|
||||
setState(() {
|
||||
comics = LocalFavoritesManager().getAllComics(widget.folder);
|
||||
});
|
||||
if (isLoading) return;
|
||||
if (isAllFolder) {
|
||||
var totalComics = manager.totalComics;
|
||||
if (totalComics < _asyncDataFetchLimit) {
|
||||
comics = manager.getAllComics();
|
||||
} else {
|
||||
isLoading = true;
|
||||
manager
|
||||
.getAllComicsAsync()
|
||||
.minTime(const Duration(milliseconds: 200))
|
||||
.then((value) {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
comics = value;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
setState(() {
|
||||
comics = LocalFavoritesManager().searchInFolder(widget.folder, keyword);
|
||||
});
|
||||
var folderComics = manager.folderComics(widget.folder);
|
||||
if (folderComics < _asyncDataFetchLimit) {
|
||||
comics = manager.getFolderComics(widget.folder);
|
||||
} else {
|
||||
isLoading = true;
|
||||
manager
|
||||
.getFolderComicsAsync(widget.folder)
|
||||
.minTime(const Duration(milliseconds: 200))
|
||||
.then((value) {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
isLoading = false;
|
||||
comics = value;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
setState(() {});
|
||||
}
|
||||
|
||||
bool matchKeyword(String keyword, FavoriteItem comic) {
|
||||
var list = keyword.split(" ");
|
||||
for (var k in list) {
|
||||
if (k.isEmpty) continue;
|
||||
if (comic.title.contains(k)) {
|
||||
continue;
|
||||
} else if (comic.subtitle != null && comic.subtitle!.contains(k)) {
|
||||
continue;
|
||||
} else if (comic.tags.any((tag) {
|
||||
if (tag == k) {
|
||||
return true;
|
||||
} else if (tag.contains(':') && tag.split(':')[1] == k) {
|
||||
return true;
|
||||
} else if (App.locale.languageCode != 'en' &&
|
||||
tag.translateTagsToCN == k) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
})) {
|
||||
continue;
|
||||
} else if (comic.author == k) {
|
||||
continue;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Convert keyword to traditional Chinese to match comics
|
||||
bool matchKeywordT(String keyword, FavoriteItem comic) {
|
||||
if (!OpenCC.hasChineseSimplified(keyword)) {
|
||||
return false;
|
||||
}
|
||||
keyword = OpenCC.simplifiedToTraditional(keyword);
|
||||
return matchKeyword(keyword, comic);
|
||||
}
|
||||
|
||||
// Convert keyword to simplified Chinese to match comics
|
||||
bool matchKeywordS(String keyword, FavoriteItem comic) {
|
||||
if (!OpenCC.hasChineseTraditional(keyword)) {
|
||||
return false;
|
||||
}
|
||||
keyword = OpenCC.traditionalToSimplified(keyword);
|
||||
return matchKeyword(keyword, comic);
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
favPage = context.findAncestorStateOfType<_FavoritesPageState>()!;
|
||||
comics = LocalFavoritesManager().getAllComics(widget.folder);
|
||||
var (a, b) = LocalFavoritesManager().findLinked(widget.folder);
|
||||
networkSource = a;
|
||||
networkFolder = b;
|
||||
if (!isAllFolder) {
|
||||
var (a, b) = LocalFavoritesManager().findLinked(widget.folder);
|
||||
networkSource = a;
|
||||
networkFolder = b;
|
||||
} else {
|
||||
networkSource = null;
|
||||
networkFolder = null;
|
||||
}
|
||||
comics = [];
|
||||
updateComics();
|
||||
LocalFavoritesManager().addListener(updateComics);
|
||||
super.initState();
|
||||
}
|
||||
@@ -62,16 +175,33 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
|
||||
void selectAll() {
|
||||
setState(() {
|
||||
selectedComics = comics.asMap().map((k, v) => MapEntry(v, true));
|
||||
if (searchMode) {
|
||||
selectedComics = searchResults.asMap().map((k, v) => MapEntry(v, true));
|
||||
} else {
|
||||
selectedComics = comics.asMap().map((k, v) => MapEntry(v, true));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void invertSelection() {
|
||||
setState(() {
|
||||
comics.asMap().forEach((k, v) {
|
||||
selectedComics[v] = !selectedComics.putIfAbsent(v, () => false);
|
||||
});
|
||||
selectedComics.removeWhere((k, v) => !v);
|
||||
if (searchMode) {
|
||||
for (var c in searchResults) {
|
||||
if (selectedComics.containsKey(c)) {
|
||||
selectedComics.remove(c);
|
||||
} else {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (var c in comics) {
|
||||
if (selectedComics.containsKey(c)) {
|
||||
selectedComics.remove(c);
|
||||
} else {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -113,6 +243,11 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var title = favPage.folder ?? "Unselected".tl;
|
||||
if (title == _localAllFolderLabel) {
|
||||
title = "All".tl;
|
||||
}
|
||||
|
||||
Widget body = SmoothCustomScrollView(
|
||||
controller: scrollController,
|
||||
slivers: [
|
||||
@@ -135,10 +270,10 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
onTap: context.width < _kTwoPanelChangeWidth
|
||||
? favPage.showFolderSelector
|
||||
: null,
|
||||
child: Text(favPage.folder ?? "Unselected".tl),
|
||||
child: Text(title),
|
||||
),
|
||||
actions: [
|
||||
if (networkSource != null)
|
||||
if (networkSource != null && !isAllFolder)
|
||||
Tooltip(
|
||||
message: "Sync".tl,
|
||||
child: Flyout(
|
||||
@@ -191,14 +326,17 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
icon: const Icon(Icons.search),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
keyword = "";
|
||||
searchMode = true;
|
||||
updateSearchResult();
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
MenuButton(
|
||||
entries: [
|
||||
MenuEntry(
|
||||
if (!isAllFolder)
|
||||
MenuButton(
|
||||
entries: [
|
||||
MenuEntry(
|
||||
icon: Icons.edit_outlined,
|
||||
text: "Rename".tl,
|
||||
onClick: () {
|
||||
@@ -220,8 +358,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
return null;
|
||||
},
|
||||
);
|
||||
}),
|
||||
MenuEntry(
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.reorder,
|
||||
text: "Reorder".tl,
|
||||
onClick: () {
|
||||
@@ -241,8 +380,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
}
|
||||
},
|
||||
);
|
||||
}),
|
||||
MenuEntry(
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.upload_file,
|
||||
text: "Export".tl,
|
||||
onClick: () {
|
||||
@@ -253,8 +393,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
data: utf8.encode(json),
|
||||
filename: "${widget.folder}.json",
|
||||
);
|
||||
}),
|
||||
MenuEntry(
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.update,
|
||||
text: "Update Comics Info".tl,
|
||||
onClick: () {
|
||||
@@ -265,8 +406,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
});
|
||||
}
|
||||
});
|
||||
}),
|
||||
MenuEntry(
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.delete_outline,
|
||||
text: "Delete Folder".tl,
|
||||
color: context.colorScheme.error,
|
||||
@@ -284,9 +426,10 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
favPage.folderList?.updateFolders();
|
||||
},
|
||||
);
|
||||
}),
|
||||
],
|
||||
),
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
else if (multiSelectMode)
|
||||
@@ -310,10 +453,12 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
"Selected @c comics".tlParams({"c": selectedComics.length})),
|
||||
actions: [
|
||||
MenuButton(entries: [
|
||||
if (!isAllFolder)
|
||||
MenuEntry(
|
||||
icon: Icons.drive_file_move,
|
||||
text: "Move to folder".tl,
|
||||
onClick: () => favoriteOption('move')),
|
||||
if (!isAllFolder)
|
||||
MenuEntry(
|
||||
icon: Icons.copy,
|
||||
text: "Copy to folder".tl,
|
||||
@@ -330,22 +475,23 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
icon: Icons.flip,
|
||||
text: "Invert Selection".tl,
|
||||
onClick: invertSelection),
|
||||
MenuEntry(
|
||||
icon: Icons.delete_outline,
|
||||
text: "Delete Comic".tl,
|
||||
color: context.colorScheme.error,
|
||||
onClick: () {
|
||||
showConfirmDialog(
|
||||
context: context,
|
||||
title: "Delete".tl,
|
||||
content: "Delete @c comics?"
|
||||
.tlParams({"c": selectedComics.length}),
|
||||
btnColor: context.colorScheme.error,
|
||||
onConfirm: () {
|
||||
_deleteComicWithId();
|
||||
},
|
||||
);
|
||||
}),
|
||||
if (!isAllFolder)
|
||||
MenuEntry(
|
||||
icon: Icons.delete_outline,
|
||||
text: "Delete Comic".tl,
|
||||
color: context.colorScheme.error,
|
||||
onClick: () {
|
||||
showConfirmDialog(
|
||||
context: context,
|
||||
title: "Delete".tl,
|
||||
content: "Delete @c comics?"
|
||||
.tlParams({"c": selectedComics.length}),
|
||||
btnColor: context.colorScheme.error,
|
||||
onConfirm: () {
|
||||
_deleteComicWithId();
|
||||
},
|
||||
);
|
||||
}),
|
||||
MenuEntry(
|
||||
icon: Icons.download,
|
||||
text: "Download".tl,
|
||||
@@ -380,9 +526,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
icon: const Icon(Icons.close),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
searchMode = false;
|
||||
keyword = "";
|
||||
updateComics();
|
||||
setState(() {
|
||||
searchMode = false;
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
@@ -391,131 +537,142 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
autofocus: true,
|
||||
decoration: InputDecoration(
|
||||
hintText: "Search".tl,
|
||||
border: InputBorder.none,
|
||||
border: UnderlineInputBorder(),
|
||||
),
|
||||
onChanged: (v) {
|
||||
keyword = v;
|
||||
updateComics();
|
||||
updateSearchResult();
|
||||
},
|
||||
),
|
||||
).paddingBottom(8).paddingRight(8),
|
||||
),
|
||||
SliverGridComics(
|
||||
comics: comics,
|
||||
selections: selectedComics,
|
||||
menuBuilder: (c) {
|
||||
return [
|
||||
MenuEntry(
|
||||
icon: Icons.delete,
|
||||
text: "Delete".tl,
|
||||
onClick: () {
|
||||
LocalFavoritesManager().deleteComicWithId(
|
||||
widget.folder,
|
||||
c.id,
|
||||
(c as FavoriteItem).type,
|
||||
);
|
||||
},
|
||||
if (isLoading)
|
||||
SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
height: 200,
|
||||
child: const Center(
|
||||
child: CircularProgressIndicator(),
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.check,
|
||||
text: "Select".tl,
|
||||
onClick: () {
|
||||
setState(() {
|
||||
if (!multiSelectMode) {
|
||||
multiSelectMode = true;
|
||||
}
|
||||
if (selectedComics.containsKey(c as FavoriteItem)) {
|
||||
selectedComics.remove(c);
|
||||
_checkExitSelectMode();
|
||||
} else {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c);
|
||||
});
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.download,
|
||||
text: "Download".tl,
|
||||
onClick: () {
|
||||
downloadComic(c as FavoriteItem);
|
||||
context.showMessage(
|
||||
message: "Download started".tl,
|
||||
);
|
||||
},
|
||||
),
|
||||
if (appdata.settings["onClickFavorite"] == "viewDetail")
|
||||
),
|
||||
)
|
||||
else
|
||||
SliverGridComics(
|
||||
comics: searchMode ? searchResults : comics,
|
||||
selections: selectedComics,
|
||||
menuBuilder: (c) {
|
||||
return [
|
||||
if (!isAllFolder)
|
||||
MenuEntry(
|
||||
icon: Icons.delete,
|
||||
text: "Delete".tl,
|
||||
onClick: () {
|
||||
LocalFavoritesManager().deleteComicWithId(
|
||||
widget.folder,
|
||||
c.id,
|
||||
(c as FavoriteItem).type,
|
||||
);
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.menu_book_outlined,
|
||||
text: "Read".tl,
|
||||
icon: Icons.check,
|
||||
text: "Select".tl,
|
||||
onClick: () {
|
||||
App.mainNavigatorKey?.currentContext?.to(
|
||||
() => ReaderWithLoading(
|
||||
id: c.id,
|
||||
sourceKey: c.sourceKey,
|
||||
),
|
||||
setState(() {
|
||||
if (!multiSelectMode) {
|
||||
multiSelectMode = true;
|
||||
}
|
||||
if (selectedComics.containsKey(c as FavoriteItem)) {
|
||||
selectedComics.remove(c);
|
||||
_checkExitSelectMode();
|
||||
} else {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c);
|
||||
});
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.download,
|
||||
text: "Download".tl,
|
||||
onClick: () {
|
||||
downloadComic(c as FavoriteItem);
|
||||
context.showMessage(
|
||||
message: "Download started".tl,
|
||||
);
|
||||
},
|
||||
),
|
||||
];
|
||||
},
|
||||
onTap: (c) {
|
||||
if (multiSelectMode) {
|
||||
setState(() {
|
||||
if (selectedComics.containsKey(c as FavoriteItem)) {
|
||||
selectedComics.remove(c);
|
||||
_checkExitSelectMode();
|
||||
} else {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c);
|
||||
});
|
||||
} else if (appdata.settings["onClickFavorite"] == "viewDetail") {
|
||||
App.mainNavigatorKey?.currentContext
|
||||
?.to(() => ComicPage(id: c.id, sourceKey: c.sourceKey));
|
||||
} else {
|
||||
App.mainNavigatorKey?.currentContext?.to(
|
||||
() => ReaderWithLoading(
|
||||
id: c.id,
|
||||
sourceKey: c.sourceKey,
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
onLongPressed: (c) {
|
||||
setState(() {
|
||||
if (!multiSelectMode) {
|
||||
multiSelectMode = true;
|
||||
if (!selectedComics.containsKey(c as FavoriteItem)) {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c);
|
||||
} else {
|
||||
if (lastSelectedIndex != null) {
|
||||
int start = lastSelectedIndex!;
|
||||
int end = comics.indexOf(c as FavoriteItem);
|
||||
if (start > end) {
|
||||
int temp = start;
|
||||
start = end;
|
||||
end = temp;
|
||||
if (appdata.settings["onClickFavorite"] == "viewDetail")
|
||||
MenuEntry(
|
||||
icon: Icons.menu_book_outlined,
|
||||
text: "Read".tl,
|
||||
onClick: () {
|
||||
App.mainNavigatorKey?.currentContext?.to(
|
||||
() => ReaderWithLoading(
|
||||
id: c.id,
|
||||
sourceKey: c.sourceKey,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
];
|
||||
},
|
||||
onTap: (c) {
|
||||
if (multiSelectMode) {
|
||||
setState(() {
|
||||
if (selectedComics.containsKey(c as FavoriteItem)) {
|
||||
selectedComics.remove(c);
|
||||
_checkExitSelectMode();
|
||||
} else {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c);
|
||||
});
|
||||
} else if (appdata.settings["onClickFavorite"] == "viewDetail") {
|
||||
App.mainNavigatorKey?.currentContext
|
||||
?.to(() => ComicPage(id: c.id, sourceKey: c.sourceKey));
|
||||
} else {
|
||||
App.mainNavigatorKey?.currentContext?.to(
|
||||
() => ReaderWithLoading(
|
||||
id: c.id,
|
||||
sourceKey: c.sourceKey,
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
onLongPressed: (c) {
|
||||
setState(() {
|
||||
if (!multiSelectMode) {
|
||||
multiSelectMode = true;
|
||||
if (!selectedComics.containsKey(c as FavoriteItem)) {
|
||||
selectedComics[c] = true;
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c);
|
||||
} else {
|
||||
if (lastSelectedIndex != null) {
|
||||
int start = lastSelectedIndex!;
|
||||
int end = comics.indexOf(c as FavoriteItem);
|
||||
if (start > end) {
|
||||
int temp = start;
|
||||
start = end;
|
||||
end = temp;
|
||||
}
|
||||
|
||||
for (int i = start; i <= end; i++) {
|
||||
if (i == lastSelectedIndex) continue;
|
||||
for (int i = start; i <= end; i++) {
|
||||
if (i == lastSelectedIndex) continue;
|
||||
|
||||
var comic = comics[i];
|
||||
if (selectedComics.containsKey(comic)) {
|
||||
selectedComics.remove(comic);
|
||||
} else {
|
||||
selectedComics[comic] = true;
|
||||
var comic = comics[i];
|
||||
if (selectedComics.containsKey(comic)) {
|
||||
selectedComics.remove(comic);
|
||||
} else {
|
||||
selectedComics[comic] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c as FavoriteItem);
|
||||
}
|
||||
lastSelectedIndex = comics.indexOf(c as FavoriteItem);
|
||||
}
|
||||
_checkExitSelectMode();
|
||||
});
|
||||
},
|
||||
),
|
||||
_checkExitSelectMode();
|
||||
});
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
body = AppScrollBar(
|
||||
@@ -638,32 +795,26 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
return;
|
||||
}
|
||||
if (option == 'move') {
|
||||
for (var c in selectedComics.keys) {
|
||||
for (var s in selectedLocalFolders) {
|
||||
LocalFavoritesManager().moveFavorite(
|
||||
favPage.folder as String,
|
||||
s,
|
||||
c.id,
|
||||
(c as FavoriteItem).type);
|
||||
}
|
||||
var comics = selectedComics.keys
|
||||
.map((e) => e as FavoriteItem)
|
||||
.toList();
|
||||
for (var f in selectedLocalFolders) {
|
||||
LocalFavoritesManager().batchMoveFavorites(
|
||||
favPage.folder as String,
|
||||
f,
|
||||
comics,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
for (var c in selectedComics.keys) {
|
||||
for (var s in selectedLocalFolders) {
|
||||
LocalFavoritesManager().addComic(
|
||||
s,
|
||||
FavoriteItem(
|
||||
id: c.id,
|
||||
name: c.title,
|
||||
coverPath: c.cover,
|
||||
author: c.subtitle ?? '',
|
||||
type: ComicType((c.sourceKey == 'local'
|
||||
? 0
|
||||
: c.sourceKey.hashCode)),
|
||||
tags: c.tags ?? [],
|
||||
),
|
||||
);
|
||||
}
|
||||
var comics = selectedComics.keys
|
||||
.map((e) => e as FavoriteItem)
|
||||
.toList();
|
||||
for (var f in selectedLocalFolders) {
|
||||
LocalFavoritesManager().batchCopyFavorites(
|
||||
favPage.folder as String,
|
||||
f,
|
||||
comics,
|
||||
);
|
||||
}
|
||||
}
|
||||
App.rootContext.pop();
|
||||
@@ -699,13 +850,8 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> {
|
||||
}
|
||||
|
||||
void _deleteComicWithId() {
|
||||
for (var c in selectedComics.keys) {
|
||||
LocalFavoritesManager().deleteComicWithId(
|
||||
widget.folder,
|
||||
c.id,
|
||||
(c as FavoriteItem).type,
|
||||
);
|
||||
}
|
||||
var toBeDeleted = selectedComics.keys.map((e) => e as FavoriteItem).toList();
|
||||
LocalFavoritesManager().batchDeleteComics(widget.folder, toBeDeleted);
|
||||
_cancel();
|
||||
}
|
||||
}
|
||||
@@ -725,7 +871,7 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
|
||||
final _key = GlobalKey();
|
||||
var reorderWidgetKey = UniqueKey();
|
||||
final _scrollController = ScrollController();
|
||||
late var comics = LocalFavoritesManager().getAllComics(widget.name);
|
||||
late var comics = LocalFavoritesManager().getFolderComics(widget.name);
|
||||
bool changed = false;
|
||||
|
||||
static int _floatToInt8(double x) {
|
||||
@@ -746,7 +892,10 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
|
||||
@override
|
||||
void dispose() {
|
||||
if (changed) {
|
||||
LocalFavoritesManager().reorder(comics, widget.name);
|
||||
// Delay to ensure navigation is completed
|
||||
Future.delayed(const Duration(milliseconds: 200), () {
|
||||
LocalFavoritesManager().reorder(comics, widget.name);
|
||||
});
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
@@ -781,27 +930,31 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> {
|
||||
appBar: Appbar(
|
||||
title: Text("Reorder".tl),
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: const Icon(Icons.info_outline),
|
||||
onPressed: () {
|
||||
showInfoDialog(
|
||||
context: context,
|
||||
title: "Reorder".tl,
|
||||
content: "Long press and drag to reorder.".tl,
|
||||
);
|
||||
},
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.swap_vert),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
comics = comics.reversed.toList();
|
||||
changed = true;
|
||||
showToast(
|
||||
message: "Reversed successfully".tl, context: context);
|
||||
});
|
||||
},
|
||||
Tooltip(
|
||||
message: "Information".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.info_outline),
|
||||
onPressed: () {
|
||||
showInfoDialog(
|
||||
context: context,
|
||||
title: "Reorder".tl,
|
||||
content: "Long press and drag to reorder.".tl,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Reverse".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.swap_vert),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
comics = comics.reversed.toList();
|
||||
changed = true;
|
||||
});
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
body: ReorderableBuilder<FavoriteItem>(
|
||||
|
@@ -1,41 +0,0 @@
|
||||
part of 'favorites_page.dart';
|
||||
|
||||
class LocalSearchPage extends StatefulWidget {
|
||||
const LocalSearchPage({super.key});
|
||||
|
||||
@override
|
||||
State<LocalSearchPage> createState() => _LocalSearchPageState();
|
||||
}
|
||||
|
||||
class _LocalSearchPageState extends State<LocalSearchPage> {
|
||||
String keyword = '';
|
||||
|
||||
var comics = <FavoriteItemWithFolderInfo>[];
|
||||
|
||||
late final SearchBarController controller;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
controller = SearchBarController(onSearch: (text) {
|
||||
keyword = text;
|
||||
comics = LocalFavoritesManager().search(keyword);
|
||||
setState(() {});
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
body: SmoothCustomScrollView(slivers: [
|
||||
SliverSearchBar(controller: controller),
|
||||
SliverGridComics(
|
||||
comics: comics,
|
||||
badgeBuilder: (c) {
|
||||
return (c as FavoriteItemWithFolderInfo).folder;
|
||||
},
|
||||
),
|
||||
]),
|
||||
);
|
||||
}
|
||||
}
|
@@ -42,6 +42,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
|
||||
folders = LocalFavoritesManager().folderNames;
|
||||
findNetworkFolders();
|
||||
appdata.settings.addListener(updateFolders);
|
||||
LocalFavoritesManager().addListener(updateFolders);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@@ -49,6 +50,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
appdata.settings.removeListener(updateFolders);
|
||||
LocalFavoritesManager().removeListener(updateFolders);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -86,58 +88,14 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
|
||||
padding: widget.withAppbar
|
||||
? EdgeInsets.zero
|
||||
: EdgeInsets.only(top: context.padding.top),
|
||||
itemCount: folders.length + networkFolders.length + 2,
|
||||
itemCount: folders.length + networkFolders.length + 3,
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.local_activity,
|
||||
color: context.colorScheme.secondary,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text("Local".tl),
|
||||
const Spacer(),
|
||||
MenuButton(
|
||||
entries: [
|
||||
MenuEntry(
|
||||
icon: Icons.search,
|
||||
text: 'Search'.tl,
|
||||
onClick: () {
|
||||
context.to(() => const LocalSearchPage());
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.add,
|
||||
text: 'Create Folder'.tl,
|
||||
onClick: () {
|
||||
newFolder().then((value) {
|
||||
setState(() {
|
||||
folders =
|
||||
LocalFavoritesManager().folderNames;
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.reorder,
|
||||
text: 'Sort'.tl,
|
||||
onClick: () {
|
||||
sortFolders().then((value) {
|
||||
setState(() {
|
||||
folders =
|
||||
LocalFavoritesManager().folderNames;
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
).paddingHorizontal(16),
|
||||
);
|
||||
return buildLocalTitle();
|
||||
}
|
||||
index--;
|
||||
if (index == 0) {
|
||||
return buildLocalFolder(_localAllFolderLabel);
|
||||
}
|
||||
index--;
|
||||
if (index < folders.length) {
|
||||
@@ -145,38 +103,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
|
||||
}
|
||||
index -= folders.length;
|
||||
if (index == 0) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 12),
|
||||
margin: const EdgeInsets.only(top: 8),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
top: BorderSide(
|
||||
color: context.colorScheme.outlineVariant,
|
||||
width: 0.6,
|
||||
),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.cloud,
|
||||
color: context.colorScheme.secondary,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text("Network".tl),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.settings),
|
||||
onPressed: () {
|
||||
showPopUpWidget(
|
||||
App.rootContext,
|
||||
setFavoritesPagesWidget(),
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
).paddingHorizontal(16),
|
||||
);
|
||||
return buildNetworkTitle();
|
||||
}
|
||||
index--;
|
||||
return buildNetworkFolder(networkFolders[index]);
|
||||
@@ -188,8 +115,95 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildLocalTitle() {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.local_activity,
|
||||
color: context.colorScheme.secondary,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text("Local".tl),
|
||||
const Spacer(),
|
||||
MenuButton(
|
||||
entries: [
|
||||
MenuEntry(
|
||||
icon: Icons.add,
|
||||
text: 'Create Folder'.tl,
|
||||
onClick: () {
|
||||
newFolder().then((value) {
|
||||
setState(() {
|
||||
folders = LocalFavoritesManager().folderNames;
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.reorder,
|
||||
text: 'Sort'.tl,
|
||||
onClick: () {
|
||||
sortFolders().then((value) {
|
||||
setState(() {
|
||||
folders = LocalFavoritesManager().folderNames;
|
||||
});
|
||||
});
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
).paddingHorizontal(16),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildNetworkTitle() {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 12),
|
||||
margin: const EdgeInsets.only(top: 8),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
top: BorderSide(
|
||||
color: context.colorScheme.outlineVariant,
|
||||
width: 0.6,
|
||||
),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.cloud,
|
||||
color: context.colorScheme.secondary,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text("Network".tl),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.settings),
|
||||
onPressed: () {
|
||||
showPopUpWidget(
|
||||
App.rootContext,
|
||||
setFavoritesPagesWidget(),
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
).paddingHorizontal(16),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildLocalFolder(String name) {
|
||||
bool isSelected = name == favPage.folder && !favPage.isNetwork;
|
||||
int count = 0;
|
||||
if (name == _localAllFolderLabel) {
|
||||
count = LocalFavoritesManager().totalComics;
|
||||
} else {
|
||||
count = LocalFavoritesManager().folderComics(name);
|
||||
}
|
||||
var folderName = name == _localAllFolderLabel
|
||||
? "All".tl
|
||||
: getFavoriteDataOrNull(name)?.title ?? name;
|
||||
return InkWell(
|
||||
onTap: () {
|
||||
if (isSelected) {
|
||||
@@ -214,7 +228,25 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
|
||||
),
|
||||
),
|
||||
padding: const EdgeInsets.only(left: 16),
|
||||
child: Text(name),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(folderName),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.only(right: 8),
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 2,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: context.colorScheme.surfaceContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Text(count.toString()),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
@@ -5,10 +5,10 @@ import 'package:venera/components/components.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
import 'package:venera/foundation/appdata.dart';
|
||||
import 'package:venera/foundation/favorites.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/utils/data_sync.dart';
|
||||
import 'package:venera/utils/translations.dart';
|
||||
import '../foundation/global_state.dart';
|
||||
import 'package:venera/foundation/follow_updates.dart';
|
||||
|
||||
class FollowUpdatesWidget extends StatefulWidget {
|
||||
const FollowUpdatesWidget({super.key});
|
||||
@@ -460,7 +460,7 @@ class _FollowUpdatesPageState extends AutomaticGlobalState<FollowUpdatesPage> {
|
||||
message: "Updating comics...".tl,
|
||||
);
|
||||
|
||||
await for (var progress in _updateFolder(folder, true)) {
|
||||
await for (var progress in updateFolder(folder, true)) {
|
||||
if (isCanceled) {
|
||||
return;
|
||||
}
|
||||
@@ -497,7 +497,7 @@ class _FollowUpdatesPageState extends AutomaticGlobalState<FollowUpdatesPage> {
|
||||
|
||||
int updated = 0;
|
||||
|
||||
await for (var progress in _updateFolder(folder!, true)) {
|
||||
await for (var progress in updateFolder(folder!, true)) {
|
||||
if (isCanceled) {
|
||||
return;
|
||||
}
|
||||
@@ -532,128 +532,6 @@ class _FollowUpdatesPageState extends AutomaticGlobalState<FollowUpdatesPage> {
|
||||
Object? get key => 'FollowUpdatesPage';
|
||||
}
|
||||
|
||||
class _UpdateProgress {
|
||||
final int total;
|
||||
final int current;
|
||||
final int errors;
|
||||
final int updated;
|
||||
|
||||
_UpdateProgress(this.total, this.current, this.errors, this.updated);
|
||||
}
|
||||
|
||||
void _updateFolderBase(
|
||||
String folder,
|
||||
StreamController<_UpdateProgress> stream,
|
||||
bool ignoreCheckTime,
|
||||
) async {
|
||||
var comics = LocalFavoritesManager().getComicsWithUpdatesInfo(folder);
|
||||
int current = 0;
|
||||
int errors = 0;
|
||||
int updated = 0;
|
||||
var futures = <Future>[];
|
||||
const maxConcurrent = 5;
|
||||
|
||||
for (int i = 0; i < comics.length; i++) {
|
||||
if (stream.isClosed) {
|
||||
return;
|
||||
}
|
||||
if (!ignoreCheckTime) {
|
||||
var lastCheckTime = comics[i].lastCheckTime;
|
||||
if (lastCheckTime != null &&
|
||||
DateTime.now().difference(lastCheckTime).inDays < 1) {
|
||||
current++;
|
||||
stream.add(_UpdateProgress(comics.length, current, errors, updated));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (futures.length >= maxConcurrent) {
|
||||
await Future.any(futures);
|
||||
}
|
||||
|
||||
var future = () async {
|
||||
int retries = 3;
|
||||
while (true) {
|
||||
try {
|
||||
var c = comics[i];
|
||||
var comicSource = c.type.comicSource;
|
||||
if (comicSource == null) return;
|
||||
var newInfo = (await comicSource.loadComicInfo!(c.id)).data;
|
||||
|
||||
var newTags = <String>[];
|
||||
for (var entry in newInfo.tags.entries) {
|
||||
const shouldIgnore = ['author', 'artist', 'time'];
|
||||
var namespace = entry.key;
|
||||
if (shouldIgnore.contains(namespace.toLowerCase())) {
|
||||
continue;
|
||||
}
|
||||
for (var tag in entry.value) {
|
||||
newTags.add("$namespace:$tag");
|
||||
}
|
||||
}
|
||||
|
||||
var item = FavoriteItem(
|
||||
id: c.id,
|
||||
name: newInfo.title,
|
||||
coverPath: newInfo.cover,
|
||||
author: newInfo.subTitle ??
|
||||
newInfo.tags['author']?.firstOrNull ??
|
||||
c.author,
|
||||
type: c.type,
|
||||
tags: newTags,
|
||||
);
|
||||
|
||||
LocalFavoritesManager().updateInfo(folder, item, false);
|
||||
|
||||
var updateTime = newInfo.findUpdateTime();
|
||||
if (updateTime != null && updateTime != c.updateTime) {
|
||||
LocalFavoritesManager().updateUpdateTime(
|
||||
folder,
|
||||
c.id,
|
||||
c.type,
|
||||
updateTime,
|
||||
);
|
||||
} else {
|
||||
LocalFavoritesManager().updateCheckTime(folder, c.id, c.type);
|
||||
}
|
||||
updated++;
|
||||
return;
|
||||
} catch (e, s) {
|
||||
Log.error("Check Updates", e, s);
|
||||
retries--;
|
||||
if (retries == 0) {
|
||||
errors++;
|
||||
return;
|
||||
}
|
||||
} finally {
|
||||
current++;
|
||||
stream.add(_UpdateProgress(comics.length, current, errors, updated));
|
||||
}
|
||||
}
|
||||
}();
|
||||
|
||||
future.then((_) {
|
||||
futures.remove(future);
|
||||
});
|
||||
|
||||
futures.add(future);
|
||||
}
|
||||
|
||||
await Future.wait(futures);
|
||||
|
||||
if (updated > 0) {
|
||||
LocalFavoritesManager().notifyChanges();
|
||||
}
|
||||
|
||||
stream.close();
|
||||
}
|
||||
|
||||
Stream<_UpdateProgress> _updateFolder(String folder, bool ignoreCheckTime) {
|
||||
var stream = StreamController<_UpdateProgress>();
|
||||
_updateFolderBase(folder, stream, ignoreCheckTime);
|
||||
return stream.stream;
|
||||
}
|
||||
|
||||
/// Background service for checking updates
|
||||
abstract class FollowUpdatesService {
|
||||
static bool _isChecking = false;
|
||||
@@ -683,7 +561,7 @@ abstract class FollowUpdatesService {
|
||||
|
||||
int updated = 0;
|
||||
try {
|
||||
await for (var progress in _updateFolder(folder, false)) {
|
||||
await for (var progress in updateFolder(folder, false)) {
|
||||
if (isCanceled) {
|
||||
return;
|
||||
}
|
||||
|
@@ -140,6 +140,14 @@ class _HistoryPageState extends State<HistoryPage> {
|
||||
title: 'Clear History'.tl,
|
||||
content: Text('Are you sure you want to clear your history?'.tl),
|
||||
actions: [
|
||||
Button.outlined(
|
||||
onPressed: () {
|
||||
HistoryManager().clearUnfavoritedHistory();
|
||||
context.pop();
|
||||
},
|
||||
child: Text('Clear Unfavorited'.tl),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Button.filled(
|
||||
color: context.colorScheme.error,
|
||||
onPressed: () {
|
||||
|
@@ -14,6 +14,7 @@ import 'package:venera/utils/io.dart';
|
||||
import 'package:venera/utils/pdf.dart';
|
||||
import 'package:venera/utils/translations.dart';
|
||||
import 'package:zip_flutter/zip_flutter.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
|
||||
class LocalComicsPage extends StatefulWidget {
|
||||
const LocalComicsPage({super.key});
|
||||
@@ -143,6 +144,14 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
||||
addFavorite(selectedComics.keys.toList());
|
||||
},
|
||||
),
|
||||
if (selectedComics.length == 1)
|
||||
MenuEntry(
|
||||
icon: Icons.folder_open,
|
||||
text: "Open Folder".tl,
|
||||
onClick: () {
|
||||
openComicFolder(selectedComics.keys.first);
|
||||
},
|
||||
),
|
||||
if (selectedComics.length == 1)
|
||||
MenuEntry(
|
||||
icon: Icons.chrome_reader_mode_outlined,
|
||||
@@ -306,12 +315,20 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
||||
});
|
||||
} else {
|
||||
// prevent dirty data
|
||||
var comic = LocalManager().find(c.id, ComicType.fromKey(c.sourceKey))!;
|
||||
var comic =
|
||||
LocalManager().find(c.id, ComicType.fromKey(c.sourceKey))!;
|
||||
comic.read();
|
||||
}
|
||||
},
|
||||
menuBuilder: (c) {
|
||||
return [
|
||||
MenuEntry(
|
||||
icon: Icons.folder_open,
|
||||
text: "Open Folder".tl,
|
||||
onClick: () {
|
||||
openComicFolder(c as LocalComic);
|
||||
},
|
||||
),
|
||||
MenuEntry(
|
||||
icon: Icons.delete,
|
||||
text: "Delete".tl,
|
||||
@@ -360,28 +377,49 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
||||
context: App.rootContext,
|
||||
builder: (context) {
|
||||
bool removeComicFile = true;
|
||||
bool removeFavoriteAndHistory = true;
|
||||
return StatefulBuilder(builder: (context, state) {
|
||||
return ContentDialog(
|
||||
title: "Delete".tl,
|
||||
content: CheckboxListTile(
|
||||
title: Text("Also remove files on disk".tl),
|
||||
value: removeComicFile,
|
||||
onChanged: (v) {
|
||||
state(() {
|
||||
removeComicFile = !removeComicFile;
|
||||
});
|
||||
},
|
||||
content: Column(
|
||||
children: [
|
||||
CheckboxListTile(
|
||||
title: Text("Remove local favorite and history".tl),
|
||||
value: removeFavoriteAndHistory,
|
||||
onChanged: (v) {
|
||||
state(() {
|
||||
removeFavoriteAndHistory = !removeFavoriteAndHistory;
|
||||
});
|
||||
},
|
||||
),
|
||||
CheckboxListTile(
|
||||
title: Text("Also remove files on disk".tl),
|
||||
value: removeComicFile,
|
||||
onChanged: (v) {
|
||||
state(() {
|
||||
removeComicFile = !removeComicFile;
|
||||
});
|
||||
},
|
||||
)
|
||||
],
|
||||
),
|
||||
actions: [
|
||||
if (comics.length == 1 && comics.first.hasChapters)
|
||||
TextButton(
|
||||
child: Text("Delete Chapters".tl),
|
||||
onPressed: () {
|
||||
context.pop();
|
||||
showDeleteChaptersPopWindow(context, comics.first);
|
||||
},
|
||||
),
|
||||
FilledButton(
|
||||
onPressed: () {
|
||||
context.pop();
|
||||
for (var comic in comics) {
|
||||
LocalManager().deleteComic(
|
||||
comic,
|
||||
removeComicFile,
|
||||
);
|
||||
}
|
||||
LocalManager().batchDeleteComics(
|
||||
comics,
|
||||
removeComicFile,
|
||||
removeFavoriteAndHistory,
|
||||
);
|
||||
isDeleted = true;
|
||||
},
|
||||
child: Text("Confirm".tl),
|
||||
@@ -444,7 +482,10 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
||||
var fileName = "";
|
||||
// For each comic, export it to a file
|
||||
for (var comic in comics) {
|
||||
fileName = FilePath.join(cacheDir, sanitizeFileName(comic.title) + ext);
|
||||
fileName = FilePath.join(
|
||||
cacheDir,
|
||||
sanitizeFileName(comic.title, maxLength: 100) + ext,
|
||||
);
|
||||
await export(comic, fileName);
|
||||
current++;
|
||||
if (comics.length > 1) {
|
||||
@@ -493,3 +534,102 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
|
||||
|
||||
typedef ExportComicFunc = Future<File> Function(
|
||||
LocalComic comic, String outFilePath);
|
||||
|
||||
/// Opens the folder containing the comic in the system file explorer
|
||||
Future<void> openComicFolder(LocalComic comic) async {
|
||||
try {
|
||||
final folderPath = comic.baseDir;
|
||||
|
||||
if (App.isWindows) {
|
||||
await Process.run('explorer', [folderPath]);
|
||||
} else if (App.isMacOS) {
|
||||
await Process.run('open', [folderPath]);
|
||||
} else if (App.isLinux) {
|
||||
// Try different file managers commonly found on Linux
|
||||
try {
|
||||
await Process.run('xdg-open', [folderPath]);
|
||||
} catch (e) {
|
||||
// Fallback to other common file managers
|
||||
try {
|
||||
await Process.run('nautilus', [folderPath]);
|
||||
} catch (e) {
|
||||
try {
|
||||
await Process.run('dolphin', [folderPath]);
|
||||
} catch (e) {
|
||||
try {
|
||||
await Process.run('thunar', [folderPath]);
|
||||
} catch (e) {
|
||||
// Last resort: use the URL launcher with file:// protocol
|
||||
await launchUrlString('file://$folderPath');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// For mobile platforms, use the URL launcher with file:// protocol
|
||||
await launchUrlString('file://$folderPath');
|
||||
}
|
||||
} catch (e, s) {
|
||||
Log.error("Open Folder", "Failed to open comic folder: $e", s);
|
||||
// Show error message to user
|
||||
if (App.rootContext.mounted) {
|
||||
App.rootContext.showMessage(message: "Failed to open folder: $e");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void showDeleteChaptersPopWindow(BuildContext context, LocalComic comic) {
|
||||
var chapters = <String>[];
|
||||
|
||||
showPopUpWidget(
|
||||
context,
|
||||
PopUpWidgetScaffold(
|
||||
title: "Delete Chapters".tl,
|
||||
body: StatefulBuilder(builder: (context, setState) {
|
||||
return Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: ListView.builder(
|
||||
itemCount: comic.downloadedChapters.length,
|
||||
itemBuilder: (context, index) {
|
||||
var id = comic.downloadedChapters[index];
|
||||
var chapter = comic.chapters![id] ?? "Unknown Chapter";
|
||||
return CheckboxListTile(
|
||||
title: Text(chapter),
|
||||
value: chapters.contains(id),
|
||||
onChanged: (v) {
|
||||
setState(() {
|
||||
if (v == true) {
|
||||
chapters.add(id);
|
||||
} else {
|
||||
chapters.remove(id);
|
||||
}
|
||||
});
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
FilledButton(
|
||||
onPressed: () {
|
||||
Future.delayed(const Duration(milliseconds: 200), () {
|
||||
LocalManager().deleteComicChapters(comic, chapters);
|
||||
});
|
||||
App.rootContext.pop();
|
||||
},
|
||||
child: Text("Submit".tl),
|
||||
)
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
}),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
@@ -152,12 +152,19 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
|
||||
|
||||
bool _dragInProgress = false;
|
||||
|
||||
bool get _enableDoubleTapToZoom =>
|
||||
appdata.settings.getReaderSetting(reader.cid, reader.type.sourceKey, 'enableDoubleTapToZoom');
|
||||
|
||||
void onTapUp(TapUpDetails event) {
|
||||
if (_longPressInProgress) {
|
||||
_longPressInProgress = false;
|
||||
return;
|
||||
}
|
||||
final location = event.globalPosition;
|
||||
if (!_enableDoubleTapToZoom) {
|
||||
onTap(location);
|
||||
return;
|
||||
}
|
||||
final previousLocation = _previousEvent?.globalPosition;
|
||||
if (previousLocation != null) {
|
||||
if ((location - previousLocation).distanceSquared <
|
||||
@@ -184,7 +191,8 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
|
||||
} else if (context.readerScaffold.isOpen) {
|
||||
context.readerScaffold.openOrClose();
|
||||
} else {
|
||||
if (appdata.settings['enableTapToTurnPages']) {
|
||||
if (appdata.settings.getReaderSetting(
|
||||
reader.cid, reader.type.sourceKey, 'enableTapToTurnPages')) {
|
||||
bool isLeft = false, isRight = false, isTop = false, isBottom = false;
|
||||
final width = context.width;
|
||||
final height = context.height;
|
||||
@@ -201,11 +209,12 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
|
||||
isBottom = true;
|
||||
}
|
||||
bool isCenter = false;
|
||||
var prev = context.reader.toPrevPage;
|
||||
var next = context.reader.toNextPage;
|
||||
if (appdata.settings['reverseTapToTurnPages']) {
|
||||
prev = context.reader.toNextPage;
|
||||
next = context.reader.toPrevPage;
|
||||
var prev = () => context.reader.toPrevPage();
|
||||
var next = () => context.reader.toNextPage();
|
||||
if (appdata.settings.getReaderSetting(
|
||||
reader.cid, reader.type.sourceKey, 'reverseTapToTurnPages')) {
|
||||
prev = () => context.reader.toNextPage();
|
||||
next = () => context.reader.toPrevPage();
|
||||
}
|
||||
switch (context.reader.mode) {
|
||||
case ReaderMode.galleryLeftToRight:
|
||||
@@ -287,6 +296,12 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
|
||||
text: "Copy Image".tl,
|
||||
onClick: () => copyImage(location),
|
||||
),
|
||||
if (!reader.isLoading)
|
||||
MenuEntry(
|
||||
icon: Icons.download_outlined,
|
||||
text: "Save Image".tl,
|
||||
onClick: () => saveImage(location),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -319,6 +334,17 @@ class _ReaderGestureDetectorState extends AutomaticGlobalState<_ReaderGestureDet
|
||||
context.showMessage(message: "No Image");
|
||||
}
|
||||
}
|
||||
|
||||
void saveImage(Offset location) async {
|
||||
var controller = reader._imageViewController;
|
||||
var image = await controller!.getImageByOffset(location);
|
||||
if (image != null) {
|
||||
var filetype = detectFileType(image);
|
||||
saveFile(filename: "image${filetype.ext}", data: image);
|
||||
} else {
|
||||
context.showMessage(message: "No Image");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class _DragListener {
|
||||
|
@@ -21,19 +21,35 @@ class _ReaderImagesState extends State<_ReaderImages> {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
ImageDownloader.cancelAllLoadingImages();
|
||||
}
|
||||
|
||||
void load() async {
|
||||
if (inProgress) return;
|
||||
inProgress = true;
|
||||
if (reader.type == ComicType.local ||
|
||||
(LocalManager().isDownloaded(
|
||||
reader.cid, reader.type, reader.chapter, reader.widget.chapters))) {
|
||||
reader.cid,
|
||||
reader.type,
|
||||
reader.chapter,
|
||||
reader.widget.chapters,
|
||||
))) {
|
||||
try {
|
||||
var images = await LocalManager()
|
||||
.getImages(reader.cid, reader.type, reader.chapter);
|
||||
var images = await LocalManager().getImages(
|
||||
reader.cid,
|
||||
reader.type,
|
||||
reader.chapter,
|
||||
);
|
||||
setState(() {
|
||||
reader.images = images;
|
||||
reader.isLoading = false;
|
||||
inProgress = false;
|
||||
Future.microtask(() {
|
||||
reader.updateHistory();
|
||||
});
|
||||
});
|
||||
} catch (e) {
|
||||
setState(() {
|
||||
@@ -59,6 +75,9 @@ class _ReaderImagesState extends State<_ReaderImages> {
|
||||
reader.images = res.data;
|
||||
reader.isLoading = false;
|
||||
inProgress = false;
|
||||
Future.microtask(() {
|
||||
reader.updateHistory();
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -69,23 +88,29 @@ class _ReaderImagesState extends State<_ReaderImages> {
|
||||
Widget build(BuildContext context) {
|
||||
if (reader.isLoading) {
|
||||
load();
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
} else if (error != null) {
|
||||
return NetworkError(
|
||||
message: error!,
|
||||
retry: () {
|
||||
setState(() {
|
||||
reader.isLoading = true;
|
||||
error = null;
|
||||
});
|
||||
return GestureDetector(
|
||||
onTap: () {
|
||||
context.readerScaffold.openOrClose();
|
||||
},
|
||||
child: SizedBox.expand(
|
||||
child: NetworkError(
|
||||
message: error!,
|
||||
retry: () {
|
||||
setState(() {
|
||||
reader.isLoading = true;
|
||||
error = null;
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
if (reader.mode.isGallery) {
|
||||
return _GalleryMode(
|
||||
key: Key('${reader.mode.key}_${reader.imagesPerPage}'));
|
||||
key: Key('${reader.mode.key}_${reader.imagesPerPage}'),
|
||||
);
|
||||
} else {
|
||||
return _ContinuousMode(key: Key(reader.mode.key));
|
||||
}
|
||||
@@ -104,15 +129,26 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
implements _ImageViewController {
|
||||
late PageController controller;
|
||||
|
||||
late List<bool> cached;
|
||||
|
||||
int get preCacheCount => appdata.settings["preloadImageCount"];
|
||||
|
||||
var photoViewControllers = <int, PhotoViewController>{};
|
||||
|
||||
late _ReaderState reader;
|
||||
|
||||
int get totalPages => (reader.images!.length / reader.imagesPerPage).ceil();
|
||||
/// [totalPages] is the total number of pages in the current chapter.
|
||||
/// More than one images can be displayed on one page.
|
||||
int get totalPages {
|
||||
if (!reader.showSingleImageOnFirstPage()) {
|
||||
return (reader.images!.length /
|
||||
reader.imagesPerPage())
|
||||
.ceil();
|
||||
} else {
|
||||
return 1 +
|
||||
((reader.images!.length - 1) /
|
||||
reader.imagesPerPage())
|
||||
.ceil();
|
||||
}
|
||||
}
|
||||
|
||||
var imageStates = <State<ComicImage>>{};
|
||||
|
||||
@@ -125,24 +161,56 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
reader = context.reader;
|
||||
controller = PageController(initialPage: reader.page);
|
||||
reader._imageViewController = this;
|
||||
cached = List.filled(reader.maxPage + 2, false);
|
||||
Future.microtask(() {
|
||||
context.readerScaffold.setFloatingButton(0);
|
||||
});
|
||||
super.initState();
|
||||
}
|
||||
|
||||
void cache(int current) {
|
||||
for (int i = current + 1; i <= current + preCacheCount; i++) {
|
||||
if (i <= totalPages && !cached[i]) {
|
||||
int startIndex = (i - 1) * reader.imagesPerPage;
|
||||
int endIndex =
|
||||
math.min(startIndex + reader.imagesPerPage, reader.images!.length);
|
||||
for (int i = startIndex; i < endIndex; i++) {
|
||||
precacheImage(
|
||||
_createImageProviderFromKey(reader.images![i], context), context);
|
||||
}
|
||||
cached[i] = true;
|
||||
/// Get the range of images for the given page. [page] is 1-based.
|
||||
(int start, int end) getPageImagesRange(int page) {
|
||||
var imagesPerPage = reader.imagesPerPage();
|
||||
if (reader.showSingleImageOnFirstPage()) {
|
||||
if (page == 1) {
|
||||
return (0, 1);
|
||||
} else {
|
||||
int startIndex = (page - 2) * imagesPerPage + 1;
|
||||
int endIndex = math.min(
|
||||
startIndex + imagesPerPage,
|
||||
reader.images!.length,
|
||||
);
|
||||
return (startIndex, endIndex);
|
||||
}
|
||||
} else {
|
||||
int startIndex = (page - 1) * imagesPerPage;
|
||||
int endIndex = math.min(
|
||||
startIndex + imagesPerPage,
|
||||
reader.images!.length,
|
||||
);
|
||||
return (startIndex, endIndex);
|
||||
}
|
||||
}
|
||||
|
||||
/// [cache] is used to cache the images.
|
||||
/// The count of images to cache is determined by the [preCacheCount] setting.
|
||||
/// For previous page and next page, it will do a memory cache.
|
||||
/// For current page, it will do nothing because it is already on the screen.
|
||||
/// For other pages, it will do a pre-download cache.
|
||||
void cache(int startPage) {
|
||||
for (int i = startPage - 1; i <= startPage + preCacheCount; i++) {
|
||||
if (i == startPage || i <= 0 || i > totalPages) continue;
|
||||
bool shouldPreCache = i == startPage + 1 || i == startPage - 1;
|
||||
_cachePage(i, shouldPreCache);
|
||||
}
|
||||
}
|
||||
|
||||
void _cachePage(int page, bool shouldPreCache) {
|
||||
var (startIndex, endIndex) = getPageImagesRange(page);
|
||||
for (int i = startIndex; i < endIndex; i++) {
|
||||
if (shouldPreCache) {
|
||||
_precacheImage(i + 1, context);
|
||||
} else {
|
||||
_preDownloadImage(i + 1, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -164,16 +232,12 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
var controller = photoViewControllers[reader.page]!;
|
||||
Offset value = event.delta;
|
||||
if (isLongPressing) {
|
||||
controller.updateMultiple(
|
||||
position: controller.position + value,
|
||||
);
|
||||
controller.updateMultiple(position: controller.position + value);
|
||||
}
|
||||
}
|
||||
},
|
||||
child: PhotoViewGallery.builder(
|
||||
backgroundDecoration: BoxDecoration(
|
||||
color: context.colorScheme.surface,
|
||||
),
|
||||
backgroundDecoration: BoxDecoration(color: context.colorScheme.surface),
|
||||
reverse: reader.mode == ReaderMode.galleryRightToLeft,
|
||||
scrollDirection: reader.mode == ReaderMode.galleryTopToBottom
|
||||
? Axis.vertical
|
||||
@@ -185,24 +249,26 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
child: const SizedBox(),
|
||||
);
|
||||
} else {
|
||||
int pageIndex = index - 1;
|
||||
int startIndex = pageIndex * reader.imagesPerPage;
|
||||
int endIndex = math.min(
|
||||
startIndex + reader.imagesPerPage, reader.images!.length);
|
||||
List<String> pageImages =
|
||||
reader.images!.sublist(startIndex, endIndex);
|
||||
var (startIndex, endIndex) = getPageImagesRange(index);
|
||||
List<String> pageImages = reader.images!.sublist(
|
||||
startIndex,
|
||||
endIndex,
|
||||
);
|
||||
|
||||
cached[index] = true;
|
||||
cache(index);
|
||||
|
||||
photoViewControllers[index] ??= PhotoViewController();
|
||||
|
||||
if (reader.imagesPerPage == 1) {
|
||||
if (reader.imagesPerPage() == 1 ||
|
||||
pageImages.length == 1) {
|
||||
return PhotoViewGalleryPageOptions(
|
||||
filterQuality: FilterQuality.medium,
|
||||
controller: photoViewControllers[index],
|
||||
imageProvider:
|
||||
_createImageProviderFromKey(pageImages[0], context),
|
||||
imageProvider: _createImageProviderFromKey(
|
||||
pageImages[0],
|
||||
context,
|
||||
startIndex + 1,
|
||||
),
|
||||
fit: BoxFit.contain,
|
||||
errorBuilder: (_, error, s, retry) {
|
||||
return NetworkError(message: error.toString(), retry: retry);
|
||||
@@ -211,10 +277,11 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
}
|
||||
|
||||
return PhotoViewGalleryPageOptions.customChild(
|
||||
childSize: reader.size * 2,
|
||||
controller: photoViewControllers[index],
|
||||
minScale: PhotoViewComputedScale.contained * 1.0,
|
||||
maxScale: PhotoViewComputedScale.covered * 10.0,
|
||||
child: buildPageImages(pageImages),
|
||||
child: buildPageImages(pageImages, startIndex),
|
||||
);
|
||||
}
|
||||
},
|
||||
@@ -244,12 +311,19 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
reader.setPage(i);
|
||||
context.readerScaffold.update();
|
||||
}
|
||||
// Remove other pages' controllers to reset their state.
|
||||
var keys = photoViewControllers.keys.toList();
|
||||
for (var key in keys) {
|
||||
if (key != i) {
|
||||
photoViewControllers.remove(key);
|
||||
}
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildPageImages(List<String> images) {
|
||||
Widget buildPageImages(List<String> images, int startIndex) {
|
||||
Axis axis = (reader.mode == ReaderMode.galleryTopToBottom)
|
||||
? Axis.vertical
|
||||
: Axis.horizontal;
|
||||
@@ -267,7 +341,11 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
child: ComicImage(
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
image: _createImageProviderFromKey(images[0], context),
|
||||
image: _createImageProviderFromKey(
|
||||
images[0],
|
||||
context,
|
||||
startIndex + 1,
|
||||
),
|
||||
fit: BoxFit.contain,
|
||||
alignment: axis == Axis.vertical
|
||||
? Alignment.bottomCenter
|
||||
@@ -280,7 +358,11 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
child: ComicImage(
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
image: _createImageProviderFromKey(images[1], context),
|
||||
image: _createImageProviderFromKey(
|
||||
images[1],
|
||||
context,
|
||||
startIndex + 2,
|
||||
),
|
||||
fit: BoxFit.contain,
|
||||
alignment: axis == Axis.vertical
|
||||
? Alignment.topCenter
|
||||
@@ -288,12 +370,16 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
onInit: (state) => imageStates.add(state),
|
||||
onDispose: (state) => imageStates.remove(state),
|
||||
),
|
||||
)
|
||||
),
|
||||
];
|
||||
} else {
|
||||
imageWidgets = images.map((imageKey) {
|
||||
ImageProvider imageProvider =
|
||||
_createImageProviderFromKey(imageKey, context);
|
||||
startIndex++;
|
||||
ImageProvider imageProvider = _createImageProviderFromKey(
|
||||
imageKey,
|
||||
context,
|
||||
startIndex,
|
||||
);
|
||||
return Expanded(
|
||||
child: ComicImage(
|
||||
image: imageProvider,
|
||||
@@ -354,10 +440,7 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
} else {
|
||||
zoomPosition = Offset(0, 0);
|
||||
}
|
||||
photoViewController.animateScale?.call(
|
||||
target,
|
||||
zoomPosition,
|
||||
);
|
||||
photoViewController.animateScale?.call(target, zoomPosition);
|
||||
isLongPressing = true;
|
||||
}
|
||||
|
||||
@@ -402,34 +485,24 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
keyRepeatTimer = null;
|
||||
}
|
||||
if (forward == true) {
|
||||
controller.nextPage(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
curve: Curves.ease,
|
||||
);
|
||||
reader.toPage(reader.page + 1);
|
||||
} else if (forward == false) {
|
||||
controller.previousPage(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
curve: Curves.ease,
|
||||
);
|
||||
reader.toPage(reader.page - 1);
|
||||
}
|
||||
}
|
||||
if (event is KeyRepeatEvent && keyRepeatTimer == null) {
|
||||
keyRepeatTimer = Timer.periodic(
|
||||
const Duration(milliseconds: 100),
|
||||
reader.enablePageAnimation(reader.cid, reader.type)
|
||||
? const Duration(milliseconds: 200)
|
||||
: const Duration(milliseconds: 50),
|
||||
(timer) {
|
||||
if (!mounted) {
|
||||
timer.cancel();
|
||||
return;
|
||||
} else if (forward == true) {
|
||||
controller.nextPage(
|
||||
duration: const Duration(milliseconds: 100),
|
||||
curve: Curves.ease,
|
||||
);
|
||||
reader.toPage(reader.page + 1);
|
||||
} else if (forward == false) {
|
||||
controller.previousPage(
|
||||
duration: const Duration(milliseconds: 100),
|
||||
curve: Curves.ease,
|
||||
);
|
||||
reader.toPage(reader.page - 1);
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -447,8 +520,21 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
|
||||
@override
|
||||
Future<Uint8List?> getImageByOffset(Offset offset) async {
|
||||
var imageKey = getImageKeyByOffset(offset);
|
||||
if (imageKey == null) return null;
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return await File(imageKey.substring(7)).readAsBytes();
|
||||
} else {
|
||||
return (await CacheManager().findCache(
|
||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}",
|
||||
))!.readAsBytes();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
String? getImageKeyByOffset(Offset offset) {
|
||||
String? imageKey;
|
||||
if (reader.imagesPerPage == 1) {
|
||||
if (reader.imagesPerPage() == 1) {
|
||||
imageKey = reader.images![reader.page - 1];
|
||||
} else {
|
||||
for (var imageState in imageStates) {
|
||||
@@ -457,14 +543,7 @@ class _GalleryModeState extends State<_GalleryMode>
|
||||
}
|
||||
}
|
||||
}
|
||||
if (imageKey == null) return null;
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return await File(imageKey.substring(7)).readAsBytes();
|
||||
} else {
|
||||
return (await CacheManager().findCache(
|
||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
|
||||
.readAsBytes();
|
||||
}
|
||||
return imageKey;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -473,7 +552,7 @@ const Set<PointerDeviceKind> _kTouchLikeDeviceTypes = <PointerDeviceKind>{
|
||||
PointerDeviceKind.mouse,
|
||||
PointerDeviceKind.stylus,
|
||||
PointerDeviceKind.invertedStylus,
|
||||
PointerDeviceKind.unknown
|
||||
PointerDeviceKind.unknown,
|
||||
};
|
||||
|
||||
const double _kChangeChapterOffset = 160;
|
||||
@@ -559,27 +638,52 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
cacheImages(page);
|
||||
}
|
||||
|
||||
double? futurePosition;
|
||||
double? _futurePosition;
|
||||
|
||||
void smoothTo(double offset) {
|
||||
futurePosition ??= scrollController.offset;
|
||||
if (futurePosition! > scrollController.position.maxScrollExtent &&
|
||||
offset > 0) {
|
||||
return;
|
||||
} else if (futurePosition! < scrollController.position.minScrollExtent &&
|
||||
offset < 0) {
|
||||
if (HardwareKeyboard.instance.isShiftPressed) {
|
||||
return;
|
||||
}
|
||||
futurePosition = futurePosition! + offset * 1.2;
|
||||
futurePosition = futurePosition!.clamp(
|
||||
var currentLocation = scrollController.position.pixels;
|
||||
var old = _futurePosition;
|
||||
_futurePosition ??= currentLocation;
|
||||
double k = (_futurePosition! - currentLocation).abs() / 1600 + 1;
|
||||
final customSpeed = appdata.settings.getReaderSetting(
|
||||
context.reader.cid,
|
||||
context.reader.type.sourceKey,
|
||||
"readerScrollSpeed",
|
||||
);
|
||||
if (customSpeed is num) {
|
||||
k *= customSpeed;
|
||||
}
|
||||
_futurePosition = _futurePosition! + offset * k;
|
||||
var beforeOffset = (_futurePosition! - currentLocation).abs();
|
||||
_futurePosition = _futurePosition!.clamp(
|
||||
scrollController.position.minScrollExtent,
|
||||
scrollController.position.maxScrollExtent,
|
||||
);
|
||||
scrollController.animateTo(
|
||||
futurePosition!,
|
||||
duration: const Duration(milliseconds: 200),
|
||||
var afterOffset = (_futurePosition! - currentLocation).abs();
|
||||
if (_futurePosition == old) return;
|
||||
var target = _futurePosition!;
|
||||
var duration = const Duration(milliseconds: 160);
|
||||
if (afterOffset < beforeOffset) {
|
||||
duration = duration * (afterOffset / beforeOffset);
|
||||
if (duration < Duration(milliseconds: 10)) {
|
||||
duration = Duration(milliseconds: 10);
|
||||
}
|
||||
}
|
||||
scrollController
|
||||
.animateTo(
|
||||
_futurePosition!,
|
||||
duration: duration,
|
||||
curve: Curves.linear,
|
||||
);
|
||||
)
|
||||
.then((_) {
|
||||
var current = scrollController.position.pixels;
|
||||
if (current == target && current == _futurePosition) {
|
||||
_futurePosition = null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void onPointerSignal(PointerSignalEvent event) {
|
||||
@@ -599,7 +703,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
void cacheImages(int current) {
|
||||
for (int i = current + 1; i <= current + preCacheCount; i++) {
|
||||
if (i <= reader.maxPage && !cached[i]) {
|
||||
_precacheImage(i, context);
|
||||
_preDownloadImage(i, context);
|
||||
cached[i] = true;
|
||||
}
|
||||
}
|
||||
@@ -608,10 +712,12 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
void onScroll() {
|
||||
if (prepareToPrevChapter) {
|
||||
jumpToNextChapter = false;
|
||||
jumpToPrevChapter = scrollController.offset <
|
||||
jumpToPrevChapter =
|
||||
scrollController.offset <
|
||||
scrollController.position.minScrollExtent - _kChangeChapterOffset;
|
||||
} else if (prepareToNextChapter) {
|
||||
jumpToNextChapter = scrollController.offset >
|
||||
jumpToNextChapter =
|
||||
scrollController.offset >
|
||||
scrollController.position.maxScrollExtent + _kChangeChapterOffset;
|
||||
jumpToPrevChapter = false;
|
||||
}
|
||||
@@ -656,8 +762,8 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
physics: isCTRLPressed || _isMouseScrolling || disableScroll
|
||||
? const NeverScrollableScrollPhysics()
|
||||
: isZoomedIn
|
||||
? const ClampingScrollPhysics()
|
||||
: const BouncingScrollPhysics(),
|
||||
? const ClampingScrollPhysics()
|
||||
: const BouncingScrollPhysics(),
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0 || index == reader.maxPage + 1) {
|
||||
return const SizedBox();
|
||||
@@ -685,8 +791,10 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
),
|
||||
);
|
||||
},
|
||||
scrollBehavior: const MaterialScrollBehavior()
|
||||
.copyWith(scrollbars: false, dragDevices: _kTouchLikeDeviceTypes),
|
||||
scrollBehavior: const MaterialScrollBehavior().copyWith(
|
||||
scrollbars: false,
|
||||
dragDevices: _kTouchLikeDeviceTypes,
|
||||
),
|
||||
);
|
||||
|
||||
widget = Stack(
|
||||
@@ -704,7 +812,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
disableScroll = true;
|
||||
});
|
||||
}
|
||||
futurePosition = null;
|
||||
_futurePosition = null;
|
||||
if (_isMouseScrolling) {
|
||||
setState(() {
|
||||
_isMouseScrolling = false;
|
||||
@@ -830,20 +938,14 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
}
|
||||
|
||||
return PhotoView.customChild(
|
||||
backgroundDecoration: BoxDecoration(
|
||||
color: context.colorScheme.surface,
|
||||
),
|
||||
backgroundDecoration: BoxDecoration(color: context.colorScheme.surface),
|
||||
childSize: Size(width, height),
|
||||
minScale: 1.0,
|
||||
maxScale: 2.5,
|
||||
strictScale: true,
|
||||
controller: photoViewController,
|
||||
onScaleUpdate: onScaleUpdate,
|
||||
child: SizedBox(
|
||||
width: width,
|
||||
height: height,
|
||||
child: widget,
|
||||
),
|
||||
child: SizedBox(width: width, height: height, child: widget),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -913,10 +1015,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
} else {
|
||||
zoomPosition = Offset(0, 0);
|
||||
}
|
||||
photoViewController.animateScale?.call(
|
||||
target,
|
||||
zoomPosition,
|
||||
);
|
||||
photoViewController.animateScale?.call(target, zoomPosition);
|
||||
onScaleUpdate(target);
|
||||
isLongPressing = true;
|
||||
}
|
||||
@@ -935,7 +1034,7 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
@override
|
||||
void toPage(int page) {
|
||||
itemScrollController.jumpTo(index: page);
|
||||
futurePosition = null;
|
||||
_futurePosition = null;
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -975,13 +1074,13 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
}
|
||||
if (forward == true) {
|
||||
scrollController.animateTo(
|
||||
scrollController.offset + context.height,
|
||||
scrollController.offset + context.height * 0.25,
|
||||
duration: const Duration(milliseconds: 200),
|
||||
curve: Curves.ease,
|
||||
);
|
||||
} else if (forward == false) {
|
||||
scrollController.animateTo(
|
||||
scrollController.offset - context.height,
|
||||
scrollController.offset - context.height * 0.25,
|
||||
duration: const Duration(milliseconds: 200),
|
||||
curve: Curves.ease,
|
||||
);
|
||||
@@ -998,25 +1097,34 @@ class _ContinuousModeState extends State<_ContinuousMode>
|
||||
|
||||
@override
|
||||
Future<Uint8List?> getImageByOffset(Offset offset) async {
|
||||
var imageKey = getImageKeyByOffset(offset);
|
||||
if (imageKey == null) return null;
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return await File(imageKey.substring(7)).readAsBytes();
|
||||
} else {
|
||||
return (await CacheManager().findCache(
|
||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}",
|
||||
))!.readAsBytes();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
String? getImageKeyByOffset(Offset offset) {
|
||||
String? imageKey;
|
||||
for (var imageState in imageStates) {
|
||||
if ((imageState as _ComicImageState).containsPoint(offset)) {
|
||||
imageKey = (imageState.widget.image as ReaderImageProvider).imageKey;
|
||||
}
|
||||
}
|
||||
if (imageKey == null) return null;
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return await File(imageKey.substring(7)).readAsBytes();
|
||||
} else {
|
||||
return (await CacheManager().findCache(
|
||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
|
||||
.readAsBytes();
|
||||
}
|
||||
return imageKey;
|
||||
}
|
||||
}
|
||||
|
||||
ImageProvider _createImageProviderFromKey(
|
||||
String imageKey, BuildContext context) {
|
||||
String imageKey,
|
||||
BuildContext context,
|
||||
int page,
|
||||
) {
|
||||
var reader = context.reader;
|
||||
return ReaderImageProvider(
|
||||
imageKey,
|
||||
@@ -1030,21 +1138,38 @@ ImageProvider _createImageProviderFromKey(
|
||||
ImageProvider _createImageProvider(int page, BuildContext context) {
|
||||
var reader = context.reader;
|
||||
var imageKey = reader.images![page - 1];
|
||||
return _createImageProviderFromKey(imageKey, context);
|
||||
return _createImageProviderFromKey(imageKey, context, page);
|
||||
}
|
||||
|
||||
/// [_precacheImage] is used to precache the image for the given page.
|
||||
/// The image is cached using the flutter's [precacheImage] method.
|
||||
/// The image will be downloaded and decoded into memory.
|
||||
void _precacheImage(int page, BuildContext context) {
|
||||
precacheImage(
|
||||
_createImageProvider(page, context),
|
||||
context,
|
||||
);
|
||||
if (page <= 0 || page > context.reader.images!.length) {
|
||||
return;
|
||||
}
|
||||
precacheImage(_createImageProvider(page, context), context);
|
||||
}
|
||||
|
||||
/// [_preDownloadImage] is used to download the image for the given page.
|
||||
/// The image is downloaded using the [CacheManager] and saved to the local storage.
|
||||
void _preDownloadImage(int page, BuildContext context) {
|
||||
if (page <= 0 || page > context.reader.images!.length) {
|
||||
return;
|
||||
}
|
||||
var reader = context.reader;
|
||||
var imageKey = reader.images![page - 1];
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return;
|
||||
}
|
||||
var cid = reader.cid;
|
||||
var eid = reader.eid;
|
||||
var sourceKey = reader.type.comicSource?.key;
|
||||
ImageDownloader.loadComicImage(imageKey, sourceKey, cid, eid);
|
||||
}
|
||||
|
||||
class _SwipeChangeChapterProgress extends StatefulWidget {
|
||||
const _SwipeChangeChapterProgress({
|
||||
this.controller,
|
||||
required this.isPrev,
|
||||
});
|
||||
const _SwipeChangeChapterProgress({this.controller, required this.isPrev});
|
||||
|
||||
final ScrollController? controller;
|
||||
|
||||
@@ -1161,7 +1286,12 @@ class _ProgressPainter extends CustomPainter {
|
||||
paint.color = color;
|
||||
canvas.drawRRect(
|
||||
RRect.fromLTRBR(
|
||||
0, 0, size.width * value, size.height, Radius.circular(16)),
|
||||
0,
|
||||
0,
|
||||
size.width * value,
|
||||
size.height,
|
||||
Radius.circular(16),
|
||||
),
|
||||
paint,
|
||||
);
|
||||
}
|
||||
|
@@ -29,6 +29,7 @@ import 'package:venera/foundation/image_provider/reader_image.dart';
|
||||
import 'package:venera/foundation/local.dart';
|
||||
import 'package:venera/foundation/log.dart';
|
||||
import 'package:venera/foundation/res.dart';
|
||||
import 'package:venera/network/images.dart';
|
||||
import 'package:venera/pages/settings/settings_page.dart';
|
||||
import 'package:venera/utils/clipboard_image.dart';
|
||||
import 'package:venera/utils/data_sync.dart';
|
||||
@@ -110,10 +111,21 @@ class _ReaderState extends State<Reader>
|
||||
}
|
||||
|
||||
@override
|
||||
int get maxPage => ((images?.length ?? 1) / imagesPerPage).ceil();
|
||||
int get maxPage {
|
||||
if (images == null) {
|
||||
return 1;
|
||||
}
|
||||
if (!showSingleImageOnFirstPage()) {
|
||||
return (images!.length / imagesPerPage()).ceil();
|
||||
} else {
|
||||
return 1 + ((images!.length - 1) / imagesPerPage()).ceil();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
ComicType get type => widget.type;
|
||||
|
||||
@override
|
||||
String get cid => widget.cid;
|
||||
|
||||
String get eid => widget.chapters?.ids.elementAtOrNull(chapter - 1) ?? '0';
|
||||
@@ -124,7 +136,8 @@ class _ReaderState extends State<Reader>
|
||||
late ReaderMode mode;
|
||||
|
||||
@override
|
||||
bool get isPortrait => MediaQuery.of(context).orientation == Orientation.portrait;
|
||||
bool get isPortrait =>
|
||||
MediaQuery.of(context).orientation == Orientation.portrait;
|
||||
|
||||
History? history;
|
||||
|
||||
@@ -151,13 +164,13 @@ class _ReaderState extends State<Reader>
|
||||
if (widget.initialPage != null) {
|
||||
page = widget.initialPage!;
|
||||
}
|
||||
mode = ReaderMode.fromKey(appdata.settings['readerMode']);
|
||||
// mode = ReaderMode.fromKey(appdata.settings['readerMode']);
|
||||
mode = ReaderMode.fromKey(appdata.settings.getReaderSetting(cid, type.sourceKey, 'readerMode'));
|
||||
history = widget.history;
|
||||
Future.microtask(() {
|
||||
updateHistory();
|
||||
});
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
|
||||
if (appdata.settings['enableTurnPageByVolumeKey']) {
|
||||
if (!appdata.settings.getReaderSetting(cid, type.sourceKey, 'showSystemStatusBar')) {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
|
||||
}
|
||||
if (appdata.settings.getReaderSetting(cid, type.sourceKey, 'enableTurnPageByVolumeKey')) {
|
||||
handleVolumeEvent();
|
||||
}
|
||||
setImageCacheSize();
|
||||
@@ -167,10 +180,18 @@ class _ReaderState extends State<Reader>
|
||||
super.initState();
|
||||
}
|
||||
|
||||
bool _isInitialized = false;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
initImagesPerPage(widget.initialPage ?? 1);
|
||||
if (!_isInitialized) {
|
||||
initImagesPerPage(widget.initialPage ?? 1);
|
||||
_isInitialized = true;
|
||||
} else {
|
||||
// For orientation changed
|
||||
_checkImagesPerPageChange();
|
||||
}
|
||||
initReaderWindow();
|
||||
}
|
||||
|
||||
@@ -216,10 +237,16 @@ class _ReaderState extends State<Reader>
|
||||
focusNode: focusNode,
|
||||
autofocus: true,
|
||||
onKeyEvent: onKeyEvent,
|
||||
child: _ReaderScaffold(
|
||||
child: _ReaderGestureDetector(
|
||||
child: _ReaderImages(key: Key(chapter.toString())),
|
||||
),
|
||||
child: Overlay(
|
||||
initialEntries: [
|
||||
OverlayEntry(builder: (context) {
|
||||
return _ReaderScaffold(
|
||||
child: _ReaderGestureDetector(
|
||||
child: _ReaderImages(key: Key(chapter.toString())),
|
||||
),
|
||||
);
|
||||
})
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -250,7 +277,15 @@ class _ReaderState extends State<Reader>
|
||||
history!.page = images?.length ?? 1;
|
||||
} else {
|
||||
/// Record the first image of the page
|
||||
history!.page = (page - 1) * imagesPerPage + 1;
|
||||
if (!showSingleImageOnFirstPage() || imagesPerPage() == 1) {
|
||||
history!.page = (page - 1) * imagesPerPage() + 1;
|
||||
} else {
|
||||
if (page == 1) {
|
||||
history!.page = 1;
|
||||
} else {
|
||||
history!.page = (page - 2) * imagesPerPage() + 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
history!.maxPage = images?.length ?? 1;
|
||||
if (widget.chapters?.isGrouped ?? false) {
|
||||
@@ -321,6 +356,8 @@ class _ReaderState extends State<Reader>
|
||||
abstract mixin class _ImagePerPageHandler {
|
||||
late int _lastImagesPerPage;
|
||||
|
||||
late bool _lastOrientation;
|
||||
|
||||
bool get isPortrait;
|
||||
|
||||
int get page;
|
||||
@@ -329,39 +366,72 @@ abstract mixin class _ImagePerPageHandler {
|
||||
|
||||
ReaderMode get mode;
|
||||
|
||||
String get cid;
|
||||
|
||||
ComicType get type;
|
||||
|
||||
void initImagesPerPage(int initialPage) {
|
||||
_lastImagesPerPage = imagesPerPage;
|
||||
if (imagesPerPage != 1) {
|
||||
page = (initialPage / imagesPerPage).ceil();
|
||||
_lastImagesPerPage = imagesPerPage();
|
||||
_lastOrientation = isPortrait;
|
||||
if (imagesPerPage() != 1) {
|
||||
if (showSingleImageOnFirstPage()) {
|
||||
page = ((initialPage - 1) / imagesPerPage()).ceil() + 1;
|
||||
} else {
|
||||
page = (initialPage / imagesPerPage()).ceil();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool showSingleImageOnFirstPage() =>
|
||||
appdata.settings.getReaderSetting(cid, type.sourceKey, 'showSingleImageOnFirstPage');
|
||||
|
||||
/// The number of images displayed on one screen
|
||||
int get imagesPerPage {
|
||||
int imagesPerPage() {
|
||||
if (mode.isContinuous) return 1;
|
||||
if (isPortrait) {
|
||||
return appdata.settings['readerScreenPicNumberForPortrait'] ?? 1;
|
||||
return appdata.settings.getReaderSetting(cid, type.sourceKey, 'readerScreenPicNumberForPortrait') ?? 1;
|
||||
} else {
|
||||
return appdata.settings['readerScreenPicNumberForLandscape'] ?? 1;
|
||||
return appdata.settings.getReaderSetting(cid, type.sourceKey, 'readerScreenPicNumberForLandscape') ?? 1;
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if the number of images per page has changed
|
||||
void _checkImagesPerPageChange() {
|
||||
int currentImagesPerPage = imagesPerPage;
|
||||
if (_lastImagesPerPage != currentImagesPerPage) {
|
||||
_adjustPageForImagesPerPageChange(
|
||||
_lastImagesPerPage, currentImagesPerPage);
|
||||
int currentImagesPerPage = imagesPerPage();
|
||||
bool currentOrientation = isPortrait;
|
||||
|
||||
if (_lastImagesPerPage != currentImagesPerPage || _lastOrientation != currentOrientation) {
|
||||
_adjustPageForImagesPerPageChange(_lastImagesPerPage, currentImagesPerPage);
|
||||
_lastImagesPerPage = currentImagesPerPage;
|
||||
_lastOrientation = currentOrientation;
|
||||
}
|
||||
}
|
||||
|
||||
/// Adjust the page number when the number of images per page changes
|
||||
void _adjustPageForImagesPerPageChange(
|
||||
int oldImagesPerPage, int newImagesPerPage) {
|
||||
int previousImageIndex = (page - 1) * oldImagesPerPage;
|
||||
int newPage = (previousImageIndex ~/ newImagesPerPage) + 1;
|
||||
page = newPage;
|
||||
void _adjustPageForImagesPerPageChange(int oldImagesPerPage, int newImagesPerPage) {
|
||||
int previousImageIndex = 1;
|
||||
if (!showSingleImageOnFirstPage() || oldImagesPerPage == 1) {
|
||||
previousImageIndex = (page - 1) * oldImagesPerPage + 1;
|
||||
} else {
|
||||
if (page == 1) {
|
||||
previousImageIndex = 1;
|
||||
} else {
|
||||
previousImageIndex = (page - 2) * oldImagesPerPage + 2;
|
||||
}
|
||||
}
|
||||
|
||||
int newPage;
|
||||
if (newImagesPerPage != 1) {
|
||||
if (showSingleImageOnFirstPage()) {
|
||||
newPage = ((previousImageIndex - 1) / newImagesPerPage).ceil() + 1;
|
||||
} else {
|
||||
newPage = (previousImageIndex / newImagesPerPage).ceil();
|
||||
}
|
||||
} else {
|
||||
newPage = previousImageIndex;
|
||||
}
|
||||
|
||||
page = newPage>0 ? newPage : 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -428,9 +498,13 @@ abstract mixin class _ReaderLocation {
|
||||
|
||||
bool get isLoading;
|
||||
|
||||
String get cid;
|
||||
|
||||
ComicType get type;
|
||||
|
||||
void update();
|
||||
|
||||
bool get enablePageAnimation => appdata.settings['enablePageAnimation'];
|
||||
bool enablePageAnimation(String cid, ComicType type) => appdata.settings.getReaderSetting(cid, type.sourceKey, 'enablePageAnimation');
|
||||
|
||||
_ImageViewController? _imageViewController;
|
||||
|
||||
@@ -467,7 +541,7 @@ abstract mixin class _ReaderLocation {
|
||||
}
|
||||
this.page = page;
|
||||
update();
|
||||
if (enablePageAnimation) {
|
||||
if (enablePageAnimation(cid, type)) {
|
||||
_animationCount++;
|
||||
_imageViewController!.animateToPage(page).then((_) {
|
||||
_animationCount--;
|
||||
@@ -506,12 +580,12 @@ abstract mixin class _ReaderLocation {
|
||||
|
||||
Timer? autoPageTurningTimer;
|
||||
|
||||
void autoPageTurning() {
|
||||
void autoPageTurning(String cid, ComicType type) {
|
||||
if (autoPageTurningTimer != null) {
|
||||
autoPageTurningTimer!.cancel();
|
||||
autoPageTurningTimer = null;
|
||||
} else {
|
||||
int interval = appdata.settings['autoPageTurningInterval'];
|
||||
int interval = appdata.settings.getReaderSetting(cid, type.sourceKey, 'autoPageTurningInterval');
|
||||
autoPageTurningTimer = Timer.periodic(Duration(seconds: interval), (_) {
|
||||
if (page == maxPage) {
|
||||
autoPageTurningTimer!.cancel();
|
||||
@@ -603,4 +677,6 @@ abstract interface class _ImageViewController {
|
||||
bool handleOnTap(Offset location);
|
||||
|
||||
Future<Uint8List?> getImageByOffset(Offset offset);
|
||||
|
||||
String? getImageKeyByOffset(Offset offset);
|
||||
}
|
||||
|
@@ -107,7 +107,11 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
if (!_isOpen) {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
} else {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
|
||||
if (!appdata.settings['showSystemStatusBar']) {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
|
||||
} else {
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
}
|
||||
}
|
||||
setState(() {
|
||||
_isOpen = !_isOpen;
|
||||
@@ -124,9 +128,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
Widget build(BuildContext context) {
|
||||
return Stack(
|
||||
children: [
|
||||
Positioned.fill(
|
||||
child: widget.child,
|
||||
),
|
||||
Positioned.fill(child: widget.child),
|
||||
if (appdata.settings['showPageNumberInReader'] == true)
|
||||
buildPageInfoText(),
|
||||
buildStatusInfo(),
|
||||
@@ -164,10 +166,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
decoration: BoxDecoration(
|
||||
color: context.colorScheme.surface.toOpacity(0.92),
|
||||
border: Border(
|
||||
bottom: BorderSide(
|
||||
color: Colors.grey.toOpacity(0.5),
|
||||
width: 0.5,
|
||||
),
|
||||
bottom: BorderSide(color: Colors.grey.toOpacity(0.5), width: 0.5),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
@@ -208,12 +207,13 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
);
|
||||
}
|
||||
|
||||
void addImageFavorite() {
|
||||
void addImageFavorite() async {
|
||||
try {
|
||||
if (context.reader.images![0].contains('file://')) {
|
||||
showToast(
|
||||
message: "Local comic collection is not supported at present".tl,
|
||||
context: context);
|
||||
message: "Local comic collection is not supported at present".tl,
|
||||
context: context,
|
||||
);
|
||||
return;
|
||||
}
|
||||
String id = context.reader.cid;
|
||||
@@ -222,14 +222,18 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
String title = context.reader.history!.title;
|
||||
String subTitle = context.reader.history!.subtitle;
|
||||
int maxPage = context.reader.images!.length;
|
||||
int page = context.reader.page;
|
||||
int? page = await selectImage();
|
||||
if (page == null) return;
|
||||
page += 1;
|
||||
String sourceKey = context.reader.type.sourceKey;
|
||||
String imageKey = context.reader.images![page - 1];
|
||||
List<String> tags = context.reader.widget.tags;
|
||||
String author = context.reader.widget.author;
|
||||
|
||||
var epName = context.reader.widget.chapters?.titles
|
||||
.elementAtOrNull(context.reader.chapter - 1) ??
|
||||
var epName =
|
||||
context.reader.widget.chapters?.titles.elementAtOrNull(
|
||||
context.reader.chapter - 1,
|
||||
) ??
|
||||
"E${context.reader.chapter}";
|
||||
var translatedTags = tags.map((e) => e.translateTagsToCN).toList();
|
||||
|
||||
@@ -242,7 +246,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
return;
|
||||
}
|
||||
ImageFavoriteManager().deleteImageFavorite([
|
||||
ImageFavorite(page, imageKey, null, eid, id, ep, sourceKey, epName)
|
||||
ImageFavorite(page, imageKey, null, eid, id, ep, sourceKey, epName),
|
||||
]);
|
||||
showToast(
|
||||
message: "Uncollected the image".tl,
|
||||
@@ -250,7 +254,8 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
seconds: 1,
|
||||
);
|
||||
} else {
|
||||
var imageFavoritesComic = ImageFavoriteManager().find(id, sourceKey) ??
|
||||
var imageFavoritesComic =
|
||||
ImageFavoriteManager().find(id, sourceKey) ??
|
||||
ImageFavoritesComic(
|
||||
id,
|
||||
[],
|
||||
@@ -264,12 +269,21 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
subTitle,
|
||||
maxPage,
|
||||
);
|
||||
ImageFavorite imageFavorite =
|
||||
ImageFavorite(page, imageKey, null, eid, id, ep, sourceKey, epName);
|
||||
ImageFavoritesEp? imageFavoritesEp =
|
||||
imageFavoritesComic.imageFavoritesEp.firstWhereOrNull((e) {
|
||||
return e.ep == ep;
|
||||
});
|
||||
ImageFavorite imageFavorite = ImageFavorite(
|
||||
page,
|
||||
imageKey,
|
||||
null,
|
||||
eid,
|
||||
id,
|
||||
ep,
|
||||
sourceKey,
|
||||
epName,
|
||||
);
|
||||
ImageFavoritesEp? imageFavoritesEp = imageFavoritesComic
|
||||
.imageFavoritesEp
|
||||
.firstWhereOrNull((e) {
|
||||
return e.ep == ep;
|
||||
});
|
||||
if (imageFavoritesEp == null) {
|
||||
if (page != firstPage) {
|
||||
var copy = imageFavorite.copyWith(
|
||||
@@ -279,10 +293,20 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
);
|
||||
// 不是第一页的话, 自动塞一个封面进去
|
||||
imageFavoritesEp = ImageFavoritesEp(
|
||||
eid, ep, [copy, imageFavorite], epName, maxPage);
|
||||
eid,
|
||||
ep,
|
||||
[copy, imageFavorite],
|
||||
epName,
|
||||
maxPage,
|
||||
);
|
||||
} else {
|
||||
imageFavoritesEp =
|
||||
ImageFavoritesEp(eid, ep, [imageFavorite], epName, maxPage);
|
||||
imageFavoritesEp = ImageFavoritesEp(
|
||||
eid,
|
||||
ep,
|
||||
[imageFavorite],
|
||||
epName,
|
||||
maxPage,
|
||||
);
|
||||
}
|
||||
imageFavoritesComic.imageFavoritesEp.add(imageFavoritesEp);
|
||||
} else {
|
||||
@@ -306,7 +330,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
|
||||
ImageFavoriteManager().addOrUpdateOrDelete(imageFavoritesComic);
|
||||
showToast(
|
||||
message: "Successfully collected".tl, context: context, seconds: 1);
|
||||
message: "Successfully collected".tl,
|
||||
context: context,
|
||||
seconds: 1,
|
||||
);
|
||||
}
|
||||
update();
|
||||
} catch (e, stackTrace) {
|
||||
@@ -321,154 +348,152 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
text = "P${context.reader.page}";
|
||||
}
|
||||
|
||||
final buttons = [
|
||||
Tooltip(
|
||||
message: "Collect the image".tl,
|
||||
child: IconButton(
|
||||
icon: Icon(isLiked() ? Icons.favorite : Icons.favorite_border),
|
||||
onPressed: addImageFavorite,
|
||||
),
|
||||
),
|
||||
if (App.isDesktop)
|
||||
Tooltip(
|
||||
message: "${"Full Screen".tl}(F12)",
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.fullscreen),
|
||||
onPressed: () {
|
||||
context.reader.fullscreen();
|
||||
},
|
||||
),
|
||||
),
|
||||
if (App.isAndroid)
|
||||
Tooltip(
|
||||
message: "Screen Rotation".tl,
|
||||
child: IconButton(
|
||||
icon: () {
|
||||
if (rotation == null) {
|
||||
return const Icon(Icons.screen_rotation);
|
||||
} else if (rotation == false) {
|
||||
return const Icon(Icons.screen_lock_portrait);
|
||||
} else {
|
||||
return const Icon(Icons.screen_lock_landscape);
|
||||
}
|
||||
}.call(),
|
||||
onPressed: () {
|
||||
if (rotation == null) {
|
||||
setState(() {
|
||||
rotation = false;
|
||||
});
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.portraitUp,
|
||||
DeviceOrientation.portraitDown,
|
||||
]);
|
||||
} else if (rotation == false) {
|
||||
setState(() {
|
||||
rotation = true;
|
||||
});
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.landscapeLeft,
|
||||
DeviceOrientation.landscapeRight,
|
||||
]);
|
||||
} else {
|
||||
setState(() {
|
||||
rotation = null;
|
||||
});
|
||||
SystemChrome.setPreferredOrientations(DeviceOrientation.values);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Auto Page Turning".tl,
|
||||
child: IconButton(
|
||||
icon: context.reader.autoPageTurningTimer != null
|
||||
? const Icon(Icons.timer)
|
||||
: const Icon(Icons.timer_sharp),
|
||||
onPressed: () {
|
||||
context.reader.autoPageTurning(
|
||||
context.reader.cid,
|
||||
context.reader.type,
|
||||
);
|
||||
update();
|
||||
},
|
||||
),
|
||||
),
|
||||
if (context.reader.widget.chapters != null)
|
||||
Tooltip(
|
||||
message: "Chapters".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.library_books),
|
||||
onPressed: openChapterDrawer,
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Save Image".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.download),
|
||||
onPressed: saveCurrentImage,
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Share".tl,
|
||||
child: IconButton(icon: const Icon(Icons.share), onPressed: share),
|
||||
),
|
||||
];
|
||||
|
||||
Widget child = SizedBox(
|
||||
height: kBottomBarHeight,
|
||||
child: Column(
|
||||
children: [
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Row(
|
||||
children: [
|
||||
const SizedBox(width: 8),
|
||||
IconButton.filledTonal(
|
||||
onPressed: () => !isReversed
|
||||
? context.reader.chapter > 1
|
||||
? context.reader.toPrevChapter()
|
||||
: context.reader.toPage(1)
|
||||
? context.reader.toPrevChapter()
|
||||
: context.reader.toPage(1)
|
||||
: context.reader.chapter < context.reader.maxChapter
|
||||
? context.reader.toNextChapter()
|
||||
: context.reader.toPage(context.reader.maxPage),
|
||||
? context.reader.toNextChapter()
|
||||
: context.reader.toPage(context.reader.maxPage),
|
||||
icon: const Icon(Icons.first_page),
|
||||
),
|
||||
Expanded(
|
||||
child: buildSlider(),
|
||||
),
|
||||
Expanded(child: buildSlider()),
|
||||
IconButton.filledTonal(
|
||||
onPressed: () => !isReversed
|
||||
? context.reader.chapter < context.reader.maxChapter
|
||||
onPressed: () => !isReversed
|
||||
? context.reader.chapter < context.reader.maxChapter
|
||||
? context.reader.toNextChapter()
|
||||
: context.reader.toPage(context.reader.maxPage)
|
||||
: context.reader.chapter > 1
|
||||
? context.reader.toPrevChapter()
|
||||
: context.reader.toPage(1),
|
||||
icon: const Icon(Icons.last_page)),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
: context.reader.chapter > 1
|
||||
? context.reader.toPrevChapter()
|
||||
: context.reader.toPage(1),
|
||||
icon: const Icon(Icons.last_page),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
],
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
const SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Container(
|
||||
height: 24,
|
||||
padding: const EdgeInsets.fromLTRB(6, 2, 6, 0),
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.tertiaryContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Center(
|
||||
child: Text(text),
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Tooltip(
|
||||
message: "Collect the image".tl,
|
||||
child: IconButton(
|
||||
icon: Icon(
|
||||
isLiked() ? Icons.favorite : Icons.favorite_border),
|
||||
onPressed: addImageFavorite),
|
||||
),
|
||||
if (App.isWindows)
|
||||
Tooltip(
|
||||
message: "${"Full Screen".tl}(F12)",
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.fullscreen),
|
||||
onPressed: () {
|
||||
context.reader.fullscreen();
|
||||
},
|
||||
),
|
||||
),
|
||||
if (App.isAndroid)
|
||||
Tooltip(
|
||||
message: "Screen Rotation".tl,
|
||||
child: IconButton(
|
||||
icon: () {
|
||||
if (rotation == null) {
|
||||
return const Icon(Icons.screen_rotation);
|
||||
} else if (rotation == false) {
|
||||
return const Icon(Icons.screen_lock_portrait);
|
||||
} else {
|
||||
return const Icon(Icons.screen_lock_landscape);
|
||||
}
|
||||
}.call(),
|
||||
onPressed: () {
|
||||
if (rotation == null) {
|
||||
setState(() {
|
||||
rotation = false;
|
||||
});
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.portraitUp,
|
||||
DeviceOrientation.portraitDown,
|
||||
]);
|
||||
} else if (rotation == false) {
|
||||
setState(() {
|
||||
rotation = true;
|
||||
});
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.landscapeLeft,
|
||||
DeviceOrientation.landscapeRight
|
||||
]);
|
||||
} else {
|
||||
setState(() {
|
||||
rotation = null;
|
||||
});
|
||||
SystemChrome.setPreferredOrientations(
|
||||
DeviceOrientation.values);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Auto Page Turning".tl,
|
||||
child: IconButton(
|
||||
icon: context.reader.autoPageTurningTimer != null
|
||||
? const Icon(Icons.timer)
|
||||
: const Icon(Icons.timer_sharp),
|
||||
onPressed: () {
|
||||
context.reader.autoPageTurning();
|
||||
update();
|
||||
},
|
||||
),
|
||||
),
|
||||
if (context.reader.widget.chapters != null)
|
||||
Tooltip(
|
||||
message: "Chapters".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.library_books),
|
||||
onPressed: openChapterDrawer,
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Save Image".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.download),
|
||||
onPressed: saveCurrentImage,
|
||||
),
|
||||
),
|
||||
Tooltip(
|
||||
message: "Share".tl,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.share),
|
||||
onPressed: share,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4)
|
||||
],
|
||||
)
|
||||
LayoutBuilder(
|
||||
builder: (context, constrains) {
|
||||
return Row(
|
||||
children: [
|
||||
if ((constrains.maxWidth - buttons.length * 42) > 80)
|
||||
Container(
|
||||
height: 24,
|
||||
padding: const EdgeInsets.fromLTRB(6, 2, 6, 0),
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.tertiaryContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Center(child: Text(text)),
|
||||
).paddingLeft(16),
|
||||
const Spacer(),
|
||||
...buttons,
|
||||
const SizedBox(width: 4),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -499,8 +524,9 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
focusNode: sliderFocus,
|
||||
value: context.reader.page.toDouble(),
|
||||
min: 1,
|
||||
max:
|
||||
context.reader.maxPage.clamp(context.reader.page, 1 << 16).toDouble(),
|
||||
max: context.reader.maxPage
|
||||
.clamp(context.reader.page, 1 << 16)
|
||||
.toDouble(),
|
||||
reversed: isReversed,
|
||||
divisions: (context.reader.maxPage - 1).clamp(2, 1 << 16),
|
||||
onChanged: (i) {
|
||||
@@ -510,8 +536,10 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
}
|
||||
|
||||
Widget buildPageInfoText() {
|
||||
var epName = context.reader.widget.chapters?.titles
|
||||
.elementAtOrNull(context.reader.chapter - 1) ??
|
||||
var epName =
|
||||
context.reader.widget.chapters?.titles.elementAtOrNull(
|
||||
context.reader.chapter - 1,
|
||||
) ??
|
||||
"E${context.reader.chapter}";
|
||||
if (epName.length > 8) {
|
||||
epName = "${epName.substring(0, 8)}...";
|
||||
@@ -570,94 +598,8 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
);
|
||||
}
|
||||
|
||||
Future<Uint8List?> _getCurrentImageData() async {
|
||||
var imageKey = context.reader.images![context.reader.page - 1];
|
||||
var reader = context.reader;
|
||||
if (context.reader.mode.isContinuous) {
|
||||
var continuesState =
|
||||
context.reader._imageViewController as _ContinuousModeState;
|
||||
var imagesOnScreen =
|
||||
continuesState.itemPositionsListener.itemPositions.value;
|
||||
var images = imagesOnScreen
|
||||
.map((e) => context.reader.images!.elementAtOrNull(e.index - 1))
|
||||
.whereType<String>()
|
||||
.toList();
|
||||
String? selected;
|
||||
if (images.length > 1) {
|
||||
await showPopUpWidget(
|
||||
context,
|
||||
PopUpWidgetScaffold(
|
||||
title: "Select an image on screen".tl,
|
||||
body: GridView.builder(
|
||||
itemCount: images.length,
|
||||
itemBuilder: (context, index) {
|
||||
ImageProvider image;
|
||||
var imageKey = images[index];
|
||||
if (imageKey.startsWith('file://')) {
|
||||
image = FileImage(File(imageKey.replaceFirst("file://", '')));
|
||||
} else {
|
||||
image = ReaderImageProvider(
|
||||
imageKey,
|
||||
reader.type.comicSource!.key,
|
||||
reader.cid,
|
||||
reader.eid,
|
||||
reader.page,
|
||||
);
|
||||
}
|
||||
return InkWell(
|
||||
borderRadius: const BorderRadius.all(Radius.circular(16)),
|
||||
onTap: () {
|
||||
selected = images[index];
|
||||
App.rootContext.pop();
|
||||
},
|
||||
child: Container(
|
||||
foregroundDecoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
border: Border.all(
|
||||
color: Theme.of(context).colorScheme.outline,
|
||||
),
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
child: Image(
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
image: image,
|
||||
),
|
||||
),
|
||||
).padding(const EdgeInsets.all(8));
|
||||
},
|
||||
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
|
||||
maxCrossAxisExtent: 200,
|
||||
childAspectRatio: 0.7,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
selected = images.first;
|
||||
}
|
||||
if (selected == null) {
|
||||
return null;
|
||||
} else {
|
||||
imageKey = selected!;
|
||||
}
|
||||
}
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return await File(imageKey.substring(7)).readAsBytes();
|
||||
} else {
|
||||
return (await CacheManager().findCache(
|
||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}"))!
|
||||
.readAsBytes();
|
||||
}
|
||||
}
|
||||
|
||||
void saveCurrentImage() async {
|
||||
var data = await _getCurrentImageData();
|
||||
var data = await selectImageToData();
|
||||
if (data == null) {
|
||||
return;
|
||||
}
|
||||
@@ -667,29 +609,37 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
}
|
||||
|
||||
void share() async {
|
||||
var data = await _getCurrentImageData();
|
||||
var data = await selectImageToData();
|
||||
if (data == null) {
|
||||
return;
|
||||
}
|
||||
var fileType = detectFileType(data);
|
||||
var filename = "${context.reader.page}${fileType.ext}";
|
||||
Share.shareFile(
|
||||
data: data,
|
||||
filename: filename,
|
||||
mime: fileType.mime,
|
||||
);
|
||||
Share.shareFile(data: data, filename: filename, mime: fileType.mime);
|
||||
}
|
||||
|
||||
void openSetting() {
|
||||
showSideBar(
|
||||
context,
|
||||
ReaderSettings(
|
||||
comicId: context.reader.cid,
|
||||
comicSource: context.reader.type.sourceKey,
|
||||
onChanged: (key) {
|
||||
if (key == "readerMode") {
|
||||
context.reader.mode = ReaderMode.fromKey(appdata.settings[key]);
|
||||
context.reader.mode = ReaderMode.fromKey(
|
||||
appdata.settings.getReaderSetting(
|
||||
context.reader.cid,
|
||||
context.reader.type.sourceKey,
|
||||
key,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (key == "enableTurnPageByVolumeKey") {
|
||||
if (appdata.settings[key]) {
|
||||
if (appdata.settings.getReaderSetting(
|
||||
context.reader.cid,
|
||||
context.reader.type.sourceKey,
|
||||
key,
|
||||
)) {
|
||||
context.reader.handleVolumeEvent();
|
||||
} else {
|
||||
context.reader.stopVolumeEvent();
|
||||
@@ -750,9 +700,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
? Icons.arrow_forward_ios
|
||||
: Icons.arrow_back_ios_outlined,
|
||||
size: 24,
|
||||
color: Theme.of(context)
|
||||
.colorScheme
|
||||
.onPrimaryContainer,
|
||||
color: Theme.of(context).colorScheme.onPrimaryContainer,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -761,6 +709,77 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
|
||||
}
|
||||
return const SizedBox();
|
||||
}
|
||||
|
||||
/// If there is only one image on screen, return it.
|
||||
///
|
||||
/// If there are multiple images on screen,
|
||||
/// show an overlay to let the user select an image.
|
||||
///
|
||||
/// The return value is the index of the selected image.
|
||||
Future<int?> selectImage() async {
|
||||
var reader = context.reader;
|
||||
var imageViewController = context.reader._imageViewController;
|
||||
if (imageViewController is _GalleryModeState && reader.imagesPerPage == 1) {
|
||||
return reader.page - 1;
|
||||
} else {
|
||||
var location = await _showSelectImageOverlay();
|
||||
if (location == null) {
|
||||
return null;
|
||||
}
|
||||
var imageKey = imageViewController!.getImageKeyByOffset(location);
|
||||
if (imageKey == null) {
|
||||
return null;
|
||||
}
|
||||
return reader.images!.indexOf(imageKey);
|
||||
}
|
||||
}
|
||||
|
||||
/// Same as [selectImage], but return the image data.
|
||||
Future<Uint8List?> selectImageToData() async {
|
||||
var i = await selectImage();
|
||||
if (i == null) {
|
||||
return null;
|
||||
}
|
||||
var imageKey = context.reader.images![i];
|
||||
if (imageKey.startsWith("file://")) {
|
||||
return await File(imageKey.substring(7)).readAsBytes();
|
||||
} else {
|
||||
return (await CacheManager().findCache(
|
||||
"$imageKey@${context.reader.type.sourceKey}@${context.reader.cid}@${context.reader.eid}",
|
||||
))!.readAsBytes();
|
||||
}
|
||||
}
|
||||
|
||||
Future<Offset?> _showSelectImageOverlay() {
|
||||
if (_isOpen) {
|
||||
openOrClose();
|
||||
}
|
||||
|
||||
var completer = Completer<Offset?>();
|
||||
|
||||
var overlay = Overlay.of(context);
|
||||
OverlayEntry? entry;
|
||||
entry = OverlayEntry(
|
||||
builder: (context) {
|
||||
return Positioned.fill(
|
||||
child: _SelectImageOverlayContent(
|
||||
onTap: (offset) {
|
||||
completer.complete(offset);
|
||||
entry!.remove();
|
||||
},
|
||||
onDispose: () {
|
||||
if (!completer.isCompleted) {
|
||||
completer.complete(null);
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
overlay.insert(entry);
|
||||
|
||||
return completer.future;
|
||||
}
|
||||
}
|
||||
|
||||
class _BatteryWidget extends StatefulWidget {
|
||||
@@ -853,20 +872,17 @@ class _BatteryWidgetState extends State<_BatteryWidget> {
|
||||
size: 16,
|
||||
color: batteryColor,
|
||||
// Stroke
|
||||
shadows: List.generate(
|
||||
9,
|
||||
(index) {
|
||||
if (index == 4) {
|
||||
return null;
|
||||
}
|
||||
double offsetX = (index % 3 - 1) * 0.8;
|
||||
double offsetY = ((index / 3).floor() - 1) * 0.8;
|
||||
return Shadow(
|
||||
color: context.colorScheme.onInverseSurface,
|
||||
offset: Offset(offsetX, offsetY),
|
||||
);
|
||||
},
|
||||
).whereType<Shadow>().toList(),
|
||||
shadows: List.generate(9, (index) {
|
||||
if (index == 4) {
|
||||
return null;
|
||||
}
|
||||
double offsetX = (index % 3 - 1) * 0.8;
|
||||
double offsetY = ((index / 3).floor() - 1) * 0.8;
|
||||
return Shadow(
|
||||
color: context.colorScheme.onInverseSurface,
|
||||
offset: Offset(offsetX, offsetY),
|
||||
);
|
||||
}).whereType<Shadow>().toList(),
|
||||
),
|
||||
Stack(
|
||||
children: [
|
||||
@@ -941,3 +957,66 @@ class _ClockWidgetState extends State<_ClockWidget> {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _SelectImageOverlayContent extends StatefulWidget {
|
||||
const _SelectImageOverlayContent({
|
||||
required this.onTap,
|
||||
required this.onDispose,
|
||||
});
|
||||
|
||||
final void Function(Offset) onTap;
|
||||
|
||||
final void Function() onDispose;
|
||||
|
||||
@override
|
||||
State<_SelectImageOverlayContent> createState() =>
|
||||
_SelectImageOverlayContentState();
|
||||
}
|
||||
|
||||
class _SelectImageOverlayContentState
|
||||
extends State<_SelectImageOverlayContent> {
|
||||
@override
|
||||
void dispose() {
|
||||
widget.onDispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTapUp: (details) {
|
||||
widget.onTap(details.globalPosition);
|
||||
},
|
||||
child: Container(
|
||||
color: Colors.black.withAlpha(50),
|
||||
child: Align(
|
||||
alignment: Alignment(0, -0.8),
|
||||
child: Container(
|
||||
width: 232,
|
||||
height: 42,
|
||||
decoration: BoxDecoration(
|
||||
color: context.colorScheme.surface,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(color: context.colorScheme.outlineVariant),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
const SizedBox(width: 8),
|
||||
const Icon(Icons.info_outline),
|
||||
const SizedBox(width: 16),
|
||||
Text(
|
||||
"Click to select an image".tl,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: context.colorScheme.onSurface,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@@ -376,11 +376,16 @@ class _SearchPageState extends State<SearchPage> {
|
||||
controller.text =
|
||||
controller.text.replaceLast(words[words.length - 1], "");
|
||||
}
|
||||
if (type != null) {
|
||||
controller.text += "${type.name}:$text ";
|
||||
final source = ComicSource.find(searchTarget);
|
||||
String insert;
|
||||
if (source?.onTagSuggestionSelected != null) {
|
||||
insert = source!.onTagSuggestionSelected!(type?.name ?? '', text);
|
||||
} else {
|
||||
controller.text += "$text ";
|
||||
var t = text;
|
||||
if (t.contains(' ')) t = "'$t'";
|
||||
insert = type != null ? "${type.name}:$t" : t;
|
||||
}
|
||||
controller.text += "$insert ";
|
||||
suggestions.clear();
|
||||
update();
|
||||
focusNode.requestFocus();
|
||||
|
@@ -124,7 +124,7 @@ class _SearchResultPageState extends State<SearchResultPage> {
|
||||
options = widget.options ?? const [];
|
||||
validateOptions();
|
||||
appdata.addSearchHistory(text);
|
||||
suggestionsController = _SuggestionsController(controller);
|
||||
suggestionsController = _SuggestionsController(controller, sourceKey);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@@ -213,6 +213,8 @@ class _SuggestionsController {
|
||||
|
||||
final SearchBarController controller;
|
||||
|
||||
final String sourceKey;
|
||||
|
||||
OverlayEntry? entry;
|
||||
|
||||
void updateWidget() {
|
||||
@@ -270,7 +272,7 @@ class _SuggestionsController {
|
||||
find(TagsTranslation.cosplayerTags, TranslationType.cosplayer);
|
||||
}
|
||||
|
||||
_SuggestionsController(this.controller);
|
||||
_SuggestionsController(this.controller, this.sourceKey);
|
||||
}
|
||||
|
||||
class _Suggestions extends StatefulWidget {
|
||||
@@ -400,14 +402,16 @@ class _SuggestionsState extends State<_Suggestions> {
|
||||
controller.text =
|
||||
controller.text.replaceLast(words[words.length - 1], "");
|
||||
}
|
||||
if (text.contains(' ')) {
|
||||
text = "'$text'";
|
||||
}
|
||||
if (type != null) {
|
||||
controller.text += "${type.name}:$text ";
|
||||
final source = ComicSource.find(widget.controller.sourceKey);
|
||||
String insert;
|
||||
if (source?.onTagSuggestionSelected != null) {
|
||||
insert = source!.onTagSuggestionSelected!(type?.name ?? '', text);
|
||||
} else {
|
||||
controller.text += "$text ";
|
||||
var t = text;
|
||||
if (t.contains(' ')) t = "'$t'";
|
||||
insert = type != null ? "${type.name}:$t" : t;
|
||||
}
|
||||
controller.text += "$insert ";
|
||||
widget.controller.suggestions.clear();
|
||||
widget.controller.remove();
|
||||
}
|
||||
|
@@ -96,10 +96,13 @@ Future<bool> checkUpdate() async {
|
||||
return false;
|
||||
}
|
||||
|
||||
Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true]) async {
|
||||
Future<void> checkUpdateUi([bool showMessageIfNoUpdate = true, bool delay = false]) async {
|
||||
try {
|
||||
var value = await checkUpdate();
|
||||
if (value) {
|
||||
if (delay) {
|
||||
await Future.delayed(const Duration(seconds: 2));
|
||||
}
|
||||
showDialog(
|
||||
context: App.rootContext,
|
||||
builder: (context) {
|
||||
|
@@ -193,12 +193,46 @@ class LogsPage extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _LogsPageState extends State<LogsPage> {
|
||||
String logLevelToShow = "all";
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var logToShow = logLevelToShow == "all"
|
||||
? Log.logs
|
||||
: Log.logs.where((log) => log.level.name == logLevelToShow).toList();
|
||||
return Scaffold(
|
||||
appBar: Appbar(
|
||||
title: const Text("Logs"),
|
||||
title: Text("Logs".tl),
|
||||
actions: [
|
||||
IconButton(
|
||||
onPressed: () => setState(() {
|
||||
final RelativeRect position = RelativeRect.fromLTRB(
|
||||
MediaQuery.of(context).size.width,
|
||||
MediaQuery.of(context).padding.top + kToolbarHeight,
|
||||
0.0,
|
||||
0.0,
|
||||
);
|
||||
showMenu(context: context, position: position, items: [
|
||||
PopupMenuItem(
|
||||
child: Text("all"),
|
||||
onTap: () => setState(() => logLevelToShow = "all")
|
||||
),
|
||||
PopupMenuItem(
|
||||
child: Text("info"),
|
||||
onTap: () => setState(() => logLevelToShow = "info")
|
||||
),
|
||||
PopupMenuItem(
|
||||
child: Text("warning"),
|
||||
onTap: () => setState(() => logLevelToShow = "warning")
|
||||
),
|
||||
PopupMenuItem(
|
||||
child: Text("error"),
|
||||
onTap: () => setState(() => logLevelToShow = "error")
|
||||
),
|
||||
]);
|
||||
}),
|
||||
icon: const Icon(Icons.filter_list_outlined)
|
||||
),
|
||||
IconButton(
|
||||
onPressed: () => setState(() {
|
||||
final RelativeRect position = RelativeRect.fromLTRB(
|
||||
@@ -217,7 +251,7 @@ class _LogsPageState extends State<LogsPage> {
|
||||
onTap: () {
|
||||
Log.ignoreLimitation = true;
|
||||
context.showMessage(
|
||||
message: "Only valid for this run");
|
||||
message: "Only valid for this run".tl);
|
||||
},
|
||||
),
|
||||
PopupMenuItem(
|
||||
@@ -232,9 +266,9 @@ class _LogsPageState extends State<LogsPage> {
|
||||
body: ListView.builder(
|
||||
reverse: true,
|
||||
controller: ScrollController(),
|
||||
itemCount: Log.logs.length,
|
||||
itemCount: logToShow.length,
|
||||
itemBuilder: (context, index) {
|
||||
index = Log.logs.length - index - 1;
|
||||
index = logToShow.length - index - 1;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
|
||||
child: SelectionArea(
|
||||
@@ -253,7 +287,7 @@ class _LogsPageState extends State<LogsPage> {
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(5, 0, 5, 1),
|
||||
child: Text(Log.logs[index].title),
|
||||
child: Text(logToShow[index].title),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
@@ -265,16 +299,16 @@ class _LogsPageState extends State<LogsPage> {
|
||||
Theme.of(context).colorScheme.error,
|
||||
Theme.of(context).colorScheme.errorContainer,
|
||||
Theme.of(context).colorScheme.primaryContainer
|
||||
][Log.logs[index].level.index],
|
||||
][logToShow[index].level.index],
|
||||
borderRadius:
|
||||
const BorderRadius.all(Radius.circular(16)),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(5, 0, 5, 1),
|
||||
child: Text(
|
||||
Log.logs[index].level.name,
|
||||
logToShow[index].level.name,
|
||||
style: TextStyle(
|
||||
color: Log.logs[index].level.index == 0
|
||||
color: logToShow[index].level.index == 0
|
||||
? Colors.white
|
||||
: Colors.black),
|
||||
),
|
||||
@@ -282,14 +316,14 @@ class _LogsPageState extends State<LogsPage> {
|
||||
),
|
||||
],
|
||||
),
|
||||
Text(Log.logs[index].content),
|
||||
Text(Log.logs[index].time
|
||||
Text(logToShow[index].content),
|
||||
Text(logToShow[index].time
|
||||
.toString()
|
||||
.replaceAll(RegExp(r"\.\w+"), "")),
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Clipboard.setData(
|
||||
ClipboardData(text: Log.logs[index].content));
|
||||
ClipboardData(text: logToShow[index].content));
|
||||
},
|
||||
child: Text("Copy".tl),
|
||||
),
|
||||
|
@@ -18,8 +18,8 @@ class DebugPageState extends State<DebugPage> {
|
||||
slivers: [
|
||||
SliverAppbar(title: Text("Debug".tl)),
|
||||
_CallbackSetting(
|
||||
title: "Reload Configs",
|
||||
actionTitle: "Reload",
|
||||
title: "Reload Configs".tl,
|
||||
actionTitle: "Reload".tl,
|
||||
callback: () {
|
||||
ComicSourceManager().reload();
|
||||
},
|
||||
@@ -31,6 +31,10 @@ class DebugPageState extends State<DebugPage> {
|
||||
},
|
||||
actionTitle: 'Open'.tl,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Ignore Certificate Errors".tl,
|
||||
settingKey: "ignoreBadCertificate",
|
||||
).toSliver(),
|
||||
SliverToBoxAdapter(
|
||||
child: Column(
|
||||
children: [
|
||||
@@ -58,7 +62,7 @@ class DebugPageState extends State<DebugPage> {
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
try {
|
||||
var res = JsEngine().runCode(controller.text);
|
||||
var res = JsEngine().runCode(controller.text, "<debug>");
|
||||
setState(() {
|
||||
result = res.toString();
|
||||
});
|
||||
|
@@ -52,6 +52,10 @@ class _ExploreSettingsState extends State<ExploreSettings> {
|
||||
title: "Show history on comic tile".tl,
|
||||
settingKey: "showHistoryStatusOnTile",
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Reverse default chapter order".tl,
|
||||
settingKey: "reverseChapterOrder",
|
||||
).toSliver(),
|
||||
_PopupWindowSetting(
|
||||
title: "Keyword blocking".tl,
|
||||
builder: () => const _ManageBlockingWordView(),
|
||||
|
@@ -1,9 +1,16 @@
|
||||
part of 'settings_page.dart';
|
||||
|
||||
class ReaderSettings extends StatefulWidget {
|
||||
const ReaderSettings({super.key, this.onChanged});
|
||||
const ReaderSettings({
|
||||
super.key,
|
||||
this.onChanged,
|
||||
this.comicId,
|
||||
this.comicSource,
|
||||
});
|
||||
|
||||
final void Function(String key)? onChanged;
|
||||
final String? comicId;
|
||||
final String? comicSource;
|
||||
|
||||
@override
|
||||
State<ReaderSettings> createState() => _ReaderSettingsState();
|
||||
@@ -12,15 +19,57 @@ class ReaderSettings extends StatefulWidget {
|
||||
class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final comicId = widget.comicId;
|
||||
final sourceKey = widget.comicSource;
|
||||
final key = "$comicId@$sourceKey";
|
||||
|
||||
bool isEnabledSpecificSettings =
|
||||
comicId != null &&
|
||||
appdata.settings.isComicSpecificSettingsEnabled(comicId, sourceKey);
|
||||
|
||||
return SmoothCustomScrollView(
|
||||
slivers: [
|
||||
SliverAppbar(title: Text("Reading".tl)),
|
||||
if (comicId != null && sourceKey != null)
|
||||
SliverMainAxisGroup(
|
||||
slivers: [
|
||||
SwitchListTile(
|
||||
title: Text("Enable comic specific settings".tl),
|
||||
value: isEnabledSpecificSettings,
|
||||
onChanged: (b) {
|
||||
setState(() {
|
||||
appdata.settings.setEnabledComicSpecificSettings(
|
||||
comicId,
|
||||
sourceKey,
|
||||
b,
|
||||
);
|
||||
});
|
||||
},
|
||||
).toSliver(),
|
||||
if (isEnabledSpecificSettings)
|
||||
Center(
|
||||
child: TextButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
appdata.settings.resetComicReaderSettings(key);
|
||||
});
|
||||
},
|
||||
child: Text(
|
||||
"Clear specific reader settings for this comic".tl,
|
||||
),
|
||||
),
|
||||
).toSliver(),
|
||||
Divider().toSliver(),
|
||||
],
|
||||
),
|
||||
_SwitchSetting(
|
||||
title: "Tap to turn Pages".tl,
|
||||
settingKey: "enableTapToTurnPages",
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("enableTapToTurnPages");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Reverse tap to turn Pages".tl,
|
||||
@@ -28,6 +77,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("reverseTapToTurnPages");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Page animation".tl,
|
||||
@@ -35,6 +86,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("enablePageAnimation");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
SelectSetting(
|
||||
title: "Reading mode".tl,
|
||||
@@ -58,6 +111,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
}
|
||||
widget.onChanged?.call("readerMode");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SliderSetting(
|
||||
title: "Auto page turning interval".tl,
|
||||
@@ -66,8 +121,11 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
min: 1,
|
||||
max: 20,
|
||||
onChanged: () {
|
||||
setState(() {});
|
||||
widget.onChanged?.call("autoPageTurningInterval");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
SliverAnimatedVisibility(
|
||||
visible: appdata.settings['readerMode']!.startsWith('gallery'),
|
||||
@@ -80,8 +138,11 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
min: 1,
|
||||
max: 5,
|
||||
onChanged: () {
|
||||
setState(() {});
|
||||
widget.onChanged?.call("readerScreenPicNumberForLandscape");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
),
|
||||
),
|
||||
SliverAnimatedVisibility(
|
||||
@@ -97,8 +158,50 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("readerScreenPicNumberForPortrait");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
),
|
||||
),
|
||||
SliverAnimatedVisibility(
|
||||
visible:
|
||||
appdata.settings['readerMode']!.startsWith('gallery') &&
|
||||
(appdata.settings['readerScreenPicNumberForLandscape'] > 1 ||
|
||||
appdata.settings['readerScreenPicNumberForPortrait'] > 1),
|
||||
child: _SwitchSetting(
|
||||
title: "Show single image on first page".tl,
|
||||
settingKey: "showSingleImageOnFirstPage",
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("showSingleImageOnFirstPage");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
),
|
||||
),
|
||||
SliverAnimatedVisibility(
|
||||
visible: appdata.settings['readerMode']!.startsWith('continuous'),
|
||||
child: _SliderSetting(
|
||||
title: "Mouse scroll speed".tl,
|
||||
settingsIndex: "readerScrollSpeed",
|
||||
interval: 0.1,
|
||||
min: 0.5,
|
||||
max: 3,
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("readerScrollSpeed");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
),
|
||||
),
|
||||
_SwitchSetting(
|
||||
title: 'Double tap to zoom'.tl,
|
||||
settingKey: 'enableDoubleTapToZoom',
|
||||
onChanged: () {
|
||||
setState(() {});
|
||||
widget.onChanged?.call('enableDoubleTapToZoom');
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: 'Long press to zoom'.tl,
|
||||
settingKey: 'enableLongPressToZoom',
|
||||
@@ -106,6 +209,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
setState(() {});
|
||||
widget.onChanged?.call('enableLongPressToZoom');
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
SliverAnimatedVisibility(
|
||||
visible: appdata.settings['enableLongPressToZoom'] == true,
|
||||
@@ -116,6 +221,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
"press": "Press position".tl,
|
||||
"center": "Screen center".tl,
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
),
|
||||
),
|
||||
_SwitchSetting(
|
||||
@@ -125,6 +232,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call('limitImageWidth');
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
if (App.isAndroid)
|
||||
_SwitchSetting(
|
||||
@@ -133,6 +242,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call('enableTurnPageByVolumeKey');
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Display time & battery info in reader".tl,
|
||||
@@ -140,6 +251,17 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("enableClockAndBatteryInfoInReader");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Show system status bar".tl,
|
||||
settingKey: "showSystemStatusBar",
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("showSystemStatusBar");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
SelectSetting(
|
||||
title: "Quick collect image".tl,
|
||||
@@ -155,6 +277,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
help:
|
||||
"On the image browsing page, you can quickly collect images by sliding horizontally or vertically according to your reading mode"
|
||||
.tl,
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_CallbackSetting(
|
||||
title: "Custom Image Processing".tl,
|
||||
@@ -167,6 +291,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
interval: 1,
|
||||
min: 1,
|
||||
max: 16,
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
_SwitchSetting(
|
||||
title: "Show Page Number".tl,
|
||||
@@ -174,6 +300,8 @@ class _ReaderSettingsState extends State<ReaderSettings> {
|
||||
onChanged: () {
|
||||
widget.onChanged?.call("showPageNumberInReader");
|
||||
},
|
||||
comicId: isEnabledSpecificSettings ? widget.comicId : null,
|
||||
comicSource: isEnabledSpecificSettings ? widget.comicSource : null,
|
||||
).toSliver(),
|
||||
],
|
||||
);
|
||||
@@ -219,7 +347,7 @@ class __CustomImageProcessingState extends State<_CustomImageProcessing> {
|
||||
setState(() {});
|
||||
},
|
||||
child: Text("Reset".tl),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
body: Column(
|
||||
@@ -245,7 +373,7 @@ class __CustomImageProcessingState extends State<_CustomImageProcessing> {
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
@@ -6,6 +6,8 @@ class _SwitchSetting extends StatefulWidget {
|
||||
required this.settingKey,
|
||||
this.onChanged,
|
||||
this.subtitle,
|
||||
this.comicId,
|
||||
this.comicSource,
|
||||
});
|
||||
|
||||
final String title;
|
||||
@@ -16,6 +18,10 @@ class _SwitchSetting extends StatefulWidget {
|
||||
|
||||
final String? subtitle;
|
||||
|
||||
final String? comicId;
|
||||
|
||||
final String? comicSource;
|
||||
|
||||
@override
|
||||
State<_SwitchSetting> createState() => _SwitchSettingState();
|
||||
}
|
||||
@@ -23,16 +29,33 @@ class _SwitchSetting extends StatefulWidget {
|
||||
class _SwitchSettingState extends State<_SwitchSetting> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
assert(appdata.settings[widget.settingKey] is bool);
|
||||
var value = widget.comicId == null
|
||||
? appdata.settings[widget.settingKey]
|
||||
: appdata.settings.getReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingKey,
|
||||
);
|
||||
|
||||
assert(value is bool);
|
||||
|
||||
return ListTile(
|
||||
title: Text(widget.title),
|
||||
subtitle: widget.subtitle == null ? null : Text(widget.subtitle!),
|
||||
trailing: Switch(
|
||||
value: appdata.settings[widget.settingKey],
|
||||
value: value,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
appdata.settings[widget.settingKey] = value;
|
||||
if (widget.comicId == null) {
|
||||
appdata.settings[widget.settingKey] = value;
|
||||
} else {
|
||||
appdata.settings.setReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingKey,
|
||||
value,
|
||||
);
|
||||
}
|
||||
});
|
||||
appdata.saveData().then((_) {
|
||||
widget.onChanged?.call();
|
||||
@@ -51,6 +74,8 @@ class SelectSetting extends StatelessWidget {
|
||||
required this.optionTranslation,
|
||||
this.onChanged,
|
||||
this.help,
|
||||
this.comicId,
|
||||
this.comicSource,
|
||||
});
|
||||
|
||||
final String title;
|
||||
@@ -63,6 +88,10 @@ class SelectSetting extends StatelessWidget {
|
||||
|
||||
final String? help;
|
||||
|
||||
final String? comicId;
|
||||
|
||||
final String? comicSource;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SizedBox(
|
||||
@@ -76,6 +105,8 @@ class SelectSetting extends StatelessWidget {
|
||||
optionTranslation: optionTranslation,
|
||||
onChanged: onChanged,
|
||||
help: help,
|
||||
comicId: comicId,
|
||||
comicSource: comicSource,
|
||||
);
|
||||
} else {
|
||||
return _EndSelectorSelectSetting(
|
||||
@@ -84,6 +115,8 @@ class SelectSetting extends StatelessWidget {
|
||||
optionTranslation: optionTranslation,
|
||||
onChanged: onChanged,
|
||||
help: help,
|
||||
comicId: comicId,
|
||||
comicSource: comicSource,
|
||||
);
|
||||
}
|
||||
},
|
||||
@@ -99,6 +132,8 @@ class _DoubleLineSelectSettings extends StatefulWidget {
|
||||
required this.optionTranslation,
|
||||
this.onChanged,
|
||||
this.help,
|
||||
this.comicId,
|
||||
this.comicSource,
|
||||
});
|
||||
|
||||
final String title;
|
||||
@@ -111,6 +146,10 @@ class _DoubleLineSelectSettings extends StatefulWidget {
|
||||
|
||||
final String? help;
|
||||
|
||||
final String? comicId;
|
||||
|
||||
final String? comicSource;
|
||||
|
||||
@override
|
||||
State<_DoubleLineSelectSettings> createState() =>
|
||||
_DoubleLineSelectSettingsState();
|
||||
@@ -119,6 +158,14 @@ class _DoubleLineSelectSettings extends StatefulWidget {
|
||||
class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var value = widget.comicId == null
|
||||
? appdata.settings[widget.settingKey]
|
||||
: appdata.settings.getReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingKey,
|
||||
);
|
||||
|
||||
return ListTile(
|
||||
title: Row(
|
||||
children: [
|
||||
@@ -134,9 +181,9 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
|
||||
builder: (context) {
|
||||
return ContentDialog(
|
||||
title: "Help".tl,
|
||||
content: Text(widget.help!)
|
||||
.paddingHorizontal(16)
|
||||
.fixWidth(double.infinity),
|
||||
content: Text(
|
||||
widget.help!,
|
||||
).paddingHorizontal(16).fixWidth(double.infinity),
|
||||
actions: [
|
||||
Button.filled(
|
||||
onPressed: context.pop,
|
||||
@@ -150,9 +197,7 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
|
||||
),
|
||||
],
|
||||
),
|
||||
subtitle: Text(
|
||||
widget.optionTranslation[appdata.settings[widget.settingKey]] ??
|
||||
"None"),
|
||||
subtitle: Text(widget.optionTranslation[value] ?? "None"),
|
||||
trailing: const Icon(Icons.arrow_drop_down),
|
||||
onTap: () {
|
||||
var renderBox = context.findRenderObject() as RenderBox;
|
||||
@@ -170,16 +215,27 @@ class _DoubleLineSelectSettingsState extends State<_DoubleLineSelectSettings> {
|
||||
Offset.zero & MediaQuery.of(context).size,
|
||||
),
|
||||
items: widget.optionTranslation.keys
|
||||
.map((key) => PopupMenuItem(
|
||||
value: key,
|
||||
height: App.isMobile ? 46 : 40,
|
||||
child: Text(widget.optionTranslation[key]!),
|
||||
))
|
||||
.map(
|
||||
(key) => PopupMenuItem(
|
||||
value: key,
|
||||
height: App.isMobile ? 46 : 40,
|
||||
child: Text(widget.optionTranslation[key]!),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
).then((value) {
|
||||
if (value != null) {
|
||||
setState(() {
|
||||
appdata.settings[widget.settingKey] = value;
|
||||
if (widget.comicId == null) {
|
||||
appdata.settings[widget.settingKey] = value;
|
||||
} else {
|
||||
appdata.settings.setReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingKey,
|
||||
value,
|
||||
);
|
||||
}
|
||||
});
|
||||
appdata.saveData();
|
||||
widget.onChanged?.call();
|
||||
@@ -197,6 +253,8 @@ class _EndSelectorSelectSetting extends StatefulWidget {
|
||||
required this.optionTranslation,
|
||||
this.onChanged,
|
||||
this.help,
|
||||
this.comicId,
|
||||
this.comicSource,
|
||||
});
|
||||
|
||||
final String title;
|
||||
@@ -209,6 +267,10 @@ class _EndSelectorSelectSetting extends StatefulWidget {
|
||||
|
||||
final String? help;
|
||||
|
||||
final String? comicId;
|
||||
|
||||
final String? comicSource;
|
||||
|
||||
@override
|
||||
State<_EndSelectorSelectSetting> createState() =>
|
||||
_EndSelectorSelectSettingState();
|
||||
@@ -218,6 +280,13 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var options = widget.optionTranslation;
|
||||
var value = widget.comicId == null
|
||||
? appdata.settings[widget.settingKey]
|
||||
: appdata.settings.getReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingKey,
|
||||
);
|
||||
return ListTile(
|
||||
title: Row(
|
||||
children: [
|
||||
@@ -233,9 +302,9 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
|
||||
builder: (context) {
|
||||
return ContentDialog(
|
||||
title: "Help".tl,
|
||||
content: Text(widget.help!)
|
||||
.paddingHorizontal(16)
|
||||
.fixWidth(double.infinity),
|
||||
content: Text(
|
||||
widget.help!,
|
||||
).paddingHorizontal(16).fixWidth(double.infinity),
|
||||
actions: [
|
||||
Button.filled(
|
||||
onPressed: context.pop,
|
||||
@@ -250,12 +319,22 @@ class _EndSelectorSelectSettingState extends State<_EndSelectorSelectSetting> {
|
||||
],
|
||||
),
|
||||
trailing: Select(
|
||||
current: options[appdata.settings[widget.settingKey]],
|
||||
current: options[value],
|
||||
values: options.values.toList(),
|
||||
minWidth: 64,
|
||||
onTap: (index) {
|
||||
setState(() {
|
||||
appdata.settings[widget.settingKey] = options.keys.elementAt(index);
|
||||
var value = options.keys.elementAt(index);
|
||||
if (widget.comicId == null) {
|
||||
appdata.settings[widget.settingKey] = value;
|
||||
} else {
|
||||
appdata.settings.setReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingKey,
|
||||
value,
|
||||
);
|
||||
}
|
||||
});
|
||||
appdata.saveData();
|
||||
widget.onChanged?.call();
|
||||
@@ -273,6 +352,8 @@ class _SliderSetting extends StatefulWidget {
|
||||
required this.min,
|
||||
required this.max,
|
||||
this.onChanged,
|
||||
this.comicId,
|
||||
this.comicSource,
|
||||
});
|
||||
|
||||
final String title;
|
||||
@@ -287,6 +368,10 @@ class _SliderSetting extends StatefulWidget {
|
||||
|
||||
final VoidCallback? onChanged;
|
||||
|
||||
final String? comicId;
|
||||
|
||||
final String? comicSource;
|
||||
|
||||
@override
|
||||
State<_SliderSetting> createState() => _SliderSettingState();
|
||||
}
|
||||
@@ -294,28 +379,52 @@ class _SliderSetting extends StatefulWidget {
|
||||
class _SliderSettingState extends State<_SliderSetting> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var value =
|
||||
(widget.comicId == null
|
||||
? appdata.settings[widget.settingsIndex]
|
||||
: appdata.settings.getReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingsIndex,
|
||||
))
|
||||
.toDouble();
|
||||
return ListTile(
|
||||
title: Row(
|
||||
children: [
|
||||
Text(widget.title),
|
||||
const Spacer(),
|
||||
Text(
|
||||
appdata.settings[widget.settingsIndex].toString(),
|
||||
style: ts.s12,
|
||||
),
|
||||
Text(value.toString(), style: ts.s12),
|
||||
],
|
||||
),
|
||||
subtitle: Slider(
|
||||
value: appdata.settings[widget.settingsIndex].toDouble(),
|
||||
value: value,
|
||||
onChanged: (value) {
|
||||
if (value.toInt() == value) {
|
||||
setState(() {
|
||||
appdata.settings[widget.settingsIndex] = value.toInt();
|
||||
if (widget.comicId == null) {
|
||||
appdata.settings[widget.settingsIndex] = value.toInt();
|
||||
} else {
|
||||
appdata.settings.setReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingsIndex,
|
||||
value.toInt(),
|
||||
);
|
||||
}
|
||||
appdata.saveData();
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
appdata.settings[widget.settingsIndex] = value;
|
||||
if (widget.comicId == null) {
|
||||
appdata.settings[widget.settingsIndex] = value;
|
||||
} else {
|
||||
appdata.settings.setReaderSetting(
|
||||
widget.comicId!,
|
||||
widget.comicSource!,
|
||||
widget.settingsIndex,
|
||||
value,
|
||||
);
|
||||
}
|
||||
appdata.saveData();
|
||||
});
|
||||
}
|
||||
@@ -402,10 +511,11 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
|
||||
color: Theme.of(context).colorScheme.surfaceContainer,
|
||||
boxShadow: const [
|
||||
BoxShadow(
|
||||
color: Colors.black12,
|
||||
blurRadius: 5,
|
||||
offset: Offset(0, 2),
|
||||
spreadRadius: 2)
|
||||
color: Colors.black12,
|
||||
blurRadius: 5,
|
||||
offset: Offset(0, 2),
|
||||
spreadRadius: 2,
|
||||
),
|
||||
],
|
||||
),
|
||||
onReorder: (reorderFunc) {
|
||||
@@ -435,7 +545,7 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
|
||||
label: Text("Add".tl),
|
||||
icon: const Icon(Icons.add),
|
||||
onPressed: showAddDialog,
|
||||
)
|
||||
),
|
||||
],
|
||||
body: view,
|
||||
);
|
||||
@@ -445,12 +555,13 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
|
||||
Widget removeButton = Padding(
|
||||
padding: const EdgeInsets.only(right: 8),
|
||||
child: IconButton(
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
keys.remove(key);
|
||||
});
|
||||
},
|
||||
icon: const Icon(Icons.delete_outline)),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
keys.remove(key);
|
||||
});
|
||||
},
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
),
|
||||
);
|
||||
|
||||
return ListTile(
|
||||
@@ -458,10 +569,7 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
|
||||
key: Key(key),
|
||||
trailing: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
removeButton,
|
||||
const Icon(Icons.drag_handle),
|
||||
],
|
||||
children: [removeButton, const Icon(Icons.drag_handle)],
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -477,64 +585,66 @@ class _MultiPagesFilterState extends State<_MultiPagesFilter> {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return StatefulBuilder(builder: (context, setState) {
|
||||
return ContentDialog(
|
||||
title: "Add".tl,
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: canAdd.entries
|
||||
.map(
|
||||
(e) => CheckboxListTile(
|
||||
value: selected.contains(e.key),
|
||||
title: Text(e.value),
|
||||
key: Key(e.key),
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
if (value!) {
|
||||
selected.add(e.key);
|
||||
} else {
|
||||
selected.remove(e.key);
|
||||
}
|
||||
});
|
||||
},
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
actions: [
|
||||
if (selected.length < canAdd.length)
|
||||
TextButton(
|
||||
child: Text("Select All".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
selected = canAdd.keys.toList();
|
||||
});
|
||||
},
|
||||
)
|
||||
else
|
||||
TextButton(
|
||||
child: Text("Deselect All".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
selected.clear();
|
||||
});
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
FilledButton(
|
||||
onPressed: selected.isNotEmpty
|
||||
? () {
|
||||
this.setState(() {
|
||||
keys.addAll(selected);
|
||||
});
|
||||
Navigator.pop(context);
|
||||
}
|
||||
: null,
|
||||
child: Text("Add".tl),
|
||||
return StatefulBuilder(
|
||||
builder: (context, setState) {
|
||||
return ContentDialog(
|
||||
title: "Add".tl,
|
||||
content: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: canAdd.entries
|
||||
.map(
|
||||
(e) => CheckboxListTile(
|
||||
value: selected.contains(e.key),
|
||||
title: Text(e.value),
|
||||
key: Key(e.key),
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
if (value!) {
|
||||
selected.add(e.key);
|
||||
} else {
|
||||
selected.remove(e.key);
|
||||
}
|
||||
});
|
||||
},
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
],
|
||||
);
|
||||
});
|
||||
actions: [
|
||||
if (selected.length < canAdd.length)
|
||||
TextButton(
|
||||
child: Text("Select All".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
selected = canAdd.keys.toList();
|
||||
});
|
||||
},
|
||||
)
|
||||
else
|
||||
TextButton(
|
||||
child: Text("Deselect All".tl),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
selected.clear();
|
||||
});
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
FilledButton(
|
||||
onPressed: selected.isNotEmpty
|
||||
? () {
|
||||
this.setState(() {
|
||||
keys.addAll(selected);
|
||||
});
|
||||
Navigator.pop(context);
|
||||
}
|
||||
: null,
|
||||
child: Text("Add".tl),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
@@ -9,7 +9,7 @@ import 'package:url_launcher/url_launcher_string.dart';
|
||||
import 'package:venera/components/components.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
import 'package:venera/foundation/appdata.dart';
|
||||
import 'package:venera/network/app_dio.dart';
|
||||
import 'package:venera/network/proxy.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
import 'package:venera/utils/translations.dart';
|
||||
import 'dart:io' as io;
|
||||
@@ -308,7 +308,7 @@ class DesktopWebview {
|
||||
useWindowPositionAndSize: true,
|
||||
userDataFolderWindows: "${App.dataPath}\\webview",
|
||||
title: "webview",
|
||||
proxy: AppDio.proxy,
|
||||
proxy: await getProxy(),
|
||||
));
|
||||
_webview!.addOnWebMessageReceivedCallback(onMessage);
|
||||
_webview!.setOnNavigation((s) {
|
||||
|
@@ -112,7 +112,7 @@ abstract class CBZ {
|
||||
var ext = e.path.split('.').last;
|
||||
return !['jpg', 'jpeg', 'png', 'webp', 'gif', 'jpe'].contains(ext);
|
||||
});
|
||||
if(files.isEmpty) {
|
||||
if (files.isEmpty) {
|
||||
cache.deleteSync(recursive: true);
|
||||
throw Exception('No images found in the archive');
|
||||
}
|
||||
@@ -141,8 +141,7 @@ abstract class CBZ {
|
||||
FilePath.join(LocalManager().path, sanitizeFileName(metaData.title)),
|
||||
);
|
||||
dest.createSync();
|
||||
coverFile.copyMem(
|
||||
FilePath.join(dest.path, 'cover.${coverFile.extension}'));
|
||||
coverFile.copyMem(FilePath.join(dest.path, 'cover.${coverFile.extension}'));
|
||||
if (metaData.chapters == null) {
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
var src = files[i];
|
||||
@@ -233,17 +232,19 @@ abstract class CBZ {
|
||||
}
|
||||
}
|
||||
var cover = comic.coverFile;
|
||||
await cover
|
||||
.copyMem(FilePath.join(cache.path, 'cover.${cover.path.split('.').last}'));
|
||||
await cover.copyMem(
|
||||
FilePath.join(cache.path, 'cover.${cover.path.split('.').last}'));
|
||||
final metaData = ComicMetaData(
|
||||
title: comic.title,
|
||||
author: comic.subtitle,
|
||||
tags: comic.tags,
|
||||
chapters: chapters,
|
||||
);
|
||||
await File(FilePath.join(cache.path, 'metadata.json')).writeAsString(
|
||||
jsonEncode(
|
||||
ComicMetaData(
|
||||
title: comic.title,
|
||||
author: comic.subtitle,
|
||||
tags: comic.tags,
|
||||
chapters: chapters,
|
||||
).toJson(),
|
||||
),
|
||||
jsonEncode(metaData),
|
||||
);
|
||||
await File(FilePath.join(cache.path, 'ComicInfo.xml')).writeAsString(
|
||||
_buildComicInfoXml(metaData),
|
||||
);
|
||||
var cbz = File(outFilePath);
|
||||
if (cbz.existsSync()) cbz.deleteSync();
|
||||
@@ -252,7 +253,54 @@ abstract class CBZ {
|
||||
return cbz;
|
||||
}
|
||||
|
||||
static String _buildComicInfoXml(ComicMetaData data) {
|
||||
final buffer = StringBuffer();
|
||||
buffer.writeln('<?xml version="1.0" encoding="utf-8"?>');
|
||||
buffer.writeln('<ComicInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">');
|
||||
|
||||
buffer.writeln(' <Title>${_escapeXml(data.title)}</Title>');
|
||||
buffer.writeln(' <Series>${_escapeXml(data.title)}</Series>');
|
||||
|
||||
if (data.author.isNotEmpty) {
|
||||
buffer.writeln(' <Writer>${_escapeXml(data.author)}</Writer>');
|
||||
}
|
||||
|
||||
if (data.tags.isNotEmpty) {
|
||||
var tags = data.tags;
|
||||
if (tags.length > 5) {
|
||||
tags = tags.sublist(0, 5);
|
||||
}
|
||||
buffer.writeln(' <Genre>${_escapeXml(tags.join(', '))}</Genre>');
|
||||
}
|
||||
|
||||
if (data.chapters != null && data.chapters!.isNotEmpty) {
|
||||
final chaptersInfo = data.chapters!.map((chapter) =>
|
||||
'${_escapeXml(chapter.title)}: ${chapter.start}-${chapter.end}'
|
||||
).join('; ');
|
||||
buffer.writeln(' <Notes>Chapters: $chaptersInfo</Notes>');
|
||||
}
|
||||
|
||||
buffer.writeln(' <Manga>Unknown</Manga>');
|
||||
buffer.writeln(' <BlackAndWhite>Unknown</BlackAndWhite>');
|
||||
|
||||
final now = DateTime.now();
|
||||
buffer.writeln(' <Year>${now.year}</Year>');
|
||||
|
||||
buffer.writeln('</ComicInfo>');
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
static String _escapeXml(String text) {
|
||||
return text
|
||||
.replaceAll('&', '&')
|
||||
.replaceAll('<', '<')
|
||||
.replaceAll('>', '>')
|
||||
.replaceAll('"', '"')
|
||||
.replaceAll("'", ''');
|
||||
}
|
||||
|
||||
static _compress(String src, String dst) async {
|
||||
await ZipFile.compressFolderAsync(src, dst, 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -11,7 +11,6 @@ import 'package:venera/network/app_dio.dart';
|
||||
import 'package:venera/utils/data.dart';
|
||||
import 'package:venera/utils/ext.dart';
|
||||
import 'package:webdav_client/webdav_client.dart' hide File;
|
||||
import 'package:rhttp/rhttp.dart' as rhttp;
|
||||
import 'package:venera/utils/translations.dart';
|
||||
|
||||
import 'io.dart';
|
||||
@@ -23,10 +22,12 @@ class DataSync with ChangeNotifier {
|
||||
}
|
||||
LocalFavoritesManager().addListener(onDataChanged);
|
||||
ComicSourceManager().addListener(onDataChanged);
|
||||
Future.delayed(const Duration(seconds: 1), () {
|
||||
var controller = WindowFrame.of(App.rootContext);
|
||||
controller.addCloseListener(_handleWindowClose);
|
||||
});
|
||||
if (App.isDesktop) {
|
||||
Future.delayed(const Duration(seconds: 1), () {
|
||||
var controller = WindowFrame.of(App.rootContext);
|
||||
controller.addCloseListener(_handleWindowClose);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void onDataChanged() {
|
||||
@@ -119,19 +120,11 @@ class DataSync with ChangeNotifier {
|
||||
String user = config[1];
|
||||
String pass = config[2];
|
||||
|
||||
var proxy = await AppDio.getProxy();
|
||||
|
||||
var client = newClient(
|
||||
url,
|
||||
user: user,
|
||||
password: pass,
|
||||
adapter: RHttpAdapter(
|
||||
rhttp.ClientSettings(
|
||||
proxySettings:
|
||||
proxy == null ? null : rhttp.ProxySettings.proxy(proxy),
|
||||
userAgent: "venera v${App.version}",
|
||||
),
|
||||
),
|
||||
adapter: RHttpAdapter(),
|
||||
);
|
||||
|
||||
try {
|
||||
@@ -192,19 +185,11 @@ class DataSync with ChangeNotifier {
|
||||
String user = config[1];
|
||||
String pass = config[2];
|
||||
|
||||
var proxy = await AppDio.getProxy();
|
||||
|
||||
var client = newClient(
|
||||
url,
|
||||
user: user,
|
||||
password: pass,
|
||||
adapter: RHttpAdapter(
|
||||
rhttp.ClientSettings(
|
||||
proxySettings:
|
||||
proxy == null ? null : rhttp.ProxySettings.proxy(proxy),
|
||||
userAgent: "venera v${App.version}",
|
||||
),
|
||||
),
|
||||
adapter: RHttpAdapter(),
|
||||
);
|
||||
|
||||
try {
|
||||
|
@@ -107,4 +107,15 @@ abstract class MapOrNull{
|
||||
static Map<K, V>? from<K, V>(Map<dynamic, dynamic>? i){
|
||||
return i == null ? null : Map<K, V>.from(i);
|
||||
}
|
||||
}
|
||||
|
||||
extension FutureExt<T> on Future<T>{
|
||||
/// Wrap the future to make sure it will return at least the duration.
|
||||
Future<T> minTime(Duration duration) async {
|
||||
var res = await Future.wait([
|
||||
this,
|
||||
Future.delayed(duration),
|
||||
]);
|
||||
return res[0];
|
||||
}
|
||||
}
|
@@ -28,6 +28,8 @@ final _resolver = MimeTypeResolver()
|
||||
..addMagicNumber([0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C], 'application/x-7z-compressed')
|
||||
// rar
|
||||
..addMagicNumber([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07], 'application/vnd.rar')
|
||||
// avif
|
||||
..addMagicNumber([0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70, 0x61, 0x76, 0x69, 0x66], 'image/avif')
|
||||
;
|
||||
|
||||
FileType detectFileType(List<int> data) {
|
||||
|
@@ -132,15 +132,15 @@ extension DirectoryExtension on Directory {
|
||||
|
||||
/// Sanitize the file name. Remove invalid characters and trim the file name.
|
||||
String sanitizeFileName(String fileName, {String? dir, int? maxLength}) {
|
||||
if (fileName.endsWith('.')) {
|
||||
while (fileName.endsWith('.')) {
|
||||
fileName = fileName.substring(0, fileName.length - 1);
|
||||
}
|
||||
var maxLength = 255;
|
||||
var length = maxLength ?? 255;
|
||||
if (dir != null) {
|
||||
if (!dir.endsWith('/') && !dir.endsWith('\\')) {
|
||||
dir = "$dir/";
|
||||
}
|
||||
maxLength -= dir.length;
|
||||
length -= dir.length;
|
||||
}
|
||||
final invalidChars = RegExp(r'[<>:"/\\|?*]');
|
||||
final sanitizedFileName = fileName.replaceAll(invalidChars, ' ');
|
||||
@@ -148,11 +148,11 @@ String sanitizeFileName(String fileName, {String? dir, int? maxLength}) {
|
||||
if (trimmedFileName.isEmpty) {
|
||||
throw Exception('Invalid File Name: Empty length.');
|
||||
}
|
||||
if (maxLength <= 0) {
|
||||
if (length <= 0) {
|
||||
throw Exception('Invalid File Name: Max length is less than 0.');
|
||||
}
|
||||
if (trimmedFileName.length > maxLength) {
|
||||
trimmedFileName = trimmedFileName.substring(0, maxLength);
|
||||
if (trimmedFileName.length > length) {
|
||||
trimmedFileName = trimmedFileName.substring(0, length);
|
||||
}
|
||||
return trimmedFileName;
|
||||
}
|
||||
|
67
lib/utils/opencc.dart
Normal file
67
lib/utils/opencc.dart
Normal file
@@ -0,0 +1,67 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
abstract class OpenCC {
|
||||
static late final Map<int, int> _s2t;
|
||||
static late final Map<int, int> _t2s;
|
||||
|
||||
static Future<void> init() async {
|
||||
var data = await rootBundle.load("assets/opencc.txt");
|
||||
var txt = utf8.decode(data.buffer.asUint8List());
|
||||
_s2t = <int, int>{};
|
||||
_t2s = <int, int>{};
|
||||
for (var line in txt.split('\n')) {
|
||||
if (line.isEmpty || line.startsWith('#') || line.length != 2) continue;
|
||||
var s = line.runes.elementAt(0);
|
||||
var t = line.runes.elementAt(1);
|
||||
_s2t[s] = t;
|
||||
_t2s[t] = s;
|
||||
}
|
||||
}
|
||||
|
||||
static bool hasChineseSimplified(String text) {
|
||||
if (text != "监禁") {
|
||||
return false;
|
||||
}
|
||||
for (var rune in text.runes) {
|
||||
if (_s2t.containsKey(rune)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool hasChineseTraditional(String text) {
|
||||
for (var rune in text.runes) {
|
||||
if (_t2s.containsKey(rune)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static String simplifiedToTraditional(String text) {
|
||||
var sb = StringBuffer();
|
||||
for (var rune in text.runes) {
|
||||
if (_s2t.containsKey(rune)) {
|
||||
sb.write(String.fromCharCodes([_s2t[rune]!]));
|
||||
} else {
|
||||
sb.write(String.fromCharCodes([rune]));
|
||||
}
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
static String traditionalToSimplified(String text) {
|
||||
var sb = StringBuffer();
|
||||
for (var rune in text.runes) {
|
||||
if (_t2s.containsKey(rune)) {
|
||||
sb.write(String.fromCharCodes([_t2s[rune]!]));
|
||||
} else {
|
||||
sb.write(String.fromCharCodes([rune]));
|
||||
}
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
@@ -1,6 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:isolate';
|
||||
import 'package:flutter_saf/flutter_saf.dart';
|
||||
import 'package:venera/foundation/app.dart';
|
||||
import 'package:venera/foundation/local.dart';
|
||||
import 'package:venera/utils/image.dart';
|
||||
@@ -74,6 +75,9 @@ Future<Isolate> _runIsolate(
|
||||
return Isolate.spawn<SendPort>(
|
||||
(sendPort) => overrideIO(
|
||||
() async {
|
||||
if (App.isAndroid) {
|
||||
await SAFTaskWorker().init();
|
||||
}
|
||||
var receivePort = ReceivePort();
|
||||
sendPort.send(receivePort.sendPort);
|
||||
|
||||
|
@@ -35,8 +35,10 @@ extension TagsTranslation on String{
|
||||
/// 对tag进行处理后进行翻译: 代表'或'的分割符'|', namespace.
|
||||
static String _translateTags(String tag){
|
||||
if (tag.contains('|')) {
|
||||
var splits = tag.split(' | ');
|
||||
return enTagsTranslations[splits[0]]??enTagsTranslations[splits[1]]??tag;
|
||||
var splits = tag.split('|');
|
||||
return enTagsTranslations[splits[0].trim()]
|
||||
?? enTagsTranslations[splits[1].trim()]
|
||||
?? tag;
|
||||
} else if(tag.contains(':')) {
|
||||
var splits = tag.split(':');
|
||||
if(_haveNamespace(splits[0])) {
|
||||
|
92
pubspec.lock
92
pubspec.lock
@@ -170,6 +170,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
display_mode:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: display_mode
|
||||
sha256: "8a381f3602a09dc4e96140a0df30808631468d6d0dfff7722f67b1f83757a7cc"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.0.2"
|
||||
dynamic_color:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -178,6 +186,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.7.0"
|
||||
enough_convert:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: enough_convert
|
||||
sha256: c67d85ca21aaa0648f155907362430701db41f7ec8e6501a58ad9cd9d8569d01
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.6.0"
|
||||
fake_async:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -308,18 +324,18 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: flutter_inappwebview
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "6.2.0-beta.3"
|
||||
flutter_inappwebview_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: flutter_inappwebview_android
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "1.2.0-beta.3"
|
||||
flutter_inappwebview_internal_annotations:
|
||||
@@ -334,45 +350,45 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: flutter_inappwebview_ios
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "1.2.0-beta.3"
|
||||
flutter_inappwebview_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: flutter_inappwebview_macos
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "1.2.0-beta.3"
|
||||
flutter_inappwebview_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: flutter_inappwebview_platform_interface
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "1.4.0-beta.3"
|
||||
flutter_inappwebview_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: flutter_inappwebview_web
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "1.2.0-beta.3"
|
||||
flutter_inappwebview_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: flutter_inappwebview_windows
|
||||
ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
resolved-ref: "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676"
|
||||
url: "https://github.com/pichillilorenzo/flutter_inappwebview"
|
||||
ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
resolved-ref: "3ef899b3db57c911b080979f1392253b835f98ab"
|
||||
url: "https://github.com/venera-app/flutter_inappwebview"
|
||||
source: git
|
||||
version: "0.7.0-beta.3"
|
||||
flutter_lints:
|
||||
@@ -425,10 +441,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: flutter_rust_bridge
|
||||
sha256: "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611"
|
||||
sha256: b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.9.0"
|
||||
version: "2.10.0"
|
||||
flutter_saf:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -540,26 +556,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
|
||||
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.9"
|
||||
version: "11.0.1"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
|
||||
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.9"
|
||||
version: "3.0.10"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_testing
|
||||
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
|
||||
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
version: "3.0.2"
|
||||
lints:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -758,11 +774,11 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: rhttp
|
||||
ref: e7dca15ca543b5df49f3ada06016e874b79bce36
|
||||
resolved-ref: e7dca15ca543b5df49f3ada06016e874b79bce36
|
||||
ref: "1f0ff50336062c5f809c256726dc55cd30b9ce59"
|
||||
resolved-ref: "1f0ff50336062c5f809c256726dc55cd30b9ce59"
|
||||
url: "https://github.com/wgh136/rhttp"
|
||||
source: git
|
||||
version: "0.11.0"
|
||||
version: "0.12.0"
|
||||
screen_retriever:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -925,10 +941,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
|
||||
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.4"
|
||||
version: "0.7.6"
|
||||
typed_data:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1021,10 +1037,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vector_math
|
||||
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
|
||||
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.4"
|
||||
version: "2.2.0"
|
||||
vm_service:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1099,5 +1115,5 @@ packages:
|
||||
source: hosted
|
||||
version: "0.0.12"
|
||||
sdks:
|
||||
dart: ">=3.7.0 <4.0.0"
|
||||
flutter: ">=3.29.2"
|
||||
dart: ">=3.8.0 <4.0.0"
|
||||
flutter: ">=3.35.2"
|
||||
|
19
pubspec.yaml
19
pubspec.yaml
@@ -2,11 +2,11 @@ name: venera
|
||||
description: "A comic app."
|
||||
publish_to: 'none'
|
||||
|
||||
version: 1.4.0+140
|
||||
version: 1.5.0+150
|
||||
|
||||
environment:
|
||||
sdk: '>=3.6.0 <4.0.0'
|
||||
flutter: 3.29.2
|
||||
sdk: '>=3.8.0 <4.0.0'
|
||||
flutter: 3.35.2
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
@@ -46,9 +46,9 @@ dependencies:
|
||||
ref: 7801fc582ecf5a7351632887891ecf309a7b2583
|
||||
flutter_inappwebview:
|
||||
git:
|
||||
url: https://github.com/pichillilorenzo/flutter_inappwebview
|
||||
url: https://github.com/venera-app/flutter_inappwebview
|
||||
path: flutter_inappwebview
|
||||
ref: 0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676
|
||||
ref: 3ef899b3db57c911b080979f1392253b835f98ab
|
||||
app_links: ^6.4.0
|
||||
sliver_tools: ^0.2.12
|
||||
flutter_file_dialog: ^3.0.2
|
||||
@@ -58,10 +58,10 @@ dependencies:
|
||||
git:
|
||||
url: https://github.com/venera-app/lodepng_flutter
|
||||
ref: ac7d05dde32e8d728102a9ff66e6b55f05d94ba1
|
||||
rhttp:
|
||||
git:
|
||||
rhttp:
|
||||
git:
|
||||
url: https://github.com/wgh136/rhttp
|
||||
ref: e7dca15ca543b5df49f3ada06016e874b79bce36
|
||||
ref: 1f0ff50336062c5f809c256726dc55cd30b9ce59
|
||||
path: rhttp
|
||||
webdav_client:
|
||||
git:
|
||||
@@ -85,6 +85,8 @@ dependencies:
|
||||
flutter_localizations:
|
||||
sdk: flutter
|
||||
yaml: ^3.1.3
|
||||
enough_convert: ^1.6.0
|
||||
display_mode: ^0.0.2
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
@@ -101,6 +103,7 @@ flutter:
|
||||
- assets/app_icon.png
|
||||
- assets/tags.json
|
||||
- assets/tags_tw.json
|
||||
- assets/opencc.txt
|
||||
|
||||
flutter_to_arch:
|
||||
name: Venera
|
||||
|
150
update_alt_store.py
Normal file
150
update_alt_store.py
Normal file
@@ -0,0 +1,150 @@
|
||||
import json
|
||||
import plistlib
|
||||
import re
|
||||
import requests
|
||||
import os
|
||||
from datetime import datetime
|
||||
|
||||
def prepare_description(text):
|
||||
text = re.sub('<[^<]+?>', '', text) # Remove HTML tags
|
||||
text = re.sub(r'#{1,6}\s?', '', text) # Remove markdown header tags
|
||||
text = re.sub(r'\*{2}', '', text) # Remove all occurrences of two consecutive asterisks
|
||||
text = re.sub(r'(?<=\r|\n)-', '•', text) # Only replace - with • if it is preceded by \r or \n
|
||||
text = re.sub(r'`', '"', text) # Replace ` with "
|
||||
text = re.sub(r'\r\n\r\n', '\r \n', text) # Replace \r\n\r\n with \r \n (avoid incorrect display of the description regarding paragraphs)
|
||||
return text
|
||||
|
||||
def fetch_latest_release(repo_url):
|
||||
api_url = f"https://api.github.com/repos/{repo_url}/releases"
|
||||
headers = {
|
||||
"Accept": "application/vnd.github+json",
|
||||
}
|
||||
try:
|
||||
response = requests.get(api_url, headers=headers)
|
||||
response.raise_for_status()
|
||||
release = response.json()
|
||||
return release
|
||||
except requests.RequestException as e:
|
||||
print(f"Error fetching releases: {e}")
|
||||
raise
|
||||
|
||||
def get_file_size(url):
|
||||
try:
|
||||
response = requests.head(url)
|
||||
response.raise_for_status()
|
||||
return int(response.headers.get('Content-Length', 0))
|
||||
except requests.RequestException as e:
|
||||
print(f"Error getting file size: {e}")
|
||||
return 194586
|
||||
|
||||
def update_json_file_release(json_file, latest_release):
|
||||
if isinstance(latest_release, list) and latest_release:
|
||||
latest_release = latest_release[0]
|
||||
else:
|
||||
print("Error getting latest release")
|
||||
return
|
||||
|
||||
try:
|
||||
with open(json_file, "r") as file:
|
||||
data = json.load(file)
|
||||
except json.JSONDecodeError as e:
|
||||
print(f"Error reading JSON file: {e}")
|
||||
data = {"apps": []}
|
||||
raise
|
||||
|
||||
app = data["apps"][0]
|
||||
|
||||
full_version = latest_release["tag_name"]
|
||||
tag = latest_release["tag_name"]
|
||||
# Extract version like 1.4.5 from tag, which may be like 'v1.4.5'
|
||||
version_match = re.search(r"(\d+\.\d+\.\d+)", full_version)
|
||||
if version_match:
|
||||
version = version_match.group(1)
|
||||
else:
|
||||
print("Error: Could not parse version from tag_name.")
|
||||
return
|
||||
version_date = latest_release["published_at"]
|
||||
date_obj = datetime.strptime(version_date, "%Y-%m-%dT%H:%M:%SZ")
|
||||
version_date = date_obj.strftime("%Y-%m-%d")
|
||||
|
||||
description = latest_release["body"]
|
||||
description = prepare_description(description)
|
||||
|
||||
assets = latest_release.get("assets", [])
|
||||
download_url = None
|
||||
size = None
|
||||
for asset in assets:
|
||||
# venera-ios-1.4.5+145.ipa
|
||||
if asset["name"] == f"venera-ios-{version}+{version.replace('.', '')}.ipa":
|
||||
download_url = asset["browser_download_url"]
|
||||
size = asset["size"]
|
||||
break
|
||||
|
||||
if download_url is None or size is None:
|
||||
print("Error: IPA file not found in release assets.")
|
||||
return
|
||||
|
||||
version_entry = {
|
||||
"version": version,
|
||||
"date": version_date,
|
||||
"localizedDescription": description,
|
||||
"downloadURL": download_url,
|
||||
"size": size
|
||||
}
|
||||
|
||||
duplicate_entries = [item for item in app["versions"] if item["version"] == version]
|
||||
if duplicate_entries:
|
||||
app["versions"].remove(duplicate_entries[0])
|
||||
|
||||
app["versions"].insert(0, version_entry)
|
||||
|
||||
app.update({
|
||||
"version": version,
|
||||
"versionDate": version_date,
|
||||
"versionDescription": description,
|
||||
"downloadURL": download_url,
|
||||
"size": size
|
||||
})
|
||||
|
||||
if "news" not in data:
|
||||
data["news"] = []
|
||||
|
||||
news_identifier = f"release-{full_version}"
|
||||
date_string = date_obj.strftime("%d/%m/%y")
|
||||
news_entry = {
|
||||
"appID": "com.github.wgh136.venera",
|
||||
"caption": f"Update of Venera just got released!",
|
||||
"date": latest_release["published_at"],
|
||||
"identifier": news_identifier,
|
||||
"notify": True,
|
||||
"tintColor": "#0784FC",
|
||||
"title": f"{full_version} - Venera {date_string}",
|
||||
"url": f"https://github.com/venera-app/venera/releases/tag/{tag}"
|
||||
}
|
||||
|
||||
news_entry_exists = any(item["identifier"] == news_identifier for item in data["news"])
|
||||
if not news_entry_exists:
|
||||
data["news"].append(news_entry)
|
||||
|
||||
try:
|
||||
with open(json_file, "w") as file:
|
||||
json.dump(data, file, indent=2)
|
||||
print("JSON file updated successfully.")
|
||||
except IOError as e:
|
||||
print(f"Error writing to JSON file: {e}")
|
||||
raise
|
||||
|
||||
def main():
|
||||
repo_url = "venera-app/venera"
|
||||
is_nightly = "NIGHTLY_LINK" in os.environ
|
||||
|
||||
try:
|
||||
fetched_data_latest = fetch_latest_release(repo_url)
|
||||
json_file = "alt_store.json"
|
||||
update_json_file_release(json_file, fetched_data_latest)
|
||||
except Exception as e:
|
||||
print(f"An error occurred: {e}")
|
||||
raise
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
@@ -10,11 +10,16 @@
|
||||
#include <flutter/event_stream_handler_functions.h>
|
||||
#include <flutter/standard_method_codec.h>
|
||||
#include "flutter/generated_plugin_registrant.h"
|
||||
#include <thread>
|
||||
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
|
||||
std::unique_ptr<flutter::EventSink<flutter::EncodableValue>>&& mouseEvents = nullptr;
|
||||
|
||||
std::atomic<bool> mainThreadAlive(true);
|
||||
std::atomic<std::chrono::steady_clock::time_point> lastHeartbeat(std::chrono::steady_clock::now());
|
||||
std::thread* monitorThread = nullptr;
|
||||
|
||||
char* wideCharToMultiByte(wchar_t* pWCStrKey)
|
||||
{
|
||||
size_t pSize = WideCharToMultiByte(CP_OEMCP, 0, pWCStrKey, wcslen(pWCStrKey), NULL, 0, NULL, NULL);
|
||||
@@ -45,6 +50,22 @@ FlutterWindow::FlutterWindow(const flutter::DartProject& project)
|
||||
|
||||
FlutterWindow::~FlutterWindow() {}
|
||||
|
||||
void monitorUIThread() {
|
||||
const auto timeout = std::chrono::seconds(5);
|
||||
|
||||
while (mainThreadAlive.load()) {
|
||||
auto now = std::chrono::steady_clock::now();
|
||||
auto duration = now - lastHeartbeat.load();
|
||||
|
||||
if (duration > timeout) {
|
||||
std::cerr << "The UI thread is dead. Terminate the application.";
|
||||
std::exit(0);
|
||||
}
|
||||
|
||||
std::this_thread::sleep_for(std::chrono::seconds(1));
|
||||
}
|
||||
}
|
||||
|
||||
bool FlutterWindow::OnCreate() {
|
||||
if (!Win32Window::OnCreate()) {
|
||||
return false;
|
||||
@@ -77,7 +98,20 @@ bool FlutterWindow::OnCreate() {
|
||||
else
|
||||
result->Success(flutter::EncodableValue("No Proxy"));
|
||||
delete(res);
|
||||
return;
|
||||
}
|
||||
#ifdef NDEBUG
|
||||
else if (call.method_name() == "heartBeat") {
|
||||
|
||||
if (monitorThread == nullptr) {
|
||||
monitorThread = new std::thread{ monitorUIThread };
|
||||
}
|
||||
lastHeartbeat = std::chrono::steady_clock::now();
|
||||
result->Success();
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
result->Success(); // Default response for unhandled method calls
|
||||
});
|
||||
|
||||
flutter::EventChannel<> channel2(
|
||||
@@ -163,6 +197,10 @@ void FlutterWindow::OnDestroy() {
|
||||
}
|
||||
|
||||
Win32Window::OnDestroy();
|
||||
if (monitorThread != nullptr) {
|
||||
mainThreadAlive = false;
|
||||
monitorThread->join();
|
||||
}
|
||||
}
|
||||
|
||||
void mouse_side_button_listener(unsigned int input)
|
||||
|
Reference in New Issue
Block a user