Compare commits
223 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 70402a6d3a | |||
| 5c4143224a | |||
| f943e924f7 | |||
| 7d2f542f8a | |||
| fb1f88e971 | |||
| f566f13423 | |||
| 0f88baf1c1 | |||
| a04cbcd814 | |||
| a17d6a2ea4 | |||
| 08f49e0ac4 | |||
| 7787dd1ecc | |||
| 3d0765d4ab | |||
| b51651ace4 | |||
| 568fa56d59 | |||
| 50dee9251c | |||
| e575aaf4fb | |||
| bdd5caae1a | |||
| 3af7de3460 | |||
| caa219f8d6 | |||
| afabaccf1d | |||
| 53cc73701c | |||
| c69b954ffd | |||
| d05c447fe4 | |||
| 5810a24cb0 | |||
| e04c6a9f4d | |||
| e3a9f7af42 | |||
| 5eb58a73ee | |||
| 68ad1f72ce | |||
| 704a52d943 | |||
| 67ec9ccc4e | |||
| c7112ec67f | |||
| 1e1e2034eb | |||
| 5f316c6f44 | |||
| 0c39718f82 | |||
| 8a5ac4a0af | |||
| 492d5f5e84 | |||
| 5a3621fe39 | |||
| fb862e23e5 | |||
| 3d69348301 | |||
| 30787846a2 | |||
| 345ca27f85 | |||
| b7a6d6cae8 | |||
| dadb686514 | |||
| 75f635a28b | |||
| f2bd5b8149 | |||
| 6ed4c79ca4 | |||
| 333f954919 | |||
| 2494d0821d | |||
| e349d0cef3 | |||
| eddad2ba89 | |||
| bfaf88afd6 | |||
| cd59aed8c7 | |||
| f18ca5811f | |||
| 1ed9bcf7c8 | |||
| 29a79ab079 | |||
| 7c03c73419 | |||
| 74f3b9b609 | |||
| a3953d530e | |||
| 2280e8c725 | |||
| b327df732c | |||
| 21d7cf5d6a | |||
| 5b64bdc5b7 | |||
| a3a25b6263 | |||
| c7611c8024 | |||
| f08170504c | |||
| 863dccb5ea | |||
| fc8bb10ca3 | |||
| d06c3586fd | |||
| 395989b528 | |||
| a325440f24 | |||
| 14072bb5a0 | |||
| 7fc33ba8db | |||
| 47e51b6615 | |||
| 857562eaff | |||
| bace854b50 | |||
| e4a404472d | |||
| 7bfa215b4c | |||
| ab7af4b80b | |||
| 2c7ebd8ece | |||
| c96da79058 | |||
| 8f09ebacf5 | |||
| e21f3b9c75 | |||
| 37eeef06e2 | |||
| b7fe56687c | |||
| 60565729ca | |||
| 36f4e1c340 | |||
| abc2a5214b | |||
| a29010e0d7 | |||
| db99ab66ae | |||
| 84cc73c149 | |||
| 10a29cab33 | |||
| 849e2f103a | |||
| 6c22fe193a | |||
| e69dbbf418 | |||
| dfa59a1691 | |||
| 5023e96301 | |||
| 224c24ee9f | |||
| e3b154cf9e | |||
| d249867c4c | |||
| b56045e984 | |||
| 3777cc646e | |||
| aa5a1083d0 | |||
| 2ae5e0742e | |||
| e5e875c54a | |||
| 1a99ec76e4 | |||
| 1b122d1157 | |||
| 77f2f8cc18 | |||
| f0a99980b6 | |||
| b0d43ffe69 | |||
| 16cb0184a4 | |||
| f211a33ea3 | |||
| 440c815189 | |||
| 25829aacfd | |||
| 700a739f95 | |||
| d9620bec05 | |||
| 4b6c51b1f8 | |||
| bd02edf0b1 | |||
| 5c7123a997 | |||
| c17e3bd04f | |||
| 994ae97256 | |||
| 781428a690 | |||
| c23ac5faa8 | |||
| e8d41f83c2 | |||
| 921a0a3361 | |||
| dda5a2df93 | |||
| 155f9f107d | |||
| 24f68b8f1a | |||
| 0ffbe194fa | |||
| 0b41e2b72b | |||
| ef07b9b4ce | |||
| f3999cf2d9 | |||
| 1729847937 | |||
| 37bff6c76c | |||
| 4ef32d8037 | |||
| d2f6a33f0a | |||
| 31d9903251 | |||
| e97642d92a | |||
| c49fc0ff5f | |||
| deb2ab1ff4 | |||
| 23466cf853 | |||
| 16b34f874d | |||
| 0e0d08ae5a | |||
| 986b4c2c27 | |||
| 0bf9ccfcbd | |||
| 5e8c47928d | |||
| ffae7f911f | |||
| e37fdf6d79 | |||
| b359116745 | |||
| 60073aace3 | |||
| 874b13fa14 | |||
| b146d1024b | |||
| 332e95c021 | |||
| 1f68141df5 | |||
| dd731cd306 | |||
| 38d8d03cae | |||
| ec7d840f37 | |||
| 2813dbb897 | |||
| 77d1402b8a | |||
| 08e8a9d105 | |||
| 71661f70b6 | |||
| ac1e79ba83 | |||
| d082809776 | |||
| a458a696db | |||
| 75786a91b0 | |||
| 6ddb5db57b | |||
| 4f70cc9283 | |||
| 23b643d637 | |||
| fdfc256c4d | |||
| fba56c1b75 | |||
| 4743bfacf7 | |||
| 2356537f7c | |||
| fa071aee84 | |||
| c00ca23a8b | |||
| 733b017936 | |||
| 4147f2e368 | |||
| 154b9992eb | |||
| 88b881b043 | |||
| 5d1491fb8c | |||
| 3a33196cf1 | |||
| fa8e0478da | |||
| 7e7e069244 | |||
| 18e0d34af0 | |||
| 3fe3f35483 | |||
| cf8e274883 | |||
| 10dee8b345 | |||
| ae8d30593f | |||
| 9cde46b5da | |||
| 8e61632155 | |||
| e2c4b4cb57 | |||
| 326da504ea | |||
| c5874a3f10 | |||
| 02802fab97 | |||
| 29dea10be2 | |||
| 6bc36193dc | |||
| 81e123388e | |||
| 8ebd7869a5 | |||
| 7a2f5f13f1 | |||
| 25d7dad39f | |||
| c8f8795920 | |||
| 84206a7074 | |||
| 6fd8b36dca | |||
| d1500baae1 | |||
| 045801dd1a | |||
| 14a2cbc793 | |||
| fd385017df | |||
| 9b05954cf2 | |||
| 6aaf636069 | |||
| d30e89e5ec | |||
| 7acc745478 | |||
| 5a9a2d816e | |||
| 105f11ed02 | |||
| 3021437a05 | |||
| 439602fc03 | |||
| 34e13b9589 | |||
| 2aab4ae918 | |||
| 7ef67671a4 | |||
| e8df84416c | |||
| be930bb68b | |||
| db52948865 | |||
| d2a72526f6 | |||
| 0a9f57b32b | |||
| 180f210536 | |||
| c1baa31eed |
+2
-1
@@ -9,7 +9,7 @@
|
|||||||
# Gradle wrapper
|
# Gradle wrapper
|
||||||
*.jar binary
|
*.jar binary
|
||||||
|
|
||||||
# Images
|
# Binary files types
|
||||||
*.webp binary
|
*.webp binary
|
||||||
*.png binary
|
*.png binary
|
||||||
*.jpg binary
|
*.jpg binary
|
||||||
@@ -25,3 +25,4 @@
|
|||||||
*.pyc binary
|
*.pyc binary
|
||||||
*.swp binary
|
*.swp binary
|
||||||
*.pdf binary
|
*.pdf binary
|
||||||
|
*.exe binary
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
cp master/server/build/Tachidesk-*.jar preview
|
|
||||||
cd preview
|
|
||||||
|
|
||||||
new_jar_build=$(ls *.jar| tail -1)
|
|
||||||
echo "last jar build file name: $new_jar_build"
|
|
||||||
|
|
||||||
cp -f $new_jar_build Tachidesk-latest.jar
|
|
||||||
|
|
||||||
rm -rf latest_pointer/*
|
|
||||||
cp $new_jar_build latest_pointer
|
|
||||||
cp ../master/server/build/Tachidesk-*.zip latest_pointer
|
|
||||||
|
|
||||||
latest=$(ls *.jar | tail -n1 | sed -e's/Tachidesk-\|.jar//g')
|
|
||||||
echo "{ \"latest\": \"$latest\" }" > index.json
|
|
||||||
|
|
||||||
git config --global user.email "github-actions[bot]@users.noreply.github.com"
|
|
||||||
git config --global user.name "github-actions[bot]"
|
|
||||||
git status
|
|
||||||
if [ -n "$(git status --porcelain)" ]; then
|
|
||||||
git add .
|
|
||||||
git commit -m "Update preview repository"
|
|
||||||
git push
|
|
||||||
else
|
|
||||||
echo "No changes to commit"
|
|
||||||
fi
|
|
||||||
@@ -16,18 +16,18 @@ jobs:
|
|||||||
uses: gradle/wrapper-validation-action@v1
|
uses: gradle/wrapper-validation-action@v1
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: Build FatJar
|
name: Build pull request
|
||||||
needs: check_wrapper
|
needs: check_wrapper
|
||||||
if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
|
if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel previous runs
|
- name: Cancel previous runs
|
||||||
uses: styfle/cancel-workflow-action@0.5.0
|
uses: styfle/cancel-workflow-action@0.9.0
|
||||||
with:
|
with:
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Checkout master branch
|
- name: Checkout pull request
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
ref: ${{ github.event.pull_request.head.sha }}
|
||||||
@@ -48,21 +48,14 @@ jobs:
|
|||||||
- name: Download android.jar
|
- name: Download android.jar
|
||||||
run: |
|
run: |
|
||||||
cd master
|
cd master
|
||||||
curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
||||||
|
|
||||||
- name: Cache node_modules
|
- name: Build Jar
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
**/react/node_modules
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
|
|
||||||
|
|
||||||
- name: Build and copy webUI, Build Jar and launch4j
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
with:
|
with:
|
||||||
build-root-directory: master
|
build-root-directory: master
|
||||||
wrapper-directory: master
|
wrapper-directory: master
|
||||||
arguments: :webUI:copyBuild :server:windowsPackage --stacktrace
|
arguments: :server:shadowJar --stacktrace
|
||||||
wrapper-cache-enabled: true
|
wrapper-cache-enabled: true
|
||||||
dependencies-cache-enabled: true
|
dependencies-cache-enabled: true
|
||||||
configuration-cache-enabled: true
|
configuration-cache-enabled: true
|
||||||
@@ -25,7 +25,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel previous runs
|
- name: Cancel previous runs
|
||||||
uses: styfle/cancel-workflow-action@0.5.0
|
uses: styfle/cancel-workflow-action@0.9.0
|
||||||
with:
|
with:
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
@@ -50,36 +50,77 @@ jobs:
|
|||||||
- name: Download android.jar
|
- name: Download android.jar
|
||||||
run: |
|
run: |
|
||||||
cd master
|
cd master
|
||||||
curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
||||||
|
|
||||||
- name: Cache node_modules
|
- name: Build Jar
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
**/react/node_modules
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
|
|
||||||
|
|
||||||
- name: Build and copy webUI, Build Jar
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
|
env:
|
||||||
|
ProductBuildType: "Preview"
|
||||||
with:
|
with:
|
||||||
build-root-directory: master
|
build-root-directory: master
|
||||||
wrapper-directory: master
|
wrapper-directory: master
|
||||||
arguments: :webUI:copyBuild :server:shadowJar --stacktrace
|
arguments: :server:shadowJar --stacktrace
|
||||||
wrapper-cache-enabled: true
|
wrapper-cache-enabled: true
|
||||||
dependencies-cache-enabled: true
|
dependencies-cache-enabled: true
|
||||||
configuration-cache-enabled: true
|
configuration-cache-enabled: true
|
||||||
|
|
||||||
- name: make windows package
|
# - name: Mock Build and copy webUI, Build Jar
|
||||||
|
# run: |
|
||||||
|
# mkdir -p master/server/build
|
||||||
|
# cd master/server/build
|
||||||
|
# echo "test" > Tachidesk-v0.3.8-r583.jar
|
||||||
|
|
||||||
|
- name: Generate Tag Name
|
||||||
|
id: GenTagName
|
||||||
|
run: |
|
||||||
|
cd master/server/build
|
||||||
|
genTag=$(ls *.jar | sed -e's/Tachidesk-\|.jar//g')
|
||||||
|
echo "$genTag"
|
||||||
|
echo "::set-output name=value::$genTag"
|
||||||
|
|
||||||
|
- name: make windows packages
|
||||||
run: |
|
run: |
|
||||||
cd master/scripts
|
cd master/scripts
|
||||||
./windows-bundler.sh
|
./windows-bundler.sh win32
|
||||||
|
./windows-bundler.sh win64
|
||||||
|
|
||||||
|
# - name: Mock make windows packages
|
||||||
|
# run: |
|
||||||
|
# cd master/server/build
|
||||||
|
# echo test > Tachidesk-v0.3.8-r580-win32.zip
|
||||||
|
|
||||||
- name: Checkout preview branch
|
- name: Checkout preview branch
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: preview
|
repository: 'Suwayomi/Tachidesk-Server-preview'
|
||||||
|
ref: main
|
||||||
path: preview
|
path: preview
|
||||||
|
token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
|
||||||
|
|
||||||
- name: Deploy preview
|
- name: Create Tag
|
||||||
run: |
|
run: |
|
||||||
./master/.github/scripts/commit-preview.sh
|
TAG="${{ steps.GenTagName.outputs.value }}"
|
||||||
|
echo "tag: $TAG"
|
||||||
|
cd preview
|
||||||
|
echo "{ \"latest\": \"$TAG\" }" > index.json
|
||||||
|
git add index.json
|
||||||
|
git config --global user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
git config --global user.name "github-actions[bot]"
|
||||||
|
git commit -m "Updated to $TAG"
|
||||||
|
git push origin main
|
||||||
|
|
||||||
|
git tag $TAG
|
||||||
|
git push origin $TAG
|
||||||
|
|
||||||
|
- name: Upload Preview Release
|
||||||
|
uses: ncipollo/release-action@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
|
||||||
|
artifacts: "master/server/build/*.jar,master/server/build/*.zip"
|
||||||
|
owner: "Suwayomi"
|
||||||
|
repo: "Tachidesk-Server-preview"
|
||||||
|
tag: ${{ steps.GenTagName.outputs.value }}
|
||||||
|
|
||||||
|
- name: Run Docker build workflow
|
||||||
|
run: |
|
||||||
|
curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "preview"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
|
||||||
|
|||||||
@@ -18,20 +18,20 @@ jobs:
|
|||||||
uses: gradle/wrapper-validation-action@v1
|
uses: gradle/wrapper-validation-action@v1
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: Build FatJar
|
name: Build artifacts and release
|
||||||
needs: check_wrapper
|
needs: check_wrapper
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel previous runs
|
- name: Cancel previous runs
|
||||||
uses: styfle/cancel-workflow-action@0.5.0
|
uses: styfle/cancel-workflow-action@0.9.0
|
||||||
with:
|
with:
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Checkout master branch
|
- name: Checkout ${{ github.ref }}
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: master
|
ref: ${{ github.ref }}
|
||||||
path: master
|
path: master
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
@@ -49,32 +49,35 @@ jobs:
|
|||||||
- name: Download android.jar
|
- name: Download android.jar
|
||||||
run: |
|
run: |
|
||||||
cd master
|
cd master
|
||||||
curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
||||||
|
|
||||||
- name: Cache node_modules
|
- name: Cache node_modules
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
**/react/node_modules
|
**/webUI/node_modules
|
||||||
key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
|
key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
|
||||||
|
|
||||||
- name: Build and copy webUI, Build Jar
|
- name: Build and copy webUI, Build Jar
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
|
env:
|
||||||
|
ProductBuildType: "Stable"
|
||||||
with:
|
with:
|
||||||
build-root-directory: master
|
build-root-directory: master
|
||||||
wrapper-directory: master
|
wrapper-directory: master
|
||||||
arguments: :webUI:copyBuild :server:shadowJar --stacktrace
|
arguments: :server:downloadWebUI :server:shadowJar --stacktrace
|
||||||
wrapper-cache-enabled: true
|
wrapper-cache-enabled: true
|
||||||
dependencies-cache-enabled: true
|
dependencies-cache-enabled: true
|
||||||
configuration-cache-enabled: true
|
configuration-cache-enabled: true
|
||||||
|
|
||||||
- name: make windows package
|
- name: make windows packages
|
||||||
run: |
|
run: |
|
||||||
cd master/scripts
|
cd master/scripts
|
||||||
./windows-bundler.sh
|
./windows-bundler.sh win32
|
||||||
|
./windows-bundler.sh win64
|
||||||
|
|
||||||
- name: Upload Release
|
- name: Upload Release
|
||||||
uses: xresloader/upload-to-github-release@master
|
uses: xresloader/upload-to-github-release@v1
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
@@ -82,3 +85,8 @@ jobs:
|
|||||||
tags: true
|
tags: true
|
||||||
draft: true
|
draft: true
|
||||||
verbose: true
|
verbose: true
|
||||||
|
|
||||||
|
- name: Run Docker build workflow
|
||||||
|
run: |
|
||||||
|
curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
|
||||||
|
|
||||||
|
|||||||
+6
-1
@@ -6,6 +6,11 @@ gradle.properties
|
|||||||
# Ignore Gradle build output directory
|
# Ignore Gradle build output directory
|
||||||
build
|
build
|
||||||
|
|
||||||
server/src/main/resources/react
|
server/src/main/resources/WebUI.zip
|
||||||
server/tmp/
|
server/tmp/
|
||||||
server/tachiserver-data/
|
server/tachiserver-data/
|
||||||
|
|
||||||
|
# bundle asset downlaods
|
||||||
|
OpenJDK*.zip
|
||||||
|
electron-*.zip
|
||||||
|
rcedit-*
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import net.harawata.appdirs.AppDirsFactory
|
|||||||
val ApplicationRootDir: String
|
val ApplicationRootDir: String
|
||||||
get(): String {
|
get(): String {
|
||||||
return System.getProperty(
|
return System.getProperty(
|
||||||
"ir.armor.tachidesk.rootDir",
|
"suwayomi.tachidesk.server.rootDir",
|
||||||
AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
|
AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -7,6 +7,7 @@ package xyz.nulldev.ts.config
|
|||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import ch.qos.logback.classic.Level
|
||||||
import com.typesafe.config.Config
|
import com.typesafe.config.Config
|
||||||
import com.typesafe.config.ConfigFactory
|
import com.typesafe.config.ConfigFactory
|
||||||
import com.typesafe.config.ConfigRenderOptions
|
import com.typesafe.config.ConfigRenderOptions
|
||||||
@@ -41,21 +42,34 @@ open class ConfigManager {
|
|||||||
*/
|
*/
|
||||||
fun loadConfigs(): Config {
|
fun loadConfigs(): Config {
|
||||||
//Load reference configs
|
//Load reference configs
|
||||||
val compatConfig = ConfigFactory.parseResources("compat-reference.conf")
|
val compatConfig = ConfigFactory.parseResources("compat-reference.conf")
|
||||||
val serverConfig = ConfigFactory.parseResources("server-reference.conf")
|
val serverConfig = ConfigFactory.parseResources("server-reference.conf")
|
||||||
|
val baseConfig =
|
||||||
|
ConfigFactory.parseMap(
|
||||||
|
mapOf(
|
||||||
|
"ts.server.rootDir" to ApplicationRootDir
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
//Load user config
|
//Load user config
|
||||||
val userConfig =
|
val userConfig =
|
||||||
File(ApplicationRootDir, "server.conf").let {
|
File(ApplicationRootDir, "server.conf").let {
|
||||||
ConfigFactory.parseFile(it)
|
ConfigFactory.parseFile(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val config = ConfigFactory.empty()
|
val config = ConfigFactory.empty()
|
||||||
|
.withFallback(baseConfig)
|
||||||
.withFallback(userConfig)
|
.withFallback(userConfig)
|
||||||
.withFallback(compatConfig)
|
.withFallback(compatConfig)
|
||||||
.withFallback(serverConfig)
|
.withFallback(serverConfig)
|
||||||
.resolve()
|
.resolve()
|
||||||
|
|
||||||
|
// set log level early
|
||||||
|
if (debugLogsEnabled(config)) {
|
||||||
|
setLogLevel(Level.DEBUG)
|
||||||
|
}
|
||||||
|
|
||||||
logger.debug {
|
logger.debug {
|
||||||
"Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true))
|
"Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package xyz.nulldev.ts.config
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import ch.qos.logback.classic.Level
|
||||||
|
import com.typesafe.config.Config
|
||||||
|
import mu.KotlinLogging
|
||||||
|
import org.slf4j.Logger
|
||||||
|
|
||||||
|
fun setLogLevel(level: Level) {
|
||||||
|
(KotlinLogging.logger(Logger.ROOT_LOGGER_NAME).underlyingLogger as ch.qos.logback.classic.Logger).level = level
|
||||||
|
}
|
||||||
|
|
||||||
|
fun debugLogsEnabled(config: Config)
|
||||||
|
= System.getProperty("suwayomi.tachidesk.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
application
|
application
|
||||||
|
kotlin("plugin.serialization")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -24,13 +25,13 @@ dependencies {
|
|||||||
// compileOnly( fileTree(dir: new File(rootProject.rootDir, "libs/other"), include: "*.jar")
|
// compileOnly( fileTree(dir: new File(rootProject.rootDir, "libs/other"), include: "*.jar")
|
||||||
|
|
||||||
// JSON
|
// JSON
|
||||||
compileOnly( "com.google.code.gson:gson:2.8.6")
|
compileOnly("com.google.code.gson:gson:2.8.6")
|
||||||
|
|
||||||
// Javassist
|
// Javassist
|
||||||
compileOnly( "org.javassist:javassist:3.27.0-GA")
|
compileOnly("org.javassist:javassist:3.27.0-GA")
|
||||||
|
|
||||||
// XML
|
// XML
|
||||||
compileOnly( group= "xmlpull", name= "xmlpull", version= "1.1.3.1")
|
compileOnly(group= "xmlpull", name= "xmlpull", version= "1.1.3.1")
|
||||||
|
|
||||||
// Config API
|
// Config API
|
||||||
implementation(project(":AndroidCompat:Config"))
|
implementation(project(":AndroidCompat:Config"))
|
||||||
@@ -39,13 +40,27 @@ dependencies {
|
|||||||
compileOnly("com.android.tools.build:apksig:4.2.0-alpha13")
|
compileOnly("com.android.tools.build:apksig:4.2.0-alpha13")
|
||||||
|
|
||||||
// AndroidX annotations
|
// AndroidX annotations
|
||||||
compileOnly( "androidx.annotation:annotation:1.2.0-alpha01")
|
compileOnly("androidx.annotation:annotation:1.2.0-alpha01")
|
||||||
|
|
||||||
// substitute for duktape-android
|
// substitute for duktape-android
|
||||||
// 'org.mozilla:rhino' includes some code that we don't need so use 'org.mozilla:rhino-runtime' instead
|
// 'org.mozilla:rhino' includes some code that we don't need so use 'org.mozilla:rhino-runtime' instead
|
||||||
implementation("org.mozilla:rhino-runtime:1.7.13")
|
implementation("org.mozilla:rhino-runtime:1.7.13")
|
||||||
// 'org.mozilla:rhino-engine' provides the same interface as 'javax.script' a.k.a Nashorn
|
// 'org.mozilla:rhino-engine' provides the same interface as 'javax.script' a.k.a Nashorn
|
||||||
implementation("org.mozilla:rhino-engine:1.7.13")
|
implementation("org.mozilla:rhino-engine:1.7.13")
|
||||||
|
|
||||||
|
// Kotlin wrapper around Java Preferences, makes certain things easier
|
||||||
|
val multiplatformSettingsVersion = "0.7.7"
|
||||||
|
implementation("com.russhwolf:multiplatform-settings-jvm:$multiplatformSettingsVersion")
|
||||||
|
implementation("com.russhwolf:multiplatform-settings-serialization-jvm:$multiplatformSettingsVersion")
|
||||||
|
|
||||||
|
// Android version of SimpleDateFormat
|
||||||
|
implementation("com.ibm.icu:icu4j:69.1")
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
|
||||||
|
kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')
|
//def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ Write-Output "Getting required Android.jar..."
|
|||||||
Remove-Item -Recurse -Force "tmp" -ErrorAction SilentlyContinue | Out-Null
|
Remove-Item -Recurse -Force "tmp" -ErrorAction SilentlyContinue | Out-Null
|
||||||
New-Item -ItemType Directory -Force -Path "tmp" | Out-Null
|
New-Item -ItemType Directory -Force -Path "tmp" | Out-Null
|
||||||
|
|
||||||
$androidEncoded = (Invoke-WebRequest -Uri "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT" -UseBasicParsing).content
|
$androidEncoded = (Invoke-WebRequest -Uri "https://android.googlesource.com/platform/prebuilts/sdk/+/6cd31be5e4e25901aadf838120d71a79b46d9add/30/public/android.jar?format=TEXT" -UseBasicParsing).content
|
||||||
|
|
||||||
$android_jar = (Get-Location).Path + "\tmp\android.jar"
|
$android_jar = (Get-Location).Path + "\tmp\android.jar"
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ $android_jar = (Get-Location).Path + "\tmp\android.jar"
|
|||||||
# We need to remove any stub classes that we have implementations for
|
# We need to remove any stub classes that we have implementations for
|
||||||
Write-Output "Patching JAR..."
|
Write-Output "Patching JAR..."
|
||||||
|
|
||||||
function Remove-Files-Zip($zipfile, $path)
|
function Remove-Files-Zip($zipfile, $paths)
|
||||||
{
|
{
|
||||||
[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression') | Out-Null
|
[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression') | Out-Null
|
||||||
|
|
||||||
@@ -32,7 +32,18 @@ function Remove-Files-Zip($zipfile, $path)
|
|||||||
$mode = [IO.Compression.ZipArchiveMode]::Update
|
$mode = [IO.Compression.ZipArchiveMode]::Update
|
||||||
$zip = New-Object IO.Compression.ZipArchive($stream, $mode)
|
$zip = New-Object IO.Compression.ZipArchive($stream, $mode)
|
||||||
|
|
||||||
($zip.Entries | Where-Object { $_.FullName -like $path }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
|
if ($paths.getType().Name -eq "Object[]")
|
||||||
|
{
|
||||||
|
$paths | ForEach-Object {
|
||||||
|
$path = $_
|
||||||
|
($zip.Entries | Where-Object { $_.FullName -like $path }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
($zip.Entries | Where-Object { $_.FullName -like $paths }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$zip.Dispose()
|
$zip.Dispose()
|
||||||
$stream.Close()
|
$stream.Close()
|
||||||
@@ -78,16 +89,12 @@ function Dedupe($path)
|
|||||||
$classes = Get-ChildItem . *.* -Recurse | Where-Object { !$_.PSIsContainer }
|
$classes = Get-ChildItem . *.* -Recurse | Where-Object { !$_.PSIsContainer }
|
||||||
$classes | ForEach-Object {
|
$classes | ForEach-Object {
|
||||||
"Processing class: $($_.FullName)"
|
"Processing class: $($_.FullName)"
|
||||||
Remove-Files-Zip $android_jar "$($_.Name).class" | Out-Null
|
Remove-Files-Zip $android_jar ("$($_.Name).class","$($_.Name)$*.class","$($_.Name)Kt.class","$($_.Name)Kt$*.class") | Out-Null
|
||||||
Remove-Files-Zip $android_jar "$($_.Name)$*.class" | Out-Null
|
|
||||||
Remove-Files-Zip $android_jar "$($_.Name)Kt.class" | Out-Null
|
|
||||||
Remove-Files-Zip $android_jar "$($_.Name)Kt$*.class" | Out-Null
|
|
||||||
}
|
}
|
||||||
Pop-Location
|
Pop-Location
|
||||||
}
|
}
|
||||||
|
|
||||||
Dedupe "AndroidCompat/src/main/java"
|
Dedupe "AndroidCompat/src/main/java"
|
||||||
Dedupe "server/src/main/java"
|
|
||||||
Dedupe "server/src/main/kotlin"
|
Dedupe "server/src/main/kotlin"
|
||||||
|
|
||||||
Write-Output "Copying Android.jar to library folder..."
|
Write-Output "Copying Android.jar to library folder..."
|
||||||
|
|||||||
@@ -13,14 +13,14 @@ do
|
|||||||
which $dep >/dev/null 2>&1 || { echo >&2 "Error: This script needs $dep installed."; abort=yes; }
|
which $dep >/dev/null 2>&1 || { echo >&2 "Error: This script needs $dep installed."; abort=yes; }
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ $abort = yes ]; then
|
if [ "$abort" = yes ]; then
|
||||||
echo "Some of the dependencies didn't exist. Aborting."
|
echo "Some of the dependencies didn't exist. Aborting."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# foolproof against running from AndroidCompat dir instead of running from project root
|
# foolproof against running from AndroidCompat dir instead of running from project root
|
||||||
if [ "$(basename $(pwd))" = "AndroidCompat" ]; then
|
if [ "$(basename "$(pwd)")" = "AndroidCompat" ]; then
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ rm -rf "tmp"
|
|||||||
mkdir -p "tmp"
|
mkdir -p "tmp"
|
||||||
pushd "tmp"
|
pushd "tmp"
|
||||||
|
|
||||||
curl "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT" | base64 --decode > android.jar
|
curl "https://android.googlesource.com/platform/prebuilts/sdk/+/6cd31be5e4e25901aadf838120d71a79b46d9add/30/public/android.jar?format=TEXT" | base64 --decode > android.jar
|
||||||
|
|
||||||
# We need to remove any stub classes that we have implementations for
|
# We need to remove any stub classes that we have implementations for
|
||||||
echo "Patching JAR..."
|
echo "Patching JAR..."
|
||||||
@@ -59,7 +59,7 @@ zip --delete android.jar javax/*
|
|||||||
echo "Removing java..."
|
echo "Removing java..."
|
||||||
zip --delete android.jar java/*
|
zip --delete android.jar java/*
|
||||||
|
|
||||||
echo "Removing overriden classes..."
|
echo "Removing overridden classes..."
|
||||||
zip --delete android.jar android/app/Application.class
|
zip --delete android.jar android/app/Application.class
|
||||||
zip --delete android.jar android/app/Service.class
|
zip --delete android.jar android/app/Service.class
|
||||||
zip --delete android.jar android/net/Uri.class
|
zip --delete android.jar android/net/Uri.class
|
||||||
@@ -68,12 +68,12 @@ zip --delete android.jar android/os/Environment.class
|
|||||||
zip --delete android.jar android/text/format/Formatter.class
|
zip --delete android.jar android/text/format/Formatter.class
|
||||||
zip --delete android.jar android/text/Html.class
|
zip --delete android.jar android/text/Html.class
|
||||||
|
|
||||||
# Dedup overriden Android classes
|
# Dedup overridden Android classes
|
||||||
ABS_JAR="$(realpath android.jar)"
|
ABS_JAR="$(realpath android.jar)"
|
||||||
function dedup() {
|
function dedup() {
|
||||||
pushd "$1"
|
pushd "$1"
|
||||||
CLASSES="$(find * -type f)"
|
CLASSES="$(find ./* -type f)"
|
||||||
echo "$CLASSES" | while read class
|
echo "$CLASSES" | while read -r class
|
||||||
do
|
do
|
||||||
NAME="${class%.*}"
|
NAME="${class%.*}"
|
||||||
echo "Processing class: $NAME"
|
echo "Processing class: $NAME"
|
||||||
@@ -82,13 +82,10 @@ function dedup() {
|
|||||||
popd
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
pushd ..
|
popd
|
||||||
dedup AndroidCompat/src/main/java
|
dedup AndroidCompat/src/main/java
|
||||||
dedup server/src/main/java
|
|
||||||
dedup server/src/main/kotlin
|
dedup server/src/main/kotlin
|
||||||
popd
|
|
||||||
|
|
||||||
popd
|
|
||||||
echo "Copying Android.jar to library folder..."
|
echo "Copying Android.jar to library folder..."
|
||||||
mv tmp/android.jar AndroidCompat/lib
|
mv tmp/android.jar AndroidCompat/lib
|
||||||
|
|
||||||
|
|||||||
@@ -1,291 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2012 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package android.support.v4.content;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.StatFs;
|
|
||||||
import android.support.v4.os.EnvironmentCompat;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper for accessing features in {@link android.content.Context}
|
|
||||||
* introduced after API level 4 in a backwards compatible fashion.
|
|
||||||
*/
|
|
||||||
public class ContextCompat {
|
|
||||||
/**
|
|
||||||
* Start a set of activities as a synthesized task stack, if able.
|
|
||||||
*
|
|
||||||
* <p>In API level 11 (Android 3.0/Honeycomb) the recommended conventions for
|
|
||||||
* app navigation using the back key changed. The back key's behavior is local
|
|
||||||
* to the current task and does not capture navigation across different tasks.
|
|
||||||
* Navigating across tasks and easily reaching the previous task is accomplished
|
|
||||||
* through the "recents" UI, accessible through the software-provided Recents key
|
|
||||||
* on the navigation or system bar. On devices with the older hardware button configuration
|
|
||||||
* the recents UI can be accessed with a long press on the Home key.</p>
|
|
||||||
*
|
|
||||||
* <p>When crossing from one task stack to another post-Android 3.0,
|
|
||||||
* the application should synthesize a back stack/history for the new task so that
|
|
||||||
* the user may navigate out of the new task and back to the Launcher by repeated
|
|
||||||
* presses of the back key. Back key presses should not navigate across task stacks.</p>
|
|
||||||
*
|
|
||||||
* <p>startActivities provides a mechanism for constructing a synthetic task stack of
|
|
||||||
* multiple activities. If the underlying API is not available on the system this method
|
|
||||||
* will return false.</p>
|
|
||||||
*
|
|
||||||
* @param context Start activities using this activity as the starting context
|
|
||||||
* @param intents Array of intents defining the activities that will be started. The element
|
|
||||||
* length-1 will correspond to the top activity on the resulting task stack.
|
|
||||||
* @return true if the underlying API was available and the call was successful, false otherwise
|
|
||||||
*/
|
|
||||||
public static boolean startActivities(Context context, Intent[] intents) {
|
|
||||||
return startActivities(context, intents, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start a set of activities as a synthesized task stack, if able.
|
|
||||||
*
|
|
||||||
* <p>In API level 11 (Android 3.0/Honeycomb) the recommended conventions for
|
|
||||||
* app navigation using the back key changed. The back key's behavior is local
|
|
||||||
* to the current task and does not capture navigation across different tasks.
|
|
||||||
* Navigating across tasks and easily reaching the previous task is accomplished
|
|
||||||
* through the "recents" UI, accessible through the software-provided Recents key
|
|
||||||
* on the navigation or system bar. On devices with the older hardware button configuration
|
|
||||||
* the recents UI can be accessed with a long press on the Home key.</p>
|
|
||||||
*
|
|
||||||
* <p>When crossing from one task stack to another post-Android 3.0,
|
|
||||||
* the application should synthesize a back stack/history for the new task so that
|
|
||||||
* the user may navigate out of the new task and back to the Launcher by repeated
|
|
||||||
* presses of the back key. Back key presses should not navigate across task stacks.</p>
|
|
||||||
*
|
|
||||||
* <p>startActivities provides a mechanism for constructing a synthetic task stack of
|
|
||||||
* multiple activities. If the underlying API is not available on the system this method
|
|
||||||
* will return false.</p>
|
|
||||||
*
|
|
||||||
* @param context Start activities using this activity as the starting context
|
|
||||||
* @param intents Array of intents defining the activities that will be started. The element
|
|
||||||
* length-1 will correspond to the top activity on the resulting task stack.
|
|
||||||
* @param options Additional options for how the Activity should be started.
|
|
||||||
* See {@link android.content.Context#startActivity(Intent, Bundle)
|
|
||||||
* @return true if the underlying API was available and the call was successful, false otherwise
|
|
||||||
*/
|
|
||||||
public static boolean startActivities(Context context, Intent[] intents,
|
|
||||||
Bundle options) {
|
|
||||||
context.startActivities(intents, options);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns absolute paths to application-specific directories on all
|
|
||||||
* external storage devices where the application's OBB files (if there are
|
|
||||||
* any) can be found. Note if the application does not have any OBB files,
|
|
||||||
* these directories may not exist.
|
|
||||||
* <p>
|
|
||||||
* This is like {@link Context#getFilesDir()} in that these files will be
|
|
||||||
* deleted when the application is uninstalled, however there are some
|
|
||||||
* important differences:
|
|
||||||
* <ul>
|
|
||||||
* <li>External files are not always available: they will disappear if the
|
|
||||||
* user mounts the external storage on a computer or removes it.
|
|
||||||
* <li>There is no security enforced with these files.
|
|
||||||
* </ul>
|
|
||||||
* <p>
|
|
||||||
* External storage devices returned here are considered a permanent part of
|
|
||||||
* the device, including both emulated external storage and physical media
|
|
||||||
* slots, such as SD cards in a battery compartment. The returned paths do
|
|
||||||
* not include transient devices, such as USB flash drives.
|
|
||||||
* <p>
|
|
||||||
* An application may store data on any or all of the returned devices. For
|
|
||||||
* example, an app may choose to store large files on the device with the
|
|
||||||
* most available space, as measured by {@link StatFs}.
|
|
||||||
* <p>
|
|
||||||
* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions
|
|
||||||
* are required to write to the returned paths; they're always accessible to
|
|
||||||
* the calling app. Before then,
|
|
||||||
* {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} is required to
|
|
||||||
* write. Write access outside of these paths on secondary external storage
|
|
||||||
* devices is not available. To request external storage access in a
|
|
||||||
* backwards compatible way, consider using {@code android:maxSdkVersion}
|
|
||||||
* like this:
|
|
||||||
*
|
|
||||||
* <pre class="prettyprint"><uses-permission
|
|
||||||
* android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
|
||||||
* android:maxSdkVersion="18" /></pre>
|
|
||||||
* <p>
|
|
||||||
* The first path returned is the same as {@link Context#getObbDir()}.
|
|
||||||
* Returned paths may be {@code null} if a storage device is unavailable.
|
|
||||||
*
|
|
||||||
* @see Context#getObbDir()
|
|
||||||
* @see EnvironmentCompat#getStorageState(File)
|
|
||||||
*/
|
|
||||||
public static File[] getObbDirs(Context context) {
|
|
||||||
return context.getObbDirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns absolute paths to application-specific directories on all
|
|
||||||
* external storage devices where the application can place persistent files
|
|
||||||
* it owns. These files are internal to the application, and not typically
|
|
||||||
* visible to the user as media.
|
|
||||||
* <p>
|
|
||||||
* This is like {@link Context#getFilesDir()} in that these files will be
|
|
||||||
* deleted when the application is uninstalled, however there are some
|
|
||||||
* important differences:
|
|
||||||
* <ul>
|
|
||||||
* <li>External files are not always available: they will disappear if the
|
|
||||||
* user mounts the external storage on a computer or removes it.
|
|
||||||
* <li>There is no security enforced with these files.
|
|
||||||
* </ul>
|
|
||||||
* <p>
|
|
||||||
* External storage devices returned here are considered a permanent part of
|
|
||||||
* the device, including both emulated external storage and physical media
|
|
||||||
* slots, such as SD cards in a battery compartment. The returned paths do
|
|
||||||
* not include transient devices, such as USB flash drives.
|
|
||||||
* <p>
|
|
||||||
* An application may store data on any or all of the returned devices. For
|
|
||||||
* example, an app may choose to store large files on the device with the
|
|
||||||
* most available space, as measured by {@link StatFs}.
|
|
||||||
* <p>
|
|
||||||
* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions
|
|
||||||
* are required to write to the returned paths; they're always accessible to
|
|
||||||
* the calling app. Before then,
|
|
||||||
* {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} is required to
|
|
||||||
* write. Write access outside of these paths on secondary external storage
|
|
||||||
* devices is not available. To request external storage access in a
|
|
||||||
* backwards compatible way, consider using {@code android:maxSdkVersion}
|
|
||||||
* like this:
|
|
||||||
*
|
|
||||||
* <pre class="prettyprint"><uses-permission
|
|
||||||
* android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
|
||||||
* android:maxSdkVersion="18" /></pre>
|
|
||||||
* <p>
|
|
||||||
* The first path returned is the same as
|
|
||||||
* {@link Context#getExternalFilesDir(String)}. Returned paths may be
|
|
||||||
* {@code null} if a storage device is unavailable.
|
|
||||||
*
|
|
||||||
* @see Context#getExternalFilesDir(String)
|
|
||||||
* @see EnvironmentCompat#getStorageState(File)
|
|
||||||
*/
|
|
||||||
public static File[] getExternalFilesDirs(Context context, String type) {
|
|
||||||
return context.getExternalFilesDirs(type);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns absolute paths to application-specific directories on all
|
|
||||||
* external storage devices where the application can place cache files it
|
|
||||||
* owns. These files are internal to the application, and not typically
|
|
||||||
* visible to the user as media.
|
|
||||||
* <p>
|
|
||||||
* This is like {@link Context#getCacheDir()} in that these files will be
|
|
||||||
* deleted when the application is uninstalled, however there are some
|
|
||||||
* important differences:
|
|
||||||
* <ul>
|
|
||||||
* <li>External files are not always available: they will disappear if the
|
|
||||||
* user mounts the external storage on a computer or removes it.
|
|
||||||
* <li>There is no security enforced with these files.
|
|
||||||
* </ul>
|
|
||||||
* <p>
|
|
||||||
* External storage devices returned here are considered a permanent part of
|
|
||||||
* the device, including both emulated external storage and physical media
|
|
||||||
* slots, such as SD cards in a battery compartment. The returned paths do
|
|
||||||
* not include transient devices, such as USB flash drives.
|
|
||||||
* <p>
|
|
||||||
* An application may store data on any or all of the returned devices. For
|
|
||||||
* example, an app may choose to store large files on the device with the
|
|
||||||
* most available space, as measured by {@link StatFs}.
|
|
||||||
* <p>
|
|
||||||
* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions
|
|
||||||
* are required to write to the returned paths; they're always accessible to
|
|
||||||
* the calling app. Before then,
|
|
||||||
* {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} is required to
|
|
||||||
* write. Write access outside of these paths on secondary external storage
|
|
||||||
* devices is not available. To request external storage access in a
|
|
||||||
* backwards compatible way, consider using {@code android:maxSdkVersion}
|
|
||||||
* like this:
|
|
||||||
*
|
|
||||||
* <pre class="prettyprint"><uses-permission
|
|
||||||
* android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
|
||||||
* android:maxSdkVersion="18" /></pre>
|
|
||||||
* <p>
|
|
||||||
* The first path returned is the same as
|
|
||||||
* {@link Context#getExternalCacheDir()}. Returned paths may be {@code null}
|
|
||||||
* if a storage device is unavailable.
|
|
||||||
*
|
|
||||||
* @see Context#getExternalCacheDir()
|
|
||||||
* @see EnvironmentCompat#getStorageState(File)
|
|
||||||
*/
|
|
||||||
public static File[] getExternalCacheDirs(Context context) {
|
|
||||||
return context.getExternalCacheDirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a drawable object associated with a particular resource ID.
|
|
||||||
* <p>
|
|
||||||
* Starting in {@link android.os.Build.VERSION_CODES#LOLLIPOP}, the returned
|
|
||||||
* drawable will be styled for the specified Context's theme.
|
|
||||||
*
|
|
||||||
* @param id The desired resource identifier, as generated by the aapt tool.
|
|
||||||
* This integer encodes the package, type, and resource entry.
|
|
||||||
* The value 0 is an invalid identifier.
|
|
||||||
* @return Drawable An object that can be used to draw this resource.
|
|
||||||
*/
|
|
||||||
public static final Drawable getDrawable(Context context, int id) {
|
|
||||||
return context.getDrawable(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the absolute path to the directory on the filesystem similar to
|
|
||||||
* {@link Context#getFilesDir()}. The difference is that files placed under this
|
|
||||||
* directory will be excluded from automatic backup to remote storage on
|
|
||||||
* devices running {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later. See
|
|
||||||
* {@link android.app.backup.BackupAgent BackupAgent} for a full discussion
|
|
||||||
* of the automatic backup mechanism in Android.
|
|
||||||
*
|
|
||||||
* <p>No permissions are required to read or write to the returned path, since this
|
|
||||||
* path is internal storage.
|
|
||||||
*
|
|
||||||
* @return The path of the directory holding application files that will not be
|
|
||||||
* automatically backed up to remote storage.
|
|
||||||
*
|
|
||||||
* @see android.content.Context.getFilesDir
|
|
||||||
*/
|
|
||||||
public final File getNoBackupFilesDir(Context context) {
|
|
||||||
return context.getNoBackupFilesDir();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the absolute path to the application specific cache directory on
|
|
||||||
* the filesystem designed for storing cached code. On devices running
|
|
||||||
* {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later, the system will delete
|
|
||||||
* any files stored in this location both when your specific application is
|
|
||||||
* upgraded, and when the entire platform is upgraded.
|
|
||||||
* <p>
|
|
||||||
* This location is optimal for storing compiled or optimized code generated
|
|
||||||
* by your application at runtime.
|
|
||||||
* <p>
|
|
||||||
* Apps require no extra permissions to read or write to the returned path,
|
|
||||||
* since this path lives in their private storage.
|
|
||||||
*
|
|
||||||
* @return The path of the directory holding application code cache files.
|
|
||||||
*/
|
|
||||||
public final File getCodeCacheDir(Context context) {
|
|
||||||
return context.getCodeCacheDir();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package android.support.v4.os;
|
|
||||||
|
|
||||||
import android.os.Environment;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper for accessing features in {@link Environment} introduced after API
|
|
||||||
* level 4 in a backwards compatible fashion.
|
|
||||||
*/
|
|
||||||
public class EnvironmentCompat {
|
|
||||||
/**
|
|
||||||
* Unknown storage state, such as when a path isn't backed by known storage
|
|
||||||
* media.
|
|
||||||
*
|
|
||||||
* @see #getStorageState(File)
|
|
||||||
*/
|
|
||||||
public static final String MEDIA_UNKNOWN = "unknown";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the current state of the storage device that provides the given
|
|
||||||
* path.
|
|
||||||
*
|
|
||||||
* @return one of {@link #MEDIA_UNKNOWN}, {@link Environment#MEDIA_REMOVED},
|
|
||||||
* {@link Environment#MEDIA_UNMOUNTED},
|
|
||||||
* {@link Environment#MEDIA_CHECKING},
|
|
||||||
* {@link Environment#MEDIA_NOFS},
|
|
||||||
* {@link Environment#MEDIA_MOUNTED},
|
|
||||||
* {@link Environment#MEDIA_MOUNTED_READ_ONLY},
|
|
||||||
* {@link Environment#MEDIA_SHARED},
|
|
||||||
* {@link Environment#MEDIA_BAD_REMOVAL}, or
|
|
||||||
* {@link Environment#MEDIA_UNMOUNTABLE}.
|
|
||||||
*/
|
|
||||||
public static String getStorageState(File path) {
|
|
||||||
return Environment.getStorageState(path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,193 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2017 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package android.support.v7.preference;
|
|
||||||
|
|
||||||
import android.support.annotation.Nullable;
|
|
||||||
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A data store interface to be implemented and provided to the Preferences framework. This can be
|
|
||||||
* used to replace the default {@link android.content.SharedPreferences}, if needed.
|
|
||||||
*
|
|
||||||
* <p>In most cases you want to use {@link android.content.SharedPreferences} as it is automatically
|
|
||||||
* backed up and migrated to new devices. However, providing custom data store to preferences can be
|
|
||||||
* useful if your app stores its preferences in a local db, cloud or they are device specific like
|
|
||||||
* "Developer settings". It might be also useful when you want to use the preferences UI but
|
|
||||||
* the data are not supposed to be stored at all because they are valid per session only.
|
|
||||||
*
|
|
||||||
* <p>Once a put method is called it is full responsibility of the data store implementation to
|
|
||||||
* safely store the given values. Time expensive operations need to be done in the background to
|
|
||||||
* prevent from blocking the UI. You also need to have a plan on how to serialize the data in case
|
|
||||||
* the activity holding this object gets destroyed.
|
|
||||||
*
|
|
||||||
* <p>By default, all "put" methods throw {@link UnsupportedOperationException}.
|
|
||||||
*/
|
|
||||||
public abstract class PreferenceDataStore {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a {@link String} value to the data store.
|
|
||||||
*
|
|
||||||
* <p>Once the value is set the data store is responsible for holding it.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to modify
|
|
||||||
* @param value the new value for the preference
|
|
||||||
* @see #getString(String, String)
|
|
||||||
*/
|
|
||||||
public void putString(String key, @Nullable String value) {
|
|
||||||
throw new UnsupportedOperationException("Not implemented on this data store");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a set of Strings to the data store.
|
|
||||||
*
|
|
||||||
* <p>Once the value is set the data store is responsible for holding it.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to modify
|
|
||||||
* @param values the set of new values for the preference
|
|
||||||
* @see #getStringSet(String, Set<String>)
|
|
||||||
*/
|
|
||||||
public void putStringSet(String key, @Nullable Set<String> values) {
|
|
||||||
throw new UnsupportedOperationException("Not implemented on this data store");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets an {@link Integer} value to the data store.
|
|
||||||
*
|
|
||||||
* <p>Once the value is set the data store is responsible for holding it.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to modify
|
|
||||||
* @param value the new value for the preference
|
|
||||||
* @see #getInt(String, int)
|
|
||||||
*/
|
|
||||||
public void putInt(String key, int value) {
|
|
||||||
throw new UnsupportedOperationException("Not implemented on this data store");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a {@link Long} value to the data store.
|
|
||||||
*
|
|
||||||
* <p>Once the value is set the data store is responsible for holding it.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to modify
|
|
||||||
* @param value the new value for the preference
|
|
||||||
* @see #getLong(String, long)
|
|
||||||
*/
|
|
||||||
public void putLong(String key, long value) {
|
|
||||||
throw new UnsupportedOperationException("Not implemented on this data store");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a {@link Float} value to the data store.
|
|
||||||
*
|
|
||||||
* <p>Once the value is set the data store is responsible for holding it.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to modify
|
|
||||||
* @param value the new value for the preference
|
|
||||||
* @see #getFloat(String, float)
|
|
||||||
*/
|
|
||||||
public void putFloat(String key, float value) {
|
|
||||||
throw new UnsupportedOperationException("Not implemented on this data store");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a {@link Boolean} value to the data store.
|
|
||||||
*
|
|
||||||
* <p>Once the value is set the data store is responsible for holding it.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to modify
|
|
||||||
* @param value the new value for the preference
|
|
||||||
* @see #getBoolean(String, boolean)
|
|
||||||
*/
|
|
||||||
public void putBoolean(String key, boolean value) {
|
|
||||||
throw new UnsupportedOperationException("Not implemented on this data store");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves a {@link String} value from the data store.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to retrieve
|
|
||||||
* @param defValue value to return if this preference does not exist in the storage
|
|
||||||
* @return the value from the data store or the default return value
|
|
||||||
* @see #putString(String, String)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public String getString(String key, @Nullable String defValue) {
|
|
||||||
return defValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves a set of Strings from the data store.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to retrieve
|
|
||||||
* @param defValues values to return if this preference does not exist in the storage
|
|
||||||
* @return the values from the data store or the default return values
|
|
||||||
* @see #putStringSet(String, Set<String>)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public Set<String> getStringSet(String key, @Nullable Set<String> defValues) {
|
|
||||||
return defValues;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves an {@link Integer} value from the data store.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to retrieve
|
|
||||||
* @param defValue value to return if this preference does not exist in the storage
|
|
||||||
* @return the value from the data store or the default return value
|
|
||||||
* @see #putInt(String, int)
|
|
||||||
*/
|
|
||||||
public int getInt(String key, int defValue) {
|
|
||||||
return defValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves a {@link Long} value from the data store.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to retrieve
|
|
||||||
* @param defValue value to return if this preference does not exist in the storage
|
|
||||||
* @return the value from the data store or the default return value
|
|
||||||
* @see #putLong(String, long)
|
|
||||||
*/
|
|
||||||
public long getLong(String key, long defValue) {
|
|
||||||
return defValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves a {@link Float} value from the data store.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to retrieve
|
|
||||||
* @param defValue value to return if this preference does not exist in the storage
|
|
||||||
* @return the value from the data store or the default return value
|
|
||||||
* @see #putFloat(String, float)
|
|
||||||
*/
|
|
||||||
public float getFloat(String key, float defValue) {
|
|
||||||
return defValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves a {@link Boolean} value from the data store.
|
|
||||||
*
|
|
||||||
* @param key the name of the preference to retrieve
|
|
||||||
* @param defValue value to return if this preference does not exist in the storage
|
|
||||||
* @return the value from the data store or the default return value
|
|
||||||
* @see #getBoolean(String, boolean)
|
|
||||||
*/
|
|
||||||
public boolean getBoolean(String key, boolean defValue) {
|
|
||||||
return defValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
package android.support.v7.preference;
|
|
||||||
|
|
||||||
public class PreferenceScreen {
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package android.widget;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
public class EditText {
|
||||||
|
public EditText(android.content.Context context) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public EditText(android.content.Context context, android.util.AttributeSet attrs) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public boolean getFreezesText() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
protected boolean getDefaultEditable() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
protected android.text.method.MovementMethod getDefaultMovementMethod() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public android.text.Editable getText() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public void setText(java.lang.CharSequence text, android.widget.TextView.BufferType type) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public void setSelection(int start, int stop) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public void setSelection(int index) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public void selectAll() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public void extendSelection(int index) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public void setEllipsize(android.text.TextUtils.TruncateAt ellipsis) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public java.lang.CharSequence getAccessibilityClassName() { throw new RuntimeException("Stub!"); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
package android.widget;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
public class Toast {
|
||||||
|
public static final int LENGTH_LONG = 1;
|
||||||
|
public static final int LENGTH_SHORT = 0;
|
||||||
|
|
||||||
|
private CharSequence text;
|
||||||
|
|
||||||
|
private Toast(CharSequence text) {
|
||||||
|
this.text = text;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Toast(android.content.Context context) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void show() {
|
||||||
|
System.out.printf("made a Toast: \"%s\"\n", text.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void cancel() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setView(android.view.View view) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public android.view.View getView() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDuration(int duration) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getDuration() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMargin(float horizontalMargin, float verticalMargin) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getHorizontalMargin() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getVerticalMargin() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGravity(int gravity, int xOffset, int yOffset) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getGravity() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getXOffset() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getYOffset() {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Toast makeText(android.content.Context context, java.lang.CharSequence text, int duration) {
|
||||||
|
return new Toast(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static android.widget.Toast makeText(android.content.Context context, int resId, int duration) throws android.content.res.Resources.NotFoundException {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setText(int resId) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setText(java.lang.CharSequence s) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
public class CheckBoxPreference extends TwoStatePreference {
|
||||||
|
// reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/CheckBoxPreference.java
|
||||||
|
|
||||||
|
public CheckBoxPreference(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
public abstract class DialogPreference extends Preference {
|
||||||
|
private CharSequence dialogTitle;
|
||||||
|
private CharSequence dialogMessage;
|
||||||
|
|
||||||
|
public DialogPreference(Context context) { super(context); }
|
||||||
|
|
||||||
|
public CharSequence getDialogTitle() {
|
||||||
|
return dialogTitle;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDialogTitle(CharSequence dialogTitle) {
|
||||||
|
this.dialogTitle = dialogTitle;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CharSequence getDialogMessage() {
|
||||||
|
return dialogMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDialogMessage(CharSequence dialogMessage) {
|
||||||
|
this.dialogMessage = dialogMessage;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.annotation.NonNull;
|
||||||
|
import android.annotation.Nullable;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.widget.EditText;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
|
public class EditTextPreference extends DialogPreference {
|
||||||
|
// reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/EditTextPreference.java
|
||||||
|
|
||||||
|
private String text;
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
private OnBindEditTextListener onBindEditTextListener;
|
||||||
|
|
||||||
|
public EditTextPreference(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getText() {
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setText(String text) {
|
||||||
|
this.text = text;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OnBindEditTextListener getOnBindEditTextListener() {
|
||||||
|
return onBindEditTextListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOnBindEditTextListener(@Nullable OnBindEditTextListener onBindEditTextListener) {
|
||||||
|
this.onBindEditTextListener = onBindEditTextListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface OnBindEditTextListener {
|
||||||
|
void onBindEditText(@NonNull EditText editText);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
@Override
|
||||||
|
public String getDefaultValueType() {
|
||||||
|
return "String";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
|
public class ListPreference extends Preference {
|
||||||
|
// reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/ListPreference.java
|
||||||
|
// Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them
|
||||||
|
|
||||||
|
private CharSequence[] entries;
|
||||||
|
private CharSequence[] entryValues;
|
||||||
|
|
||||||
|
public ListPreference(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CharSequence[] getEntries() {
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEntries(CharSequence[] entries) {
|
||||||
|
this.entries = entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int findIndexOfValue(String value) {
|
||||||
|
if (value != null && entryValues != null) {
|
||||||
|
for (int i = entryValues.length - 1; i >= 0; i--) {
|
||||||
|
if (TextUtils.equals(entryValues[i].toString(), value)) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CharSequence[] getEntryValues() {
|
||||||
|
return entryValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEntryValues(CharSequence[] entryValues) {
|
||||||
|
this.entryValues = entryValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setValueIndex(int index) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public String getValue() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setValue(String value) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
@Override
|
||||||
|
public String getDefaultValueType() {
|
||||||
|
return "String";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class MultiSelectListPreference extends DialogPreference {
|
||||||
|
// Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them
|
||||||
|
|
||||||
|
public MultiSelectListPreference(Context context) { super(context); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setEntries(CharSequence[] entries) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public CharSequence[] getEntries() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setEntryValues(CharSequence[] entryValues) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public CharSequence[] getEntryValues() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setValues(Set<String> values) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public Set<String> getValues() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
public int findIndexOfValue(String value) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
@Override
|
||||||
|
public String getDefaultValueType() {
|
||||||
|
return "Set";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A minimal implementation of androidx.preference.Preference
|
||||||
|
*/
|
||||||
|
public class Preference {
|
||||||
|
// reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/Preference.java
|
||||||
|
// Note: `Preference` doesn't actually hold or persist the value, `OnPreferenceChangeListener` is called and it's up to the extension to persist it.
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
protected Context context;
|
||||||
|
|
||||||
|
private String key;
|
||||||
|
private CharSequence title;
|
||||||
|
private CharSequence summary;
|
||||||
|
private Object defaultValue;
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
@JsonIgnore
|
||||||
|
private SharedPreferences sharedPreferences;
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public OnPreferenceChangeListener onChangeListener;
|
||||||
|
|
||||||
|
public Preference(Context context) {
|
||||||
|
this.context = context;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Context getContext() {
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOnPreferenceChangeListener(OnPreferenceChangeListener onPreferenceChangeListener) {
|
||||||
|
this.onChangeListener = onPreferenceChangeListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOnPreferenceClickListener(OnPreferenceClickListener onPreferenceClickListener) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public CharSequence getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(CharSequence title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CharSequence getSummary() {
|
||||||
|
return summary;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSummary(CharSequence summary) {
|
||||||
|
this.summary = summary;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEnabled(boolean enabled) {
|
||||||
|
throw new RuntimeException("Stub!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getKey() {
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setKey(String key) {
|
||||||
|
this.key = key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDefaultValue(Object defaultValue) {
|
||||||
|
this.defaultValue = defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean callChangeListener(Object newValue) {
|
||||||
|
return onChangeListener == null || onChangeListener.onPreferenceChange(this, newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Object getDefaultValue() {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
public String getDefaultValueType() {
|
||||||
|
return defaultValue.getClass().getSimpleName();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
public SharedPreferences getSharedPreferences() {
|
||||||
|
return sharedPreferences;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
public void setSharedPreferences(SharedPreferences sharedPreferences) {
|
||||||
|
this.sharedPreferences = sharedPreferences;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface OnPreferenceChangeListener {
|
||||||
|
boolean onPreferenceChange(Preference preference, Object newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface OnPreferenceClickListener {
|
||||||
|
boolean onPreferenceClick(Preference preference);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
public Object getCurrentValue() {
|
||||||
|
switch (getDefaultValueType()) {
|
||||||
|
case "String":
|
||||||
|
return sharedPreferences.getString(key, (String)defaultValue);
|
||||||
|
case "Boolean":
|
||||||
|
return sharedPreferences.getBoolean(key, (Boolean)defaultValue);
|
||||||
|
default:
|
||||||
|
throw new RuntimeException("Unsupported type");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
public void saveNewValue(Object value) {
|
||||||
|
switch (getDefaultValueType()) {
|
||||||
|
case "String":
|
||||||
|
sharedPreferences.edit().putString(key, (String)value).apply();
|
||||||
|
break;
|
||||||
|
case "Boolean":
|
||||||
|
sharedPreferences.edit().putBoolean(key, (Boolean)value).apply();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new RuntimeException("Unsupported type");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class PreferenceScreen extends Preference {
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
private List<Preference> preferences = new LinkedList<>();
|
||||||
|
|
||||||
|
public PreferenceScreen(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean addPreference(Preference preference) {
|
||||||
|
// propagate own shared preferences
|
||||||
|
preference.setSharedPreferences(getSharedPreferences());
|
||||||
|
|
||||||
|
preferences.add(preference);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
public List<Preference> getPreferences(){
|
||||||
|
return preferences;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
public class SwitchPreferenceCompat extends TwoStatePreference {
|
||||||
|
// reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/CheckBoxPreference.java
|
||||||
|
|
||||||
|
public SwitchPreferenceCompat(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package androidx.preference;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
|
public class TwoStatePreference extends Preference {
|
||||||
|
// Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them
|
||||||
|
|
||||||
|
public TwoStatePreference(Context context) { super(context); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public boolean isChecked() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setChecked(boolean checked) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public CharSequence getSummaryOn() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setSummaryOn(CharSequence summary) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public CharSequence getSummaryOff() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setSummaryOff(CharSequence summary) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public boolean getDisableDependentsState() { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public void setDisableDependentsState(boolean disableDependentsState) { throw new RuntimeException("Stub!"); }
|
||||||
|
|
||||||
|
/** Tachidesk specific API */
|
||||||
|
@Override
|
||||||
|
public String getDefaultValueType() {
|
||||||
|
return "Boolean";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package rx.android.schedulers
|
package rx.android.schedulers
|
||||||
|
|
||||||
|
import rx.Scheduler
|
||||||
import rx.internal.schedulers.ImmediateScheduler
|
import rx.internal.schedulers.ImmediateScheduler
|
||||||
|
|
||||||
class AndroidSchedulers {
|
class AndroidSchedulers {
|
||||||
@@ -11,6 +12,7 @@ class AndroidSchedulers {
|
|||||||
/**
|
/**
|
||||||
* Simulated main thread scheduler
|
* Simulated main thread scheduler
|
||||||
*/
|
*/
|
||||||
fun mainThread() = mainThreadScheduler
|
@JvmStatic
|
||||||
|
fun mainThread(): Scheduler = mainThreadScheduler
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,5 +26,8 @@ class AndroidCompatInitializer {
|
|||||||
ApplicationInfoConfigModule.register(GlobalConfigManager.config),
|
ApplicationInfoConfigModule.register(GlobalConfigManager.config),
|
||||||
SystemConfigModule.register(GlobalConfigManager.config)
|
SystemConfigModule.register(GlobalConfigManager.config)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Set some properties extensions use
|
||||||
|
System.setProperty("http.agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-13
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
|
import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
|
||||||
import xyz.nulldev.androidcompat.io.AndroidFiles;
|
import xyz.nulldev.androidcompat.io.AndroidFiles;
|
||||||
import xyz.nulldev.androidcompat.io.sharedprefs.JsonSharedPreferences;
|
import xyz.nulldev.androidcompat.io.sharedprefs.JavaSharedPreferences;
|
||||||
import xyz.nulldev.androidcompat.service.ServiceSupport;
|
import xyz.nulldev.androidcompat.service.ServiceSupport;
|
||||||
import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
|
import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
|
||||||
|
|
||||||
@@ -50,10 +50,9 @@ import java.util.Map;
|
|||||||
/**
|
/**
|
||||||
* Custom context implementation.
|
* Custom context implementation.
|
||||||
*
|
*
|
||||||
* TODO Deal with packagemanager for extension sources
|
|
||||||
*/
|
*/
|
||||||
public class CustomContext extends Context implements DIAware {
|
public class CustomContext extends Context implements DIAware {
|
||||||
private DI kodein;
|
private final DI kodein;
|
||||||
public CustomContext() {
|
public CustomContext() {
|
||||||
this(KodeinGlobalHelper.kodein());
|
this(KodeinGlobalHelper.kodein());
|
||||||
}
|
}
|
||||||
@@ -165,23 +164,22 @@ public class CustomContext extends Context implements DIAware {
|
|||||||
/** Fake shared prefs! **/
|
/** Fake shared prefs! **/
|
||||||
private Map<String, SharedPreferences> prefs = new HashMap<>(); //Cache
|
private Map<String, SharedPreferences> prefs = new HashMap<>(); //Cache
|
||||||
|
|
||||||
private File sharedPrefsFileFromString(String s) {
|
|
||||||
return new File(androidFiles.getPrefsDir(), s + ".json");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized SharedPreferences getSharedPreferences(String s, int i) {
|
public synchronized SharedPreferences getSharedPreferences(String s, int i) {
|
||||||
SharedPreferences preferences = prefs.get(s);
|
SharedPreferences preferences = prefs.get(s);
|
||||||
//Create new shared preferences if one does not exist
|
//Create new shared preferences if one does not exist
|
||||||
if(preferences == null) {
|
if(preferences == null) {
|
||||||
preferences = getSharedPreferences(sharedPrefsFileFromString(s), i);
|
preferences = new JavaSharedPreferences(s);
|
||||||
prefs.put(s, preferences);
|
prefs.put(s, preferences);
|
||||||
}
|
}
|
||||||
return preferences;
|
return preferences;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SharedPreferences getSharedPreferences(File file, int mode) {
|
@Override
|
||||||
return new JsonSharedPreferences(file);
|
public SharedPreferences getSharedPreferences(@NotNull File file, int mode) {
|
||||||
|
String path = file.getAbsolutePath().replace('\\', '/');
|
||||||
|
int firstSlash = path.indexOf("/");
|
||||||
|
return new JavaSharedPreferences(path.substring(firstSlash));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -191,8 +189,8 @@ public class CustomContext extends Context implements DIAware {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean deleteSharedPreferences(String name) {
|
public boolean deleteSharedPreferences(String name) {
|
||||||
prefs.remove(name);
|
JavaSharedPreferences item = (JavaSharedPreferences) prefs.remove(name);
|
||||||
return sharedPrefsFileFromString(name).delete();
|
return item.deleteAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -735,4 +733,3 @@ public class CustomContext extends Context implements DIAware {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+177
@@ -0,0 +1,177 @@
|
|||||||
|
package xyz.nulldev.androidcompat.io.sharedprefs
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.SharedPreferences
|
||||||
|
import com.russhwolf.settings.ExperimentalSettingsApi
|
||||||
|
import com.russhwolf.settings.ExperimentalSettingsImplementation
|
||||||
|
import com.russhwolf.settings.JvmPreferencesSettings
|
||||||
|
import com.russhwolf.settings.serialization.decodeValue
|
||||||
|
import com.russhwolf.settings.serialization.encodeValue
|
||||||
|
import kotlinx.serialization.ExperimentalSerializationApi
|
||||||
|
import kotlinx.serialization.SerializationException
|
||||||
|
import kotlinx.serialization.builtins.SetSerializer
|
||||||
|
import kotlinx.serialization.builtins.nullable
|
||||||
|
import kotlinx.serialization.builtins.serializer
|
||||||
|
import java.util.prefs.PreferenceChangeListener
|
||||||
|
import java.util.prefs.Preferences
|
||||||
|
|
||||||
|
@OptIn(ExperimentalSettingsImplementation::class, ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
|
||||||
|
class JavaSharedPreferences(key: String) : SharedPreferences {
|
||||||
|
private val javaPreferences = Preferences.userRoot().node("suwayomi/tachidesk/$key")
|
||||||
|
private val preferences = JvmPreferencesSettings(javaPreferences)
|
||||||
|
private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, PreferenceChangeListener>()
|
||||||
|
|
||||||
|
// TODO: 2021-05-29 Need to find a way to get this working with all pref types
|
||||||
|
override fun getAll(): MutableMap<String, *> {
|
||||||
|
return preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getString(key: String, defValue: String?): String? {
|
||||||
|
return if (defValue != null) {
|
||||||
|
preferences.getString(key, defValue)
|
||||||
|
} else {
|
||||||
|
preferences.getStringOrNull(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getStringSet(key: String, defValues: MutableSet<String>?): MutableSet<String>? {
|
||||||
|
try {
|
||||||
|
return if (defValues != null) {
|
||||||
|
preferences.decodeValue(SetSerializer(String.serializer()).nullable, key, defValues)
|
||||||
|
} else {
|
||||||
|
preferences.decodeValue(SetSerializer(String.serializer()).nullable, key, null)
|
||||||
|
}?.toMutableSet()
|
||||||
|
} catch (e: SerializationException) {
|
||||||
|
throw ClassCastException("$key was not a StringSet")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getInt(key: String, defValue: Int): Int {
|
||||||
|
return preferences.getInt(key, defValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getLong(key: String, defValue: Long): Long {
|
||||||
|
return preferences.getLong(key, defValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getFloat(key: String, defValue: Float): Float {
|
||||||
|
return preferences.getFloat(key, defValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getBoolean(key: String, defValue: Boolean): Boolean {
|
||||||
|
return preferences.getBoolean(key, defValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun contains(key: String): Boolean {
|
||||||
|
return key in preferences.keys
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun edit(): SharedPreferences.Editor {
|
||||||
|
return Editor(preferences)
|
||||||
|
}
|
||||||
|
|
||||||
|
class Editor(private val preferences: JvmPreferencesSettings) : SharedPreferences.Editor {
|
||||||
|
val itemsToAdd = mutableMapOf<String, Any>()
|
||||||
|
|
||||||
|
override fun putString(key: String, value: String?): SharedPreferences.Editor {
|
||||||
|
if (value != null) {
|
||||||
|
itemsToAdd[key] = value
|
||||||
|
} else {
|
||||||
|
remove(key)
|
||||||
|
}
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun putStringSet(
|
||||||
|
key: String,
|
||||||
|
values: MutableSet<String>?
|
||||||
|
): SharedPreferences.Editor {
|
||||||
|
if (values != null) {
|
||||||
|
itemsToAdd[key] = values
|
||||||
|
} else {
|
||||||
|
remove(key)
|
||||||
|
}
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun putInt(key: String, value: Int): SharedPreferences.Editor {
|
||||||
|
itemsToAdd[key] = value
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun putLong(key: String, value: Long): SharedPreferences.Editor {
|
||||||
|
itemsToAdd[key] = value
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun putFloat(key: String, value: Float): SharedPreferences.Editor {
|
||||||
|
itemsToAdd[key] = value
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun putBoolean(key: String, value: Boolean): SharedPreferences.Editor {
|
||||||
|
itemsToAdd[key] = value
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun remove(key: String): SharedPreferences.Editor {
|
||||||
|
itemsToAdd.remove(key)
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun clear(): SharedPreferences.Editor {
|
||||||
|
itemsToAdd.clear()
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun commit(): Boolean {
|
||||||
|
addToPreferences()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun apply() {
|
||||||
|
addToPreferences()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun addToPreferences() {
|
||||||
|
itemsToAdd.forEach { (key, value) ->
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
when (value) {
|
||||||
|
is Set<*> -> preferences.encodeValue(SetSerializer(String.serializer()), key, value as Set<String>)
|
||||||
|
is String -> preferences.putString(key, value)
|
||||||
|
is Int -> preferences.putInt(key, value)
|
||||||
|
is Long -> preferences.putLong(key, value)
|
||||||
|
is Float -> preferences.putFloat(key, value)
|
||||||
|
is Double -> preferences.putDouble(key, value)
|
||||||
|
is Boolean -> preferences.putBoolean(key, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun registerOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
|
||||||
|
val javaListener = PreferenceChangeListener {
|
||||||
|
listener.onSharedPreferenceChanged(this, it.key)
|
||||||
|
}
|
||||||
|
listeners[listener] = javaListener
|
||||||
|
javaPreferences.addPreferenceChangeListener(javaListener)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun unregisterOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
|
||||||
|
val registeredListener = listeners.remove(listener)
|
||||||
|
if (registeredListener != null) {
|
||||||
|
javaPreferences.removePreferenceChangeListener(registeredListener)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun deleteAll(): Boolean {
|
||||||
|
javaPreferences.removeNode()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -233,7 +233,7 @@ public class JsonSharedPreferences implements SharedPreferences {
|
|||||||
private JsonSharedPreferencesEditor() {
|
private JsonSharedPreferencesEditor() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void recordChange(String key) {
|
private void recordChange(String key) {
|
||||||
if (!affectedKeys.contains(key)) {
|
if (!affectedKeys.contains(key)) {
|
||||||
affectedKeys.add(key);
|
affectedKeys.add(key);
|
||||||
}
|
}
|
||||||
|
|||||||
+249
@@ -0,0 +1,249 @@
|
|||||||
|
package xyz.nulldev.androidcompat.replace.java.text;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import com.ibm.icu.text.DisplayContext;
|
||||||
|
import com.ibm.icu.util.Currency;
|
||||||
|
import com.ibm.icu.util.CurrencyAmount;
|
||||||
|
import com.ibm.icu.util.ULocale;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.BigInteger;
|
||||||
|
import java.text.AttributedCharacterIterator;
|
||||||
|
import java.text.FieldPosition;
|
||||||
|
import java.text.ParseException;
|
||||||
|
import java.text.ParsePosition;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
public class NumberFormat extends java.text.NumberFormat {
|
||||||
|
private com.ibm.icu.text.NumberFormat delegate;
|
||||||
|
|
||||||
|
public NumberFormat(com.ibm.icu.text.NumberFormat delegate) {
|
||||||
|
this.delegate = delegate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(number, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String format(BigInteger number) {
|
||||||
|
return delegate.format(number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String format(BigDecimal number) {
|
||||||
|
return delegate.format(number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String format(com.ibm.icu.math.BigDecimal number) {
|
||||||
|
return delegate.format(number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String format(CurrencyAmount currAmt) {
|
||||||
|
return delegate.format(currAmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(number, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(long number, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(number, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(BigInteger number, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(number, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(BigDecimal number, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(number, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(number, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(CurrencyAmount currAmt, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(currAmt, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Number parse(String text, ParsePosition parsePosition) {
|
||||||
|
return delegate.parse(text, parsePosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Number parse(String text) throws ParseException {
|
||||||
|
return delegate.parse(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CurrencyAmount parseCurrency(CharSequence text, ParsePosition pos) {
|
||||||
|
return delegate.parseCurrency(text, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isParseIntegerOnly() {
|
||||||
|
return delegate.isParseIntegerOnly();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setParseIntegerOnly(boolean value) {
|
||||||
|
delegate.setParseIntegerOnly(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setParseStrict(boolean value) {
|
||||||
|
delegate.setParseStrict(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isParseStrict() {
|
||||||
|
return delegate.isParseStrict();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setContext(DisplayContext context) {
|
||||||
|
delegate.setContext(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DisplayContext getContext(DisplayContext.Type type) {
|
||||||
|
return delegate.getContext(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.text.NumberFormat getInstance(Locale inLocale) {
|
||||||
|
return new NumberFormat(com.ibm.icu.text.NumberFormat.getInstance(inLocale));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getInstance(ULocale inLocale) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getInstance(inLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getInstance(int style) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getInstance(style);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getInstance(Locale inLocale, int style) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getInstance(inLocale, style);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getNumberInstance(ULocale inLocale) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getNumberInstance(inLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getIntegerInstance(ULocale inLocale) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getIntegerInstance(inLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getCurrencyInstance(ULocale inLocale) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getCurrencyInstance(inLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getPercentInstance(ULocale inLocale) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getPercentInstance(inLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getScientificInstance(ULocale inLocale) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getScientificInstance(inLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Locale[] getAvailableLocales() {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getAvailableLocales();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ULocale[] getAvailableULocales() {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getAvailableULocales();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Object registerFactory(com.ibm.icu.text.NumberFormat.NumberFormatFactory factory) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.registerFactory(factory);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean unregister(Object registryKey) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.unregister(registryKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return delegate.hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
return delegate.equals(obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object clone() {
|
||||||
|
return delegate.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isGroupingUsed() {
|
||||||
|
return delegate.isGroupingUsed();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGroupingUsed(boolean newValue) {
|
||||||
|
delegate.setGroupingUsed(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMaximumIntegerDigits() {
|
||||||
|
return delegate.getMaximumIntegerDigits();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMaximumIntegerDigits(int newValue) {
|
||||||
|
delegate.setMaximumIntegerDigits(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMinimumIntegerDigits() {
|
||||||
|
return delegate.getMinimumIntegerDigits();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMinimumIntegerDigits(int newValue) {
|
||||||
|
delegate.setMinimumIntegerDigits(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMaximumFractionDigits() {
|
||||||
|
return delegate.getMaximumFractionDigits();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMaximumFractionDigits(int newValue) {
|
||||||
|
delegate.setMaximumFractionDigits(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMinimumFractionDigits() {
|
||||||
|
return delegate.getMinimumFractionDigits();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMinimumFractionDigits(int newValue) {
|
||||||
|
delegate.setMinimumFractionDigits(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCurrency(Currency theCurrency) {
|
||||||
|
delegate.setCurrency(theCurrency);
|
||||||
|
}
|
||||||
|
|
||||||
|
public java.util.Currency getCurrency() {
|
||||||
|
return java.util.Currency.getInstance(delegate.getCurrency().getCurrencyCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRoundingMode(int roundingMode) {
|
||||||
|
delegate.setRoundingMode(roundingMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.NumberFormat getInstance(ULocale desiredLocale, int choice) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getInstance(desiredLocale, choice);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static String getPatternForStyle(ULocale forLocale, int choice) {
|
||||||
|
return com.ibm.icu.text.NumberFormat.getPatternForStyle(forLocale, choice);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ULocale getLocale(ULocale.Type type) {
|
||||||
|
return delegate.getLocale(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
|
||||||
|
return delegate.formatToCharacterIterator(obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Object parseObject(String source) throws ParseException {
|
||||||
|
return delegate.parseObject(source);
|
||||||
|
}
|
||||||
|
}
|
||||||
+346
@@ -0,0 +1,346 @@
|
|||||||
|
package xyz.nulldev.androidcompat.replace.java.text;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import com.ibm.icu.text.DateFormatSymbols;
|
||||||
|
import com.ibm.icu.text.DisplayContext;
|
||||||
|
import com.ibm.icu.text.TimeZoneFormat;
|
||||||
|
import com.ibm.icu.util.ULocale;
|
||||||
|
import xyz.nulldev.androidcompat.replace.java.util.Calendar;
|
||||||
|
import xyz.nulldev.androidcompat.replace.java.util.TimeZone;
|
||||||
|
|
||||||
|
import java.text.*;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overridden to switch to Android implementation
|
||||||
|
*/
|
||||||
|
public class SimpleDateFormat extends java.text.DateFormat {
|
||||||
|
private com.ibm.icu.text.SimpleDateFormat delegate;
|
||||||
|
|
||||||
|
public SimpleDateFormat() {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat();
|
||||||
|
}
|
||||||
|
|
||||||
|
private SimpleDateFormat(com.ibm.icu.text.SimpleDateFormat delegate) {
|
||||||
|
this.delegate = delegate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SimpleDateFormat(String pattern) {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SimpleDateFormat(String pattern, Locale loc) {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SimpleDateFormat(String pattern, ULocale loc) {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SimpleDateFormat(String pattern, String override, ULocale loc) {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, override, loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SimpleDateFormat(String pattern, DateFormatSymbols formatData) {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, formatData);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SimpleDateFormat(String pattern, DateFormatSymbols formatData, ULocale loc) {
|
||||||
|
delegate = new com.ibm.icu.text.SimpleDateFormat(pattern, formatData, loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static SimpleDateFormat getInstance(com.ibm.icu.util.Calendar.FormatConfiguration formatConfig) {
|
||||||
|
return new SimpleDateFormat(com.ibm.icu.text.SimpleDateFormat.getInstance(formatConfig));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void set2DigitYearStart(Date startDate) {
|
||||||
|
delegate.set2DigitYearStart(startDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Date get2DigitYearStart() {
|
||||||
|
return delegate.get2DigitYearStart();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setContext(DisplayContext context) {
|
||||||
|
delegate.setContext(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuffer format(com.ibm.icu.util.Calendar cal, StringBuffer toAppendTo, FieldPosition pos) {
|
||||||
|
return delegate.format(cal, toAppendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNumberFormat(com.ibm.icu.text.NumberFormat newNumberFormat) {
|
||||||
|
delegate.setNumberFormat(newNumberFormat);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void parse(String text, com.ibm.icu.util.Calendar cal, ParsePosition parsePos) {
|
||||||
|
delegate.parse(text, cal, parsePos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String toPattern() {
|
||||||
|
return delegate.toPattern();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String toLocalizedPattern() {
|
||||||
|
return delegate.toLocalizedPattern();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void applyPattern(String pat) {
|
||||||
|
delegate.applyPattern(pat);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void applyLocalizedPattern(String pat) {
|
||||||
|
delegate.applyLocalizedPattern(pat);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DateFormatSymbols getDateFormatSymbols() {
|
||||||
|
return delegate.getDateFormatSymbols();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDateFormatSymbols(DateFormatSymbols newFormatSymbols) {
|
||||||
|
delegate.setDateFormatSymbols(newFormatSymbols);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TimeZoneFormat getTimeZoneFormat() {
|
||||||
|
return delegate.getTimeZoneFormat();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTimeZoneFormat(TimeZoneFormat tzfmt) {
|
||||||
|
delegate.setTimeZoneFormat(tzfmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object clone() {
|
||||||
|
return delegate.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return delegate.hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
return delegate.equals(obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
|
||||||
|
return delegate.formatToCharacterIterator(obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public StringBuffer intervalFormatByAlgorithm(com.ibm.icu.util.Calendar fromCalendar, com.ibm.icu.util.Calendar toCalendar, StringBuffer appendTo, FieldPosition pos) throws IllegalArgumentException {
|
||||||
|
return delegate.intervalFormatByAlgorithm(fromCalendar, toCalendar, appendTo, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNumberFormat(String fields, com.ibm.icu.text.NumberFormat overrideNF) {
|
||||||
|
delegate.setNumberFormat(fields, overrideNF);
|
||||||
|
}
|
||||||
|
|
||||||
|
public com.ibm.icu.text.NumberFormat getNumberFormat(char field) {
|
||||||
|
return delegate.getNumberFormat(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
|
||||||
|
return delegate.format(date, toAppendTo, fieldPosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Date parse(String text) throws ParseException {
|
||||||
|
return delegate.parse(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Date parse(String text, ParsePosition pos) {
|
||||||
|
return delegate.parse(text, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object parseObject(String source, ParsePosition pos) {
|
||||||
|
return delegate.parseObject(source, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getTimeInstance(int style, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getTimeInstance(style, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateInstance(int style, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateInstance(style, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateTimeInstance(int dateStyle, int timeStyle, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Locale[] getAvailableLocales() {
|
||||||
|
return com.ibm.icu.text.DateFormat.getAvailableLocales();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ULocale[] getAvailableULocales() {
|
||||||
|
return com.ibm.icu.text.DateFormat.getAvailableULocales();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCalendar(java.util.Calendar newCalendar) {
|
||||||
|
com.ibm.icu.util.Calendar cal = com.ibm.icu.util.Calendar.getInstance(com.ibm.icu.util.TimeZone.getTimeZone(newCalendar.getTimeZone().getID()));
|
||||||
|
cal.setTimeInMillis(newCalendar.getTimeInMillis());
|
||||||
|
delegate.setCalendar(cal);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public java.util.Calendar getCalendar() {
|
||||||
|
return new Calendar(delegate.getCalendar());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public java.text.NumberFormat getNumberFormat() {
|
||||||
|
return new NumberFormat(delegate.getNumberFormat());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setTimeZone(java.util.TimeZone zone) {
|
||||||
|
delegate.setTimeZone(com.ibm.icu.util.TimeZone.getTimeZone(zone.getID()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public java.util.TimeZone getTimeZone() {
|
||||||
|
return new TimeZone(delegate.getTimeZone());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setLenient(boolean lenient) {
|
||||||
|
delegate.setLenient(lenient);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isLenient() {
|
||||||
|
return delegate.isLenient();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCalendarLenient(boolean lenient) {
|
||||||
|
delegate.setCalendarLenient(lenient);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isCalendarLenient() {
|
||||||
|
return delegate.isCalendarLenient();
|
||||||
|
}
|
||||||
|
|
||||||
|
public com.ibm.icu.text.DateFormat setBooleanAttribute(com.ibm.icu.text.DateFormat.BooleanAttribute key, boolean value) {
|
||||||
|
return delegate.setBooleanAttribute(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getBooleanAttribute(com.ibm.icu.text.DateFormat.BooleanAttribute key) {
|
||||||
|
return delegate.getBooleanAttribute(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DisplayContext getContext(DisplayContext.Type type) {
|
||||||
|
return delegate.getContext(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateInstance(com.ibm.icu.util.Calendar cal, int dateStyle, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateInstance(cal, dateStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateInstance(com.ibm.icu.util.Calendar cal, int dateStyle, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateInstance(cal, dateStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getTimeInstance(com.ibm.icu.util.Calendar cal, int timeStyle, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getTimeInstance(cal, timeStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getTimeInstance(com.ibm.icu.util.Calendar cal, int timeStyle, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getTimeInstance(cal, timeStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateTimeInstance(com.ibm.icu.util.Calendar cal, int dateStyle, int timeStyle, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateTimeInstance(cal, dateStyle, timeStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateTimeInstance(com.ibm.icu.util.Calendar cal, int dateStyle, int timeStyle, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateTimeInstance(cal, dateStyle, timeStyle, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstance(com.ibm.icu.util.Calendar cal, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstance(cal, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstance(com.ibm.icu.util.Calendar cal, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstance(cal, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstance(com.ibm.icu.util.Calendar cal) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstance(cal);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateInstance(com.ibm.icu.util.Calendar cal, int dateStyle) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateInstance(cal, dateStyle);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getTimeInstance(com.ibm.icu.util.Calendar cal, int timeStyle) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getTimeInstance(cal, timeStyle);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getDateTimeInstance(com.ibm.icu.util.Calendar cal, int dateStyle, int timeStyle) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getDateTimeInstance(cal, dateStyle, timeStyle);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(String skeleton) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(skeleton);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(String skeleton, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(String skeleton, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(com.ibm.icu.util.Calendar cal, String skeleton, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(cal, skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getInstanceForSkeleton(com.ibm.icu.util.Calendar cal, String skeleton, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getInstanceForSkeleton(cal, skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getPatternInstance(String skeleton) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getPatternInstance(skeleton);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getPatternInstance(String skeleton, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getPatternInstance(skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getPatternInstance(String skeleton, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getPatternInstance(skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getPatternInstance(com.ibm.icu.util.Calendar cal, String skeleton, Locale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getPatternInstance(cal, skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.text.DateFormat getPatternInstance(com.ibm.icu.util.Calendar cal, String skeleton, ULocale locale) {
|
||||||
|
return com.ibm.icu.text.DateFormat.getPatternInstance(cal, skeleton, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ULocale getLocale(ULocale.Type type) {
|
||||||
|
return delegate.getLocale(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object parseObject(String source) throws ParseException {
|
||||||
|
return delegate.parseObject(source);
|
||||||
|
}
|
||||||
|
}
|
||||||
+294
@@ -0,0 +1,294 @@
|
|||||||
|
package xyz.nulldev.androidcompat.replace.java.util;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import com.ibm.icu.text.DateFormat;
|
||||||
|
import com.ibm.icu.util.ULocale;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
public class Calendar extends java.util.Calendar {
|
||||||
|
private com.ibm.icu.util.Calendar delegate;
|
||||||
|
|
||||||
|
public Calendar(com.ibm.icu.util.Calendar delegate) {
|
||||||
|
this.delegate = delegate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.util.Calendar getInstance() {
|
||||||
|
return new Calendar(com.ibm.icu.util.Calendar.getInstance());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.Calendar getInstance(com.ibm.icu.util.TimeZone zone) {
|
||||||
|
return com.ibm.icu.util.Calendar.getInstance(zone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.util.Calendar getInstance(Locale aLocale) {
|
||||||
|
return new Calendar(com.ibm.icu.util.Calendar.getInstance(aLocale));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.Calendar getInstance(ULocale locale) {
|
||||||
|
return com.ibm.icu.util.Calendar.getInstance(locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.Calendar getInstance(com.ibm.icu.util.TimeZone zone, Locale aLocale) {
|
||||||
|
return com.ibm.icu.util.Calendar.getInstance(zone, aLocale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.Calendar getInstance(com.ibm.icu.util.TimeZone zone, ULocale locale) {
|
||||||
|
return com.ibm.icu.util.Calendar.getInstance(zone, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Locale[] getAvailableLocales() {
|
||||||
|
return com.ibm.icu.util.Calendar.getAvailableLocales();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void computeTime() {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void computeFields() {}
|
||||||
|
|
||||||
|
public static ULocale[] getAvailableULocales() {
|
||||||
|
return com.ibm.icu.util.Calendar.getAvailableULocales();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String[] getKeywordValuesForLocale(String key, ULocale locale, boolean commonlyUsed) {
|
||||||
|
return com.ibm.icu.util.Calendar.getKeywordValuesForLocale(key, locale, commonlyUsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getTimeInMillis() {
|
||||||
|
return delegate.getTimeInMillis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setTimeInMillis(long millis) {
|
||||||
|
delegate.setTimeInMillis(millis);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public int getRelatedYear() {
|
||||||
|
return delegate.getRelatedYear();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public void setRelatedYear(int year) {
|
||||||
|
delegate.setRelatedYear(year);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
return delegate.equals(obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEquivalentTo(com.ibm.icu.util.Calendar other) {
|
||||||
|
return delegate.isEquivalentTo(other);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return delegate.hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean before(Object when) {
|
||||||
|
return delegate.before(when);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean after(Object when) {
|
||||||
|
return delegate.after(when);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getActualMaximum(int field) {
|
||||||
|
return delegate.getActualMaximum(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getActualMinimum(int field) {
|
||||||
|
return delegate.getActualMinimum(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void roll(int field, int amount) {
|
||||||
|
delegate.roll(field, amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void add(int field, int amount) {
|
||||||
|
delegate.add(field, amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void roll(int field, boolean up) {
|
||||||
|
roll(field, up ? 1 : -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDisplayName(Locale loc) {
|
||||||
|
return delegate.getDisplayName(loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDisplayName(ULocale loc) {
|
||||||
|
return delegate.getDisplayName(loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int compareTo(com.ibm.icu.util.Calendar that) {
|
||||||
|
return delegate.compareTo(that);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, Locale loc) {
|
||||||
|
return delegate.getDateTimeFormat(dateStyle, timeStyle, loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, ULocale loc) {
|
||||||
|
return delegate.getDateTimeFormat(dateStyle, timeStyle, loc);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static String getDateTimePattern(com.ibm.icu.util.Calendar cal, ULocale uLocale, int dateStyle) {
|
||||||
|
return com.ibm.icu.util.Calendar.getDateTimePattern(cal, uLocale, dateStyle);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int fieldDifference(Date when, int field) {
|
||||||
|
return delegate.fieldDifference(when, field);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTimeZone(com.ibm.icu.util.TimeZone value) {
|
||||||
|
delegate.setTimeZone(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public java.util.TimeZone getTimeZone() {
|
||||||
|
return new TimeZone(delegate.getTimeZone());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setLenient(boolean lenient) {
|
||||||
|
delegate.setLenient(lenient);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isLenient() {
|
||||||
|
return delegate.isLenient();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRepeatedWallTimeOption(int option) {
|
||||||
|
delegate.setRepeatedWallTimeOption(option);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getRepeatedWallTimeOption() {
|
||||||
|
return delegate.getRepeatedWallTimeOption();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSkippedWallTimeOption(int option) {
|
||||||
|
delegate.setSkippedWallTimeOption(option);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSkippedWallTimeOption() {
|
||||||
|
return delegate.getSkippedWallTimeOption();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setFirstDayOfWeek(int value) {
|
||||||
|
delegate.setFirstDayOfWeek(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getFirstDayOfWeek() {
|
||||||
|
return delegate.getFirstDayOfWeek();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setMinimalDaysInFirstWeek(int value) {
|
||||||
|
delegate.setMinimalDaysInFirstWeek(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMinimalDaysInFirstWeek() {
|
||||||
|
return delegate.getMinimalDaysInFirstWeek();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMinimum(int field) {
|
||||||
|
return delegate.getMinimum(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaximum(int field) {
|
||||||
|
return delegate.getMaximum(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getGreatestMinimum(int field) {
|
||||||
|
return delegate.getGreatestMinimum(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getLeastMaximum(int field) {
|
||||||
|
return delegate.getLeastMaximum(field);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public int getDayOfWeekType(int dayOfWeek) {
|
||||||
|
return delegate.getDayOfWeekType(dayOfWeek);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public int getWeekendTransition(int dayOfWeek) {
|
||||||
|
return delegate.getWeekendTransition(dayOfWeek);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isWeekend(Date date) {
|
||||||
|
return delegate.isWeekend(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isWeekend() {
|
||||||
|
return delegate.isWeekend();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object clone() {
|
||||||
|
return delegate.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return delegate.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.Calendar.WeekData getWeekDataForRegion(String region) {
|
||||||
|
return com.ibm.icu.util.Calendar.getWeekDataForRegion(region);
|
||||||
|
}
|
||||||
|
|
||||||
|
public com.ibm.icu.util.Calendar.WeekData getWeekData() {
|
||||||
|
return delegate.getWeekData();
|
||||||
|
}
|
||||||
|
|
||||||
|
public com.ibm.icu.util.Calendar setWeekData(com.ibm.icu.util.Calendar.WeekData wdata) {
|
||||||
|
return delegate.setWeekData(wdata);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getFieldCount() {
|
||||||
|
return delegate.getFieldCount();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getType() {
|
||||||
|
return delegate.getType();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public boolean haveDefaultCentury() {
|
||||||
|
return delegate.haveDefaultCentury();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ULocale getLocale(ULocale.Type type) {
|
||||||
|
return delegate.getLocale(type);
|
||||||
|
}
|
||||||
|
}
|
||||||
+196
@@ -0,0 +1,196 @@
|
|||||||
|
package xyz.nulldev.androidcompat.replace.java.util;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import com.ibm.icu.util.ULocale;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class TimeZone extends java.util.TimeZone {
|
||||||
|
private com.ibm.icu.util.TimeZone delegate;
|
||||||
|
|
||||||
|
public TimeZone(com.ibm.icu.util.TimeZone delegate) {
|
||||||
|
this.delegate = delegate;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds) {
|
||||||
|
return delegate.getOffset(era, year, month, day, dayOfWeek, milliseconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getOffset(long date) {
|
||||||
|
return delegate.getOffset(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void getOffset(long date, boolean local, int[] offsets) {
|
||||||
|
delegate.getOffset(date, local, offsets);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setRawOffset(int offsetMillis) {
|
||||||
|
delegate.setRawOffset(offsetMillis);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getRawOffset() {
|
||||||
|
return delegate.getRawOffset();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getID() {
|
||||||
|
return delegate.getID();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setID(String ID) {
|
||||||
|
delegate.setID(ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDisplayName(ULocale locale) {
|
||||||
|
return delegate.getDisplayName(locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDisplayName(boolean daylight, int style, Locale locale) {
|
||||||
|
return delegate.getDisplayName(daylight, style, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDisplayName(boolean daylight, int style, ULocale locale) {
|
||||||
|
return delegate.getDisplayName(daylight, style, locale);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getDSTSavings() {
|
||||||
|
return delegate.getDSTSavings();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean useDaylightTime() {
|
||||||
|
return delegate.useDaylightTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean observesDaylightTime() {
|
||||||
|
return delegate.observesDaylightTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean inDaylightTime(Date date) {
|
||||||
|
return delegate.inDaylightTime(date);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.util.TimeZone getTimeZone(String ID) {
|
||||||
|
return new TimeZone(com.ibm.icu.util.TimeZone.getTimeZone(ID));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.TimeZone getFrozenTimeZone(String ID) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getFrozenTimeZone(ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static com.ibm.icu.util.TimeZone getTimeZone(String ID, int type) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getTimeZone(ID, type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setDefaultTimeZoneType(int type) {
|
||||||
|
com.ibm.icu.util.TimeZone.setDefaultTimeZoneType(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getDefaultTimeZoneType() {
|
||||||
|
return com.ibm.icu.util.TimeZone.getDefaultTimeZoneType();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Set<String> getAvailableIDs(com.ibm.icu.util.TimeZone.SystemTimeZoneType zoneType, String region, Integer rawOffset) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getAvailableIDs(zoneType, region, rawOffset);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String[] getAvailableIDs(int rawOffset) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getAvailableIDs(rawOffset);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String[] getAvailableIDs(String country) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getAvailableIDs(country);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String[] getAvailableIDs() {
|
||||||
|
return com.ibm.icu.util.TimeZone.getAvailableIDs();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int countEquivalentIDs(String id) {
|
||||||
|
return com.ibm.icu.util.TimeZone.countEquivalentIDs(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getEquivalentID(String id, int index) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getEquivalentID(id, index);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.util.TimeZone getDefault() {
|
||||||
|
return new TimeZone(com.ibm.icu.util.TimeZone.getDefault());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setDefault(com.ibm.icu.util.TimeZone tz) {
|
||||||
|
com.ibm.icu.util.TimeZone.setDefault(tz);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasSameRules(com.ibm.icu.util.TimeZone other) {
|
||||||
|
return delegate.hasSameRules(other);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object clone() {
|
||||||
|
return delegate.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
return delegate.equals(obj);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return delegate.hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getTZDataVersion() {
|
||||||
|
return com.ibm.icu.util.TimeZone.getTZDataVersion();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getCanonicalID(String id) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getCanonicalID(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getCanonicalID(String id, boolean[] isSystemID) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getCanonicalID(id, isSystemID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getRegion(String id) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getRegion(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getWindowsID(String id) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getWindowsID(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getIDForWindowsID(String winid, String region) {
|
||||||
|
return com.ibm.icu.util.TimeZone.getIDForWindowsID(winid, region);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isFrozen() {
|
||||||
|
return delegate.isFrozen();
|
||||||
|
}
|
||||||
|
|
||||||
|
public com.ibm.icu.util.TimeZone freeze() {
|
||||||
|
return delegate.freeze();
|
||||||
|
}
|
||||||
|
|
||||||
|
public com.ibm.icu.util.TimeZone cloneAsThawed() {
|
||||||
|
return delegate.cloneAsThawed();
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
-5
@@ -16,7 +16,7 @@ This structure is chosen to
|
|||||||
- Eaise development of alternative user intefaces for Tachidesk
|
- Eaise development of alternative user intefaces for Tachidesk
|
||||||
|
|
||||||
## User Interfaces for Tachidesk server
|
## User Interfaces for Tachidesk server
|
||||||
Currently there are three known interfaces for Tachidesk:
|
Currently, there are three known interfaces for Tachidesk:
|
||||||
1. [webUI](https://github.com/Suwayomi/Tachidesk/tree/master/webUI/react): The react SPA that Tachidesk is traditionally shipped with.
|
1. [webUI](https://github.com/Suwayomi/Tachidesk/tree/master/webUI/react): The react SPA that Tachidesk is traditionally shipped with.
|
||||||
2. [TachideskJUI](https://github.com/Suwayomi/TachideskJUI): A Jetbrains Compose Native app, re-uses components made for the upcoming Tachiyomi 1.x
|
2. [TachideskJUI](https://github.com/Suwayomi/TachideskJUI): A Jetbrains Compose Native app, re-uses components made for the upcoming Tachiyomi 1.x
|
||||||
3. [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stages of development.
|
3. [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stages of development.
|
||||||
@@ -28,7 +28,7 @@ You need these software packages installed in order to build the project
|
|||||||
- Java Development Kit and Java Runtime Environment version 8 or newer(both Oracle JDK and OpenJDK works)
|
- Java Development Kit and Java Runtime Environment version 8 or newer(both Oracle JDK and OpenJDK works)
|
||||||
- Android stubs jar
|
- Android stubs jar
|
||||||
- Manual download: Download [android.jar](https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
|
- Manual download: Download [android.jar](https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
|
||||||
- Automated download: Run `AndroidCompat/getAndroid.sh`(MacOS/Linux) or `AndroidCompat/getAndroid.ps1`(Windows) from project's root directory to download and rebuild the jar file from Google's repository.
|
- Automated download: Run `AndroidCompat/getAndroid.sh`(MacOS/Linux) or `AndroidCompat/getAndroid.ps1`(Windows) from project's root directory to download and rebuild the jar file from Google's repository.
|
||||||
### webUI
|
### webUI
|
||||||
- Nodejs LTS or latest
|
- Nodejs LTS or latest
|
||||||
- Yarn
|
- Yarn
|
||||||
@@ -38,15 +38,15 @@ Run `./gradlew :webUI:copyBuild server:shadowJar`, the resulting built jar file
|
|||||||
### building without `webUI` bundled(server only)
|
### building without `webUI` bundled(server only)
|
||||||
Delete the `server/src/main/resources/react` directory if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
|
Delete the `server/src/main/resources/react` directory if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
|
||||||
### building the Windows package
|
### building the Windows package
|
||||||
Run `./gradlew :server:windowsPackage` to build a server only bundle and `./gradlew :webUI:copyBuild :server:windowsPackage` to get a full bundle , the resulting built zip package file will be `server/build/Tachidesk-vX.Y.Z-rxxx-win32.zip`.
|
First Build the jar, then cd into the `scripts` directory and run `./windows<bits>-bundler.sh` (or `./windows<bits>-bundler.ps1` if you are on windows), the resulting built zip package file will be `server/build/Tachidesk-vX.Y.Z-rxxx-win64.zip`.
|
||||||
## Running in development mode
|
## Running in development mode
|
||||||
First satistify [the prerequisites](#prerequisites)
|
First satisfy [the prerequisites](#prerequisites)
|
||||||
### server
|
### server
|
||||||
run `./gradlew :server:run --stacktrace` to run the server
|
run `./gradlew :server:run --stacktrace` to run the server
|
||||||
### webUI
|
### webUI
|
||||||
How to do it is described in `webUI/react/README.md` but for short,
|
How to do it is described in `webUI/react/README.md` but for short,
|
||||||
first cd into `webUI/react` then run `yarn` to install the node modules(do this only once)
|
first cd into `webUI/react` then run `yarn` to install the node modules(do this only once)
|
||||||
then `yarn start` to start the development server, if a new browser window doesn't get opned automatically,
|
then `yarn start` to start the development server, if a new browser window doesn't get opened automatically,
|
||||||
then open `http://127.0.0.1:3000` in a modern browser. This is a `create-react-app` project
|
then open `http://127.0.0.1:3000` in a modern browser. This is a `create-react-app` project
|
||||||
and supports HMR and all the other goodies you'll need.
|
and supports HMR and all the other goodies you'll need.
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
| Build | Stable | Preview | Support Server |
|
| Build | Stable | Preview | Support Server |
|
||||||
|-------|----------|---------|---------|
|
|-------|----------|---------|---------|
|
||||||
|  | [](https://github.com/Suwayomi/Tachidesk/releases) | [](https://github.com/Suwayomi/Tachidesk/tree/preview/latest_pointer) | [](https://discord.gg/DDZdqZWaHA) |
|
|  | [](https://github.com/Suwayomi/Tachidesk/releases) | [](https://github.com/Suwayomi/Tachidesk-preview/releases/latest) | [](https://discord.gg/DDZdqZWaHA) |
|
||||||
|
|
||||||
# Tachidesk
|
# Tachidesk
|
||||||
<img src="https://github.com/Suwayomi/Tachidesk/raw/master/server/src/main/resources/icon/faviconlogo.png" alt="drawing" width="200"/>
|
<img src="https://github.com/Suwayomi/Tachidesk/raw/master/server/src/main/resources/icon/faviconlogo.png" alt="drawing" width="200"/>
|
||||||
@@ -14,6 +14,8 @@ Tachidesk is as multi-platform as you can get. Any platform that runs java and/o
|
|||||||
|
|
||||||
Ability to read and write Tachiyomi compatible backups and syncing is a planned feature.
|
Ability to read and write Tachiyomi compatible backups and syncing is a planned feature.
|
||||||
|
|
||||||
|
**Tachidesk needs serious front-end dev help for it's reader and other parts, if you like the app and want to see it become better please don't hesitate to contribute some code!**
|
||||||
|
|
||||||
## Is this application usable? Should I test it?
|
## Is this application usable? Should I test it?
|
||||||
Here is a list of current features:
|
Here is a list of current features:
|
||||||
|
|
||||||
@@ -21,7 +23,7 @@ Here is a list of current features:
|
|||||||
- A library to save your mangas and categories to put them into.
|
- A library to save your mangas and categories to put them into.
|
||||||
- Searching and browsing installed sources.
|
- Searching and browsing installed sources.
|
||||||
- A decent chapter reader.
|
- A decent chapter reader.
|
||||||
- Ability to download Mangas for offline read(This partially works)
|
- Ability to download Manga for offline read
|
||||||
- Backup and restore support powered by Tachiyomi Legacy Backups
|
- Backup and restore support powered by Tachiyomi Legacy Backups
|
||||||
|
|
||||||
**Note:** Keep in mind that Tachidesk is alpha software and can break rarely and/or with each update. See [Troubleshooting](https://github.com/Suwayomi/Tachidesk/wiki/Troubleshooting) if it happens.
|
**Note:** Keep in mind that Tachidesk is alpha software and can break rarely and/or with each update. See [Troubleshooting](https://github.com/Suwayomi/Tachidesk/wiki/Troubleshooting) if it happens.
|
||||||
@@ -30,27 +32,36 @@ Here is a list of current features:
|
|||||||
### All Operating Systems
|
### All Operating Systems
|
||||||
You should have The Java Runtime Environment(JRE) 8 or newer and a modern browser installed(Google is your friend for seeking assitance). Also an internet connection is required as almost everything this app does is downloading stuff.
|
You should have The Java Runtime Environment(JRE) 8 or newer and a modern browser installed(Google is your friend for seeking assitance). Also an internet connection is required as almost everything this app does is downloading stuff.
|
||||||
|
|
||||||
Download the latest "Stable" jar release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview jar build from [the preview branch](https://github.com/Suwayomi/Tachidesk/tree/preview).
|
Download the latest "Stable" jar release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
|
||||||
|
|
||||||
Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxx.jar` (or `java -jar Tachidesk-latest.jar` if you have the latest preview) from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
|
Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxx.jar` (or `java -jar Tachidesk-latest.jar` if you have the latest preview) from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
Download the latest win32 release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases).
|
Download the latest "Stable" win32 or win64 (depending on your system, usually you want win64) release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
|
||||||
|
|
||||||
The Windows specific build has java bundled inside, so you don't have to install java to use it. Unzip `Tachidesk-vX.Y.Z-rxxx-win64.zip` and run `Tachidesk.bat`. The rest works like the previous section.
|
The Windows specific build has java bundled inside, so you don't have to install java to use it. Unzip `Tachidesk-vX.Y.Z-rxxx-win64.zip` and run one of the Launcher files depending on what you want(see bellow). The rest works like the previous section.
|
||||||
|
#### Windows Launchers
|
||||||
|
- `Tachidesk Electron Launcher.bat`: Launches Tachidesk inside Electron as a desktop applicaton
|
||||||
|
- `Tachidesk Browser Launcher.bat`: Launches Tachidesk in a browser window
|
||||||
|
- `Tachidesk Debug Launcher.bat`: Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why.
|
||||||
|
|
||||||
### Arch Linux
|
### Arch Linux
|
||||||
You can install Tachidesk from the AUR
|
You can install Tachidesk from the AUR
|
||||||
```
|
```
|
||||||
yay -S tachidesk
|
yay -S tachidesk
|
||||||
```
|
```
|
||||||
Or the latest preview version
|
|
||||||
```
|
|
||||||
yay -S tachidesk-preview
|
|
||||||
```
|
|
||||||
|
|
||||||
### Docker
|
### Docker
|
||||||
Check [arbuilder's repo](https://github.com/arbuilder/Tachidesk-docker) out for more details and the dockerfile.
|
Check our Offical Docker release [Tachidesk Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) or use [arbuilder's](https://github.com/arbuilder/Tachidesk-docker) tachidesk docker repo for installation. Source code for our container is available at [docker-tachidesk](https://github.com/Suwayomi/docker-tachidesk). By default the server will be running on http://localhost:4567 open this url in your browser.
|
||||||
|
|
||||||
|
Install from the command line:
|
||||||
|
```
|
||||||
|
$ docker pull ghcr.io/suwayomi/tachidesk
|
||||||
|
```
|
||||||
|
Run Container from the command line:
|
||||||
|
```
|
||||||
|
$ docker run -p 4567:4567 ghcr.io/suwayomi/tachidesk
|
||||||
|
```
|
||||||
|
|
||||||
### Using Tachidesk Remotely
|
### Using Tachidesk Remotely
|
||||||
You can run Tachidesk on your computer or a server and connect to it remotely through the web interface with a web browser on any device including a mobile or tablet or even your smart TV!, this method of using Tachidesk is only recommended if you are a power user and know what you are doing.
|
You can run Tachidesk on your computer or a server and connect to it remotely through the web interface with a web browser on any device including a mobile or tablet or even your smart TV!, this method of using Tachidesk is only recommended if you are a power user and know what you are doing.
|
||||||
|
|||||||
+12
-4
@@ -2,10 +2,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.4.32"
|
kotlin("jvm") version "1.4.32"
|
||||||
|
kotlin("plugin.serialization") version "1.4.32" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
group = "ir.armor.tachidesk"
|
group = "suwayomi"
|
||||||
|
|
||||||
version = "1.0"
|
version = "1.0"
|
||||||
|
|
||||||
@@ -42,7 +43,7 @@ configure(projects) {
|
|||||||
// Kotlin
|
// Kotlin
|
||||||
implementation(kotlin("stdlib-jdk8"))
|
implementation(kotlin("stdlib-jdk8"))
|
||||||
implementation(kotlin("reflect"))
|
implementation(kotlin("reflect"))
|
||||||
testImplementation(kotlin("test"))
|
testImplementation(kotlin("test-junit5"))
|
||||||
|
|
||||||
// coroutines
|
// coroutines
|
||||||
val coroutinesVersion = "1.4.3"
|
val coroutinesVersion = "1.4.3"
|
||||||
@@ -50,6 +51,10 @@ configure(projects) {
|
|||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
|
||||||
|
|
||||||
|
val kotlinSerializationVersion = "1.1.0"
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
|
||||||
|
|
||||||
|
|
||||||
// Dependency Injection
|
// Dependency Injection
|
||||||
implementation("org.kodein.di:kodein-di-conf-jvm:7.5.0")
|
implementation("org.kodein.di:kodein-di-conf-jvm:7.5.0")
|
||||||
@@ -59,14 +64,14 @@ configure(projects) {
|
|||||||
implementation("ch.qos.logback:logback-classic:1.2.3")
|
implementation("ch.qos.logback:logback-classic:1.2.3")
|
||||||
implementation("io.github.microutils:kotlin-logging:2.0.6")
|
implementation("io.github.microutils:kotlin-logging:2.0.6")
|
||||||
|
|
||||||
// RxJava
|
// ReactiveX
|
||||||
implementation("io.reactivex:rxjava:1.3.8")
|
implementation("io.reactivex:rxjava:1.3.8")
|
||||||
implementation("io.reactivex:rxkotlin:1.0.0")
|
implementation("io.reactivex:rxkotlin:1.0.0")
|
||||||
|
implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
|
||||||
|
|
||||||
// JSoup
|
// JSoup
|
||||||
implementation("org.jsoup:jsoup:1.13.1")
|
implementation("org.jsoup:jsoup:1.13.1")
|
||||||
|
|
||||||
|
|
||||||
// dependency of :AndroidCompat:Config
|
// dependency of :AndroidCompat:Config
|
||||||
implementation("com.typesafe:config:1.4.1")
|
implementation("com.typesafe:config:1.4.1")
|
||||||
implementation("io.github.config4k:config4k:0.4.2")
|
implementation("io.github.config4k:config4k:0.4.2")
|
||||||
@@ -79,5 +84,8 @@ configure(projects) {
|
|||||||
|
|
||||||
// APK parser
|
// APK parser
|
||||||
implementation("net.dongliu:apk-parser:2.6.10")
|
implementation("net.dongliu:apk-parser:2.6.10")
|
||||||
|
|
||||||
|
// Jackson
|
||||||
|
implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.3")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
start "" jre/bin/javaw -jar Tachidesk.jar
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
jre\bin\java -Dsuwayomi.tachidesk.server.debugLogsEnabled=true -jar Tachidesk.jar
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
jre\bin\javaw "-Dsuwayomi.tachidesk.server.webInterface=electron" "-Dsuwayomi.tachidesk.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
|
||||||
@@ -1 +0,0 @@
|
|||||||
jre\bin\java -Dir.armor.tachidesk.debugLogsEnabled=true -jar Tachidesk.jar
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
start "" "jre/bin/javaw -jar Tachidesk.jar"
|
|
||||||
+57
-11
@@ -6,31 +6,77 @@
|
|||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
echo "Downloading jre..."
|
electron_version="v12.0.9"
|
||||||
|
|
||||||
jre="OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip"
|
if [ $1 = "win32" ]; then
|
||||||
curl -L "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip" -o $jre
|
jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
|
||||||
|
arch="win32"
|
||||||
|
electron="electron-$electron_version-win32-ia32.zip"
|
||||||
|
else
|
||||||
|
jre="OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip"
|
||||||
|
arch="win64"
|
||||||
|
electron="electron-$electron_version-win32-x64.zip"
|
||||||
|
fi
|
||||||
|
|
||||||
|
jre_dir="jdk8u292-b10-jre"
|
||||||
|
|
||||||
echo "creating windows bundle"
|
echo "creating windows bundle"
|
||||||
|
|
||||||
jar=$(ls ../server/build/Tachidesk-*.jar)
|
jar=$(ls ../server/build/*.jar | tail -n1)
|
||||||
jar_name=$(echo $jar | cut -d'/' -f4)
|
jar_name=$(echo $jar | cut -d'/' -f4)
|
||||||
release_name=$(echo $jar_name | cut -d'.' -f4 --complement)-win64
|
release_name=$(echo $jar_name | sed 's/.jar//')-$arch
|
||||||
|
|
||||||
|
|
||||||
# make release dir
|
# make release dir
|
||||||
mkdir $release_name
|
mkdir $release_name
|
||||||
|
|
||||||
|
|
||||||
|
echo "Dealing with jre..."
|
||||||
|
if [ ! -f $jre ]; then
|
||||||
|
curl -L "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/$jre" -o $jre
|
||||||
|
fi
|
||||||
unzip $jre
|
unzip $jre
|
||||||
|
mv $jre_dir $release_name/jre
|
||||||
|
|
||||||
# move jre
|
echo "Dealing with electron"
|
||||||
mv jdk8u292-b10-jre $release_name/jre
|
if [ ! -f $electron ]; then
|
||||||
|
curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
|
||||||
|
fi
|
||||||
|
unzip $electron -d $release_name/electron
|
||||||
|
|
||||||
|
# change electron's icon
|
||||||
|
rcedit="rcedit-x86.exe"
|
||||||
|
if [ ! -f $rcedit ]; then
|
||||||
|
curl -L "https://github.com/electron/rcedit/releases/download/v1.1.1/$rcedit" -o $rcedit
|
||||||
|
fi
|
||||||
|
|
||||||
|
# check if running under github actions
|
||||||
|
if [ $CI = true ]; then
|
||||||
|
# change electron executable's icon
|
||||||
|
sudo dpkg --add-architecture i386
|
||||||
|
wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
|
||||||
|
sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
|
||||||
|
sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
|
||||||
|
sudo apt install --install-recommends winehq-stable
|
||||||
|
fi
|
||||||
|
# this script assumes that wine is installed here on out
|
||||||
|
|
||||||
|
WINEARCH=win32 wine $rcedit $release_name/electron/electron.exe --set-icon ../server/src/main/resources/icon/faviconlogo.ico
|
||||||
|
|
||||||
|
# copy artifacts
|
||||||
cp $jar $release_name/Tachidesk.jar
|
cp $jar $release_name/Tachidesk.jar
|
||||||
|
cp "resources/Tachidesk Browser Launcher.bat" $release_name
|
||||||
cp resources/Tachidesk.bat $release_name
|
cp "resources/Tachidesk Debug Launcher.bat" $release_name
|
||||||
cp resources/Tachidesk-debug.bat $release_name
|
cp "resources/Tachidesk Electron Launcher.bat" $release_name
|
||||||
|
|
||||||
zip_name=$release_name.zip
|
zip_name=$release_name.zip
|
||||||
zip -9 -r $zip_name $release_name
|
zip -9 -r $zip_name $release_name
|
||||||
|
|
||||||
cp $zip_name ../server/build/
|
rm -rf $release_name
|
||||||
|
|
||||||
|
# clean up from possible previous runs
|
||||||
|
if [ -f ../server/build/$zip_name ]; then
|
||||||
|
rm ../server/build/$zip_name
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv $zip_name ../server/build/
|
||||||
|
|||||||
+70
-66
@@ -3,58 +3,37 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|||||||
import org.jmailen.gradle.kotlinter.tasks.FormatTask
|
import org.jmailen.gradle.kotlinter.tasks.FormatTask
|
||||||
import org.jmailen.gradle.kotlinter.tasks.LintTask
|
import org.jmailen.gradle.kotlinter.tasks.LintTask
|
||||||
import java.io.BufferedReader
|
import java.io.BufferedReader
|
||||||
|
import java.time.Instant
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
application
|
application
|
||||||
id("com.github.johnrengelman.shadow") version "7.0.0"
|
id("com.github.johnrengelman.shadow") version "7.0.0"
|
||||||
id("org.jmailen.kotlinter") version "3.4.3"
|
id("org.jmailen.kotlinter") version "3.4.3"
|
||||||
id("edu.sc.seis.launch4j") version "2.5.0"
|
|
||||||
id("de.fuerstenau.buildconfig") version "1.1.8"
|
id("de.fuerstenau.buildconfig") version "1.1.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
maven {
|
||||||
|
url = uri("https://repo1.maven.org/maven2/")
|
||||||
|
}
|
||||||
maven {
|
maven {
|
||||||
url = uri("https://jitpack.io")
|
url = uri("https://jitpack.io")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Source models and interfaces from Tachiyomi 1.x
|
// okhttp
|
||||||
// using source class from tachiyomi commit 9493577de27c40ce8b2b6122cc447d025e34c477 to not depend on tachiyomi.sourceapi
|
val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions
|
||||||
// implementation("tachiyomi.sourceapi:source-api:1.1")
|
|
||||||
|
|
||||||
implementation("com.github.inorichi.injekt:injekt-core:65b0440")
|
|
||||||
|
|
||||||
val okhttpVersion = "4.10.0-RC1"
|
|
||||||
implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
|
implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
|
||||||
implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
|
implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
|
||||||
implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
|
implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
|
||||||
implementation("com.squareup.okio:okio:2.10.0")
|
implementation("com.squareup.okio:okio:2.10.0")
|
||||||
|
|
||||||
|
// Javalin api
|
||||||
// Retrofit
|
|
||||||
val retrofitVersion = "2.9.0"
|
|
||||||
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
|
|
||||||
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
|
|
||||||
implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
|
|
||||||
implementation("com.squareup.retrofit2:adapter-rxjava:$retrofitVersion")
|
|
||||||
|
|
||||||
|
|
||||||
// Reactivex
|
|
||||||
implementation("io.reactivex:rxjava:1.3.8")
|
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
|
|
||||||
implementation("com.google.code.gson:gson:2.8.6")
|
|
||||||
implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
|
|
||||||
|
|
||||||
implementation("org.jsoup:jsoup:1.13.1")
|
|
||||||
implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
|
|
||||||
|
|
||||||
|
|
||||||
// api
|
|
||||||
implementation("io.javalin:javalin:3.13.6")
|
implementation("io.javalin:javalin:3.13.6")
|
||||||
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.3")
|
// jackson version is tied to javalin, ref: `io.javalin.core.util.OptionalDependency`
|
||||||
|
implementation("com.fasterxml.jackson.core:jackson-databind:2.10.3")
|
||||||
|
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.3")
|
||||||
|
|
||||||
// Exposed ORM
|
// Exposed ORM
|
||||||
val exposedVersion = "0.31.1"
|
val exposedVersion = "0.31.1"
|
||||||
@@ -62,15 +41,37 @@ dependencies {
|
|||||||
implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
|
implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
|
||||||
implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
|
implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
|
||||||
implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
|
implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
|
||||||
|
|
||||||
// current database driver
|
// current database driver
|
||||||
implementation("com.h2database:h2:1.4.200")
|
implementation("com.h2database:h2:1.4.200")
|
||||||
|
|
||||||
|
// Exposed Migrations
|
||||||
|
val exposedMigrationsVersion = "3.1.0"
|
||||||
|
implementation("com.github.Suwayomi:exposed-migrations:$exposedMigrationsVersion")
|
||||||
|
|
||||||
// tray icon
|
// tray icon
|
||||||
implementation("com.dorkbox:SystemTray:4.1")
|
implementation("com.dorkbox:SystemTray:4.1")
|
||||||
implementation("com.dorkbox:Utilities:1.9")
|
implementation("com.dorkbox:Utilities:1.9")
|
||||||
|
|
||||||
implementation("com.google.guava:guava:30.1.1-jre")
|
|
||||||
|
|
||||||
|
// dependencies of Tachiyomi extensions, some are duplicate, keeping it here for reference
|
||||||
|
implementation("com.github.inorichi.injekt:injekt-core:65b0440")
|
||||||
|
implementation("com.squareup.okhttp3:okhttp:4.9.1")
|
||||||
|
implementation("io.reactivex:rxjava:1.3.8")
|
||||||
|
implementation("org.jsoup:jsoup:1.13.1")
|
||||||
|
implementation("com.google.code.gson:gson:2.8.6")
|
||||||
|
implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
|
||||||
|
|
||||||
|
|
||||||
|
// asm for fixing SimpleDateFormat (must match Dex2Jar version)
|
||||||
|
implementation("org.ow2.asm:asm-debug-all:5.0.3")
|
||||||
|
|
||||||
|
// extracting zip files
|
||||||
|
implementation("net.lingala.zip4j:zip4j:2.9.0")
|
||||||
|
|
||||||
|
// Source models and interfaces from Tachiyomi 1.x
|
||||||
|
// using source class from tachiyomi commit 9493577de27c40ce8b2b6122cc447d025e34c477 to not depend on tachiyomi.sourceapi
|
||||||
|
// implementation("tachiyomi.sourceapi:source-api:1.1")
|
||||||
|
|
||||||
// AndroidCompat
|
// AndroidCompat
|
||||||
implementation(project(":AndroidCompat"))
|
implementation(project(":AndroidCompat"))
|
||||||
@@ -78,14 +79,17 @@ dependencies {
|
|||||||
|
|
||||||
// uncomment to test extensions directly
|
// uncomment to test extensions directly
|
||||||
// implementation(fileTree("lib/"))
|
// implementation(fileTree("lib/"))
|
||||||
|
|
||||||
// Testing
|
|
||||||
testImplementation(kotlin("test-junit5"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val MainClass = "ir.armor.tachidesk.MainKt"
|
val MainClass = "suwayomi.tachidesk.MainKt"
|
||||||
application {
|
application {
|
||||||
mainClass.set(MainClass)
|
mainClass.set(MainClass)
|
||||||
|
|
||||||
|
// for testing electron
|
||||||
|
// applicationDefaultJvmArgs = listOf(
|
||||||
|
// "-Dsuwayomi.tachidesk.webInterface=electron",
|
||||||
|
// "-Dsuwayomi.tachidesk.electronPath=/usr/bin/electron"
|
||||||
|
// )
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@@ -97,12 +101,14 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// should be bumped with each stable release
|
// should be bumped with each stable release
|
||||||
val tachideskVersion = "v0.3.5"
|
val tachideskVersion = System.getenv("ProductVersion") ?: "v0.4.4"
|
||||||
|
val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r20"
|
||||||
|
|
||||||
// counts commit count on master
|
// counts commit count on master
|
||||||
val tachideskRevision = Runtime
|
val tachideskRevision = runCatching {
|
||||||
|
System.getenv("ProductRevision") ?: Runtime
|
||||||
.getRuntime()
|
.getRuntime()
|
||||||
.exec("git rev-list master --count")
|
.exec("git rev-list HEAD --count")
|
||||||
.let { process ->
|
.let { process ->
|
||||||
process.waitFor()
|
process.waitFor()
|
||||||
val output = process.inputStream.use {
|
val output = process.inputStream.use {
|
||||||
@@ -110,34 +116,31 @@ val tachideskRevision = Runtime
|
|||||||
}
|
}
|
||||||
process.destroy()
|
process.destroy()
|
||||||
"r" + output.trim()
|
"r" + output.trim()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}.getOrDefault("r0")
|
||||||
|
|
||||||
buildConfig {
|
buildConfig {
|
||||||
appName = rootProject.name
|
|
||||||
clsName = "BuildConfig"
|
clsName = "BuildConfig"
|
||||||
packageName = "ir.armor.tachidesk.server"
|
packageName = "suwayomi.tachidesk.server"
|
||||||
version = tachideskVersion
|
|
||||||
|
|
||||||
|
|
||||||
buildConfigField("String", "name", rootProject.name) // alias for BuildConfig.NAME
|
buildConfigField("String", "NAME", rootProject.name)
|
||||||
buildConfigField("String", "version", tachideskVersion) // alias for BuildConfig.VERSION
|
buildConfigField("String", "VERSION", tachideskVersion)
|
||||||
buildConfigField("String", "revision", tachideskRevision)
|
buildConfigField("String", "REVISION", tachideskRevision)
|
||||||
buildConfigField("boolean", "debug", project.hasProperty("debugApp").toString())
|
buildConfigField("String", "BUILD_TYPE", if (System.getenv("ProductBuildType") == "Stable") "Stable" else "Preview")
|
||||||
}
|
buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
|
||||||
|
|
||||||
launch4j { //used for windows
|
|
||||||
mainClassName = MainClass
|
buildConfigField("String", "WEBUI_REPO", "https://github.com/Suwayomi/Tachidesk-WebUI-preview")
|
||||||
bundledJrePath = "jre"
|
buildConfigField("String", "WEBUI_TAG", webUIRevisionTag)
|
||||||
bundledJre64Bit = true
|
|
||||||
jreMinVersion = "8"
|
|
||||||
outputDir = "${rootProject.name}-$tachideskVersion-$tachideskRevision-win64"
|
buildConfigField("String", "GITHUB", "https://github.com/Suwayomi/Tachidesk")
|
||||||
icon = "${projectDir}/src/main/resources/icon/faviconlogo.ico"
|
buildConfigField("String", "DISCORD", "https://discord.gg/DDZdqZWaHA")
|
||||||
jar = "${projectDir}/build/${rootProject.name}-$tachideskVersion-$tachideskRevision.jar"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
jar {
|
shadowJar {
|
||||||
manifest {
|
manifest {
|
||||||
attributes(
|
attributes(
|
||||||
mapOf(
|
mapOf(
|
||||||
@@ -149,9 +152,6 @@ tasks {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
shadowJar {
|
|
||||||
manifest.inheritFrom(jar.get().manifest) //will make your shadowJar (produced by jar task) runnable
|
|
||||||
archiveBaseName.set(rootProject.name)
|
archiveBaseName.set(rootProject.name)
|
||||||
archiveVersion.set(tachideskVersion)
|
archiveVersion.set(tachideskVersion)
|
||||||
archiveClassifier.set(tachideskRevision)
|
archiveClassifier.set(tachideskRevision)
|
||||||
@@ -165,11 +165,11 @@ tasks {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnit()
|
useJUnit()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
withType<ShadowJar> {
|
withType<ShadowJar> {
|
||||||
destinationDirectory.set(File("$rootDir/server/build"))
|
destinationDirectory.set(File("$rootDir/server/build"))
|
||||||
dependsOn("formatKotlin", "lintKotlin")
|
dependsOn("formatKotlin", "lintKotlin")
|
||||||
@@ -181,15 +181,19 @@ tasks {
|
|||||||
|
|
||||||
named<Copy>("processResources") {
|
named<Copy>("processResources") {
|
||||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||||
mustRunAfter(":webUI:copyBuild")
|
mustRunAfter("downloadWebUI")
|
||||||
|
}
|
||||||
|
|
||||||
|
register<de.undercouch.gradle.tasks.download.Download>("downloadWebUI") {
|
||||||
|
src("https://github.com/Suwayomi/Tachidesk-WebUI-preview/releases/download/$webUIRevisionTag/Tachidesk-WebUI-$webUIRevisionTag.zip")
|
||||||
|
dest("src/main/resources/WebUI.zip")
|
||||||
}
|
}
|
||||||
|
|
||||||
withType<LintTask> {
|
withType<LintTask> {
|
||||||
source(files("src"))
|
source(files("src/kotlin"))
|
||||||
}
|
}
|
||||||
|
|
||||||
withType<FormatTask> {
|
withType<FormatTask> {
|
||||||
source(files("src"))
|
source(files("src/kotlin"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import com.google.gson.Gson
|
|||||||
// import eu.kanade.tachiyomi.data.track.TrackManager
|
// import eu.kanade.tachiyomi.data.track.TrackManager
|
||||||
// import eu.kanade.tachiyomi.extension.ExtensionManager
|
// import eu.kanade.tachiyomi.extension.ExtensionManager
|
||||||
import eu.kanade.tachiyomi.network.NetworkHelper
|
import eu.kanade.tachiyomi.network.NetworkHelper
|
||||||
|
import kotlinx.serialization.json.Json
|
||||||
import rx.Observable
|
import rx.Observable
|
||||||
import rx.schedulers.Schedulers
|
import rx.schedulers.Schedulers
|
||||||
import uy.kohesive.injekt.api.InjektModule
|
import uy.kohesive.injekt.api.InjektModule
|
||||||
@@ -54,6 +55,8 @@ class AppModule(val app: Application) : InjektModule {
|
|||||||
|
|
||||||
addSingletonFactory { Gson() }
|
addSingletonFactory { Gson() }
|
||||||
|
|
||||||
|
addSingletonFactory { Json { ignoreUnknownKeys = true } }
|
||||||
|
|
||||||
// Asynchronously init expensive components for a faster cold start
|
// Asynchronously init expensive components for a faster cold start
|
||||||
|
|
||||||
// rxAsync { get<PreferencesHelper>() }
|
// rxAsync { get<PreferencesHelper>() }
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.AnimesPage
|
||||||
|
import rx.Observable
|
||||||
|
|
||||||
|
interface AnimeCatalogueSource : AnimeSource {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An ISO 639-1 compliant language code (two letters in lower case).
|
||||||
|
*/
|
||||||
|
val lang: String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the source has support for latest updates.
|
||||||
|
*/
|
||||||
|
val supportsLatest: Boolean
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable containing a page with a list of anime.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
*/
|
||||||
|
fun fetchPopularAnime(page: Int): Observable<AnimesPage>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable containing a page with a list of anime.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
* @param query the search query.
|
||||||
|
* @param filters the list of filters to apply.
|
||||||
|
*/
|
||||||
|
fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable containing a page with a list of latest anime updates.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
*/
|
||||||
|
fun fetchLatestUpdates(page: Int): Observable<AnimesPage>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the list of filters for the source.
|
||||||
|
*/
|
||||||
|
fun getFilterList(): AnimeFilterList
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SEpisode
|
||||||
|
import rx.Observable
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A basic interface for creating a source. It could be an online source, a local source, etc...
|
||||||
|
*/
|
||||||
|
interface AnimeSource {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Id for the source. Must be unique.
|
||||||
|
*/
|
||||||
|
val id: Long
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Name of the source.
|
||||||
|
*/
|
||||||
|
val name: String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with the updated details for a anime.
|
||||||
|
*
|
||||||
|
* @param anime the anime to update.
|
||||||
|
*/
|
||||||
|
// @Deprecated("Use getAnimeDetails instead")
|
||||||
|
fun fetchAnimeDetails(anime: SAnime): Observable<SAnime>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with all the available episodes for an anime.
|
||||||
|
*
|
||||||
|
* @param anime the anime to update.
|
||||||
|
*/
|
||||||
|
// @Deprecated("Use getEpisodeList instead")
|
||||||
|
fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with a link for the episode of an anime.
|
||||||
|
*
|
||||||
|
* @param episode the episode to get the link for.
|
||||||
|
*/
|
||||||
|
// @Deprecated("Use getEpisodeList instead")
|
||||||
|
fun fetchEpisodeLink(episode: SEpisode): Observable<String>
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * [1.x API] Get the updated details for a anime.
|
||||||
|
// */
|
||||||
|
// @Suppress("DEPRECATION")
|
||||||
|
// override suspend fun getAnimeDetails(anime: AnimeInfo): AnimeInfo {
|
||||||
|
// val sAnime = anime.toSAnime()
|
||||||
|
// val networkAnime = fetchAnimeDetails(sAnime).awaitSingle()
|
||||||
|
// sAnime.copyFrom(networkAnime)
|
||||||
|
// return sAnime.toAnimeInfo()
|
||||||
|
// }
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * [1.x API] Get all the available episodes for a anime.
|
||||||
|
// */
|
||||||
|
// @Suppress("DEPRECATION")
|
||||||
|
// override suspend fun getEpisodeList(anime: AnimeInfo): List<EpisodeInfo> {
|
||||||
|
// return fetchEpisodeList(anime.toSAnime()).awaitSingle()
|
||||||
|
// .map { it.toEpisodeInfo() }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * [1.x API] Get a link for the episode of an anime.
|
||||||
|
// */
|
||||||
|
// @Suppress("DEPRECATION")
|
||||||
|
// override suspend fun getEpisodeLink(episode: EpisodeInfo): String {
|
||||||
|
// return fetchEpisodeLink(episode.toSEpisode()).awaitSingle()
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
// fun AnimeSource.icon(): Drawable? = Injekt.get<AnimeExtensionManager>().getAppIconForSource(this)
|
||||||
|
|
||||||
|
// fun AnimeSource.getPreferenceKey(): String = "source_$id"
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A factory for creating sources at runtime.
|
||||||
|
*/
|
||||||
|
interface AnimeSourceFactory {
|
||||||
|
/**
|
||||||
|
* Create a new copy of the sources
|
||||||
|
* @return The created sources
|
||||||
|
*/
|
||||||
|
fun createSources(): List<AnimeSource>
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SEpisode
|
||||||
|
import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
|
||||||
|
import rx.Observable
|
||||||
|
|
||||||
|
open class AnimeSourceManager(private val context: Context) {
|
||||||
|
|
||||||
|
private val sourcesMap = mutableMapOf<Long, AnimeSource>()
|
||||||
|
|
||||||
|
private val stubSourcesMap = mutableMapOf<Long, StubSource>()
|
||||||
|
|
||||||
|
init {
|
||||||
|
createInternalSources().forEach { registerSource(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun get(sourceKey: Long): AnimeSource? {
|
||||||
|
return sourcesMap[sourceKey]
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getOrStub(sourceKey: Long): AnimeSource {
|
||||||
|
return sourcesMap[sourceKey] ?: stubSourcesMap.getOrPut(sourceKey) {
|
||||||
|
StubSource(sourceKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getOnlineSources() = sourcesMap.values.filterIsInstance<AnimeHttpSource>()
|
||||||
|
|
||||||
|
fun getCatalogueSources() = sourcesMap.values.filterIsInstance<AnimeCatalogueSource>()
|
||||||
|
|
||||||
|
internal fun registerSource(source: AnimeSource) {
|
||||||
|
if (!sourcesMap.containsKey(source.id)) {
|
||||||
|
sourcesMap[source.id] = source
|
||||||
|
}
|
||||||
|
if (!stubSourcesMap.containsKey(source.id)) {
|
||||||
|
stubSourcesMap[source.id] = StubSource(source.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun unregisterSource(source: AnimeSource) {
|
||||||
|
sourcesMap.remove(source.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createInternalSources(): List<AnimeSource> = listOf(
|
||||||
|
// LocalAnimeSource(context)
|
||||||
|
)
|
||||||
|
|
||||||
|
inner class StubSource(override val id: Long) : AnimeSource {
|
||||||
|
|
||||||
|
override val name: String
|
||||||
|
get() = id.toString()
|
||||||
|
|
||||||
|
override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
|
||||||
|
return Observable.error(getSourceNotInstalledException())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
|
||||||
|
return Observable.error(getSourceNotInstalledException())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun fetchEpisodeLink(episode: SEpisode): Observable<String> {
|
||||||
|
return Observable.error(getSourceNotInstalledException())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getSourceNotInstalledException(): Exception {
|
||||||
|
// return Exception(context.getString(R.string.source_not_installed, id.toString()))
|
||||||
|
return Exception("source not found")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource
|
||||||
|
|
||||||
|
import androidx.preference.PreferenceScreen
|
||||||
|
|
||||||
|
interface ConfigurableAnimeSource : AnimeSource {
|
||||||
|
|
||||||
|
fun setupPreferenceScreen(screen: PreferenceScreen)
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
sealed class AnimeFilter<T>(val name: String, var state: T) {
|
||||||
|
open class Header(name: String) : AnimeFilter<Any>(name, 0)
|
||||||
|
open class Separator(name: String = "") : AnimeFilter<Any>(name, 0)
|
||||||
|
abstract class Select<V>(name: String, val values: Array<V>, state: Int = 0) : AnimeFilter<Int>(name, state)
|
||||||
|
abstract class Text(name: String, state: String = "") : AnimeFilter<String>(name, state)
|
||||||
|
abstract class CheckBox(name: String, state: Boolean = false) : AnimeFilter<Boolean>(name, state)
|
||||||
|
abstract class TriState(name: String, state: Int = STATE_IGNORE) : AnimeFilter<Int>(name, state) {
|
||||||
|
fun isIgnored() = state == STATE_IGNORE
|
||||||
|
fun isIncluded() = state == STATE_INCLUDE
|
||||||
|
fun isExcluded() = state == STATE_EXCLUDE
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val STATE_IGNORE = 0
|
||||||
|
const val STATE_INCLUDE = 1
|
||||||
|
const val STATE_EXCLUDE = 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class Group<V>(name: String, state: List<V>) : AnimeFilter<List<V>>(name, state)
|
||||||
|
|
||||||
|
abstract class Sort(name: String, val values: Array<String>, state: Selection? = null) :
|
||||||
|
AnimeFilter<Sort.Selection?>(name, state) {
|
||||||
|
data class Selection(val index: Int, val ascending: Boolean)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (other !is AnimeFilter<*>) return false
|
||||||
|
|
||||||
|
return name == other.name && state == other.state
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
var result = name.hashCode()
|
||||||
|
result = 31 * result + (state?.hashCode() ?: 0)
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
data class AnimeFilterList(val list: List<AnimeFilter<*>>) : List<AnimeFilter<*>> by list {
|
||||||
|
|
||||||
|
constructor(vararg fs: AnimeFilter<*>) : this(if (fs.isNotEmpty()) fs.asList() else emptyList())
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
data class AnimesPage(val animes: List<SAnime>, val hasNextPage: Boolean)
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
import java.io.Serializable
|
||||||
|
|
||||||
|
interface SAnime : Serializable {
|
||||||
|
|
||||||
|
var url: String
|
||||||
|
|
||||||
|
var title: String
|
||||||
|
|
||||||
|
var artist: String?
|
||||||
|
|
||||||
|
var author: String?
|
||||||
|
|
||||||
|
var description: String?
|
||||||
|
|
||||||
|
var genre: String?
|
||||||
|
|
||||||
|
var status: Int
|
||||||
|
|
||||||
|
var thumbnail_url: String?
|
||||||
|
|
||||||
|
var initialized: Boolean
|
||||||
|
|
||||||
|
fun copyFrom(other: SAnime) {
|
||||||
|
if (other.title != null) {
|
||||||
|
title = other.title
|
||||||
|
}
|
||||||
|
|
||||||
|
if (other.author != null) {
|
||||||
|
author = other.author
|
||||||
|
}
|
||||||
|
|
||||||
|
if (other.artist != null) {
|
||||||
|
artist = other.artist
|
||||||
|
}
|
||||||
|
|
||||||
|
if (other.description != null) {
|
||||||
|
description = other.description
|
||||||
|
}
|
||||||
|
|
||||||
|
if (other.genre != null) {
|
||||||
|
genre = other.genre
|
||||||
|
}
|
||||||
|
|
||||||
|
if (other.thumbnail_url != null) {
|
||||||
|
thumbnail_url = other.thumbnail_url
|
||||||
|
}
|
||||||
|
|
||||||
|
status = other.status
|
||||||
|
|
||||||
|
if (!initialized) {
|
||||||
|
initialized = other.initialized
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val UNKNOWN = 0
|
||||||
|
const val ONGOING = 1
|
||||||
|
const val COMPLETED = 2
|
||||||
|
const val LICENSED = 3
|
||||||
|
|
||||||
|
fun create(): SAnime {
|
||||||
|
return SAnimeImpl()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
class SAnimeImpl : SAnime {
|
||||||
|
|
||||||
|
override lateinit var url: String
|
||||||
|
|
||||||
|
override lateinit var title: String
|
||||||
|
|
||||||
|
override var artist: String? = null
|
||||||
|
|
||||||
|
override var author: String? = null
|
||||||
|
|
||||||
|
override var description: String? = null
|
||||||
|
|
||||||
|
override var genre: String? = null
|
||||||
|
|
||||||
|
override var status: Int = 0
|
||||||
|
|
||||||
|
override var thumbnail_url: String? = null
|
||||||
|
|
||||||
|
override var initialized: Boolean = false
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
import java.io.Serializable
|
||||||
|
|
||||||
|
interface SEpisode : Serializable {
|
||||||
|
|
||||||
|
var url: String
|
||||||
|
|
||||||
|
var name: String
|
||||||
|
|
||||||
|
var date_upload: Long
|
||||||
|
|
||||||
|
var episode_number: Float
|
||||||
|
|
||||||
|
var scanlator: String?
|
||||||
|
|
||||||
|
fun copyFrom(other: SEpisode) {
|
||||||
|
name = other.name
|
||||||
|
url = other.url
|
||||||
|
date_upload = other.date_upload
|
||||||
|
episode_number = other.episode_number
|
||||||
|
scanlator = other.scanlator
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun create(): SEpisode {
|
||||||
|
return SEpisodeImpl()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.model
|
||||||
|
|
||||||
|
class SEpisodeImpl : SEpisode {
|
||||||
|
|
||||||
|
override lateinit var url: String
|
||||||
|
|
||||||
|
override lateinit var name: String
|
||||||
|
|
||||||
|
override var date_upload: Long = 0
|
||||||
|
|
||||||
|
override var episode_number: Float = -1f
|
||||||
|
|
||||||
|
override var scanlator: String? = null
|
||||||
|
}
|
||||||
@@ -0,0 +1,388 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.online
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.AnimesPage
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SEpisode
|
||||||
|
import eu.kanade.tachiyomi.network.GET
|
||||||
|
import eu.kanade.tachiyomi.network.NetworkHelper
|
||||||
|
import eu.kanade.tachiyomi.network.asObservableSuccess
|
||||||
|
import eu.kanade.tachiyomi.network.newCallWithProgress
|
||||||
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
|
import okhttp3.Headers
|
||||||
|
import okhttp3.OkHttpClient
|
||||||
|
import okhttp3.Request
|
||||||
|
import okhttp3.Response
|
||||||
|
import rx.Observable
|
||||||
|
import uy.kohesive.injekt.injectLazy
|
||||||
|
import java.net.URI
|
||||||
|
import java.net.URISyntaxException
|
||||||
|
import java.security.MessageDigest
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple implementation for sources from a website.
|
||||||
|
*/
|
||||||
|
abstract class AnimeHttpSource : AnimeCatalogueSource {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Network service.
|
||||||
|
*/
|
||||||
|
protected val network: NetworkHelper by injectLazy()
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * Preferences that a source may need.
|
||||||
|
// */
|
||||||
|
// val preferences: SharedPreferences by lazy {
|
||||||
|
// Injekt.get<Application>().getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE)
|
||||||
|
// }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Base url of the website without the trailing slash, like: http://mysite.com
|
||||||
|
*/
|
||||||
|
abstract val baseUrl: String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Version id used to generate the source id. If the site completely changes and urls are
|
||||||
|
* incompatible, you may increase this value and it'll be considered as a new source.
|
||||||
|
*/
|
||||||
|
open val versionId = 1
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Id of the source. By default it uses a generated id using the first 16 characters (64 bits)
|
||||||
|
* of the MD5 of the string: sourcename/language/versionId
|
||||||
|
* Note the generated id sets the sign bit to 0.
|
||||||
|
*/
|
||||||
|
override val id by lazy {
|
||||||
|
val key = "${name.toLowerCase()}/$lang/$versionId"
|
||||||
|
val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray())
|
||||||
|
(0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Headers used for requests.
|
||||||
|
*/
|
||||||
|
val headers: Headers by lazy { headersBuilder().build() }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default network client for doing requests.
|
||||||
|
*/
|
||||||
|
open val client: OkHttpClient
|
||||||
|
get() = network.client
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Headers builder for requests. Implementations can override this method for custom headers.
|
||||||
|
*/
|
||||||
|
protected open fun headersBuilder() = Headers.Builder().apply {
|
||||||
|
add("User-Agent", DEFAULT_USER_AGENT)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Visible name of the source.
|
||||||
|
*/
|
||||||
|
override fun toString() = "$name (${lang.toUpperCase()})"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable containing a page with a list of anime. Normally it's not needed to
|
||||||
|
* override this method.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
*/
|
||||||
|
override fun fetchPopularAnime(page: Int): Observable<AnimesPage> {
|
||||||
|
return client.newCall(popularAnimeRequest(page))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { response ->
|
||||||
|
popularAnimeParse(response)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for the popular anime given the page.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
*/
|
||||||
|
protected abstract fun popularAnimeRequest(page: Int): Request
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a [AnimesPage] object.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun popularAnimeParse(response: Response): AnimesPage
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable containing a page with a list of anime. Normally it's not needed to
|
||||||
|
* override this method.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
* @param query the search query.
|
||||||
|
* @param filters the list of filters to apply.
|
||||||
|
*/
|
||||||
|
override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
|
||||||
|
return client.newCall(searchAnimeRequest(page, query, filters))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { response ->
|
||||||
|
searchAnimeParse(response)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for the search anime given the page.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
* @param query the search query.
|
||||||
|
* @param filters the list of filters to apply.
|
||||||
|
*/
|
||||||
|
protected abstract fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a [AnimesPage] object.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun searchAnimeParse(response: Response): AnimesPage
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable containing a page with a list of latest anime updates.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
*/
|
||||||
|
override fun fetchLatestUpdates(page: Int): Observable<AnimesPage> {
|
||||||
|
return client.newCall(latestUpdatesRequest(page))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { response ->
|
||||||
|
latestUpdatesParse(response)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for latest anime given the page.
|
||||||
|
*
|
||||||
|
* @param page the page number to retrieve.
|
||||||
|
*/
|
||||||
|
protected abstract fun latestUpdatesRequest(page: Int): Request
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a [AnimesPage] object.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun latestUpdatesParse(response: Response): AnimesPage
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with the updated details for a anime. Normally it's not needed to
|
||||||
|
* override this method.
|
||||||
|
*
|
||||||
|
* @param anime the anime to be updated.
|
||||||
|
*/
|
||||||
|
override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
|
||||||
|
return client.newCall(animeDetailsRequest(anime))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { response ->
|
||||||
|
animeDetailsParse(response).apply { initialized = true }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for the details of a anime. Override only if it's needed to change the
|
||||||
|
* url, send different headers or request method like POST.
|
||||||
|
*
|
||||||
|
* @param anime the anime to be updated.
|
||||||
|
*/
|
||||||
|
open fun animeDetailsRequest(anime: SAnime): Request {
|
||||||
|
return GET(baseUrl + anime.url, headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns the details of a anime.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun animeDetailsParse(response: Response): SAnime
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with the updated episode list for a anime. Normally it's not needed to
|
||||||
|
* override this method. If a anime is licensed an empty episode list observable is returned
|
||||||
|
*
|
||||||
|
* @param anime the anime to look for episodes.
|
||||||
|
*/
|
||||||
|
override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
|
||||||
|
return if (anime.status != SAnime.LICENSED) {
|
||||||
|
client.newCall(episodeListRequest(anime))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { response ->
|
||||||
|
episodeListParse(response)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Observable.error(Exception("Licensed - No episodes to show"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun fetchEpisodeLink(episode: SEpisode): Observable<String> {
|
||||||
|
return client.newCall(episodeLinkRequest(episode))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { response ->
|
||||||
|
episodeLinkParse(response)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for updating the episode list. Override only if it's needed to override
|
||||||
|
* the url, send different headers or request method like POST.
|
||||||
|
*
|
||||||
|
* @param anime the anime to look for episodes.
|
||||||
|
*/
|
||||||
|
protected open fun episodeListRequest(anime: SAnime): Request {
|
||||||
|
return GET(baseUrl + anime.url, headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for getting the episode link. Override only if it's needed to override
|
||||||
|
* the url, send different headers or request method like POST.
|
||||||
|
*
|
||||||
|
* @param episode the episode to look for links.
|
||||||
|
*/
|
||||||
|
protected open fun episodeLinkRequest(episode: SEpisode): Request {
|
||||||
|
return GET(baseUrl + episode.url, headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a list of episodes.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun episodeListParse(response: Response): List<SEpisode>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a list of episodes.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun episodeLinkParse(response: Response): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for getting the page list. Override only if it's needed to override the
|
||||||
|
* url, send different headers or request method like POST.
|
||||||
|
*
|
||||||
|
* @param episode the episode whose page list has to be fetched.
|
||||||
|
*/
|
||||||
|
protected open fun pageListRequest(episode: SEpisode): Request {
|
||||||
|
return GET(baseUrl + episode.url, headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a list of pages.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun pageListParse(response: Response): List<Page>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with the page containing the source url of the image. If there's any
|
||||||
|
* error, it will return null instead of throwing an exception.
|
||||||
|
*
|
||||||
|
* @param page the page whose source image has to be fetched.
|
||||||
|
*/
|
||||||
|
open fun fetchImageUrl(page: Page): Observable<String> {
|
||||||
|
return client.newCall(imageUrlRequest(page))
|
||||||
|
.asObservableSuccess()
|
||||||
|
.map { imageUrlParse(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for getting the url to the source image. Override only if it's needed to
|
||||||
|
* override the url, send different headers or request method like POST.
|
||||||
|
*
|
||||||
|
* @param page the episode whose page list has to be fetched
|
||||||
|
*/
|
||||||
|
protected open fun imageUrlRequest(page: Page): Request {
|
||||||
|
return GET(page.url, headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns the absolute url to the source image.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
protected abstract fun imageUrlParse(response: Response): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an observable with the response of the source image.
|
||||||
|
*
|
||||||
|
* @param page the page whose source image has to be downloaded.
|
||||||
|
*/
|
||||||
|
fun fetchImage(page: Page): Observable<Response> {
|
||||||
|
return client.newCallWithProgress(imageRequest(page), page)
|
||||||
|
.asObservableSuccess()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the request for getting the source image. Override only if it's needed to override
|
||||||
|
* the url, send different headers or request method like POST.
|
||||||
|
*
|
||||||
|
* @param page the episode whose page list has to be fetched
|
||||||
|
*/
|
||||||
|
protected open fun imageRequest(page: Page): Request {
|
||||||
|
return GET(page.imageUrl!!, headers)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Assigns the url of the episode without the scheme and domain. It saves some redundancy from
|
||||||
|
* database and the urls could still work after a domain change.
|
||||||
|
*
|
||||||
|
* @param url the full url to the episode.
|
||||||
|
*/
|
||||||
|
fun SEpisode.setUrlWithoutDomain(url: String) {
|
||||||
|
this.url = getUrlWithoutDomain(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Assigns the url of the anime without the scheme and domain. It saves some redundancy from
|
||||||
|
* database and the urls could still work after a domain change.
|
||||||
|
*
|
||||||
|
* @param url the full url to the anime.
|
||||||
|
*/
|
||||||
|
fun SAnime.setUrlWithoutDomain(url: String) {
|
||||||
|
this.url = getUrlWithoutDomain(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the url of the given string without the scheme and domain.
|
||||||
|
*
|
||||||
|
* @param orig the full url.
|
||||||
|
*/
|
||||||
|
private fun getUrlWithoutDomain(orig: String): String {
|
||||||
|
return try {
|
||||||
|
val uri = URI(orig)
|
||||||
|
var out = uri.path
|
||||||
|
if (uri.query != null) {
|
||||||
|
out += "?" + uri.query
|
||||||
|
}
|
||||||
|
if (uri.fragment != null) {
|
||||||
|
out += "#" + uri.fragment
|
||||||
|
}
|
||||||
|
out
|
||||||
|
} catch (e: URISyntaxException) {
|
||||||
|
orig
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called before inserting a new episode into database. Use it if you need to override episode
|
||||||
|
* fields, like the title or the episode number. Do not change anything to [anime].
|
||||||
|
*
|
||||||
|
* @param episode the episode to be added.
|
||||||
|
* @param anime the anime of the episode.
|
||||||
|
*/
|
||||||
|
open fun prepareNewEpisode(episode: SEpisode, anime: SAnime) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the list of filters for the source.
|
||||||
|
*/
|
||||||
|
override fun getFilterList() = AnimeFilterList()
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36 Edg/88.0.705.63"
|
||||||
|
}
|
||||||
|
}
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
package eu.kanade.tachiyomi.source.online
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
|
||||||
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
|
import rx.Observable
|
||||||
|
|
||||||
|
fun AnimeHttpSource.getImageUrl(page: Page): Observable<Page> {
|
||||||
|
page.status = Page.LOAD_PAGE
|
||||||
|
return fetchImageUrl(page)
|
||||||
|
.doOnError { page.status = Page.ERROR }
|
||||||
|
.onErrorReturn { null }
|
||||||
|
.doOnNext { page.imageUrl = it }
|
||||||
|
.map { page }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun AnimeHttpSource.fetchAllImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
|
||||||
|
return Observable.from(pages)
|
||||||
|
.filter { !it.imageUrl.isNullOrEmpty() }
|
||||||
|
.mergeWith(fetchRemainingImageUrlsFromPageList(pages))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun AnimeHttpSource.fetchRemainingImageUrlsFromPageList(pages: List<Page>): Observable<Page> {
|
||||||
|
return Observable.from(pages)
|
||||||
|
.filter { it.imageUrl.isNullOrEmpty() }
|
||||||
|
.concatMap { getImageUrl(it) }
|
||||||
|
}
|
||||||
+222
@@ -0,0 +1,222 @@
|
|||||||
|
package eu.kanade.tachiyomi.animesource.online
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.AnimesPage
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SEpisode
|
||||||
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
|
import eu.kanade.tachiyomi.util.asJsoup
|
||||||
|
import okhttp3.Response
|
||||||
|
import org.jsoup.nodes.Document
|
||||||
|
import org.jsoup.nodes.Element
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple implementation for sources from a website using Jsoup, an HTML parser.
|
||||||
|
*/
|
||||||
|
abstract class ParsedAnimeHttpSource : AnimeHttpSource() {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a [AnimesPage] object.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun popularAnimeParse(response: Response): AnimesPage {
|
||||||
|
val document = response.asJsoup()
|
||||||
|
|
||||||
|
val animes = document.select(popularAnimeSelector()).map { element ->
|
||||||
|
popularAnimeFromElement(element)
|
||||||
|
}
|
||||||
|
|
||||||
|
val hasNextPage = popularAnimeNextPageSelector()?.let { selector ->
|
||||||
|
document.select(selector).first()
|
||||||
|
} != null
|
||||||
|
|
||||||
|
return AnimesPage(animes, hasNextPage)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns a list of [Element] corresponding to each anime.
|
||||||
|
*/
|
||||||
|
protected abstract fun popularAnimeSelector(): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a anime from the given [element]. Most sites only show the title and the url, it's
|
||||||
|
* totally fine to fill only those two values.
|
||||||
|
*
|
||||||
|
* @param element an element obtained from [popularAnimeSelector].
|
||||||
|
*/
|
||||||
|
protected abstract fun popularAnimeFromElement(element: Element): SAnime
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
|
||||||
|
* there's no next page.
|
||||||
|
*/
|
||||||
|
protected abstract fun popularAnimeNextPageSelector(): String?
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a [AnimesPage] object.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun searchAnimeParse(response: Response): AnimesPage {
|
||||||
|
val document = response.asJsoup()
|
||||||
|
|
||||||
|
val animes = document.select(searchAnimeSelector()).map { element ->
|
||||||
|
searchAnimeFromElement(element)
|
||||||
|
}
|
||||||
|
|
||||||
|
val hasNextPage = searchAnimeNextPageSelector()?.let { selector ->
|
||||||
|
document.select(selector).first()
|
||||||
|
} != null
|
||||||
|
|
||||||
|
return AnimesPage(animes, hasNextPage)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns a list of [Element] corresponding to each anime.
|
||||||
|
*/
|
||||||
|
protected abstract fun searchAnimeSelector(): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a anime from the given [element]. Most sites only show the title and the url, it's
|
||||||
|
* totally fine to fill only those two values.
|
||||||
|
*
|
||||||
|
* @param element an element obtained from [searchAnimeSelector].
|
||||||
|
*/
|
||||||
|
protected abstract fun searchAnimeFromElement(element: Element): SAnime
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
|
||||||
|
* there's no next page.
|
||||||
|
*/
|
||||||
|
protected abstract fun searchAnimeNextPageSelector(): String?
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a [AnimesPage] object.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun latestUpdatesParse(response: Response): AnimesPage {
|
||||||
|
val document = response.asJsoup()
|
||||||
|
|
||||||
|
val animes = document.select(latestUpdatesSelector()).map { element ->
|
||||||
|
latestUpdatesFromElement(element)
|
||||||
|
}
|
||||||
|
|
||||||
|
val hasNextPage = latestUpdatesNextPageSelector()?.let { selector ->
|
||||||
|
document.select(selector).first()
|
||||||
|
} != null
|
||||||
|
|
||||||
|
return AnimesPage(animes, hasNextPage)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns a list of [Element] corresponding to each anime.
|
||||||
|
*/
|
||||||
|
protected abstract fun latestUpdatesSelector(): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a anime from the given [element]. Most sites only show the title and the url, it's
|
||||||
|
* totally fine to fill only those two values.
|
||||||
|
*
|
||||||
|
* @param element an element obtained from [latestUpdatesSelector].
|
||||||
|
*/
|
||||||
|
protected abstract fun latestUpdatesFromElement(element: Element): SAnime
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns the <a> tag linking to the next page, or null if
|
||||||
|
* there's no next page.
|
||||||
|
*/
|
||||||
|
protected abstract fun latestUpdatesNextPageSelector(): String?
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns the details of a anime.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun animeDetailsParse(response: Response): SAnime {
|
||||||
|
return animeDetailsParse(response.asJsoup())
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the details of the anime from the given [document].
|
||||||
|
*
|
||||||
|
* @param document the parsed document.
|
||||||
|
*/
|
||||||
|
protected abstract fun animeDetailsParse(document: Document): SAnime
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a list of episodes.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun episodeListParse(response: Response): List<SEpisode> {
|
||||||
|
val document = response.asJsoup()
|
||||||
|
return document.select(episodeListSelector()).map { episodeFromElement(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns a list of [Element] corresponding to each episode.
|
||||||
|
*/
|
||||||
|
protected abstract fun episodeListSelector(): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns a list of episodes.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun episodeLinkParse(response: Response): String {
|
||||||
|
val document = response.asJsoup()
|
||||||
|
return linkFromElement(document.select(episodeLinkSelector()).first())
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Jsoup selector that returns a list of [Element] corresponding to each episode.
|
||||||
|
*/
|
||||||
|
protected abstract fun episodeLinkSelector(): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a episode from the given element.
|
||||||
|
*
|
||||||
|
* @param element an element obtained from [episodeListSelector].
|
||||||
|
*/
|
||||||
|
protected abstract fun episodeFromElement(element: Element): SEpisode
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a episode from the given element.
|
||||||
|
*
|
||||||
|
* @param element an element obtained from [episodeListSelector].
|
||||||
|
*/
|
||||||
|
protected abstract fun linkFromElement(element: Element): String
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses the response from the site and returns the page list.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun pageListParse(response: Response): List<Page> {
|
||||||
|
return pageListParse(response.asJsoup())
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a page list from the given document.
|
||||||
|
*
|
||||||
|
* @param document the parsed document.
|
||||||
|
*/
|
||||||
|
protected abstract fun pageListParse(document: Document): List<Page>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse the response from the site and returns the absolute url to the source image.
|
||||||
|
*
|
||||||
|
* @param response the response from the site.
|
||||||
|
*/
|
||||||
|
override fun imageUrlParse(response: Response): String {
|
||||||
|
return imageUrlParse(response.asJsoup())
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the absolute url to the source image from the document.
|
||||||
|
*
|
||||||
|
* @param document the parsed document.
|
||||||
|
*/
|
||||||
|
protected abstract fun imageUrlParse(document: Document): String
|
||||||
|
}
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
package eu.kanade.tachiyomi.extension.api
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.extension.model.Extension
|
|
||||||
import eu.kanade.tachiyomi.extension.util.ExtensionLoader
|
|
||||||
import ir.armor.tachidesk.model.dataclass.ExtensionDataClass
|
|
||||||
import kotlinx.serialization.json.JsonArray
|
|
||||||
import kotlinx.serialization.json.int
|
|
||||||
import kotlinx.serialization.json.jsonObject
|
|
||||||
import kotlinx.serialization.json.jsonPrimitive
|
|
||||||
|
|
||||||
object ExtensionGithubApi {
|
|
||||||
const val BASE_URL = "https://raw.githubusercontent.com"
|
|
||||||
const val REPO_URL_PREFIX = "$BASE_URL/tachiyomiorg/tachiyomi-extensions/repo"
|
|
||||||
|
|
||||||
private fun parseResponse(json: JsonArray): List<Extension.Available> {
|
|
||||||
return json
|
|
||||||
.filter { element ->
|
|
||||||
val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
|
|
||||||
val libVersion = versionName.substringBeforeLast('.').toDouble()
|
|
||||||
libVersion >= ExtensionLoader.LIB_VERSION_MIN && libVersion <= ExtensionLoader.LIB_VERSION_MAX
|
|
||||||
}
|
|
||||||
.map { element ->
|
|
||||||
val name = element.jsonObject["name"]!!.jsonPrimitive.content.substringAfter("Tachiyomi: ")
|
|
||||||
val pkgName = element.jsonObject["pkg"]!!.jsonPrimitive.content
|
|
||||||
val apkName = element.jsonObject["apk"]!!.jsonPrimitive.content
|
|
||||||
val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
|
|
||||||
val versionCode = element.jsonObject["code"]!!.jsonPrimitive.int
|
|
||||||
val lang = element.jsonObject["lang"]!!.jsonPrimitive.content
|
|
||||||
val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1
|
|
||||||
val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
|
|
||||||
|
|
||||||
Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun findExtensions(): List<Extension.Available> {
|
|
||||||
val service: ExtensionGithubService = ExtensionGithubService.create()
|
|
||||||
|
|
||||||
val response = service.getRepo()
|
|
||||||
return parseResponse(response)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getApkUrl(extension: ExtensionDataClass): String {
|
|
||||||
return "$REPO_URL_PREFIX/apk/${extension.apkName}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package eu.kanade.tachiyomi.extension.api
|
|
||||||
|
|
||||||
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
|
|
||||||
import eu.kanade.tachiyomi.network.NetworkHelper
|
|
||||||
import kotlinx.serialization.ExperimentalSerializationApi
|
|
||||||
import kotlinx.serialization.json.Json
|
|
||||||
import kotlinx.serialization.json.JsonArray
|
|
||||||
import okhttp3.MediaType.Companion.toMediaType
|
|
||||||
import retrofit2.Retrofit
|
|
||||||
import retrofit2.http.GET
|
|
||||||
import uy.kohesive.injekt.injectLazy
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used to get the extension repo listing from GitHub.
|
|
||||||
*/
|
|
||||||
interface ExtensionGithubService {
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
private val client by lazy {
|
|
||||||
val network: NetworkHelper by injectLazy()
|
|
||||||
network.client.newBuilder()
|
|
||||||
.addNetworkInterceptor { chain ->
|
|
||||||
val originalResponse = chain.proceed(chain.request())
|
|
||||||
originalResponse.newBuilder()
|
|
||||||
.header("Content-Encoding", "gzip")
|
|
||||||
.header("Content-Type", "application/json")
|
|
||||||
.build()
|
|
||||||
}
|
|
||||||
.build()
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExperimentalSerializationApi
|
|
||||||
fun create(): ExtensionGithubService {
|
|
||||||
val adapter = Retrofit.Builder()
|
|
||||||
.baseUrl(ExtensionGithubApi.BASE_URL)
|
|
||||||
.addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
|
|
||||||
.client(client)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
return adapter.create(ExtensionGithubService::class.java)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@GET("${ExtensionGithubApi.REPO_URL_PREFIX}/index.json.gz")
|
|
||||||
suspend fun getRepo(): JsonArray
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
package eu.kanade.tachiyomi.extension.model
|
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.source.Source
|
|
||||||
|
|
||||||
sealed class Extension {
|
|
||||||
|
|
||||||
abstract val name: String
|
|
||||||
abstract val pkgName: String
|
|
||||||
abstract val versionName: String
|
|
||||||
abstract val versionCode: Int
|
|
||||||
abstract val lang: String?
|
|
||||||
abstract val isNsfw: Boolean
|
|
||||||
|
|
||||||
data class Installed(
|
|
||||||
override val name: String,
|
|
||||||
override val pkgName: String,
|
|
||||||
override val versionName: String,
|
|
||||||
override val versionCode: Int,
|
|
||||||
override val lang: String,
|
|
||||||
override val isNsfw: Boolean,
|
|
||||||
val sources: List<Source>,
|
|
||||||
val hasUpdate: Boolean = false,
|
|
||||||
val isObsolete: Boolean = false,
|
|
||||||
val isUnofficial: Boolean = false
|
|
||||||
) : Extension()
|
|
||||||
|
|
||||||
data class Available(
|
|
||||||
override val name: String,
|
|
||||||
override val pkgName: String,
|
|
||||||
override val versionName: String,
|
|
||||||
override val versionCode: Int,
|
|
||||||
override val lang: String,
|
|
||||||
override val isNsfw: Boolean,
|
|
||||||
val apkName: String,
|
|
||||||
val iconUrl: String
|
|
||||||
) : Extension()
|
|
||||||
|
|
||||||
data class Untrusted(
|
|
||||||
override val name: String,
|
|
||||||
override val pkgName: String,
|
|
||||||
override val versionName: String,
|
|
||||||
override val versionCode: Int,
|
|
||||||
val signatureHash: String,
|
|
||||||
override val lang: String? = null,
|
|
||||||
override val isNsfw: Boolean = false
|
|
||||||
) : Extension()
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
package eu.kanade.tachiyomi.extension.model
|
|
||||||
|
|
||||||
enum class InstallStep {
|
|
||||||
Pending, Downloading, Installing, Installed, Error;
|
|
||||||
|
|
||||||
fun isCompleted(): Boolean {
|
|
||||||
return this == Installed || this == Error
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package eu.kanade.tachiyomi.extension.model
|
|
||||||
|
|
||||||
sealed class LoadResult {
|
|
||||||
|
|
||||||
class Success(val extension: Extension.Installed) : LoadResult()
|
|
||||||
class Untrusted(val extension: Extension.Untrusted) : LoadResult()
|
|
||||||
class Error(val message: String? = null) : LoadResult() {
|
|
||||||
constructor(exception: Throwable) : this(exception.message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
package eu.kanade.tachiyomi.extension.util
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
// import android.annotation.SuppressLint
|
|
||||||
// import android.content.Context
|
|
||||||
// import android.content.pm.PackageInfo
|
|
||||||
// import android.content.pm.PackageManager
|
|
||||||
// import dalvik.system.PathClassLoader
|
|
||||||
// import eu.kanade.tachiyomi.data.preference.PreferenceValues
|
|
||||||
// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
|
||||||
// import eu.kanade.tachiyomi.util.lang.Hash
|
|
||||||
// import kotlinx.coroutines.async
|
|
||||||
// import kotlinx.coroutines.runBlocking
|
|
||||||
// import timber.log.Timber
|
|
||||||
// import uy.kohesive.injekt.injectLazy
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class that handles the loading of the extensions installed in the system.
|
|
||||||
*/
|
|
||||||
// @SuppressLint("PackageManagerGetSignatures")
|
|
||||||
internal object ExtensionLoader {
|
|
||||||
|
|
||||||
// private val preferences: PreferencesHelper by injectLazy()
|
|
||||||
// private val allowNsfwSource by lazy {
|
|
||||||
// preferences.allowNsfwSource().get()
|
|
||||||
// }
|
|
||||||
|
|
||||||
private const val EXTENSION_FEATURE = "tachiyomi.extension"
|
|
||||||
private const val METADATA_SOURCE_CLASS = "tachiyomi.extension.class"
|
|
||||||
private const val METADATA_NSFW = "tachiyomi.extension.nsfw"
|
|
||||||
const val LIB_VERSION_MIN = 1.2
|
|
||||||
const val LIB_VERSION_MAX = 1.2
|
|
||||||
|
|
||||||
// private const val PACKAGE_FLAGS = PackageManager.GET_CONFIGURATIONS or PackageManager.GET_SIGNATURES
|
|
||||||
|
|
||||||
// inorichi's key
|
|
||||||
private const val officialSignature = "7ce04da7773d41b489f4693a366c36bcd0a11fc39b547168553c285bd7348e23"
|
|
||||||
/**
|
|
||||||
* List of the trusted signatures.
|
|
||||||
*/
|
|
||||||
// var trustedSignatures = mutableSetOf<String>() + preferences.trustedSignatures().get() + officialSignature
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a list of all the installed extensions initialized concurrently.
|
|
||||||
*
|
|
||||||
* @param context The application context.
|
|
||||||
*/
|
|
||||||
// fun loadExtensions(context: Context): List<LoadResult> {
|
|
||||||
// val pkgManager = context.packageManager
|
|
||||||
// val installedPkgs = pkgManager.getInstalledPackages(PACKAGE_FLAGS)
|
|
||||||
// val extPkgs = installedPkgs.filter { isPackageAnExtension(it) }
|
|
||||||
//
|
|
||||||
// if (extPkgs.isEmpty()) return emptyList()
|
|
||||||
//
|
|
||||||
// // Load each extension concurrently and wait for completion
|
|
||||||
// return runBlocking {
|
|
||||||
// val deferred = extPkgs.map {
|
|
||||||
// async { loadExtension(context, it.packageName, it) }
|
|
||||||
// }
|
|
||||||
// deferred.map { it.await() }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Attempts to load an extension from the given package name. It checks if the extension
|
|
||||||
* contains the required feature flag before trying to load it.
|
|
||||||
*/
|
|
||||||
// fun loadExtensionFromPkgName(context: Context, pkgName: String): LoadResult {
|
|
||||||
// val pkgInfo = try {
|
|
||||||
// context.packageManager.getPackageInfo(pkgName, PACKAGE_FLAGS)
|
|
||||||
// } catch (error: PackageManager.NameNotFoundException) {
|
|
||||||
// // Unlikely, but the package may have been uninstalled at this point
|
|
||||||
// return LoadResult.Error(error)
|
|
||||||
// }
|
|
||||||
// if (!isPackageAnExtension(pkgInfo)) {
|
|
||||||
// return LoadResult.Error("Tried to load a package that wasn't a extension")
|
|
||||||
// }
|
|
||||||
// return loadExtension(context, pkgName, pkgInfo)
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads an extension given its package name.
|
|
||||||
*
|
|
||||||
* @param context The application context.
|
|
||||||
* @param pkgName The package name of the extension to load.
|
|
||||||
* @param pkgInfo The package info of the extension.
|
|
||||||
*/
|
|
||||||
// private fun loadExtension(context: Context, pkgName: String, pkgInfo: PackageInfo): LoadResult {
|
|
||||||
// val pkgManager = context.packageManager
|
|
||||||
//
|
|
||||||
// val appInfo = try {
|
|
||||||
// pkgManager.getApplicationInfo(pkgName, PackageManager.GET_META_DATA)
|
|
||||||
// } catch (error: PackageManager.NameNotFoundException) {
|
|
||||||
// // Unlikely, but the package may have been uninstalled at this point
|
|
||||||
// return LoadResult.Error(error)
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// val extName = pkgManager.getApplicationLabel(appInfo).toString().substringAfter("Tachiyomi: ")
|
|
||||||
// val versionName = pkgInfo.versionName
|
|
||||||
// val versionCode = pkgInfo.versionCode
|
|
||||||
//
|
|
||||||
// if (versionName.isNullOrEmpty()) {
|
|
||||||
// val exception = Exception("Missing versionName for extension $extName")
|
|
||||||
// Timber.w(exception)
|
|
||||||
// return LoadResult.Error(exception)
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // Validate lib version
|
|
||||||
// val libVersion = versionName.substringBeforeLast('.').toDouble()
|
|
||||||
// if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
|
|
||||||
// val exception = Exception(
|
|
||||||
// "Lib version is $libVersion, while only versions " +
|
|
||||||
// "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed"
|
|
||||||
// )
|
|
||||||
// Timber.w(exception)
|
|
||||||
// return LoadResult.Error(exception)
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// val signatureHash = getSignatureHash(pkgInfo)
|
|
||||||
//
|
|
||||||
// if (signatureHash == null) {
|
|
||||||
// return LoadResult.Error("Package $pkgName isn't signed")
|
|
||||||
// } else if (signatureHash !in trustedSignatures) {
|
|
||||||
// val extension = Extension.Untrusted(extName, pkgName, versionName, versionCode, signatureHash)
|
|
||||||
// Timber.w("Extension $pkgName isn't trusted")
|
|
||||||
// return LoadResult.Untrusted(extension)
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// val isNsfw = appInfo.metaData.getInt(METADATA_NSFW) == 1
|
|
||||||
// if (allowNsfwSource == PreferenceValues.NsfwAllowance.BLOCKED && isNsfw) {
|
|
||||||
// return LoadResult.Error("NSFW extension $pkgName not allowed")
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// val classLoader = PathClassLoader(appInfo.sourceDir, null, context.classLoader)
|
|
||||||
//
|
|
||||||
// val sources = appInfo.metaData.getString(METADATA_SOURCE_CLASS)!!
|
|
||||||
// .split(";")
|
|
||||||
// .map {
|
|
||||||
// val sourceClass = it.trim()
|
|
||||||
// if (sourceClass.startsWith(".")) {
|
|
||||||
// pkgInfo.packageName + sourceClass
|
|
||||||
// } else {
|
|
||||||
// sourceClass
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// .flatMap {
|
|
||||||
// try {
|
|
||||||
// when (val obj = Class.forName(it, false, classLoader).newInstance()) {
|
|
||||||
// is Source -> listOf(obj)
|
|
||||||
// is SourceFactory -> {
|
|
||||||
// if (isSourceNsfw(obj)) {
|
|
||||||
// emptyList()
|
|
||||||
// } else {
|
|
||||||
// obj.createSources()
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// else -> throw Exception("Unknown source class type! ${obj.javaClass}")
|
|
||||||
// }
|
|
||||||
// } catch (e: Throwable) {
|
|
||||||
// Timber.e(e, "Extension load error: $extName.")
|
|
||||||
// return LoadResult.Error(e)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// .filter { !isSourceNsfw(it) }
|
|
||||||
//
|
|
||||||
// val langs = sources.filterIsInstance<CatalogueSource>()
|
|
||||||
// .map { it.lang }
|
|
||||||
// .toSet()
|
|
||||||
// val lang = when (langs.size) {
|
|
||||||
// 0 -> ""
|
|
||||||
// 1 -> langs.first()
|
|
||||||
// else -> "all"
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// val extension = Extension.Installed(
|
|
||||||
// extName,
|
|
||||||
// pkgName,
|
|
||||||
// versionName,
|
|
||||||
// versionCode,
|
|
||||||
// lang,
|
|
||||||
// isNsfw,
|
|
||||||
// sources,
|
|
||||||
// isUnofficial = signatureHash != officialSignature
|
|
||||||
// )
|
|
||||||
// return LoadResult.Success(extension)
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the given package is an extension.
|
|
||||||
*
|
|
||||||
* @param pkgInfo The package info of the application.
|
|
||||||
*/
|
|
||||||
// private fun isPackageAnExtension(pkgInfo: PackageInfo): Boolean {
|
|
||||||
// return pkgInfo.reqFeatures.orEmpty().any { it.name == EXTENSION_FEATURE }
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the signature hash of the package or null if it's not signed.
|
|
||||||
*
|
|
||||||
* @param pkgInfo The package info of the application.
|
|
||||||
*/
|
|
||||||
// private fun getSignatureHash(pkgInfo: PackageInfo): String? {
|
|
||||||
// val signatures = pkgInfo.signatures
|
|
||||||
// return if (signatures != null && signatures.isNotEmpty()) {
|
|
||||||
// Hash.sha256(signatures.first().toByteArray())
|
|
||||||
// } else {
|
|
||||||
// null
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks whether a Source or SourceFactory is annotated with @Nsfw.
|
|
||||||
*/
|
|
||||||
// private fun isSourceNsfw(clazz: Any): Boolean {
|
|
||||||
// if (allowNsfwSource == PreferenceValues.NsfwAllowance.ALLOWED) {
|
|
||||||
// return false
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (clazz !is Source && clazz !is SourceFactory) {
|
|
||||||
// return false
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // Annotations are proxied, hence this janky way of checking for them
|
|
||||||
// return clazz.javaClass.annotations
|
|
||||||
// .flatMap { it.javaClass.interfaces.map { it.simpleName } }
|
|
||||||
// .firstOrNull { it == Nsfw::class.java.simpleName } != null
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
package eu.kanade.tachiyomi.source
|
package eu.kanade.tachiyomi.source
|
||||||
|
|
||||||
// import androidx.preference.PreferenceScreen
|
import androidx.preference.PreferenceScreen
|
||||||
|
|
||||||
interface ConfigurableSource : Source {
|
interface ConfigurableSource : Source {
|
||||||
|
|
||||||
// fun setupPreferenceScreen(screen: PreferenceScreen)
|
fun setupPreferenceScreen(screen: PreferenceScreen)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
package eu.kanade.tachiyomi.source
|
package eu.kanade.tachiyomi.source
|
||||||
|
|
||||||
// import android.graphics.drawable.Drawable
|
|
||||||
// import eu.kanade.tachiyomi.extension.ExtensionManager
|
|
||||||
import eu.kanade.tachiyomi.source.model.Page
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
import eu.kanade.tachiyomi.source.model.SChapter
|
import eu.kanade.tachiyomi.source.model.SChapter
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import rx.Observable
|
import rx.Observable
|
||||||
// import uy.kohesive.injekt.Injekt
|
|
||||||
// import uy.kohesive.injekt.api.get
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A basic interface for creating a source. It could be an online source, a local source, etc...
|
* A basic interface for creating a source. It could be an online source, a local source, etc...
|
||||||
@@ -48,4 +44,4 @@ interface Source {
|
|||||||
|
|
||||||
// fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
|
// fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
|
||||||
|
|
||||||
// fun Source.getPreferenceKey(): String = "source_$id"
|
fun Source.getPreferenceKey(): String = "source_$id"
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
package eu.kanade.tachiyomi.source
|
package eu.kanade.tachiyomi.source
|
||||||
|
|
||||||
// import android.content.Context
|
import android.content.Context
|
||||||
// import eu.kanade.tachiyomi.R
|
|
||||||
import eu.kanade.tachiyomi.source.model.Page
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
import eu.kanade.tachiyomi.source.model.SChapter
|
import eu.kanade.tachiyomi.source.model.SChapter
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import eu.kanade.tachiyomi.source.online.HttpSource
|
import eu.kanade.tachiyomi.source.online.HttpSource
|
||||||
import rx.Observable
|
import rx.Observable
|
||||||
|
|
||||||
open class SourceManager() {
|
open class SourceManager(private val context: Context) {
|
||||||
|
|
||||||
private val sourcesMap = mutableMapOf<Long, Source>()
|
private val sourcesMap = mutableMapOf<Long, Source>()
|
||||||
|
|
||||||
|
|||||||
@@ -1,203 +0,0 @@
|
|||||||
package ir.armor.tachidesk.impl
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.source.model.SChapter
|
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
|
||||||
import ir.armor.tachidesk.impl.Manga.getManga
|
|
||||||
import ir.armor.tachidesk.impl.util.GetHttpSource.getHttpSource
|
|
||||||
import ir.armor.tachidesk.impl.util.awaitSingle
|
|
||||||
import ir.armor.tachidesk.model.database.table.ChapterTable
|
|
||||||
import ir.armor.tachidesk.model.database.table.MangaTable
|
|
||||||
import ir.armor.tachidesk.model.database.table.PageTable
|
|
||||||
import ir.armor.tachidesk.model.database.table.toDataClass
|
|
||||||
import ir.armor.tachidesk.model.dataclass.ChapterDataClass
|
|
||||||
import org.jetbrains.exposed.sql.SortOrder.DESC
|
|
||||||
import org.jetbrains.exposed.sql.and
|
|
||||||
import org.jetbrains.exposed.sql.deleteWhere
|
|
||||||
import org.jetbrains.exposed.sql.insert
|
|
||||||
import org.jetbrains.exposed.sql.select
|
|
||||||
import org.jetbrains.exposed.sql.transactions.transaction
|
|
||||||
import org.jetbrains.exposed.sql.update
|
|
||||||
|
|
||||||
object Chapter {
|
|
||||||
/** get chapter list when showing a manga */
|
|
||||||
suspend fun getChapterList(mangaId: Int, onlineFetch: Boolean): List<ChapterDataClass> {
|
|
||||||
return if (!onlineFetch) {
|
|
||||||
transaction {
|
|
||||||
ChapterTable.select { ChapterTable.manga eq mangaId }.orderBy(ChapterTable.chapterIndex to DESC)
|
|
||||||
.map {
|
|
||||||
ChapterTable.toDataClass(it)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
|
|
||||||
val mangaDetails = getManga(mangaId)
|
|
||||||
val source = getHttpSource(mangaDetails.sourceId.toLong())
|
|
||||||
val chapterList = source.fetchChapterList(
|
|
||||||
SManga.create().apply {
|
|
||||||
title = mangaDetails.title
|
|
||||||
url = mangaDetails.url
|
|
||||||
}
|
|
||||||
).awaitSingle()
|
|
||||||
|
|
||||||
val chapterCount = chapterList.count()
|
|
||||||
|
|
||||||
transaction {
|
|
||||||
chapterList.reversed().forEachIndexed { index, fetchedChapter ->
|
|
||||||
val chapterEntry = ChapterTable.select { ChapterTable.url eq fetchedChapter.url }.firstOrNull()
|
|
||||||
if (chapterEntry == null) {
|
|
||||||
ChapterTable.insert {
|
|
||||||
it[url] = fetchedChapter.url
|
|
||||||
it[name] = fetchedChapter.name
|
|
||||||
it[date_upload] = fetchedChapter.date_upload
|
|
||||||
it[chapter_number] = fetchedChapter.chapter_number
|
|
||||||
it[scanlator] = fetchedChapter.scanlator
|
|
||||||
|
|
||||||
it[chapterIndex] = index + 1
|
|
||||||
it[manga] = mangaId
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ChapterTable.update({ ChapterTable.url eq fetchedChapter.url }) {
|
|
||||||
it[name] = fetchedChapter.name
|
|
||||||
it[date_upload] = fetchedChapter.date_upload
|
|
||||||
it[chapter_number] = fetchedChapter.chapter_number
|
|
||||||
it[scanlator] = fetchedChapter.scanlator
|
|
||||||
|
|
||||||
it[chapterIndex] = index + 1
|
|
||||||
it[manga] = mangaId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// clear any orphaned chapters that are in the db but not in `chapterList`
|
|
||||||
val dbChapterCount = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.count() }
|
|
||||||
if (dbChapterCount > chapterCount) { // we got some clean up due
|
|
||||||
val dbChapterList = transaction { ChapterTable.select { ChapterTable.manga eq mangaId } }
|
|
||||||
|
|
||||||
dbChapterList.forEach {
|
|
||||||
if (it[ChapterTable.chapterIndex] >= chapterList.size ||
|
|
||||||
chapterList[it[ChapterTable.chapterIndex] - 1].url != it[ChapterTable.url]
|
|
||||||
) {
|
|
||||||
transaction {
|
|
||||||
PageTable.deleteWhere { PageTable.chapter eq it[ChapterTable.id] }
|
|
||||||
ChapterTable.deleteWhere { ChapterTable.id eq it[ChapterTable.id] }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val dbChapterMap = transaction {
|
|
||||||
ChapterTable.select { ChapterTable.manga eq mangaId }
|
|
||||||
.associateBy({ it[ChapterTable.url] }, { it })
|
|
||||||
}
|
|
||||||
|
|
||||||
return chapterList.mapIndexed { index, it ->
|
|
||||||
|
|
||||||
val dbChapter = dbChapterMap.getValue(it.url)
|
|
||||||
|
|
||||||
ChapterDataClass(
|
|
||||||
it.url,
|
|
||||||
it.name,
|
|
||||||
it.date_upload,
|
|
||||||
it.chapter_number,
|
|
||||||
it.scanlator,
|
|
||||||
mangaId,
|
|
||||||
|
|
||||||
dbChapter[ChapterTable.isRead],
|
|
||||||
dbChapter[ChapterTable.isBookmarked],
|
|
||||||
dbChapter[ChapterTable.lastPageRead],
|
|
||||||
|
|
||||||
chapterCount - index,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** used to display a chapter, get a chapter in order to show it's pages */
|
|
||||||
suspend fun getChapter(chapterIndex: Int, mangaId: Int): ChapterDataClass {
|
|
||||||
val chapterEntry = transaction {
|
|
||||||
ChapterTable.select {
|
|
||||||
(ChapterTable.chapterIndex eq chapterIndex) and (ChapterTable.manga eq mangaId)
|
|
||||||
}.firstOrNull()!!
|
|
||||||
}
|
|
||||||
val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
|
|
||||||
val source = getHttpSource(mangaEntry[MangaTable.sourceReference])
|
|
||||||
|
|
||||||
val pageList = source.fetchPageList(
|
|
||||||
SChapter.create().apply {
|
|
||||||
url = chapterEntry[ChapterTable.url]
|
|
||||||
name = chapterEntry[ChapterTable.name]
|
|
||||||
}
|
|
||||||
).awaitSingle()
|
|
||||||
|
|
||||||
val chapterId = chapterEntry[ChapterTable.id].value
|
|
||||||
val chapterCount = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.count() }
|
|
||||||
|
|
||||||
// update page list for this chapter
|
|
||||||
transaction {
|
|
||||||
pageList.forEach { page ->
|
|
||||||
val pageEntry = transaction { PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }.firstOrNull() }
|
|
||||||
if (pageEntry == null) {
|
|
||||||
PageTable.insert {
|
|
||||||
it[index] = page.index
|
|
||||||
it[url] = page.url
|
|
||||||
it[imageUrl] = page.imageUrl
|
|
||||||
it[chapter] = chapterId
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
PageTable.update({ (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }) {
|
|
||||||
it[url] = page.url
|
|
||||||
it[imageUrl] = page.imageUrl
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ChapterDataClass(
|
|
||||||
chapterEntry[ChapterTable.url],
|
|
||||||
chapterEntry[ChapterTable.name],
|
|
||||||
chapterEntry[ChapterTable.date_upload],
|
|
||||||
chapterEntry[ChapterTable.chapter_number],
|
|
||||||
chapterEntry[ChapterTable.scanlator],
|
|
||||||
mangaId,
|
|
||||||
chapterEntry[ChapterTable.isRead],
|
|
||||||
chapterEntry[ChapterTable.isBookmarked],
|
|
||||||
chapterEntry[ChapterTable.lastPageRead],
|
|
||||||
|
|
||||||
chapterEntry[ChapterTable.chapterIndex],
|
|
||||||
chapterCount.toInt(),
|
|
||||||
pageList.count()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun modifyChapter(mangaId: Int, chapterIndex: Int, isRead: Boolean?, isBookmarked: Boolean?, markPrevRead: Boolean?, lastPageRead: Int?) {
|
|
||||||
transaction {
|
|
||||||
if (listOf(isRead, isBookmarked, lastPageRead).any { it != null }) {
|
|
||||||
ChapterTable.update({ (ChapterTable.manga eq mangaId) and (ChapterTable.chapterIndex eq chapterIndex) }) { update ->
|
|
||||||
isRead?.also {
|
|
||||||
update[ChapterTable.isRead] = it
|
|
||||||
}
|
|
||||||
isBookmarked?.also {
|
|
||||||
update[ChapterTable.isBookmarked] = it
|
|
||||||
}
|
|
||||||
lastPageRead?.also {
|
|
||||||
update[ChapterTable.lastPageRead] = it
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
markPrevRead?.let {
|
|
||||||
ChapterTable.update({ (ChapterTable.manga eq mangaId) and (ChapterTable.chapterIndex less chapterIndex) }) {
|
|
||||||
it[ChapterTable.isRead] = markPrevRead
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package ir.armor.tachidesk.impl
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import ir.armor.tachidesk.impl.Extension.getExtensionIconUrl
|
|
||||||
import ir.armor.tachidesk.impl.util.GetHttpSource.getHttpSource
|
|
||||||
import ir.armor.tachidesk.model.database.table.ExtensionTable
|
|
||||||
import ir.armor.tachidesk.model.database.table.SourceTable
|
|
||||||
import ir.armor.tachidesk.model.dataclass.SourceDataClass
|
|
||||||
import mu.KotlinLogging
|
|
||||||
import org.jetbrains.exposed.sql.select
|
|
||||||
import org.jetbrains.exposed.sql.selectAll
|
|
||||||
import org.jetbrains.exposed.sql.transactions.transaction
|
|
||||||
|
|
||||||
object Source {
|
|
||||||
private val logger = KotlinLogging.logger {}
|
|
||||||
|
|
||||||
fun getSourceList(): List<SourceDataClass> {
|
|
||||||
return transaction {
|
|
||||||
SourceTable.selectAll().map {
|
|
||||||
SourceDataClass(
|
|
||||||
it[SourceTable.id].value.toString(),
|
|
||||||
it[SourceTable.name],
|
|
||||||
it[SourceTable.lang],
|
|
||||||
getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()[ExtensionTable.apkName]),
|
|
||||||
getHttpSource(it[SourceTable.id].value).supportsLatest
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getSource(sourceId: Long): SourceDataClass {
|
|
||||||
return transaction {
|
|
||||||
val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()
|
|
||||||
|
|
||||||
SourceDataClass(
|
|
||||||
sourceId.toString(),
|
|
||||||
source?.get(SourceTable.name),
|
|
||||||
source?.get(SourceTable.lang),
|
|
||||||
source?.let { ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()[ExtensionTable.iconUrl] },
|
|
||||||
source?.let { getHttpSource(sourceId).supportsLatest }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
package ir.armor.tachidesk.impl.backup.legacy.models
|
|
||||||
|
|
||||||
data class DHistory(val url: String, val lastRead: Long)
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
package ir.armor.tachidesk.impl.util
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.network.POST
|
|
||||||
import eu.kanade.tachiyomi.source.online.HttpSource
|
|
||||||
import okhttp3.FormBody
|
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import java.net.URLEncoder
|
|
||||||
|
|
||||||
// TODO: finish MangaDex support
|
|
||||||
class MangaDexHelper(private val mangaDexSource: HttpSource) {
|
|
||||||
|
|
||||||
private fun clientBuilder(): OkHttpClient = clientBuilder(0)
|
|
||||||
|
|
||||||
private fun clientBuilder(
|
|
||||||
r18Toggle: Int,
|
|
||||||
okHttpClient: OkHttpClient = mangaDexSource.network.client
|
|
||||||
): OkHttpClient = okHttpClient.newBuilder()
|
|
||||||
.addNetworkInterceptor { chain ->
|
|
||||||
val originalCookies = chain.request().header("Cookie") ?: ""
|
|
||||||
val newReq = chain
|
|
||||||
.request()
|
|
||||||
.newBuilder()
|
|
||||||
.header("Cookie", "$originalCookies; ${cookiesHeader(r18Toggle)}")
|
|
||||||
.build()
|
|
||||||
chain.proceed(newReq)
|
|
||||||
}.build()
|
|
||||||
|
|
||||||
private fun cookiesHeader(r18Toggle: Int): String {
|
|
||||||
val cookies = mutableMapOf<String, String>()
|
|
||||||
cookies["mangadex_h_toggle"] = r18Toggle.toString()
|
|
||||||
return buildCookies(cookies)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun buildCookies(cookies: Map<String, String>) =
|
|
||||||
cookies.entries.joinToString(separator = "; ", postfix = ";") {
|
|
||||||
"${URLEncoder.encode(it.key, "UTF-8")}=${URLEncoder.encode(it.value, "UTF-8")}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// fun isLogged(): Boolean {
|
|
||||||
// val httpUrl = mangaDexSource.baseUrl.toHttpUrlOrNull()!!
|
|
||||||
// return network.cookieManager.get(httpUrl).any { it.name == REMEMBER_ME }
|
|
||||||
// }
|
|
||||||
|
|
||||||
fun login(username: String, password: String, twoFactorCode: String = ""): Boolean {
|
|
||||||
val formBody = FormBody.Builder()
|
|
||||||
.add("login_username", username)
|
|
||||||
.add("login_password", password)
|
|
||||||
.add("no_js", "1")
|
|
||||||
.add("remember_me", "1")
|
|
||||||
|
|
||||||
twoFactorCode.let {
|
|
||||||
formBody.add("two_factor", it)
|
|
||||||
}
|
|
||||||
|
|
||||||
val response = clientBuilder().newCall(
|
|
||||||
POST(
|
|
||||||
"${mangaDexSource.baseUrl}/ajax/actions.ajax.php?function=login",
|
|
||||||
mangaDexSource.headers,
|
|
||||||
formBody.build()
|
|
||||||
)
|
|
||||||
).execute()
|
|
||||||
return response.body!!.string().isEmpty()
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// fun logout(): Boolean {
|
|
||||||
// return withContext(Dispatchers.IO) {
|
|
||||||
// // https://mangadex.org/ajax/actions.ajax.php?function=logout
|
|
||||||
// val httpUrl = baseUrl.toHttpUrlOrNull()!!
|
|
||||||
// val listOfDexCookies = network.cookieManager.get(httpUrl)
|
|
||||||
// val cookie = listOfDexCookies.find { it.name == REMEMBER_ME }
|
|
||||||
// val token = cookie?.value
|
|
||||||
// if (token.isNullOrEmpty()) {
|
|
||||||
// return@withContext true
|
|
||||||
// }
|
|
||||||
// val result = clientBuilder().newCall(
|
|
||||||
// POSTWithCookie(
|
|
||||||
// "$baseUrl/ajax/actions.ajax.php?function=logout",
|
|
||||||
// REMEMBER_ME,
|
|
||||||
// token,
|
|
||||||
// headers
|
|
||||||
// )
|
|
||||||
// ).execute()
|
|
||||||
// val resultStr = result.body!!.string()
|
|
||||||
// if (resultStr.contains("success", true)) {
|
|
||||||
// network.cookieManager.remove(httpUrl)
|
|
||||||
// return@withContext true
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// false
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
-24
@@ -1,24 +0,0 @@
|
|||||||
package ir.armor.tachidesk.model.database.migration
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import ir.armor.tachidesk.model.database.migration.lib.Migration
|
|
||||||
import org.jetbrains.exposed.sql.transactions.TransactionManager
|
|
||||||
import org.jetbrains.exposed.sql.vendors.currentDialect
|
|
||||||
|
|
||||||
@Suppress("ClassName", "unused")
|
|
||||||
class M0002_ChapterTableIndexRename : Migration() {
|
|
||||||
/** this migration renamed ChapterTable.NUMBER_IN_LIST to ChapterTable.INDEX */
|
|
||||||
override fun run() {
|
|
||||||
with(TransactionManager.current()) {
|
|
||||||
exec("ALTER TABLE CHAPTER ALTER COLUMN NUMBER_IN_LIST RENAME TO INDEX")
|
|
||||||
commit()
|
|
||||||
currentDialect.resetCaches()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2020 Andreas Mausch
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package ir.armor.tachidesk.model.database.migration.lib
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
// originally licenced under MIT by Andreas Mausch, Changes are licenced under Mozilla Public License, v. 2.0.
|
|
||||||
// adopted from: https://gitlab.com/andreas-mausch/exposed-migrations/-/tree/4bf853c18a24d0170eda896ddbb899cb01233595
|
|
||||||
|
|
||||||
abstract class Migration {
|
|
||||||
val name: String
|
|
||||||
val version: Int
|
|
||||||
|
|
||||||
init {
|
|
||||||
val groups = Regex("^M(\\d+)_(.*)$").matchEntire(this::class.simpleName!!)?.groupValues
|
|
||||||
?: throw IllegalArgumentException("Migration class name doesn't match convention")
|
|
||||||
version = groups[1].toInt()
|
|
||||||
name = groups[2]
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract fun run()
|
|
||||||
}
|
|
||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
package ir.armor.tachidesk.model.database.migration.lib
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
// originally licenced under MIT by Andreas Mausch, Changes are licenced under Mozilla Public License, v. 2.0.
|
|
||||||
// adopted from: https://gitlab.com/andreas-mausch/exposed-migrations/-/tree/4bf853c18a24d0170eda896ddbb899cb01233595
|
|
||||||
|
|
||||||
import org.jetbrains.exposed.dao.IntEntity
|
|
||||||
import org.jetbrains.exposed.dao.IntEntityClass
|
|
||||||
import org.jetbrains.exposed.dao.id.EntityID
|
|
||||||
import org.jetbrains.exposed.dao.id.IdTable
|
|
||||||
import org.jetbrains.exposed.sql.`java-time`.timestamp
|
|
||||||
|
|
||||||
object MigrationsTable : IdTable<Int>() {
|
|
||||||
override val id = integer("version").entityId()
|
|
||||||
override val primaryKey = PrimaryKey(id)
|
|
||||||
|
|
||||||
val name = varchar("name", length = 400)
|
|
||||||
val executedAt = timestamp("executed_at")
|
|
||||||
|
|
||||||
init {
|
|
||||||
index(true, name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class MigrationEntity(id: EntityID<Int>) : IntEntity(id) {
|
|
||||||
companion object : IntEntityClass<MigrationEntity>(MigrationsTable)
|
|
||||||
|
|
||||||
var version by MigrationsTable.id
|
|
||||||
var name by MigrationsTable.name
|
|
||||||
var executedAt by MigrationsTable.executedAt
|
|
||||||
}
|
|
||||||
-98
@@ -1,98 +0,0 @@
|
|||||||
package ir.armor.tachidesk.model.database.migration.lib
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
// originally licenced under MIT by Andreas Mausch, Changes are licenced under Mozilla Public License, v. 2.0.
|
|
||||||
// adopted from: https://gitlab.com/andreas-mausch/exposed-migrations/-/tree/4bf853c18a24d0170eda896ddbb899cb01233595
|
|
||||||
|
|
||||||
import com.google.common.reflect.ClassPath
|
|
||||||
import mu.KotlinLogging
|
|
||||||
import org.jetbrains.exposed.dao.id.EntityID
|
|
||||||
import org.jetbrains.exposed.sql.Database
|
|
||||||
import org.jetbrains.exposed.sql.SchemaUtils.create
|
|
||||||
import org.jetbrains.exposed.sql.exists
|
|
||||||
import org.jetbrains.exposed.sql.transactions.TransactionManager
|
|
||||||
import org.jetbrains.exposed.sql.transactions.transaction
|
|
||||||
import java.time.Clock
|
|
||||||
import java.time.Instant.now
|
|
||||||
|
|
||||||
private val logger = KotlinLogging.logger {}
|
|
||||||
|
|
||||||
fun runMigrations(migrations: List<Migration>, database: Database = TransactionManager.defaultDatabase!!, clock: Clock = Clock.systemUTC()) {
|
|
||||||
checkVersions(migrations)
|
|
||||||
|
|
||||||
logger.info { "Running migrations on database ${database.url}" }
|
|
||||||
|
|
||||||
val latestVersion = transaction(database) {
|
|
||||||
createTableIfNotExists(database)
|
|
||||||
MigrationEntity.all().maxByOrNull { it.version }?.version?.value
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info { "Database version before migrations: $latestVersion" }
|
|
||||||
|
|
||||||
migrations
|
|
||||||
.sortedBy { it.version }
|
|
||||||
.filter { shouldRun(latestVersion, it) }
|
|
||||||
.forEach {
|
|
||||||
logger.info { "Running migration version ${it.version}: ${it.name}" }
|
|
||||||
transaction(database) {
|
|
||||||
it.run()
|
|
||||||
|
|
||||||
MigrationEntity.new {
|
|
||||||
version = EntityID(it.version, MigrationsTable)
|
|
||||||
name = it.name
|
|
||||||
executedAt = now(clock)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info { "Migrations finished successfully" }
|
|
||||||
}
|
|
||||||
|
|
||||||
@Suppress("UnstableApiUsage")
|
|
||||||
fun loadMigrationsFrom(classPath: String): List<Migration> {
|
|
||||||
return ClassPath.from(Thread.currentThread().contextClassLoader)
|
|
||||||
.getTopLevelClasses(classPath)
|
|
||||||
.map {
|
|
||||||
logger.debug("found Migration class ${it.name}")
|
|
||||||
val clazz = it.load().getDeclaredConstructor().newInstance()
|
|
||||||
if (clazz is Migration)
|
|
||||||
clazz
|
|
||||||
else
|
|
||||||
throw RuntimeException("found a class that's not a Migration")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun checkVersions(migrations: List<Migration>) {
|
|
||||||
val sorted = migrations.map { it.version }.sorted()
|
|
||||||
if ((1..migrations.size).toList() != sorted) {
|
|
||||||
throw IllegalStateException("List of migrations version is not consecutive: $sorted")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun createTableIfNotExists(database: Database) {
|
|
||||||
if (MigrationsTable.exists()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
val tableNames = database.dialect.allTablesNames()
|
|
||||||
when (tableNames.isEmpty()) {
|
|
||||||
true -> {
|
|
||||||
logger.info { "Empty database found, creating table for migrations" }
|
|
||||||
create(MigrationsTable)
|
|
||||||
}
|
|
||||||
false -> throw IllegalStateException("Tried to run migrations against a non-empty database without a Migrations table. This is not supported.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun shouldRun(latestVersion: Int?, migration: Migration): Boolean {
|
|
||||||
val run = latestVersion?.let { migration.version > it } ?: true
|
|
||||||
if (!run) {
|
|
||||||
logger.debug { "Skipping migration version ${migration.version}: ${migration.name}" }
|
|
||||||
}
|
|
||||||
return run
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
package ir.armor.tachidesk.model.database.table
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import ir.armor.tachidesk.model.dataclass.ChapterDataClass
|
|
||||||
import org.jetbrains.exposed.dao.id.IntIdTable
|
|
||||||
import org.jetbrains.exposed.sql.ResultRow
|
|
||||||
|
|
||||||
object ChapterTable : IntIdTable() {
|
|
||||||
val url = varchar("url", 2048)
|
|
||||||
val name = varchar("name", 512)
|
|
||||||
val date_upload = long("date_upload").default(0)
|
|
||||||
val chapter_number = float("chapter_number").default(-1f)
|
|
||||||
val scanlator = varchar("scanlator", 128).nullable()
|
|
||||||
|
|
||||||
val isRead = bool("read").default(false)
|
|
||||||
val isBookmarked = bool("bookmark").default(false)
|
|
||||||
val lastPageRead = integer("last_page_read").default(0)
|
|
||||||
|
|
||||||
// index is reserved by a function
|
|
||||||
val chapterIndex = integer("index")
|
|
||||||
|
|
||||||
val manga = reference("manga", MangaTable)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun ChapterTable.toDataClass(chapterEntry: ResultRow) =
|
|
||||||
ChapterDataClass(
|
|
||||||
chapterEntry[this.url],
|
|
||||||
chapterEntry[this.name],
|
|
||||||
chapterEntry[this.date_upload],
|
|
||||||
chapterEntry[this.chapter_number],
|
|
||||||
chapterEntry[this.scanlator],
|
|
||||||
chapterEntry[this.manga].value,
|
|
||||||
chapterEntry[this.isRead],
|
|
||||||
chapterEntry[this.isBookmarked],
|
|
||||||
chapterEntry[this.lastPageRead],
|
|
||||||
chapterEntry[this.chapterIndex],
|
|
||||||
)
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
package ir.armor.tachidesk.server.util
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
|
||||||
*
|
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
import dorkbox.systemTray.MenuItem
|
|
||||||
import dorkbox.systemTray.SystemTray
|
|
||||||
import dorkbox.systemTray.SystemTray.TrayType
|
|
||||||
import dorkbox.util.CacheUtil
|
|
||||||
import dorkbox.util.Desktop
|
|
||||||
import ir.armor.tachidesk.server.BuildConfig
|
|
||||||
import ir.armor.tachidesk.server.ServerConfig
|
|
||||||
import ir.armor.tachidesk.server.serverConfig
|
|
||||||
import kotlin.system.exitProcess
|
|
||||||
|
|
||||||
fun openInBrowser() {
|
|
||||||
try {
|
|
||||||
Desktop.browseURL("http://127.0.0.1:4567")
|
|
||||||
} catch (e: Throwable) { // cover both java.lang.Exception and java.lang.Error
|
|
||||||
e.printStackTrace()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun systemTray(): SystemTray? {
|
|
||||||
try {
|
|
||||||
// ref: https://github.com/dorkbox/SystemTray/blob/master/test/dorkbox/TestTray.java
|
|
||||||
SystemTray.DEBUG = serverConfig.debugLogsEnabled
|
|
||||||
if (System.getProperty("os.name").startsWith("Windows"))
|
|
||||||
SystemTray.FORCE_TRAY_TYPE = TrayType.Swing
|
|
||||||
|
|
||||||
CacheUtil.clear(BuildConfig.name)
|
|
||||||
|
|
||||||
val systemTray = SystemTray.get(BuildConfig.name) ?: return null
|
|
||||||
val mainMenu = systemTray.menu
|
|
||||||
|
|
||||||
mainMenu.add(
|
|
||||||
MenuItem(
|
|
||||||
"Open Tachidesk"
|
|
||||||
) {
|
|
||||||
openInBrowser()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
val icon = ServerConfig::class.java.getResource("/icon/faviconlogo.png")
|
|
||||||
|
|
||||||
// systemTray.setTooltip("Tachidesk")
|
|
||||||
systemTray.setImage(icon)
|
|
||||||
// systemTray.status = "No Mail"
|
|
||||||
|
|
||||||
mainMenu.add(
|
|
||||||
MenuItem("Quit") {
|
|
||||||
systemTray.shutdown()
|
|
||||||
exitProcess(0)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
systemTray.installShutdownHook()
|
|
||||||
|
|
||||||
return systemTray
|
|
||||||
} catch (e: Exception) {
|
|
||||||
e.printStackTrace()
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
package ir.armor.tachidesk
|
package suwayomi.tachidesk
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
@@ -7,8 +7,8 @@ package ir.armor.tachidesk
|
|||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
import ir.armor.tachidesk.server.JavalinSetup.javalinSetup
|
import suwayomi.tachidesk.server.JavalinSetup.javalinSetup
|
||||||
import ir.armor.tachidesk.server.applicationSetup
|
import suwayomi.tachidesk.server.applicationSetup
|
||||||
|
|
||||||
fun main() {
|
fun main() {
|
||||||
applicationSetup()
|
applicationSetup()
|
||||||
@@ -0,0 +1,379 @@
|
|||||||
|
package suwayomi.tachidesk.anime
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import io.javalin.Javalin
|
||||||
|
import suwayomi.tachidesk.anime.impl.Anime.getAnime
|
||||||
|
import suwayomi.tachidesk.anime.impl.Anime.getAnimeThumbnail
|
||||||
|
import suwayomi.tachidesk.anime.impl.AnimeList.getAnimeList
|
||||||
|
import suwayomi.tachidesk.anime.impl.Episode.getEpisode
|
||||||
|
import suwayomi.tachidesk.anime.impl.Episode.getEpisodeList
|
||||||
|
import suwayomi.tachidesk.anime.impl.Episode.modifyEpisode
|
||||||
|
import suwayomi.tachidesk.anime.impl.Source.getAnimeSource
|
||||||
|
import suwayomi.tachidesk.anime.impl.Source.getSourceList
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.Extension.getExtensionIcon
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.Extension.installExtension
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.Extension.uninstallExtension
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.Extension.updateExtension
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.ExtensionsList.getExtensionList
|
||||||
|
import suwayomi.tachidesk.server.JavalinSetup.future
|
||||||
|
|
||||||
|
object AnimeAPI {
|
||||||
|
fun defineEndpoints(app: Javalin) {
|
||||||
|
// list all extensions
|
||||||
|
app.get("/api/v1/anime/extension/list") { ctx ->
|
||||||
|
ctx.json(
|
||||||
|
future {
|
||||||
|
getExtensionList()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// install extension identified with "pkgName"
|
||||||
|
app.get("/api/v1/anime/extension/install/:pkgName") { ctx ->
|
||||||
|
val pkgName = ctx.pathParam("pkgName")
|
||||||
|
|
||||||
|
ctx.json(
|
||||||
|
future {
|
||||||
|
installExtension(pkgName)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// update extension identified with "pkgName"
|
||||||
|
app.get("/api/v1/anime/extension/update/:pkgName") { ctx ->
|
||||||
|
val pkgName = ctx.pathParam("pkgName")
|
||||||
|
|
||||||
|
ctx.json(
|
||||||
|
future {
|
||||||
|
updateExtension(pkgName)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// uninstall extension identified with "pkgName"
|
||||||
|
app.get("/api/v1/anime/extension/uninstall/:pkgName") { ctx ->
|
||||||
|
val pkgName = ctx.pathParam("pkgName")
|
||||||
|
|
||||||
|
uninstallExtension(pkgName)
|
||||||
|
ctx.status(200)
|
||||||
|
}
|
||||||
|
|
||||||
|
// icon for extension named `apkName`
|
||||||
|
app.get("/api/v1/anime/extension/icon/:apkName") { ctx -> // TODO: move to pkgName
|
||||||
|
val apkName = ctx.pathParam("apkName")
|
||||||
|
|
||||||
|
ctx.result(
|
||||||
|
future { getExtensionIcon(apkName) }
|
||||||
|
.thenApply {
|
||||||
|
ctx.header("content-type", it.second)
|
||||||
|
it.first
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// list of sources
|
||||||
|
app.get("/api/v1/anime/source/list") { ctx ->
|
||||||
|
ctx.json(getSourceList())
|
||||||
|
}
|
||||||
|
|
||||||
|
// fetch source with id `sourceId`
|
||||||
|
app.get("/api/v1/anime/source/:sourceId") { ctx ->
|
||||||
|
val sourceId = ctx.pathParam("sourceId").toLong()
|
||||||
|
ctx.json(getAnimeSource(sourceId))
|
||||||
|
}
|
||||||
|
|
||||||
|
// popular animes from source with id `sourceId`
|
||||||
|
app.get("/api/v1/anime/source/:sourceId/popular/:pageNum") { ctx ->
|
||||||
|
val sourceId = ctx.pathParam("sourceId").toLong()
|
||||||
|
val pageNum = ctx.pathParam("pageNum").toInt()
|
||||||
|
ctx.json(
|
||||||
|
future {
|
||||||
|
getAnimeList(sourceId, pageNum, popular = true)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// latest animes from source with id `sourceId`
|
||||||
|
app.get("/api/v1/anime/source/:sourceId/latest/:pageNum") { ctx ->
|
||||||
|
val sourceId = ctx.pathParam("sourceId").toLong()
|
||||||
|
val pageNum = ctx.pathParam("pageNum").toInt()
|
||||||
|
ctx.json(
|
||||||
|
future {
|
||||||
|
getAnimeList(sourceId, pageNum, popular = false)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// get anime info
|
||||||
|
app.get("/api/v1/anime/anime/:animeId/") { ctx ->
|
||||||
|
val animeId = ctx.pathParam("animeId").toInt()
|
||||||
|
val onlineFetch = ctx.queryParam("onlineFetch", "false").toBoolean()
|
||||||
|
|
||||||
|
ctx.json(
|
||||||
|
future {
|
||||||
|
getAnime(animeId, onlineFetch)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// anime thumbnail
|
||||||
|
app.get("api/v1/anime/anime/:animeId/thumbnail") { ctx ->
|
||||||
|
val animeId = ctx.pathParam("animeId").toInt()
|
||||||
|
|
||||||
|
ctx.result(
|
||||||
|
future { getAnimeThumbnail(animeId) }
|
||||||
|
.thenApply {
|
||||||
|
ctx.header("content-type", it.second)
|
||||||
|
it.first
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// // list manga's categories
|
||||||
|
// app.get("api/v1/manga/:mangaId/category/") { ctx ->
|
||||||
|
// val mangaId = ctx.pathParam("mangaId").toInt()
|
||||||
|
// ctx.json(getMangaCategories(mangaId))
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // adds the manga to category
|
||||||
|
// app.get("api/v1/manga/:mangaId/category/:categoryId") { ctx ->
|
||||||
|
// val mangaId = ctx.pathParam("mangaId").toInt()
|
||||||
|
// val categoryId = ctx.pathParam("categoryId").toInt()
|
||||||
|
// addMangaToCategory(mangaId, categoryId)
|
||||||
|
// ctx.status(200)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // removes the manga from the category
|
||||||
|
// app.delete("api/v1/manga/:mangaId/category/:categoryId") { ctx ->
|
||||||
|
// val mangaId = ctx.pathParam("mangaId").toInt()
|
||||||
|
// val categoryId = ctx.pathParam("categoryId").toInt()
|
||||||
|
// removeMangaFromCategory(mangaId, categoryId)
|
||||||
|
// ctx.status(200)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// get episode list when showing a anime
|
||||||
|
app.get("/api/v1/anime/anime/:animeId/episodes") { ctx ->
|
||||||
|
val animeId = ctx.pathParam("animeId").toInt()
|
||||||
|
|
||||||
|
val onlineFetch = ctx.queryParam("onlineFetch")?.toBoolean()
|
||||||
|
|
||||||
|
ctx.json(future { getEpisodeList(animeId, onlineFetch) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// used to display a episode, get a episode in order to show it's <Quality pending>
|
||||||
|
app.get("/api/v1/anime/anime/:animeId/episode/:episodeIndex") { ctx ->
|
||||||
|
val episodeIndex = ctx.pathParam("episodeIndex").toInt()
|
||||||
|
val animeId = ctx.pathParam("animeId").toInt()
|
||||||
|
ctx.json(future { getEpisode(episodeIndex, animeId) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// used to modify a episode's parameters
|
||||||
|
app.patch("/api/v1/anime/anime/:animeId/episode/:episodeIndex") { ctx ->
|
||||||
|
val episodeIndex = ctx.pathParam("episodeIndex").toInt()
|
||||||
|
val animeId = ctx.pathParam("animeId").toInt()
|
||||||
|
|
||||||
|
val read = ctx.formParam("read")?.toBoolean()
|
||||||
|
val bookmarked = ctx.formParam("bookmarked")?.toBoolean()
|
||||||
|
val markPrevRead = ctx.formParam("markPrevRead")?.toBoolean()
|
||||||
|
val lastPageRead = ctx.formParam("lastPageRead")?.toInt()
|
||||||
|
|
||||||
|
modifyEpisode(animeId, episodeIndex, read, bookmarked, markPrevRead, lastPageRead)
|
||||||
|
|
||||||
|
ctx.status(200)
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// // get page at index "index"
|
||||||
|
// app.get("/api/v1/manga/:mangaId/chapter/:chapterIndex/page/:index") { ctx ->
|
||||||
|
// val mangaId = ctx.pathParam("mangaId").toInt()
|
||||||
|
// val chapterIndex = ctx.pathParam("chapterIndex").toInt()
|
||||||
|
// val index = ctx.pathParam("index").toInt()
|
||||||
|
//
|
||||||
|
// ctx.result(
|
||||||
|
// JavalinSetup.future { getPageImage(mangaId, chapterIndex, index) }
|
||||||
|
// .thenApply {
|
||||||
|
// ctx.header("content-type", it.second)
|
||||||
|
// it.first
|
||||||
|
// }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // submit a chapter for download
|
||||||
|
// app.put("/api/v1/manga/:mangaId/chapter/:chapterIndex/download") { ctx ->
|
||||||
|
// // TODO
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // cancel a chapter download
|
||||||
|
// app.delete("/api/v1/manga/:mangaId/chapter/:chapterIndex/download") { ctx ->
|
||||||
|
// // TODO
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // global search, Not implemented yet
|
||||||
|
// app.get("/api/v1/search/:searchTerm") { ctx ->
|
||||||
|
// val searchTerm = ctx.pathParam("searchTerm")
|
||||||
|
// ctx.json(sourceGlobalSearch(searchTerm))
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // single source search
|
||||||
|
// app.get("/api/v1/source/:sourceId/search/:searchTerm/:pageNum") { ctx ->
|
||||||
|
// val sourceId = ctx.pathParam("sourceId").toLong()
|
||||||
|
// val searchTerm = ctx.pathParam("searchTerm")
|
||||||
|
// val pageNum = ctx.pathParam("pageNum").toInt()
|
||||||
|
// ctx.json(JavalinSetup.future { sourceSearch(sourceId, searchTerm, pageNum) })
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // source filter list
|
||||||
|
// app.get("/api/v1/source/:sourceId/filters/") { ctx ->
|
||||||
|
// val sourceId = ctx.pathParam("sourceId").toLong()
|
||||||
|
// ctx.json(sourceFilters(sourceId))
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // adds the manga to library
|
||||||
|
// app.get("api/v1/manga/:mangaId/library") { ctx ->
|
||||||
|
// val mangaId = ctx.pathParam("mangaId").toInt()
|
||||||
|
//
|
||||||
|
// ctx.result(
|
||||||
|
// JavalinSetup.future { addMangaToLibrary(mangaId) }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // removes the manga from the library
|
||||||
|
// app.delete("api/v1/manga/:mangaId/library") { ctx ->
|
||||||
|
// val mangaId = ctx.pathParam("mangaId").toInt()
|
||||||
|
//
|
||||||
|
// ctx.result(
|
||||||
|
// JavalinSetup.future { removeMangaFromLibrary(mangaId) }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // lists mangas that have no category assigned
|
||||||
|
// app.get("/api/v1/library/") { ctx ->
|
||||||
|
// ctx.json(getLibraryMangas())
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // category list
|
||||||
|
// app.get("/api/v1/category/") { ctx ->
|
||||||
|
// ctx.json(Category.getCategoryList())
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // category create
|
||||||
|
// app.post("/api/v1/category/") { ctx ->
|
||||||
|
// val name = ctx.formParam("name")!!
|
||||||
|
// Category.createCategory(name)
|
||||||
|
// ctx.status(200)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // returns some static info of the current app build
|
||||||
|
// app.get("/api/v1/about/") { ctx ->
|
||||||
|
// ctx.json(About.getAbout())
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // category modification
|
||||||
|
// app.patch("/api/v1/category/:categoryId") { ctx ->
|
||||||
|
// val categoryId = ctx.pathParam("categoryId").toInt()
|
||||||
|
// val name = ctx.formParam("name")
|
||||||
|
// val isDefault = ctx.formParam("default")?.toBoolean()
|
||||||
|
// Category.updateCategory(categoryId, name, isDefault)
|
||||||
|
// ctx.status(200)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // category re-ordering
|
||||||
|
// app.patch("/api/v1/category/:categoryId/reorder") { ctx ->
|
||||||
|
// val categoryId = ctx.pathParam("categoryId").toInt()
|
||||||
|
// val from = ctx.formParam("from")!!.toInt()
|
||||||
|
// val to = ctx.formParam("to")!!.toInt()
|
||||||
|
// Category.reorderCategory(categoryId, from, to)
|
||||||
|
// ctx.status(200)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // category delete
|
||||||
|
// app.delete("/api/v1/category/:categoryId") { ctx ->
|
||||||
|
// val categoryId = ctx.pathParam("categoryId").toInt()
|
||||||
|
// Category.removeCategory(categoryId)
|
||||||
|
// ctx.status(200)
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // returns the manga list associated with a category
|
||||||
|
// app.get("/api/v1/category/:categoryId") { ctx ->
|
||||||
|
// val categoryId = ctx.pathParam("categoryId").toInt()
|
||||||
|
// ctx.json(getCategoryMangaList(categoryId))
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // expects a Tachiyomi legacy backup json in the body
|
||||||
|
// app.post("/api/v1/backup/legacy/import") { ctx ->
|
||||||
|
// ctx.result(
|
||||||
|
// future {
|
||||||
|
// restoreLegacyBackup(ctx.bodyAsInputStream())
|
||||||
|
// }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // expects a Tachiyomi legacy backup json as a file upload, the file must be named "backup.json"
|
||||||
|
// app.post("/api/v1/backup/legacy/import/file") { ctx ->
|
||||||
|
// ctx.result(
|
||||||
|
// JavalinSetup.future {
|
||||||
|
// restoreLegacyBackup(ctx.uploadedFile("backup.json")!!.content)
|
||||||
|
// }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // returns a Tachiyomi legacy backup json created from the current database as a json body
|
||||||
|
// app.get("/api/v1/backup/legacy/export") { ctx ->
|
||||||
|
// ctx.contentType("application/json")
|
||||||
|
// ctx.result(
|
||||||
|
// JavalinSetup.future {
|
||||||
|
// createLegacyBackup(
|
||||||
|
// BackupFlags(
|
||||||
|
// includeManga = true,
|
||||||
|
// includeCategories = true,
|
||||||
|
// includeChapters = true,
|
||||||
|
// includeTracking = true,
|
||||||
|
// includeHistory = true,
|
||||||
|
// )
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // returns a Tachiyomi legacy backup json created from the current database as a file
|
||||||
|
// app.get("/api/v1/backup/legacy/export/file") { ctx ->
|
||||||
|
// ctx.contentType("application/json")
|
||||||
|
// val sdf = SimpleDateFormat("yyyy-MM-dd_HH-mm")
|
||||||
|
// val currentDate = sdf.format(Date())
|
||||||
|
//
|
||||||
|
// ctx.header("Content-Disposition", "attachment; filename=\"tachidesk_$currentDate.json\"")
|
||||||
|
// ctx.result(
|
||||||
|
// JavalinSetup.future {
|
||||||
|
// createLegacyBackup(
|
||||||
|
// BackupFlags(
|
||||||
|
// includeManga = true,
|
||||||
|
// includeCategories = true,
|
||||||
|
// includeChapters = true,
|
||||||
|
// includeTracking = true,
|
||||||
|
// includeHistory = true,
|
||||||
|
// )
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // Download queue stats
|
||||||
|
// app.ws("/api/v1/downloads") { ws ->
|
||||||
|
// ws.onConnect { ctx ->
|
||||||
|
// // TODO: send current stat
|
||||||
|
// // TODO: add to downlad subscribers
|
||||||
|
// }
|
||||||
|
// ws.onMessage {
|
||||||
|
// // TODO: send current stat
|
||||||
|
// }
|
||||||
|
// ws.onClose { ctx ->
|
||||||
|
// // TODO: remove from subscribers
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||||
|
import eu.kanade.tachiyomi.network.GET
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import org.jetbrains.exposed.sql.update
|
||||||
|
import org.kodein.di.DI
|
||||||
|
import org.kodein.di.conf.global
|
||||||
|
import org.kodein.di.instance
|
||||||
|
import suwayomi.tachidesk.anime.impl.AnimeList.proxyThumbnailUrl
|
||||||
|
import suwayomi.tachidesk.anime.impl.Source.getAnimeSource
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.AnimeDataClass
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeStatus
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeTable
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.network.await
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.clearCachedImage
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
|
||||||
|
import suwayomi.tachidesk.server.ApplicationDirs
|
||||||
|
import java.io.InputStream
|
||||||
|
|
||||||
|
object Anime {
|
||||||
|
private fun truncate(text: String?, maxLength: Int): String? {
|
||||||
|
return if (text?.length ?: 0 > maxLength)
|
||||||
|
text?.take(maxLength - 3) + "..."
|
||||||
|
else
|
||||||
|
text
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getAnime(animeId: Int, onlineFetch: Boolean = false): AnimeDataClass {
|
||||||
|
var animeEntry = transaction { AnimeTable.select { AnimeTable.id eq animeId }.first() }
|
||||||
|
|
||||||
|
return if (animeEntry[AnimeTable.initialized] && !onlineFetch) {
|
||||||
|
AnimeDataClass(
|
||||||
|
animeId,
|
||||||
|
animeEntry[AnimeTable.sourceReference].toString(),
|
||||||
|
|
||||||
|
animeEntry[AnimeTable.url],
|
||||||
|
animeEntry[AnimeTable.title],
|
||||||
|
proxyThumbnailUrl(animeId),
|
||||||
|
|
||||||
|
true,
|
||||||
|
|
||||||
|
animeEntry[AnimeTable.artist],
|
||||||
|
animeEntry[AnimeTable.author],
|
||||||
|
animeEntry[AnimeTable.description],
|
||||||
|
animeEntry[AnimeTable.genre],
|
||||||
|
AnimeStatus.valueOf(animeEntry[AnimeTable.status]).name,
|
||||||
|
animeEntry[AnimeTable.inLibrary],
|
||||||
|
getAnimeSource(animeEntry[AnimeTable.sourceReference]),
|
||||||
|
false
|
||||||
|
)
|
||||||
|
} else { // initialize anime
|
||||||
|
val source = getAnimeHttpSource(animeEntry[AnimeTable.sourceReference])
|
||||||
|
val fetchedAnime = source.fetchAnimeDetails(
|
||||||
|
SAnime.create().apply {
|
||||||
|
url = animeEntry[AnimeTable.url]
|
||||||
|
title = animeEntry[AnimeTable.title]
|
||||||
|
}
|
||||||
|
).awaitSingle()
|
||||||
|
|
||||||
|
transaction {
|
||||||
|
AnimeTable.update({ AnimeTable.id eq animeId }) {
|
||||||
|
|
||||||
|
it[AnimeTable.initialized] = true
|
||||||
|
|
||||||
|
it[AnimeTable.artist] = fetchedAnime.artist
|
||||||
|
it[AnimeTable.author] = fetchedAnime.author
|
||||||
|
it[AnimeTable.description] = truncate(fetchedAnime.description, 4096)
|
||||||
|
it[AnimeTable.genre] = fetchedAnime.genre
|
||||||
|
it[AnimeTable.status] = fetchedAnime.status
|
||||||
|
if (fetchedAnime.thumbnail_url != null && fetchedAnime.thumbnail_url.orEmpty().isNotEmpty())
|
||||||
|
it[AnimeTable.thumbnail_url] = fetchedAnime.thumbnail_url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
clearAnimeThumbnail(animeId)
|
||||||
|
|
||||||
|
animeEntry = transaction { AnimeTable.select { AnimeTable.id eq animeId }.first() }
|
||||||
|
|
||||||
|
AnimeDataClass(
|
||||||
|
animeId,
|
||||||
|
animeEntry[AnimeTable.sourceReference].toString(),
|
||||||
|
|
||||||
|
animeEntry[AnimeTable.url],
|
||||||
|
animeEntry[AnimeTable.title],
|
||||||
|
proxyThumbnailUrl(animeId),
|
||||||
|
|
||||||
|
true,
|
||||||
|
|
||||||
|
fetchedAnime.artist,
|
||||||
|
fetchedAnime.author,
|
||||||
|
fetchedAnime.description,
|
||||||
|
fetchedAnime.genre,
|
||||||
|
AnimeStatus.valueOf(fetchedAnime.status).name,
|
||||||
|
animeEntry[AnimeTable.inLibrary],
|
||||||
|
getAnimeSource(animeEntry[AnimeTable.sourceReference]),
|
||||||
|
true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val applicationDirs by DI.global.instance<ApplicationDirs>()
|
||||||
|
suspend fun getAnimeThumbnail(animeId: Int): Pair<InputStream, String> {
|
||||||
|
val saveDir = applicationDirs.animeThumbnailsRoot
|
||||||
|
val fileName = animeId.toString()
|
||||||
|
|
||||||
|
return getCachedImageResponse(saveDir, fileName) {
|
||||||
|
getAnime(animeId) // make sure is initialized
|
||||||
|
|
||||||
|
val animeEntry = transaction { AnimeTable.select { AnimeTable.id eq animeId }.first() }
|
||||||
|
|
||||||
|
val sourceId = animeEntry[AnimeTable.sourceReference]
|
||||||
|
val source = getAnimeHttpSource(sourceId)
|
||||||
|
|
||||||
|
val thumbnailUrl = animeEntry[AnimeTable.thumbnail_url]!!
|
||||||
|
|
||||||
|
source.client.newCall(
|
||||||
|
GET(thumbnailUrl, source.headers)
|
||||||
|
).await()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun clearAnimeThumbnail(animeId: Int) {
|
||||||
|
val saveDir = applicationDirs.animeThumbnailsRoot
|
||||||
|
val fileName = animeId.toString()
|
||||||
|
|
||||||
|
clearCachedImage(saveDir, fileName)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.AnimesPage
|
||||||
|
import org.jetbrains.exposed.sql.insertAndGetId
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.AnimeDataClass
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.PagedAnimeListDataClass
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeStatus
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeTable
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
|
||||||
|
|
||||||
|
object AnimeList {
|
||||||
|
fun proxyThumbnailUrl(animeId: Int): String {
|
||||||
|
return "/api/v1/anime/anime/$animeId/thumbnail"
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getAnimeList(sourceId: Long, pageNum: Int = 1, popular: Boolean): PagedAnimeListDataClass {
|
||||||
|
val source = getAnimeHttpSource(sourceId)
|
||||||
|
val animesPage = if (popular) {
|
||||||
|
source.fetchPopularAnime(pageNum).awaitSingle()
|
||||||
|
} else {
|
||||||
|
if (source.supportsLatest)
|
||||||
|
source.fetchLatestUpdates(pageNum).awaitSingle()
|
||||||
|
else
|
||||||
|
throw Exception("Source $source doesn't support latest")
|
||||||
|
}
|
||||||
|
return animesPage.processEntries(sourceId)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun AnimesPage.processEntries(sourceId: Long): PagedAnimeListDataClass {
|
||||||
|
val animesPage = this
|
||||||
|
val animeList = transaction {
|
||||||
|
return@transaction animesPage.animes.map { anime ->
|
||||||
|
val animeEntry = AnimeTable.select { AnimeTable.url eq anime.url }.firstOrNull()
|
||||||
|
if (animeEntry == null) { // create anime entry
|
||||||
|
val animeId = AnimeTable.insertAndGetId {
|
||||||
|
it[url] = anime.url
|
||||||
|
it[title] = anime.title
|
||||||
|
|
||||||
|
it[artist] = anime.artist
|
||||||
|
it[author] = anime.author
|
||||||
|
it[description] = anime.description
|
||||||
|
it[genre] = anime.genre
|
||||||
|
it[status] = anime.status
|
||||||
|
it[thumbnail_url] = anime.thumbnail_url
|
||||||
|
|
||||||
|
it[sourceReference] = sourceId
|
||||||
|
}.value
|
||||||
|
|
||||||
|
AnimeDataClass(
|
||||||
|
animeId,
|
||||||
|
sourceId.toString(),
|
||||||
|
|
||||||
|
anime.url,
|
||||||
|
anime.title,
|
||||||
|
proxyThumbnailUrl(animeId),
|
||||||
|
|
||||||
|
anime.initialized,
|
||||||
|
|
||||||
|
anime.artist,
|
||||||
|
anime.author,
|
||||||
|
anime.description,
|
||||||
|
anime.genre,
|
||||||
|
AnimeStatus.valueOf(anime.status).name
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
val animeId = animeEntry[AnimeTable.id].value
|
||||||
|
AnimeDataClass(
|
||||||
|
animeId,
|
||||||
|
sourceId.toString(),
|
||||||
|
|
||||||
|
anime.url,
|
||||||
|
anime.title,
|
||||||
|
proxyThumbnailUrl(animeId),
|
||||||
|
|
||||||
|
true,
|
||||||
|
|
||||||
|
animeEntry[AnimeTable.artist],
|
||||||
|
animeEntry[AnimeTable.author],
|
||||||
|
animeEntry[AnimeTable.description],
|
||||||
|
animeEntry[AnimeTable.genre],
|
||||||
|
AnimeStatus.valueOf(animeEntry[AnimeTable.status]).name,
|
||||||
|
animeEntry[AnimeTable.inLibrary]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return PagedAnimeListDataClass(
|
||||||
|
animeList,
|
||||||
|
animesPage.hasNextPage
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,241 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SAnime
|
||||||
|
import eu.kanade.tachiyomi.animesource.model.SEpisode
|
||||||
|
import org.jetbrains.exposed.sql.SortOrder.DESC
|
||||||
|
import org.jetbrains.exposed.sql.and
|
||||||
|
import org.jetbrains.exposed.sql.deleteWhere
|
||||||
|
import org.jetbrains.exposed.sql.insert
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import org.jetbrains.exposed.sql.update
|
||||||
|
import suwayomi.tachidesk.anime.impl.Anime.getAnime
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.EpisodeDataClass
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeTable
|
||||||
|
import suwayomi.tachidesk.anime.model.table.EpisodeTable
|
||||||
|
import suwayomi.tachidesk.anime.model.table.toDataClass
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
|
||||||
|
|
||||||
|
object Episode {
|
||||||
|
/** get episode list when showing an anime */
|
||||||
|
suspend fun getEpisodeList(animeId: Int, onlineFetch: Boolean?): List<EpisodeDataClass> {
|
||||||
|
return if (onlineFetch == true) {
|
||||||
|
getSourceEpisodes(animeId)
|
||||||
|
} else {
|
||||||
|
transaction {
|
||||||
|
EpisodeTable.select { EpisodeTable.anime eq animeId }.orderBy(EpisodeTable.episodeIndex to DESC)
|
||||||
|
.map {
|
||||||
|
EpisodeTable.toDataClass(it)
|
||||||
|
}
|
||||||
|
}.ifEmpty {
|
||||||
|
// If it was explicitly set to offline dont grab episodes
|
||||||
|
if (onlineFetch == null) {
|
||||||
|
getSourceEpisodes(animeId)
|
||||||
|
} else emptyList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun getSourceEpisodes(animeId: Int): List<EpisodeDataClass> {
|
||||||
|
val animeDetails = getAnime(animeId)
|
||||||
|
val source = getAnimeHttpSource(animeDetails.sourceId.toLong())
|
||||||
|
val episodeList = source.fetchEpisodeList(
|
||||||
|
SAnime.create().apply {
|
||||||
|
title = animeDetails.title
|
||||||
|
url = animeDetails.url
|
||||||
|
}
|
||||||
|
).awaitSingle()
|
||||||
|
|
||||||
|
val episodeCount = episodeList.count()
|
||||||
|
|
||||||
|
transaction {
|
||||||
|
episodeList.reversed().forEachIndexed { index, fetchedEpisode ->
|
||||||
|
val episodeEntry = EpisodeTable.select { EpisodeTable.url eq fetchedEpisode.url }.firstOrNull()
|
||||||
|
if (episodeEntry == null) {
|
||||||
|
EpisodeTable.insert {
|
||||||
|
it[url] = fetchedEpisode.url
|
||||||
|
it[name] = fetchedEpisode.name
|
||||||
|
it[date_upload] = fetchedEpisode.date_upload
|
||||||
|
it[episode_number] = fetchedEpisode.episode_number
|
||||||
|
it[scanlator] = fetchedEpisode.scanlator
|
||||||
|
|
||||||
|
it[episodeIndex] = index + 1
|
||||||
|
it[anime] = animeId
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
EpisodeTable.update({ EpisodeTable.url eq fetchedEpisode.url }) {
|
||||||
|
it[name] = fetchedEpisode.name
|
||||||
|
it[date_upload] = fetchedEpisode.date_upload
|
||||||
|
it[episode_number] = fetchedEpisode.episode_number
|
||||||
|
it[scanlator] = fetchedEpisode.scanlator
|
||||||
|
|
||||||
|
it[episodeIndex] = index + 1
|
||||||
|
it[anime] = animeId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// clear any orphaned episodes that are in the db but not in `episodeList`
|
||||||
|
val dbEpisodeCount = transaction { EpisodeTable.select { EpisodeTable.anime eq animeId }.count() }
|
||||||
|
if (dbEpisodeCount > episodeCount) { // we got some clean up due
|
||||||
|
val dbEpisodeList = transaction { EpisodeTable.select { EpisodeTable.anime eq animeId } }
|
||||||
|
|
||||||
|
dbEpisodeList.forEach {
|
||||||
|
if (it[EpisodeTable.episodeIndex] >= episodeList.size ||
|
||||||
|
episodeList[it[EpisodeTable.episodeIndex] - 1].url != it[EpisodeTable.url]
|
||||||
|
) {
|
||||||
|
transaction {
|
||||||
|
// PageTable.deleteWhere { PageTable.episode eq it[EpisodeTable.id] }
|
||||||
|
EpisodeTable.deleteWhere { EpisodeTable.id eq it[EpisodeTable.id] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val dbEpisodeMap = transaction {
|
||||||
|
EpisodeTable.select { EpisodeTable.anime eq animeId }
|
||||||
|
.associateBy({ it[EpisodeTable.url] }, { it })
|
||||||
|
}
|
||||||
|
|
||||||
|
return episodeList.mapIndexed { index, it ->
|
||||||
|
|
||||||
|
val dbEpisode = dbEpisodeMap.getValue(it.url)
|
||||||
|
|
||||||
|
EpisodeDataClass(
|
||||||
|
it.url,
|
||||||
|
it.name,
|
||||||
|
it.date_upload,
|
||||||
|
it.episode_number,
|
||||||
|
it.scanlator,
|
||||||
|
animeId,
|
||||||
|
|
||||||
|
dbEpisode[EpisodeTable.isRead],
|
||||||
|
dbEpisode[EpisodeTable.isBookmarked],
|
||||||
|
dbEpisode[EpisodeTable.lastPageRead],
|
||||||
|
|
||||||
|
episodeCount - index,
|
||||||
|
episodeList.size
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** used to display a episode, get a episode in order to show it's video */
|
||||||
|
suspend fun getEpisode(episodeIndex: Int, animeId: Int): EpisodeDataClass {
|
||||||
|
val episode = getEpisodeList(animeId, false)
|
||||||
|
.first { it.index == episodeIndex }
|
||||||
|
|
||||||
|
val animeEntry = transaction { AnimeTable.select { AnimeTable.id eq animeId }.first() }
|
||||||
|
val source = getAnimeHttpSource(animeEntry[AnimeTable.sourceReference])
|
||||||
|
val fetchedLinkUrl = source.fetchEpisodeLink(
|
||||||
|
SEpisode.create().also {
|
||||||
|
it.url = episode.url
|
||||||
|
it.name = episode.name
|
||||||
|
}
|
||||||
|
).awaitSingle()
|
||||||
|
|
||||||
|
return EpisodeDataClass(
|
||||||
|
episode.url,
|
||||||
|
episode.name,
|
||||||
|
episode.uploadDate,
|
||||||
|
episode.episodeNumber,
|
||||||
|
episode.scanlator,
|
||||||
|
animeId,
|
||||||
|
episode.read,
|
||||||
|
episode.bookmarked,
|
||||||
|
episode.lastPageRead,
|
||||||
|
episode.index,
|
||||||
|
episode.episodeCount,
|
||||||
|
fetchedLinkUrl
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// /** used to display a episode, get a episode in order to show it's pages */
|
||||||
|
// suspend fun getEpisode(episodeIndex: Int, animeId: Int): EpisodeDataClass {
|
||||||
|
// val episodeEntry = transaction {
|
||||||
|
// EpisodeTable.select {
|
||||||
|
// (EpisodeTable.episodeIndex eq episodeIndex) and (EpisodeTable.anime eq animeId)
|
||||||
|
// }.first()
|
||||||
|
// }
|
||||||
|
// val animeEntry = transaction { MangaTable.select { MangaTable.id eq animeId }.first() }
|
||||||
|
// val source = getAnimeHttpSource(animeEntry[MangaTable.sourceReference])
|
||||||
|
//
|
||||||
|
// val pageList = source.fetchPageList(
|
||||||
|
// SEpisode.create().apply {
|
||||||
|
// url = episodeEntry[EpisodeTable.url]
|
||||||
|
// name = episodeEntry[EpisodeTable.name]
|
||||||
|
// }
|
||||||
|
// ).awaitSingle()
|
||||||
|
//
|
||||||
|
// val episodeId = episodeEntry[EpisodeTable.id].value
|
||||||
|
// val episodeCount = transaction { EpisodeTable.select { EpisodeTable.anime eq animeId }.count() }
|
||||||
|
//
|
||||||
|
// // update page list for this episode
|
||||||
|
// transaction {
|
||||||
|
// pageList.forEach { page ->
|
||||||
|
// val pageEntry = transaction { PageTable.select { (PageTable.episode eq episodeId) and (PageTable.index eq page.index) }.firstOrNull() }
|
||||||
|
// if (pageEntry == null) {
|
||||||
|
// PageTable.insert {
|
||||||
|
// it[index] = page.index
|
||||||
|
// it[url] = page.url
|
||||||
|
// it[imageUrl] = page.imageUrl
|
||||||
|
// it[episode] = episodeId
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// PageTable.update({ (PageTable.episode eq episodeId) and (PageTable.index eq page.index) }) {
|
||||||
|
// it[url] = page.url
|
||||||
|
// it[imageUrl] = page.imageUrl
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// return EpisodeDataClass(
|
||||||
|
// episodeEntry[EpisodeTable.url],
|
||||||
|
// episodeEntry[EpisodeTable.name],
|
||||||
|
// episodeEntry[EpisodeTable.date_upload],
|
||||||
|
// episodeEntry[EpisodeTable.episode_number],
|
||||||
|
// episodeEntry[EpisodeTable.scanlator],
|
||||||
|
// animeId,
|
||||||
|
// episodeEntry[EpisodeTable.isRead],
|
||||||
|
// episodeEntry[EpisodeTable.isBookmarked],
|
||||||
|
// episodeEntry[EpisodeTable.lastPageRead],
|
||||||
|
//
|
||||||
|
// episodeEntry[EpisodeTable.episodeIndex],
|
||||||
|
// episodeCount.toInt(),
|
||||||
|
// pageList.count()
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
|
||||||
|
fun modifyEpisode(animeId: Int, episodeIndex: Int, isRead: Boolean?, isBookmarked: Boolean?, markPrevRead: Boolean?, lastPageRead: Int?) {
|
||||||
|
transaction {
|
||||||
|
if (listOf(isRead, isBookmarked, lastPageRead).any { it != null }) {
|
||||||
|
EpisodeTable.update({ (EpisodeTable.anime eq animeId) and (EpisodeTable.episodeIndex eq episodeIndex) }) { update ->
|
||||||
|
isRead?.also {
|
||||||
|
update[EpisodeTable.isRead] = it
|
||||||
|
}
|
||||||
|
isBookmarked?.also {
|
||||||
|
update[EpisodeTable.isBookmarked] = it
|
||||||
|
}
|
||||||
|
lastPageRead?.also {
|
||||||
|
update[EpisodeTable.lastPageRead] = it
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
markPrevRead?.let {
|
||||||
|
EpisodeTable.update({ (EpisodeTable.anime eq animeId) and (EpisodeTable.episodeIndex less episodeIndex) }) {
|
||||||
|
it[EpisodeTable.isRead] = markPrevRead
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import mu.KotlinLogging
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.selectAll
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.Extension.getExtensionIconUrl
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.AnimeSourceDataClass
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeSourceTable
|
||||||
|
|
||||||
|
object Source {
|
||||||
|
private val logger = KotlinLogging.logger {}
|
||||||
|
|
||||||
|
fun getSourceList(): List<AnimeSourceDataClass> {
|
||||||
|
return transaction {
|
||||||
|
AnimeSourceTable.selectAll().map {
|
||||||
|
AnimeSourceDataClass(
|
||||||
|
it[AnimeSourceTable.id].value.toString(),
|
||||||
|
it[AnimeSourceTable.name],
|
||||||
|
it[AnimeSourceTable.lang],
|
||||||
|
getExtensionIconUrl(AnimeExtensionTable.select { AnimeExtensionTable.id eq it[AnimeSourceTable.extension] }.first()[AnimeExtensionTable.apkName]),
|
||||||
|
getAnimeHttpSource(it[AnimeSourceTable.id].value).supportsLatest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getAnimeSource(sourceId: Long): AnimeSourceDataClass {
|
||||||
|
return transaction {
|
||||||
|
val source = AnimeSourceTable.select { AnimeSourceTable.id eq sourceId }.firstOrNull()
|
||||||
|
|
||||||
|
AnimeSourceDataClass(
|
||||||
|
sourceId.toString(),
|
||||||
|
source?.get(AnimeSourceTable.name),
|
||||||
|
source?.get(AnimeSourceTable.lang),
|
||||||
|
source?.let { AnimeExtensionTable.select { AnimeExtensionTable.id eq source[AnimeSourceTable.extension] }.first()[AnimeExtensionTable.iconUrl] },
|
||||||
|
source?.let { getAnimeHttpSource(sourceId).supportsLatest }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,251 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl.extension
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.net.Uri
|
||||||
|
import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
|
||||||
|
import eu.kanade.tachiyomi.animesource.AnimeSource
|
||||||
|
import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
|
||||||
|
import eu.kanade.tachiyomi.network.GET
|
||||||
|
import eu.kanade.tachiyomi.network.NetworkHelper
|
||||||
|
import mu.KotlinLogging
|
||||||
|
import okhttp3.Request
|
||||||
|
import okio.buffer
|
||||||
|
import okio.sink
|
||||||
|
import org.jetbrains.exposed.sql.deleteWhere
|
||||||
|
import org.jetbrains.exposed.sql.insert
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import org.jetbrains.exposed.sql.update
|
||||||
|
import org.kodein.di.DI
|
||||||
|
import org.kodein.di.conf.global
|
||||||
|
import org.kodein.di.instance
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.ExtensionsList.extensionTableAsDataClass
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.github.ExtensionGithubApi
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.EXTENSION_FEATURE
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MAX
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MIN
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.METADATA_NSFW
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.METADATA_SOURCE_CLASS
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.dex2jar
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.getPackageInfo
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.getSignatureHash
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.loadExtensionSources
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.trustedSignatures
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeSourceTable
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.network.await
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
|
||||||
|
import suwayomi.tachidesk.server.ApplicationDirs
|
||||||
|
import uy.kohesive.injekt.injectLazy
|
||||||
|
import java.io.File
|
||||||
|
import java.io.InputStream
|
||||||
|
|
||||||
|
object Extension {
|
||||||
|
private val logger = KotlinLogging.logger {}
|
||||||
|
private val applicationDirs by DI.global.instance<ApplicationDirs>()
|
||||||
|
|
||||||
|
data class InstallableAPK(
|
||||||
|
val apkFilePath: String,
|
||||||
|
val pkgName: String
|
||||||
|
)
|
||||||
|
|
||||||
|
suspend fun installExtension(pkgName: String): Int {
|
||||||
|
logger.debug("Installing $pkgName")
|
||||||
|
val extensionRecord = extensionTableAsDataClass().first { it.pkgName == pkgName }
|
||||||
|
|
||||||
|
return installAPK {
|
||||||
|
val apkURL = ExtensionGithubApi.getApkUrl(extensionRecord)
|
||||||
|
val apkName = Uri.parse(apkURL).lastPathSegment!!
|
||||||
|
val apkSavePath = "${applicationDirs.extensionsRoot}/$apkName"
|
||||||
|
// download apk file
|
||||||
|
downloadAPKFile(apkURL, apkSavePath)
|
||||||
|
|
||||||
|
apkSavePath
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun installAPK(fetcher: suspend () -> String): Int {
|
||||||
|
val apkFilePath = fetcher()
|
||||||
|
val apkName = File(apkFilePath).name
|
||||||
|
|
||||||
|
// check if we don't have the extension already installed
|
||||||
|
// if it's installed and we want to update, it first has to be uninstalled
|
||||||
|
val isInstalled = transaction {
|
||||||
|
AnimeExtensionTable.select { AnimeExtensionTable.apkName eq apkName }.firstOrNull()
|
||||||
|
}?.get(AnimeExtensionTable.isInstalled) ?: false
|
||||||
|
|
||||||
|
if (!isInstalled) {
|
||||||
|
val fileNameWithoutType = apkName.substringBefore(".apk")
|
||||||
|
|
||||||
|
val dirPathWithoutType = "${applicationDirs.extensionsRoot}/$fileNameWithoutType"
|
||||||
|
val jarFilePath = "$dirPathWithoutType.jar"
|
||||||
|
val dexFilePath = "$dirPathWithoutType.dex"
|
||||||
|
|
||||||
|
val packageInfo = getPackageInfo(apkFilePath)
|
||||||
|
val pkgName = packageInfo.packageName
|
||||||
|
|
||||||
|
if (!packageInfo.reqFeatures.orEmpty().any { it.name == EXTENSION_FEATURE }) {
|
||||||
|
throw Exception("This apk is not a Tachiyomi extension")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate lib version
|
||||||
|
val libVersion = packageInfo.versionName.substringBeforeLast('.').toDouble()
|
||||||
|
if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
|
||||||
|
throw Exception(
|
||||||
|
"Lib version is $libVersion, while only versions " +
|
||||||
|
"$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val signatureHash = getSignatureHash(packageInfo)
|
||||||
|
|
||||||
|
if (signatureHash == null) {
|
||||||
|
throw Exception("Package $pkgName isn't signed")
|
||||||
|
} else if (signatureHash !in trustedSignatures) {
|
||||||
|
// TODO: allow trusting keys
|
||||||
|
throw Exception("This apk is not a signed with the official tachiyomi signature")
|
||||||
|
}
|
||||||
|
|
||||||
|
val isNsfw = packageInfo.applicationInfo.metaData.getString(METADATA_NSFW) == "1"
|
||||||
|
|
||||||
|
val className = packageInfo.packageName + packageInfo.applicationInfo.metaData.getString(METADATA_SOURCE_CLASS)
|
||||||
|
|
||||||
|
logger.debug("Main class for extension is $className")
|
||||||
|
|
||||||
|
dex2jar(apkFilePath, jarFilePath, fileNameWithoutType)
|
||||||
|
|
||||||
|
// clean up
|
||||||
|
// File(apkFilePath).delete()
|
||||||
|
File(dexFilePath).delete()
|
||||||
|
|
||||||
|
// collect sources from the extension
|
||||||
|
val sources: List<AnimeCatalogueSource> = when (val instance = loadExtensionSources(jarFilePath, className)) {
|
||||||
|
is AnimeSource -> listOf(instance)
|
||||||
|
is AnimeSourceFactory -> instance.createSources()
|
||||||
|
else -> throw RuntimeException("Unknown source class type! ${instance.javaClass}")
|
||||||
|
}.map { it as AnimeCatalogueSource }
|
||||||
|
|
||||||
|
val langs = sources.map { it.lang }.toSet()
|
||||||
|
val extensionLang = when (langs.size) {
|
||||||
|
0 -> ""
|
||||||
|
1 -> langs.first()
|
||||||
|
else -> "all"
|
||||||
|
}
|
||||||
|
|
||||||
|
val extensionName = packageInfo.applicationInfo.nonLocalizedLabel.toString().substringAfter("Tachiyomi: ")
|
||||||
|
|
||||||
|
// update extension info
|
||||||
|
transaction {
|
||||||
|
if (AnimeExtensionTable.select { AnimeExtensionTable.pkgName eq pkgName }.firstOrNull() == null) {
|
||||||
|
AnimeExtensionTable.insert {
|
||||||
|
it[this.apkName] = apkName
|
||||||
|
it[name] = extensionName
|
||||||
|
it[this.pkgName] = packageInfo.packageName
|
||||||
|
it[versionName] = packageInfo.versionName
|
||||||
|
it[versionCode] = packageInfo.versionCode
|
||||||
|
it[lang] = extensionLang
|
||||||
|
it[this.isNsfw] = isNsfw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq pkgName }) {
|
||||||
|
it[this.isInstalled] = true
|
||||||
|
it[this.classFQName] = className
|
||||||
|
}
|
||||||
|
|
||||||
|
val extensionId = AnimeExtensionTable.select { AnimeExtensionTable.pkgName eq pkgName }.first()[AnimeExtensionTable.id].value
|
||||||
|
|
||||||
|
sources.forEach { httpSource ->
|
||||||
|
AnimeSourceTable.insert {
|
||||||
|
it[id] = httpSource.id
|
||||||
|
it[name] = httpSource.name
|
||||||
|
it[lang] = httpSource.lang
|
||||||
|
it[extension] = extensionId
|
||||||
|
}
|
||||||
|
logger.debug("Installed source ${httpSource.name} (${httpSource.lang}) with id:${httpSource.id}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 201 // we installed successfully
|
||||||
|
} else {
|
||||||
|
return 302 // extension was already installed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val network: NetworkHelper by injectLazy()
|
||||||
|
|
||||||
|
private suspend fun downloadAPKFile(url: String, savePath: String) {
|
||||||
|
val request = Request.Builder().url(url).build()
|
||||||
|
val response = network.client.newCall(request).await()
|
||||||
|
|
||||||
|
val downloadedFile = File(savePath)
|
||||||
|
downloadedFile.sink().buffer().use { sink ->
|
||||||
|
response.body!!.source().use { source ->
|
||||||
|
sink.writeAll(source)
|
||||||
|
sink.flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun uninstallExtension(pkgName: String) {
|
||||||
|
logger.debug("Uninstalling $pkgName")
|
||||||
|
|
||||||
|
val extensionRecord = transaction { AnimeExtensionTable.select { AnimeExtensionTable.pkgName eq pkgName }.first() }
|
||||||
|
val fileNameWithoutType = extensionRecord[AnimeExtensionTable.apkName].substringBefore(".apk")
|
||||||
|
val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
|
||||||
|
transaction {
|
||||||
|
val extensionId = extensionRecord[AnimeExtensionTable.id].value
|
||||||
|
|
||||||
|
AnimeSourceTable.deleteWhere { AnimeSourceTable.extension eq extensionId }
|
||||||
|
if (extensionRecord[AnimeExtensionTable.isObsolete])
|
||||||
|
AnimeExtensionTable.deleteWhere { AnimeExtensionTable.pkgName eq pkgName }
|
||||||
|
else
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq pkgName }) {
|
||||||
|
it[isInstalled] = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (File(jarPath).exists()) {
|
||||||
|
File(jarPath).delete()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun updateExtension(pkgName: String): Int {
|
||||||
|
val targetExtension = ExtensionsList.updateMap.remove(pkgName)!!
|
||||||
|
uninstallExtension(pkgName)
|
||||||
|
transaction {
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq pkgName }) {
|
||||||
|
it[name] = targetExtension.name
|
||||||
|
it[versionName] = targetExtension.versionName
|
||||||
|
it[versionCode] = targetExtension.versionCode
|
||||||
|
it[lang] = targetExtension.lang
|
||||||
|
it[isNsfw] = targetExtension.isNsfw
|
||||||
|
it[apkName] = targetExtension.apkName
|
||||||
|
it[iconUrl] = targetExtension.iconUrl
|
||||||
|
it[hasUpdate] = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return installExtension(pkgName)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
|
||||||
|
val iconUrl = transaction { AnimeExtensionTable.select { AnimeExtensionTable.apkName eq apkName }.first() }[AnimeExtensionTable.iconUrl]
|
||||||
|
|
||||||
|
val saveDir = "${applicationDirs.extensionsRoot}/icon"
|
||||||
|
|
||||||
|
return getCachedImageResponse(saveDir, apkName) {
|
||||||
|
network.client.newCall(
|
||||||
|
GET(iconUrl)
|
||||||
|
).await()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getExtensionIconUrl(apkName: String): String {
|
||||||
|
return "/api/v1/anime/extension/icon/$apkName"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl.extension
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import mu.KotlinLogging
|
||||||
|
import org.jetbrains.exposed.sql.deleteWhere
|
||||||
|
import org.jetbrains.exposed.sql.insert
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.selectAll
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import org.jetbrains.exposed.sql.update
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.Extension.getExtensionIconUrl
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.github.ExtensionGithubApi
|
||||||
|
import suwayomi.tachidesk.anime.impl.extension.github.OnlineExtension
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.AnimeExtensionDataClass
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
|
||||||
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
|
|
||||||
|
object ExtensionsList {
|
||||||
|
private val logger = KotlinLogging.logger {}
|
||||||
|
|
||||||
|
var lastUpdateCheck: Long = 0
|
||||||
|
var updateMap = ConcurrentHashMap<String, OnlineExtension>()
|
||||||
|
|
||||||
|
/** 60,000 milliseconds = 60 seconds */
|
||||||
|
private const val ExtensionUpdateDelayTime = 60 * 1000
|
||||||
|
|
||||||
|
suspend fun getExtensionList(): List<AnimeExtensionDataClass> {
|
||||||
|
// update if {ExtensionUpdateDelayTime} seconds has passed or requested offline and database is empty
|
||||||
|
if (lastUpdateCheck + ExtensionUpdateDelayTime < System.currentTimeMillis()) {
|
||||||
|
logger.debug("Getting extensions list from the internet")
|
||||||
|
lastUpdateCheck = System.currentTimeMillis()
|
||||||
|
|
||||||
|
val foundExtensions = ExtensionGithubApi.findExtensions()
|
||||||
|
updateExtensionDatabase(foundExtensions)
|
||||||
|
} else {
|
||||||
|
logger.debug("used cached extension list")
|
||||||
|
}
|
||||||
|
|
||||||
|
return extensionTableAsDataClass()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun extensionTableAsDataClass() = transaction {
|
||||||
|
AnimeExtensionTable.selectAll().map {
|
||||||
|
AnimeExtensionDataClass(
|
||||||
|
it[AnimeExtensionTable.apkName],
|
||||||
|
getExtensionIconUrl(it[AnimeExtensionTable.apkName]),
|
||||||
|
it[AnimeExtensionTable.name],
|
||||||
|
it[AnimeExtensionTable.pkgName],
|
||||||
|
it[AnimeExtensionTable.versionName],
|
||||||
|
it[AnimeExtensionTable.versionCode],
|
||||||
|
it[AnimeExtensionTable.lang],
|
||||||
|
it[AnimeExtensionTable.isNsfw],
|
||||||
|
it[AnimeExtensionTable.isInstalled],
|
||||||
|
it[AnimeExtensionTable.hasUpdate],
|
||||||
|
it[AnimeExtensionTable.isObsolete],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateExtensionDatabase(foundExtensions: List<OnlineExtension>) {
|
||||||
|
transaction {
|
||||||
|
foundExtensions.forEach { foundExtension ->
|
||||||
|
val extensionRecord = AnimeExtensionTable.select { AnimeExtensionTable.pkgName eq foundExtension.pkgName }.firstOrNull()
|
||||||
|
if (extensionRecord != null) {
|
||||||
|
if (extensionRecord[AnimeExtensionTable.isInstalled]) {
|
||||||
|
when {
|
||||||
|
foundExtension.versionCode > extensionRecord[AnimeExtensionTable.versionCode] -> {
|
||||||
|
// there is an update
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq foundExtension.pkgName }) {
|
||||||
|
it[hasUpdate] = true
|
||||||
|
}
|
||||||
|
updateMap.putIfAbsent(foundExtension.pkgName, foundExtension)
|
||||||
|
}
|
||||||
|
foundExtension.versionCode < extensionRecord[AnimeExtensionTable.versionCode] -> {
|
||||||
|
// some how the user installed an invalid version
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq foundExtension.pkgName }) {
|
||||||
|
it[isObsolete] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// extension is not installed so we can overwrite the data without a care
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq foundExtension.pkgName }) {
|
||||||
|
it[name] = foundExtension.name
|
||||||
|
it[versionName] = foundExtension.versionName
|
||||||
|
it[versionCode] = foundExtension.versionCode
|
||||||
|
it[lang] = foundExtension.lang
|
||||||
|
it[isNsfw] = foundExtension.isNsfw
|
||||||
|
it[apkName] = foundExtension.apkName
|
||||||
|
it[iconUrl] = foundExtension.iconUrl
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// insert new record
|
||||||
|
AnimeExtensionTable.insert {
|
||||||
|
it[name] = foundExtension.name
|
||||||
|
it[pkgName] = foundExtension.pkgName
|
||||||
|
it[versionName] = foundExtension.versionName
|
||||||
|
it[versionCode] = foundExtension.versionCode
|
||||||
|
it[lang] = foundExtension.lang
|
||||||
|
it[isNsfw] = foundExtension.isNsfw
|
||||||
|
it[apkName] = foundExtension.apkName
|
||||||
|
it[iconUrl] = foundExtension.iconUrl
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// deal with obsolete extensions
|
||||||
|
AnimeExtensionTable.selectAll().forEach { extensionRecord ->
|
||||||
|
val foundExtension = foundExtensions.find { it.pkgName == extensionRecord[AnimeExtensionTable.pkgName] }
|
||||||
|
if (foundExtension == null) {
|
||||||
|
// not in the repo, so this extensions is obsolete
|
||||||
|
if (extensionRecord[AnimeExtensionTable.isInstalled]) {
|
||||||
|
// is installed so we should mark it as obsolete
|
||||||
|
AnimeExtensionTable.update({ AnimeExtensionTable.pkgName eq extensionRecord[AnimeExtensionTable.pkgName] }) {
|
||||||
|
it[isObsolete] = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// is not installed so we can remove the record without a care
|
||||||
|
AnimeExtensionTable.deleteWhere { AnimeExtensionTable.pkgName eq extensionRecord[AnimeExtensionTable.pkgName] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+79
@@ -0,0 +1,79 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl.extension.github
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import com.github.salomonbrys.kotson.int
|
||||||
|
import com.github.salomonbrys.kotson.string
|
||||||
|
import com.google.gson.JsonArray
|
||||||
|
import com.google.gson.JsonParser
|
||||||
|
import eu.kanade.tachiyomi.network.NetworkHelper
|
||||||
|
import okhttp3.Request
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MAX
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MIN
|
||||||
|
import suwayomi.tachidesk.anime.model.dataclass.AnimeExtensionDataClass
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.network.UnzippingInterceptor
|
||||||
|
import uy.kohesive.injekt.injectLazy
|
||||||
|
|
||||||
|
object ExtensionGithubApi {
|
||||||
|
private const val BASE_URL = "https://raw.githubusercontent.com"
|
||||||
|
private const val REPO_URL_PREFIX = "$BASE_URL/jmir1/tachiyomi-extensions/repo"
|
||||||
|
|
||||||
|
private fun parseResponse(json: JsonArray): List<OnlineExtension> {
|
||||||
|
return json
|
||||||
|
.map { it.asJsonObject }
|
||||||
|
.filter { element ->
|
||||||
|
val versionName = element["version"].string
|
||||||
|
val libVersion = versionName.substringBeforeLast('.').toInt()
|
||||||
|
libVersion in LIB_VERSION_MIN..LIB_VERSION_MAX
|
||||||
|
}
|
||||||
|
.map { element ->
|
||||||
|
val name = element["name"].string.substringAfter("Tachiyomi: ")
|
||||||
|
val pkgName = element["pkg"].string
|
||||||
|
val apkName = element["apk"].string
|
||||||
|
val versionName = element["version"].string
|
||||||
|
val versionCode = element["code"].int
|
||||||
|
val lang = element["lang"].string
|
||||||
|
val nsfw = element["nsfw"].int == 1
|
||||||
|
val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
|
||||||
|
|
||||||
|
OnlineExtension(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun findExtensions(): List<OnlineExtension> {
|
||||||
|
val response = getRepo()
|
||||||
|
return parseResponse(response)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getApkUrl(extension: AnimeExtensionDataClass): String {
|
||||||
|
return "$REPO_URL_PREFIX/apk/${extension.apkName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
private val client by lazy {
|
||||||
|
val network: NetworkHelper by injectLazy()
|
||||||
|
network.client.newBuilder()
|
||||||
|
.addNetworkInterceptor { chain ->
|
||||||
|
val originalResponse = chain.proceed(chain.request())
|
||||||
|
originalResponse.newBuilder()
|
||||||
|
.header("Content-Encoding", "gzip")
|
||||||
|
.header("Content-Type", "application/json")
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
.addInterceptor(UnzippingInterceptor())
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getRepo(): JsonArray {
|
||||||
|
val request = Request.Builder()
|
||||||
|
.url("$REPO_URL_PREFIX/index.json.gz")
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val response = client.newCall(request).execute().use { response -> response.body!!.string() }
|
||||||
|
return JsonParser.parseString(response).asJsonArray
|
||||||
|
}
|
||||||
|
}
|
||||||
+19
@@ -0,0 +1,19 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl.extension.github
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
data class OnlineExtension(
|
||||||
|
val name: String,
|
||||||
|
val pkgName: String,
|
||||||
|
val versionName: String,
|
||||||
|
val versionCode: Int,
|
||||||
|
val lang: String,
|
||||||
|
val isNsfw: Boolean,
|
||||||
|
val apkName: String,
|
||||||
|
val iconUrl: String
|
||||||
|
)
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl.util
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.animesource.AnimeSource
|
||||||
|
import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
|
||||||
|
import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
|
||||||
|
import org.jetbrains.exposed.sql.select
|
||||||
|
import org.jetbrains.exposed.sql.transactions.transaction
|
||||||
|
import org.kodein.di.DI
|
||||||
|
import org.kodein.di.conf.global
|
||||||
|
import org.kodein.di.instance
|
||||||
|
import suwayomi.tachidesk.anime.impl.util.PackageTools.loadExtensionSources
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeSourceTable
|
||||||
|
import suwayomi.tachidesk.server.ApplicationDirs
|
||||||
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
|
|
||||||
|
object GetAnimeHttpSource {
|
||||||
|
private val sourceCache = ConcurrentHashMap<Long, AnimeHttpSource>()
|
||||||
|
private val applicationDirs by DI.global.instance<ApplicationDirs>()
|
||||||
|
|
||||||
|
fun getAnimeHttpSource(sourceId: Long): AnimeHttpSource {
|
||||||
|
val cachedResult: AnimeHttpSource? = sourceCache[sourceId]
|
||||||
|
if (cachedResult != null) {
|
||||||
|
return cachedResult
|
||||||
|
}
|
||||||
|
|
||||||
|
val sourceRecord = transaction {
|
||||||
|
AnimeSourceTable.select { AnimeSourceTable.id eq sourceId }.first()
|
||||||
|
}
|
||||||
|
|
||||||
|
val extensionId = sourceRecord[AnimeSourceTable.extension]
|
||||||
|
val extensionRecord = transaction {
|
||||||
|
AnimeExtensionTable.select { AnimeExtensionTable.id eq extensionId }.first()
|
||||||
|
}
|
||||||
|
|
||||||
|
val apkName = extensionRecord[AnimeExtensionTable.apkName]
|
||||||
|
val className = extensionRecord[AnimeExtensionTable.classFQName]
|
||||||
|
val jarName = apkName.substringBefore(".apk") + ".jar"
|
||||||
|
val jarPath = "${applicationDirs.extensionsRoot}/$jarName"
|
||||||
|
|
||||||
|
when (val instance = loadExtensionSources(jarPath, className)) {
|
||||||
|
is AnimeSource -> listOf(instance)
|
||||||
|
is AnimeSourceFactory -> instance.createSources()
|
||||||
|
else -> throw Exception("Unknown source class type! ${instance.javaClass}")
|
||||||
|
}.forEach {
|
||||||
|
sourceCache[it.id] = it as AnimeHttpSource
|
||||||
|
}
|
||||||
|
return sourceCache[sourceId]!!
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
package suwayomi.tachidesk.anime.impl.util
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import android.content.pm.PackageInfo
|
||||||
|
import android.content.pm.Signature
|
||||||
|
import android.os.Bundle
|
||||||
|
import com.googlecode.d2j.dex.Dex2jar
|
||||||
|
import com.googlecode.d2j.reader.MultiDexFileReader
|
||||||
|
import com.googlecode.dex2jar.tools.BaksmaliBaseDexExceptionHandler
|
||||||
|
import eu.kanade.tachiyomi.util.lang.Hash
|
||||||
|
import mu.KotlinLogging
|
||||||
|
import net.dongliu.apk.parser.ApkFile
|
||||||
|
import net.dongliu.apk.parser.ApkParsers
|
||||||
|
import org.kodein.di.DI
|
||||||
|
import org.kodein.di.conf.global
|
||||||
|
import org.kodein.di.instance
|
||||||
|
import org.w3c.dom.Element
|
||||||
|
import org.w3c.dom.Node
|
||||||
|
import suwayomi.tachidesk.manga.impl.util.BytecodeEditor
|
||||||
|
import suwayomi.tachidesk.server.ApplicationDirs
|
||||||
|
import xyz.nulldev.androidcompat.pm.InstalledPackage.Companion.toList
|
||||||
|
import xyz.nulldev.androidcompat.pm.toPackageInfo
|
||||||
|
import java.io.File
|
||||||
|
import java.net.URL
|
||||||
|
import java.net.URLClassLoader
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import javax.xml.parsers.DocumentBuilderFactory
|
||||||
|
|
||||||
|
object PackageTools {
|
||||||
|
private val logger = KotlinLogging.logger {}
|
||||||
|
private val applicationDirs by DI.global.instance<ApplicationDirs>()
|
||||||
|
|
||||||
|
const val EXTENSION_FEATURE = "tachiyomi.animeextension"
|
||||||
|
const val METADATA_SOURCE_CLASS = "tachiyomi.animeextension.class"
|
||||||
|
const val METADATA_SOURCE_FACTORY = "tachiyomi.animeextension.factory"
|
||||||
|
const val METADATA_NSFW = "tachiyomi.animeextension.nsfw"
|
||||||
|
const val LIB_VERSION_MIN = 10
|
||||||
|
const val LIB_VERSION_MAX = 10
|
||||||
|
|
||||||
|
private const val officialSignature = "50ab1d1e3a20d204d0ad6d334c7691c632e41b98dfa132bf385695fdfa63839c" // jmir1's key
|
||||||
|
var trustedSignatures = mutableSetOf<String>() + officialSignature
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert dex to jar, a wrapper for the dex2jar library
|
||||||
|
*/
|
||||||
|
fun dex2jar(dexFile: String, jarFile: String, fileNameWithoutType: String) {
|
||||||
|
// adopted from com.googlecode.dex2jar.tools.Dex2jarCmd.doCommandLine
|
||||||
|
// source at: https://github.com/DexPatcher/dex2jar/tree/v2.1-20190905-lanchon/dex-tools/src/main/java/com/googlecode/dex2jar/tools/Dex2jarCmd.java
|
||||||
|
|
||||||
|
val jarFilePath = File(jarFile).toPath()
|
||||||
|
val reader = MultiDexFileReader.open(Files.readAllBytes(File(dexFile).toPath()))
|
||||||
|
val handler = BaksmaliBaseDexExceptionHandler()
|
||||||
|
Dex2jar
|
||||||
|
.from(reader)
|
||||||
|
.withExceptionHandler(handler)
|
||||||
|
.reUseReg(false)
|
||||||
|
.topoLogicalSort()
|
||||||
|
.skipDebug(true)
|
||||||
|
.optimizeSynchronized(false)
|
||||||
|
.printIR(false)
|
||||||
|
.noCode(false)
|
||||||
|
.skipExceptions(false)
|
||||||
|
.to(jarFilePath)
|
||||||
|
if (handler.hasException()) {
|
||||||
|
val errorFile: Path = File(applicationDirs.extensionsRoot).toPath().resolve("$fileNameWithoutType-error.txt")
|
||||||
|
logger.error(
|
||||||
|
"""
|
||||||
|
Detail Error Information in File $errorFile
|
||||||
|
Please report this file to one of following link if possible (any one).
|
||||||
|
https://sourceforge.net/p/dex2jar/tickets/
|
||||||
|
https://bitbucket.org/pxb1988/dex2jar/issues
|
||||||
|
https://github.com/pxb1988/dex2jar/issues
|
||||||
|
dex2jar@googlegroups.com
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
handler.dump(errorFile, emptyArray<String>())
|
||||||
|
} else {
|
||||||
|
BytecodeEditor.fixAndroidClasses(jarFilePath.toFile())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A modified version of `xyz.nulldev.androidcompat.pm.InstalledPackage.info` */
|
||||||
|
fun getPackageInfo(apkFilePath: String): PackageInfo {
|
||||||
|
val apk = File(apkFilePath)
|
||||||
|
return ApkParsers.getMetaInfo(apk).toPackageInfo(apk).apply {
|
||||||
|
val parsed = ApkFile(apk)
|
||||||
|
val dbFactory = DocumentBuilderFactory.newInstance()
|
||||||
|
val dBuilder = dbFactory.newDocumentBuilder()
|
||||||
|
val doc = parsed.manifestXml.byteInputStream().use {
|
||||||
|
dBuilder.parse(it)
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.debug(parsed.manifestXml)
|
||||||
|
|
||||||
|
applicationInfo.metaData = Bundle().apply {
|
||||||
|
val appTag = doc.getElementsByTagName("application").item(0)
|
||||||
|
|
||||||
|
appTag?.childNodes?.toList()
|
||||||
|
.orEmpty()
|
||||||
|
.asSequence()
|
||||||
|
.filter {
|
||||||
|
it.nodeType == Node.ELEMENT_NODE
|
||||||
|
}.map {
|
||||||
|
it as Element
|
||||||
|
}.filter {
|
||||||
|
it.tagName == "meta-data"
|
||||||
|
}.forEach {
|
||||||
|
putString(
|
||||||
|
it.attributes.getNamedItem("android:name").nodeValue,
|
||||||
|
it.attributes.getNamedItem("android:value").nodeValue
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
signatures = (
|
||||||
|
parsed.apkSingers.flatMap { it.certificateMetas }
|
||||||
|
/*+ parsed.apkV2Singers.flatMap { it.certificateMetas }*/
|
||||||
|
) // Blocked by: https://github.com/hsiafan/apk-parser/issues/72
|
||||||
|
.map { Signature(it.data) }.toTypedArray()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getSignatureHash(pkgInfo: PackageInfo): String? {
|
||||||
|
val signatures = pkgInfo.signatures
|
||||||
|
return if (signatures != null && signatures.isNotEmpty()) {
|
||||||
|
Hash.sha256(signatures.first().toByteArray())
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* loads the extension main class called $className from the jar located at $jarPath
|
||||||
|
* It may return an instance of HttpSource or SourceFactory depending on the extension.
|
||||||
|
*/
|
||||||
|
fun loadExtensionSources(jarPath: String, className: String): Any {
|
||||||
|
val classLoader = URLClassLoader(arrayOf<URL>(URL("file:$jarPath")))
|
||||||
|
val classToLoad = Class.forName(className, false, classLoader)
|
||||||
|
return classToLoad.getDeclaredConstructor().newInstance()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package suwayomi.tachidesk.anime.model.dataclass
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import suwayomi.tachidesk.anime.model.table.AnimeStatus
|
||||||
|
|
||||||
|
data class AnimeDataClass(
|
||||||
|
val id: Int,
|
||||||
|
val sourceId: String,
|
||||||
|
|
||||||
|
val url: String,
|
||||||
|
val title: String,
|
||||||
|
val thumbnailUrl: String? = null,
|
||||||
|
|
||||||
|
val initialized: Boolean = false,
|
||||||
|
|
||||||
|
val artist: String? = null,
|
||||||
|
val author: String? = null,
|
||||||
|
val description: String? = null,
|
||||||
|
val genre: String? = null,
|
||||||
|
val status: String = AnimeStatus.UNKNOWN.name,
|
||||||
|
val inLibrary: Boolean = false,
|
||||||
|
val source: AnimeSourceDataClass? = null,
|
||||||
|
|
||||||
|
val freshData: Boolean = false
|
||||||
|
)
|
||||||
|
|
||||||
|
data class PagedAnimeListDataClass(
|
||||||
|
val mangaList: List<AnimeDataClass>,
|
||||||
|
val hasNextPage: Boolean
|
||||||
|
)
|
||||||
+24
@@ -0,0 +1,24 @@
|
|||||||
|
package suwayomi.tachidesk.anime.model.dataclass
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
data class AnimeExtensionDataClass(
|
||||||
|
val apkName: String,
|
||||||
|
val iconUrl: String,
|
||||||
|
|
||||||
|
val name: String,
|
||||||
|
val pkgName: String,
|
||||||
|
val versionName: String,
|
||||||
|
val versionCode: Int,
|
||||||
|
val lang: String,
|
||||||
|
val isNsfw: Boolean,
|
||||||
|
|
||||||
|
val installed: Boolean,
|
||||||
|
val hasUpdate: Boolean,
|
||||||
|
val obsolete: Boolean,
|
||||||
|
)
|
||||||
+9
-1
@@ -1,3 +1,5 @@
|
|||||||
|
package suwayomi.tachidesk.anime.model.dataclass
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (C) Contributors to the Suwayomi project
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
*
|
*
|
||||||
@@ -5,4 +7,10 @@
|
|||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
/// <reference types="react-scripts" />
|
data class AnimeSourceDataClass(
|
||||||
|
val id: String,
|
||||||
|
val name: String?,
|
||||||
|
val lang: String?,
|
||||||
|
val iconUrl: String?,
|
||||||
|
val supportsLatest: Boolean?
|
||||||
|
)
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package suwayomi.tachidesk.anime.model.dataclass
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
data class EpisodeDataClass(
|
||||||
|
val url: String,
|
||||||
|
val name: String,
|
||||||
|
val uploadDate: Long,
|
||||||
|
val episodeNumber: Float,
|
||||||
|
val scanlator: String?,
|
||||||
|
val animeId: Int,
|
||||||
|
|
||||||
|
/** chapter is read */
|
||||||
|
val read: Boolean,
|
||||||
|
|
||||||
|
/** chapter is bookmarked */
|
||||||
|
val bookmarked: Boolean,
|
||||||
|
|
||||||
|
/** last read page, zero means not read/no data */
|
||||||
|
val lastPageRead: Int,
|
||||||
|
|
||||||
|
/** this chapter's index, starts with 1 */
|
||||||
|
val index: Int,
|
||||||
|
|
||||||
|
/** total episode count, used to calculate if there's a next and prev episode */
|
||||||
|
val episodeCount: Int? = null,
|
||||||
|
|
||||||
|
/** used to construct pages in the front-end */
|
||||||
|
val linkUrl: String? = null,
|
||||||
|
)
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package suwayomi.tachidesk.anime.model.table
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import org.jetbrains.exposed.dao.id.IntIdTable
|
||||||
|
|
||||||
|
object AnimeExtensionTable : IntIdTable() {
|
||||||
|
val apkName = varchar("apk_name", 1024)
|
||||||
|
|
||||||
|
// default is the local source icon from tachiyomi
|
||||||
|
val iconUrl = varchar("icon_url", 2048)
|
||||||
|
.default("https://raw.githubusercontent.com/tachiyomiorg/tachiyomi/64ba127e7d43b1d7e6d58a6f5c9b2bd5fe0543f7/app/src/main/res/mipmap-xxxhdpi/ic_local_source.webp")
|
||||||
|
|
||||||
|
val name = varchar("name", 128)
|
||||||
|
val pkgName = varchar("pkg_name", 128)
|
||||||
|
val versionName = varchar("version_name", 16)
|
||||||
|
val versionCode = integer("version_code")
|
||||||
|
val lang = varchar("lang", 10)
|
||||||
|
val isNsfw = bool("is_nsfw")
|
||||||
|
|
||||||
|
val isInstalled = bool("is_installed").default(false)
|
||||||
|
val hasUpdate = bool("has_update").default(false)
|
||||||
|
val isObsolete = bool("is_obsolete").default(false)
|
||||||
|
|
||||||
|
val classFQName = varchar("class_name", 1024).default("") // fully qualified name
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package suwayomi.tachidesk.anime.model.table
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
import org.jetbrains.exposed.dao.id.IdTable
|
||||||
|
|
||||||
|
object AnimeSourceTable : IdTable<Long>() {
|
||||||
|
override val id = long("id").entityId()
|
||||||
|
val name = varchar("name", 128)
|
||||||
|
val lang = varchar("lang", 10)
|
||||||
|
val extension = reference("extension", AnimeExtensionTable)
|
||||||
|
val partOfFactorySource = bool("part_of_factory_source").default(false)
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user