trying to bundle the changes

.editorconfig

@@ -1,11 +0,0 @@
-[*.{kt,kts}]
-indent_size=4
-insert_final_newline=true
-ij_kotlin_allow_trailing_comma=true
-ij_kotlin_allow_trailing_comma_on_call_site=true
-ij_kotlin_name_count_to_use_star_import=2147483647
-ij_kotlin_name_count_to_use_star_import_for_members=2147483647
-
-ktlint_standard_discouraged-comment-location=disabled
-ktlint_standard_if-else-wrapping=disabled
-ktlint_standard_no-consecutive-comments=disabled

.gitattributes

@@ -25,7 +25,4 @@
 *.pyc binary
 *.swp binary
 *.pdf binary
-*.exe binary
+*.exe binary
-*.avif binary
-*.heif binary
-*.jxl binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,44 @@
+---
+name: "🐞 Bug report"
+title: "[Bug] <short description>"
+about: "Report a bug"
+labels: "bug"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app.
+- I have tried the troubleshooting guide described in `README.md`
+- If this is a request for adding/changing an extension it should be brought up to Tachiyomi: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
+- If this is an issue with some extension not working properly, It does work inside Tachiyomi as intended.
+- I have searched the existing issues and this is a new ticket **NOT** a duplicate or related to another open issue
+- I will fill out the title and the information in this template
+
+Note that the issue will be automatically closed if you do not fill out the title or requested information.
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## Device information
+- Tachidesk version: (Example: v0.2.3-r255-win32)
+- Server Operating System: (Example: Ubuntu 20.04)
+- Server Desktop Environment: N/A or (Example: Gnome 40)
+- Server JVM version: bundled with win32 or (Example: Java 8 Update 281 or OpenJDK 8u281)
+- Client Operating System: <usually the same as above Server Operating System>
+- Client Web Browser: (Example: Google Chrome 89.0.4389.82) 
+
+## Steps to reproduce
+1. First Step
+2. Second Step
+
+### Expected behavior
+Describe what should have happened. Remove this line after you are done.
+
+### Actual behavior
+Describe what happens instead. Remove this line after you are done.
+
+## Other details
+Describe additional details If necessary. Remove this line after you are done.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,144 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug in Suwayomi-Server
-labels: [bug]
-body:
-
-  - type: textarea
-    id: reproduce-steps
-    attributes:
-      label: Steps to reproduce
-      description: Provide an example of the issue.
-      placeholder: |
-        Example:
-          1. First step
-          2. Second step
-          3. Issue here
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: Explain what you should expect to happen.
-      placeholder: |
-        Example: "This should happen..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual behavior
-      description: Explain what actually happens.
-      placeholder: |
-        Example: "This happened instead..."
-    validations:
-      required: true
-
-  - type: input
-    id: suwayomi-server-version
-    attributes:
-      label: Suwayomi-Server version
-      description: You can find your Suwayomi-Server version in **More → About**.
-      placeholder: |
-        Example: "v2.0.1727"
-    validations:
-      required: true
-
-  - type: input
-    id: server-os
-    attributes:
-      label: Server operating system
-      description: The operating system on which Suwayomi-Server is running on
-      placeholder: |
-        Example: "Windows 11 Pro 24H2 | Ubuntu 24.04.2 LTS"
-    validations:
-      required: true
-
-  - type: input
-    id: server-desktop-environment
-    attributes:
-      label: Server Desktop Environment
-      description:
-      placeholder: |
-        Example: "Gnome 40"
-    validations:
-      required: false
-
-  - type: input
-    id: server-jvm-version
-    attributes:
-      label: Server JVM version
-      description: The java version used to run Suwayomi-Server
-      placeholder: |
-        Example: "openjdk 21.0.5 2024-10-15 LTS"
-    validations:
-      required: true
-
-  - type: input
-    id: client-name
-    attributes:
-      label: Used client name
-      description:
-      placeholder: |
-        Example: "Suwayomi-WebUI"
-    validations:
-      required: true
-
-  - type: input
-    id: client-version
-    attributes:
-      label: Client version
-      description:
-      placeholder: |
-        Example: "v1.2.3"
-    validations:
-      required: true
-
-  - type: input
-    id: client-browser
-    attributes:
-      label: Used web browser
-      description: The browser which is used to open Suwayomi-WebUI
-      placeholder: |
-        Example: "Chrome 134.0.6998.118 (64-Bit) | FireFox 136.0.2 (64-Bit) | Electron v35.0.2"
-    validations:
-      required: true
-
-  - type: input
-    id: client-os
-    attributes:
-      label: Client operating system
-      description: The system on which the Suwayomi-WebUI is running on
-      placeholder: |
-        Example: "Windows 11 Pro 24H2 | Ubuntu 24.04.2 LTS"
-    validations:
-      required: true
-
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      description: The more information that gets provided the better, especially via videos and images
-      placeholder: |
-        Additional details and attachments.
-
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
-          required: true
-        - label: I have written a short but informative title (ideally less than ~100 characters).
-          required: true
-        - label: I have tried the troubleshooting guide described in [README.md](https://github.com/Suwayomi/Suwayomi-Server?tab=readme-ov-file#troubleshooting-and-support)
-          required: true
-        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
-          required: true
-        - label: I have filled out all of the requested information in this form, including specific version numbers.
-          required: true
-        - label: I understand that **Suwayomi does not have or fix any extensions**, and I **will not receive help** for any issues related to sources or extensions.
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: ☎️ Support
-    url: https://discord.gg/DDZdqZWaHA
-    about: Join our discord to get help for anything that is not a bug or a feature request

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,29 @@
+---
+name: "🌟 Feature request"
+title: "[Feature Request] <short description>"
+about: "Suggest a feature to improve the project"
+labels: "enhancement"
+---
+
+**PLEASE READ THIS**
+
+I acknowledge that:
+
+- I have updated to the latest version of the app.
+- I have tried the troubleshooting guide described in `README.md`
+- If this is a request for adding/changing an extension it should be brought up to Tachiyomi: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
+- If this is an issue with some extension not working properly, It does work in Tachiyomi application as intended.
+- I have searched the existing issues and this is a new ticket **NOT** a duplicate or related to another open issue
+- I will fill out the title and the information in this template
+
+Note that the issue will be automatically closed if you do not fill out the title or requested information.
+
+**DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT**
+
+---
+
+## What feature should be added to Tachidesk?
+Explain What the feature is and how it should work in detail. Remove this line after you are done.
+
+##  Why/Project's Benefit/Existing Problem
+Explain why this should be added. Remove this line after you are done.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,37 +0,0 @@
-name: 🌟 Feature request
-description: Suggest a feature to improve Suwayomi-Server
-labels: [enhancement]
-body:
-
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Describe your suggested feature
-      description: How can Suwayomi-Server be improved?
-      placeholder: |
-        Example:
-          "It should work like this..."
-    validations:
-      required: true
-
-  - type: textarea
-    id: other-details
-    attributes:
-      label: Other details
-      placeholder: |
-        Additional details and attachments.
-
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Read this carefully, we will close and ignore your issue if you skimmed through this.
-      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
-          required: true
-        - label: I have written a short but informative title (ideally less than ~100 characters).
-          required: true
-        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
-          required: true
-        - label: I have filled out all of the requested information in this form, including specific version numbers.
-          required: true

.github/workflows/build_pull_request.yml

@@ -3,10 +3,6 @@ name: CI Pull Request
 on:
   pull_request:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
@@ -14,32 +10,34 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/wrapper-validation-action@v1
 
   build:
     name: Build pull request
     needs: check_wrapper
+    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
     runs-on: ubuntu-latest
 
     steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.10.0
+        with:
+          access_token: ${{ github.token }}
+
       - name: Checkout pull request
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK
+      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: 1.8
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: |
@@ -48,6 +46,8 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build Jar
-        working-directory: master
+        uses: gradle/gradle-build-action@v2
-        run: ./gradlew ktlintCheck :server:shadowJar --stacktrace
+        with:
+          build-root-directory: master
+          arguments: :server:shadowJar --stacktrace
 

.github/workflows/build_push.yml

@@ -5,41 +5,39 @@ on:
     branches:
       - master
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/wrapper-validation-action@v1
 
   build:
     name: Build Jar
     needs: check_wrapper
+    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
     runs-on: ubuntu-latest
     steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.10.0
+        with:
+          access_token: ${{ github.token }}
+
       - name: Checkout master branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: master
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK
+      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: 1.8
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: |
@@ -48,20 +46,22 @@ jobs:
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Build Jar
+        uses: gradle/gradle-build-action@v2
         env:
           ProductBuildType: "Preview"
-        working-directory: master
+        with:
-        run: ./gradlew :server:shadowJar --stacktrace
+          build-root-directory: master
+          arguments: :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: icon
           path: master/server/src/main/resources/icon
@@ -69,45 +69,13 @@ jobs:
 
       - name: Tar scripts dir to maintain file permissions
         run: tar -cvzf scripts.tar.gz -C master/ scripts/
-
       - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: scripts
           path: scripts.tar.gz
           if-no-files-found: error
 
-  jlink:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            name: linux-x64
-          - os: windows-latest
-            name: windows-x64
-          - os: macos-14
-            name: macOS-arm64
-          - os: macos-13
-            name: macOS-x64
-        os: [ubuntu-latest, windows-latest, macos-14, macos-13]
-
-    steps:
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Package JDK
-        run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.random,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
-
-      - name: Upload JRE package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.name }}-jre
-          path: suwa
-
   bundle:
     strategy:
       fail-fast: false
@@ -119,32 +87,26 @@ jobs:
           - macOS-x64
           - macOS-arm64
           - windows-x64
+          - windows-x86
 
     name: Make ${{ matrix.os }} release
-    needs: [build,jlink]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: jar
           path: server/build
 
-      - name: Download JRE
-        uses: actions/download-artifact@v4
-        if: matrix.os != 'linux-assets' && matrix.os != 'debian-all'
-        with:
-          name: ${{ matrix.os }}-jre
-          path: jre
-
       - name: Download icons
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: scripts
 
@@ -155,7 +117,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.os }}
 
       - name: Upload ${{ matrix.os }} release
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}
           path: upload/*
@@ -165,39 +127,43 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: windows-x64
           path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-x86
+          path: release
 
       - name: Checkout Preview branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
-          repository: "Suwayomi/Suwayomi-Server-preview"
+          repository: "Suwayomi/Tachidesk-Server-preview"
           ref: main
           path: preview
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
@@ -206,9 +172,9 @@ jobs:
         id: GenTagName
         run: |
           cd release
-          genTag=$(ls *.jar | sed -e's/Suwayomi-Server-\|.jar//g')
+          genTag=$(ls *.jar | sed -e's/Tachidesk-Server-\|.jar//g')
           echo "$genTag"
-          echo "value=$genTag" >> $GITHUB_OUTPUT
+          echo "::set-output name=value::$genTag"
 
       - name: Create Tag
         run: |
@@ -227,10 +193,10 @@ jobs:
           git push origin $TAG
 
       - name: Upload Preview Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-          repository: "Suwayomi/Suwayomi-Server-preview"
+          repository: "Suwayomi/Tachidesk-Server-preview"
           tag_name:  ${{ steps.GenTagName.outputs.value }}
           files: release/*
 

.github/workflows/issue_moderator.yml

@@ -0,0 +1,48 @@
+name: Issue moderator
+
+on:
+  issues:
+    types: [opened, edited, reopened]
+  issue_comment:
+    types: [created]
+
+jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Moderate issues
+        uses: tachiyomiorg/issue-moderator-action@v1
+        with:
+          repo-token: ${{ github.token }}
+          duplicate-check-enabled: true
+          duplicate-check-label: Source request
+          existing-check-enabled: true
+          existing-check-label: Source request
+          auto-close-rules: |
+            [
+              {
+                "type": "title",
+                "regex": ".*<short description>.*",
+                "message": "You did not fill out the description in the title"
+              },
+              {
+                "type": "title",
+                "regex": ".*(<|>)+.*",
+                "message": "You did not remove Angle brackets(< and >) from the title"
+              },
+              {
+                "type": "body",
+                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
+                "message": "The acknowledgment section was not removed"
+              },
+              {
+                "type": "body",
+                "regex": ".*(Tachidesk version|Server Operating System|Server Desktop Environment|Server JVM version|Client Operating System|Client Web Browser):.*(\\(Example:|<usually).*",
+                "message": "The requested information was not filled out"
+              },
+              {
+                "type": "body",
+                "regex": ".*Remove this line after you are done.*",
+                "message": "The lines requesting to be removed were not removed."
+              }
+            ]

.github/workflows/publish.yml

@@ -6,41 +6,38 @@ on:
     tags:
       - "v*"
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/wrapper-validation-action@v1
 
   build:
     name: Build Jar
     needs: check_wrapper
     runs-on: ubuntu-latest
     steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.10.0
+        with:
+          access_token: ${{ github.token }}
+
       - name: Checkout ${{ github.ref }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
           path: master
           fetch-depth: 0
 
-      - name: Set up JDK
+      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: 1.8
-          distribution: 'temurin'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
 
       - name: Copy CI gradle.properties
         run: |
@@ -50,20 +47,22 @@ jobs:
             ~/.gradle/gradle.properties
 
       - name: Build and copy webUI, Build Jar
+        uses: gradle/gradle-build-action@v2
         env:
           ProductBuildType: "Stable"
-        working-directory: master
+        with:
-        run: ./gradlew :server:downloadWebUI :server:shadowJar --stacktrace
+          build-root-directory: master
+          arguments: :server:downloadWebUI :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: icon
           path: master/server/src/main/resources/icon
@@ -71,45 +70,13 @@ jobs:
 
       - name: Tar scripts dir to maintain file permissions
         run: tar -cvzf scripts.tar.gz -C master/ scripts/
-
       - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: scripts
           path: scripts.tar.gz
           if-no-files-found: error
 
-  jlink:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            name: linux-x64
-          - os: windows-latest
-            name: windows-x64
-          - os: macos-14
-            name: macOS-arm64
-          - os: macos-13
-            name: macOS-x64
-        os: [ubuntu-latest, windows-latest, macos-14, macos-13]
-
-    steps:
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: 'temurin'
-
-      - name: Package JDK
-        run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.random,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
-
-      - name: Upload JDK package
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.name }}-jre
-          path: suwa
-
   bundle:
     strategy:
       fail-fast: false
@@ -121,32 +88,26 @@ jobs:
           - macOS-x64
           - macOS-arm64
           - windows-x64
+          - windows-x86
 
     name: Make ${{ matrix.os }} release
-    needs: [build, jlink]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: jar
           path: server/build
 
-      - name: Download JRE
-        uses: actions/download-artifact@v4
-        if: matrix.os != 'linux-assets' && matrix.os != 'debian-all'
-        with:
-          name: ${{ matrix.os }}-jre
-          path: jre
-
       - name: Download icons
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: scripts
 
@@ -157,7 +118,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.os }}
 
       - name: Upload ${{ matrix.os }} files
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}
           path: upload/*
@@ -168,41 +129,45 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: windows-x64
           path: release
+      - uses: actions/download-artifact@v3
+        with:
+          name: windows-x86
+          path: release
 
       - name: Generate checksums
         run: cd release && sha256sum * > Checksums.sha256
 
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
-          token: ${{ secrets.DEPLOY_RELEASE_TOKEN }}
+          token: ${{ secrets.WINGET_PUBLISH_PAT }}
           draft: true
           files: release/*

.gitignore

@@ -5,7 +5,6 @@ gradle.properties
 .fleet
 # But we need these
 !.idea/runConfigurations
-.kotlin
 
 # Ignore Gradle build output directory
 build

AndroidCompat/Config/build.gradle.kts

@@ -1,23 +1,12 @@
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id(
+    id(libs.plugins.kotlin.jvm.get().pluginId)
-        libs.plugins.kotlin.jvm
+    id(libs.plugins.kotlin.serialization.get().pluginId)
-            .get()
+    id(libs.plugins.kotlinter.get().pluginId)
-            .pluginId,
-    )
-    id(
-        libs.plugins.kotlin.serialization
-            .get()
-            .pluginId,
-    )
-    id(
-        libs.plugins.ktlint
-            .get()
-            .pluginId,
-    )
 }
 
 dependencies {
     // Shared
     implementation(libs.bundles.shared)
     testImplementation(libs.bundles.sharedTest)
-}
+}

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt

@@ -15,6 +15,6 @@ val ApplicationRootDir: String
     get(): String {
         return System.getProperty(
             "$CONFIG_PREFIX.server.rootDir",
-            AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null),
+            AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
         )
     }

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigKodeinModule.kt

@@ -0,0 +1,12 @@
+package xyz.nulldev.ts.config
+
+import org.kodein.di.DI
+import org.kodein.di.bind
+import org.kodein.di.singleton
+
+class ConfigKodeinModule {
+    fun create() = DI.Module("ConfigManager") {
+        // Config module
+        bind<ConfigManager>() with singleton { GlobalConfigManager }
+    }
+}

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt

@@ -10,31 +10,22 @@ package xyz.nulldev.ts.config
 import ch.qos.logback.classic.Level
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import com.typesafe.config.ConfigValue
+import com.typesafe.config.ConfigRenderOptions
-import com.typesafe.config.ConfigValueFactory
+import mu.KotlinLogging
-import com.typesafe.config.parser.ConfigDocument
-import com.typesafe.config.parser.ConfigDocumentFactory
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import java.io.File
 
 /**
  * Manages app config.
  */
 open class ConfigManager {
-    val logger = KotlinLogging.logger {}
     private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
-    private val userConfigFile = File(ApplicationRootDir, "server.conf")
+    val config by lazy { loadConfigs() }
-    private var internalConfig = loadConfigs()
-    val config: Config
-        get() = internalConfig
 
     // Public read-only view of modules
     val loadedModules: Map<Class<out ConfigModule>, ConfigModule>
         get() = generatedModules
 
-    private val mutex = Mutex()
+    val logger = KotlinLogging.logger {}
 
     /**
      * Get a config module
@@ -47,11 +38,6 @@ open class ConfigManager {
     @Suppress("UNCHECKED_CAST")
     fun <T : ConfigModule> module(type: Class<T>): T = loadedModules[type] as T
 
-    private fun getUserConfig(): Config =
-        userConfigFile.let {
-            ConfigFactory.parseFile(it)
-        }
-
     /**
      * Load configs
      */
@@ -62,26 +48,30 @@ open class ConfigManager {
         val baseConfig =
             ConfigFactory.parseMap(
                 mapOf(
-                    // override AndroidCompat's rootDir
+                    "androidcompat.rootDir" to "$ApplicationRootDir/android-compat" // override AndroidCompat's rootDir
-                    "androidcompat.rootDir" to "$ApplicationRootDir/android-compat",
+                )
-                ),
             )
 
         // Load user config
-        val userConfig = getUserConfig()
+        val userConfig =
+            File(ApplicationRootDir, "server.conf").let {
+                ConfigFactory.parseFile(it)
+            }
 
-        val config =
+        val config = ConfigFactory.empty()
-            ConfigFactory
+            .withFallback(baseConfig)
-                .empty()
+            .withFallback(userConfig)
-                .withFallback(baseConfig)
+            .withFallback(compatConfig)
-                .withFallback(userConfig)
+            .withFallback(serverConfig)
-                .withFallback(compatConfig)
+            .resolve()
-                .withFallback(serverConfig)
-                .resolve()
 
         // set log level early
         if (debugLogsEnabled(config)) {
-            setLogLevelFor(BASE_LOGGER_NAME, Level.DEBUG)
+            setLogLevel(Level.DEBUG)
+        }
+
+        logger.debug {
+            "Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true))
         }
 
         return config
@@ -96,73 +86,6 @@ open class ConfigManager {
             registerModule(it)
         }
     }
-
-    private fun updateUserConfigFile(
-        path: String,
-        value: ConfigValue,
-    ) {
-        val userConfigDoc = ConfigDocumentFactory.parseFile(userConfigFile)
-        val updatedConfigDoc = userConfigDoc.withValue(path, value)
-        val newFileContent = updatedConfigDoc.render()
-        userConfigFile.writeText(newFileContent)
-    }
-
-    suspend fun updateValue(
-        path: String,
-        value: Any,
-    ) {
-        mutex.withLock {
-            val configValue = ConfigValueFactory.fromAnyRef(value)
-
-            updateUserConfigFile(path, configValue)
-            internalConfig = internalConfig.withValue(path, configValue)
-        }
-    }
-
-    fun resetUserConfig(updateInternalConfig: Boolean = true): ConfigDocument {
-        val serverConfigFileContent = this::class.java.getResource("/server-reference.conf")?.readText()
-        val serverConfigDoc = ConfigDocumentFactory.parseString(serverConfigFileContent)
-        userConfigFile.writeText(serverConfigDoc.render())
-
-        if (updateInternalConfig) {
-            getUserConfig().entrySet().forEach { internalConfig = internalConfig.withValue(it.key, it.value) }
-        }
-
-        return serverConfigDoc
-    }
-
-    /**
-     * Makes sure the "UserConfig" is up-to-date.
-     *
-     *  - adds missing settings
-     *  - removes outdated settings
-     */
-    fun updateUserConfig() {
-        val serverConfig = ConfigFactory.parseResources("server-reference.conf")
-        val userConfig = getUserConfig()
-
-        val hasMissingSettings = serverConfig.entrySet().any { !userConfig.hasPath(it.key) }
-        val hasOutdatedSettings = userConfig.entrySet().any { !serverConfig.hasPath(it.key) }
-        val isUserConfigOutdated = hasMissingSettings || hasOutdatedSettings
-        if (!isUserConfigOutdated) {
-            return
-        }
-
-        logger.debug {
-            "user config is out of date, updating... (missingSettings= $hasMissingSettings, outdatedSettings= $hasOutdatedSettings"
-        }
-
-        var newUserConfigDoc: ConfigDocument = resetUserConfig(false)
-        userConfig
-            .entrySet()
-            .filter {
-                serverConfig.hasPath(
-                    it.key,
-                )
-            }.forEach { newUserConfigDoc = newUserConfigDoc.withValue(it.key, it.value) }
-
-        userConfigFile.writeText(newUserConfigDoc.render())
-    }
 }
 
 object GlobalConfigManager : ConfigManager()

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManagerModule.kt

@@ -1,9 +0,0 @@
-package xyz.nulldev.ts.config
-
-import org.koin.core.module.Module
-import org.koin.dsl.module
-
-fun configManagerModule(): Module =
-    module {
-        single<ConfigManager> { GlobalConfigManager }
-    }

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt

@@ -8,8 +8,6 @@ package xyz.nulldev.ts.config
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-import com.typesafe.config.ConfigValueFactory
 import io.github.config4k.getValue
 import kotlin.reflect.KProperty
 
@@ -17,47 +15,28 @@ import kotlin.reflect.KProperty
  * Abstract config module.
  */
 @Suppress("UNUSED_PARAMETER")
-abstract class ConfigModule(
+abstract class ConfigModule(config: Config)
-    getConfig: () -> Config,
-)
 
 /**
  * Abstract jvm-commandline-argument-overridable config module.
  */
-abstract class SystemPropertyOverridableConfigModule(
+abstract class SystemPropertyOverridableConfigModule(config: Config, moduleName: String) : ConfigModule(config) {
-    getConfig: () -> Config,
+    val overridableConfig = SystemPropertyOverrideDelegate(config, moduleName)
-    moduleName: String,
-) : ConfigModule(getConfig) {
-    val overridableConfig = SystemPropertyOverrideDelegate(getConfig, moduleName)
 }
 
 /** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */
-class SystemPropertyOverrideDelegate(
+class SystemPropertyOverrideDelegate(val config: Config, val moduleName: String) {
-    val getConfig: () -> Config,
+    inline operator fun <R, reified T> getValue(thisRef: R, property: KProperty<*>): T {
-    val moduleName: String,
-) {
-    inline operator fun <R, reified T> getValue(
-        thisRef: R,
-        property: KProperty<*>,
-    ): T {
-        val config = getConfig()
         val configValue: T = config.getValue(thisRef, property)
 
-        val combined =
+        val combined = System.getProperty(
-            System.getProperty(
+            "$CONFIG_PREFIX.$moduleName.${property.name}",
-                "$CONFIG_PREFIX.$moduleName.${property.name}",
+            configValue.toString()
-                if (T::class.simpleName == "List") {
+        )
-                    ConfigValueFactory.fromAnyRef(configValue).render()
-                } else {
-                    configValue.toString()
-                },
-            )
 
         return when (T::class.simpleName) {
             "Int" -> combined.toInt()
             "Boolean" -> combined.toBoolean()
-            "Double" -> combined.toDouble()
-            "List" -> ConfigFactory.parseString("internal=" + combined).getStringList("internal").orEmpty()
             // add more types as needed
             else -> combined // covers String
         } as T

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt

@@ -8,131 +8,12 @@ package xyz.nulldev.ts.config
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.LoggerContext
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder
-import ch.qos.logback.classic.spi.ILoggingEvent
-import ch.qos.logback.core.rolling.RollingFileAppender
-import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy
-import ch.qos.logback.core.util.FileSize
 import com.typesafe.config.Config
-import io.github.oshai.kotlinlogging.DelegatingKLogger
+import mu.KotlinLogging
-import io.github.oshai.kotlinlogging.KotlinLogging
 import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 
-private fun fileSizeValueOfOrDefault(
+fun setLogLevel(level: Level) {
-    fileSizeStr: String,
+    (KotlinLogging.logger(Logger.ROOT_LOGGER_NAME).underlyingLogger as ch.qos.logback.classic.Logger).level = level
-    default: String,
-): FileSize =
-    try {
-        FileSize.valueOf(fileSizeStr)
-    } catch (e: IllegalArgumentException) {
-        FileSize.valueOf(default)
-    }
-
-private const val FILE_APPENDER_NAME = "SuwayomiDefaultAppender"
-
-private fun createRollingFileAppender(
-    logContext: LoggerContext,
-    logDirPath: String,
-    maxFiles: Int,
-    maxFileSize: String,
-    maxTotalSize: String,
-): RollingFileAppender<ILoggingEvent> {
-    val logFilename = "application"
-
-    val logEncoder =
-        PatternLayoutEncoder().apply {
-            pattern = "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n"
-            context = logContext
-            start()
-        }
-
-    val appender =
-        RollingFileAppender<ILoggingEvent>().apply {
-            name = FILE_APPENDER_NAME
-            context = logContext
-            encoder = logEncoder
-            file = "$logDirPath/$logFilename.log"
-        }
-
-    val rollingPolicy =
-        SizeAndTimeBasedRollingPolicy<ILoggingEvent>().apply {
-            context = logContext
-            setParent(appender)
-            fileNamePattern = "$logDirPath/${logFilename}_%d{yyyy-MM-dd}_%i.log.gz"
-            maxHistory = maxFiles.coerceAtLeast(0)
-            setMaxFileSize(fileSizeValueOfOrDefault(maxFileSize, "10mb"))
-            setTotalSizeCap(fileSizeValueOfOrDefault(maxTotalSize, "100mb"))
-            start()
-        }
-
-    appender.rollingPolicy = rollingPolicy
-    appender.start()
-
-    return appender
-}
-
-private fun getBaseLogger(): ch.qos.logback.classic.Logger =
-    ((KotlinLogging.logger(Logger.ROOT_LOGGER_NAME) as DelegatingKLogger<*>).underlyingLogger as ch.qos.logback.classic.Logger)
-
-private fun getLogger(name: String): ch.qos.logback.classic.Logger {
-    val context = LoggerFactory.getILoggerFactory() as LoggerContext
-    return context.getLogger(name)
-}
-
-fun initLoggerConfig(
-    appRootPath: String,
-    maxFiles: Int,
-    maxFileSize: String,
-    maxTotalSize: String,
-) {
-    val context = LoggerFactory.getILoggerFactory() as LoggerContext
-    val logger = getBaseLogger()
-
-    // logback logs to the console by default (at least when adding a console appender logs in the console are duplicated)
-    logger.addAppender(createRollingFileAppender(context, "$appRootPath/logs", maxFiles, maxFileSize, maxTotalSize))
-
-    // set "kotlin exposed" log level
-    setLogLevelFor("Exposed", Level.ERROR)
-}
-
-fun updateFileAppender(
-    maxFiles: Int,
-    maxFileSize: String,
-    maxTotalSize: String,
-) {
-    val logger = getBaseLogger()
-
-    val appender = logger.getAppender(FILE_APPENDER_NAME) as RollingFileAppender<*>? ?: return
-    val rollingPolicy = appender.rollingPolicy as SizeAndTimeBasedRollingPolicy<*>
-    rollingPolicy.apply {
-        maxHistory = maxFiles
-        setMaxFileSize(FileSize.valueOf(maxFileSize))
-        setTotalSizeCap(FileSize.valueOf(maxTotalSize))
-
-        rollingPolicy.stop()
-        appender.stop()
-
-        rollingPolicy.start()
-        appender.start()
-    }
-}
-
-const val BASE_LOGGER_NAME = "_BaseLogger"
-
-fun setLogLevelFor(
-    name: String,
-    level: Level,
-) {
-    val logger =
-        if (name == BASE_LOGGER_NAME) {
-            getBaseLogger()
-        } else {
-            getLogger(name)
-        }
-
-    logger.level = level
 }
 
 fun debugLogsEnabled(config: Config) =

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/util/ConfigExtensions.kt

@@ -2,6 +2,5 @@ package xyz.nulldev.ts.config.util
 
 import com.typesafe.config.Config
 
-operator fun Config.get(key: String) =
+operator fun Config.get(key: String) = getString(key)
-    getString(key)
+    ?: throw IllegalStateException("Could not find value for config entry: $key!")
-        ?: throw IllegalStateException("Could not find value for config entry: $key!")

AndroidCompat/build.gradle.kts

@@ -1,19 +1,8 @@
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id(
+    id(libs.plugins.kotlin.jvm.get().pluginId)
-        libs.plugins.kotlin.jvm
+    id(libs.plugins.kotlin.serialization.get().pluginId)
-            .get()
+    id(libs.plugins.kotlinter.get().pluginId)
-            .pluginId,
-    )
-    id(
-        libs.plugins.kotlin.serialization
-            .get()
-            .pluginId,
-    )
-    id(
-        libs.plugins.ktlint
-            .get()
-            .pluginId,
-    )
 }
 
 dependencies {
@@ -36,8 +25,8 @@ dependencies {
     // AndroidX annotations
     compileOnly(libs.android.annotations)
 
-    // substitute for duktape-android/quickjs
+    // substitute for duktape-android
-    implementation(libs.bundles.polyglot)
+    implementation(libs.bundles.rhino)
 
     // Kotlin wrapper around Java Preferences, makes certain things easier
     implementation(libs.bundles.settings)

AndroidCompat/src/main/java/android/app/Service.java

@@ -25,7 +25,7 @@ import android.os.IBinder;
 import android.util.Log;
 import kotlin.NotImplementedError;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -299,7 +299,7 @@ import java.lang.annotation.RetentionPolicy;
  */
 public abstract class Service extends ContextWrapper implements ComponentCallbacks2 {
 
-    private static final ServiceSupport serviceSupport = KoinGlobalHelper.instance(ServiceSupport.class);
+    private static final ServiceSupport serviceSupport = KodeinGlobalHelper.instance(ServiceSupport.class);
 
     private static final String TAG = "Service";
     /**
@@ -328,7 +328,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac
     public Service() {
         //==================[THIS LINE MODIFIED FROM ANDROID SOURCE!]==================
         //Service must be initialized with a base context!
-        super(KoinGlobalHelper.instance(Context.class));
+        super(KodeinGlobalHelper.instance(Context.class));
     }
     /** Return the application that owns this service. */
     public final Application getApplication() {

AndroidCompat/src/main/java/android/graphics/Bitmap.java

@@ -1,23 +1,20 @@
 package android.graphics;
 
-import android.annotation.ColorInt;
+import java.awt.image.BufferedImage;
-import android.annotation.NonNull;
+import java.io.ByteArrayInputStream;
-
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.stream.ImageOutputStream;
-import java.awt.image.BufferedImage;
-import java.awt.image.Raster;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
 
 public final class Bitmap {
-    private final int width;
+    private int width;
-    private final int height;
+    private int height;
-    private final BufferedImage image;
+    private BufferedImage image;
 
     public Bitmap(BufferedImage image) {
         this.image = image;
@@ -62,8 +59,8 @@ public final class Bitmap {
 
         final int nativeInt;
 
-        private static final Config[] sConfigs = {
+        private static Config sConfigs[] = {
-                null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888, RGBA_F16, HARDWARE, RGBA_1010102
+            null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888, RGBA_F16, HARDWARE, RGBA_1010102
         };
 
         Config(int ni) {
@@ -75,60 +72,11 @@ public final class Bitmap {
         }
     }
 
-    /**
-     * Common code for checking that x and y are >= 0
-     *
-     * @param x x coordinate to ensure is >= 0
-     * @param y y coordinate to ensure is >= 0
-     */
-    private static void checkXYSign(int x, int y) {
-        if (x < 0) {
-            throw new IllegalArgumentException("x must be >= 0");
-        }
-        if (y < 0) {
-            throw new IllegalArgumentException("y must be >= 0");
-        }
-    }
-
-    /**
-     * Common code for checking that width and height are > 0
-     *
-     * @param width  width to ensure is > 0
-     * @param height height to ensure is > 0
-     */
-    private static void checkWidthHeight(int width, int height) {
-        if (width <= 0) {
-            throw new IllegalArgumentException("width must be > 0");
-        }
-        if (height <= 0) {
-            throw new IllegalArgumentException("height must be > 0");
-        }
-    }
-
     public static Bitmap createBitmap(int width, int height, Config config) {
         BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
         return new Bitmap(image);
     }
 
-    public static Bitmap createBitmap(@NonNull Bitmap source, int x, int y, int width, int height) {
-        checkXYSign(x, y);
-        checkWidthHeight(width, height);
-        if (x + width > source.getWidth()) {
-            throw new IllegalArgumentException("x + width must be <= bitmap.width()");
-        }
-        if (y + height > source.getHeight()) {
-            throw new IllegalArgumentException("y + height must be <= bitmap.height()");
-        }
-
-        // Android will make a copy when creating a sub image,
-        // so we do the same here
-        BufferedImage subImage = source.image.getSubimage(x, y, width, height);
-        BufferedImage newImage = new BufferedImage(subImage.getWidth(), subImage.getHeight(), subImage.getType());
-        newImage.setData(subImage.getData());
-
-        return new Bitmap(newImage);
-    }
-
     public boolean compress(CompressFormat format, int quality, OutputStream stream) {
         if (stream == null) {
             throw new NullPointerException();
@@ -139,7 +87,7 @@ public final class Bitmap {
         }
         float qualityFloat = ((float) quality) / 100;
 
-        String formatString;
+        String formatString = "";
         if (format == Bitmap.CompressFormat.PNG) {
             formatString = "png";
         } else if (format == Bitmap.CompressFormat.JPEG) {
@@ -152,7 +100,7 @@ public final class Bitmap {
         if (!writers.hasNext()) {
             throw new IllegalStateException("no image writers found for this format!");
         }
-        ImageWriter writer = writers.next();
+        ImageWriter writer = (ImageWriter) writers.next();
 
         ImageOutputStream ios;
         try {
@@ -163,73 +111,19 @@ public final class Bitmap {
         writer.setOutput(ios);
 
         ImageWriteParam param = writer.getDefaultWriteParam();
-        if ("jpg".equals(formatString)) {
+        if (formatString == "jpg") {
             param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
             param.setCompressionQuality(qualityFloat);
         }
 
         try {
-            writer.write(null, new IIOImage(image, null, null), param);
+             writer.write(null, new IIOImage(image, null, null), param);
-            ios.close();
+             ios.close();
-            writer.dispose();
+             writer.dispose();
         } catch (IOException ex) {
             throw new RuntimeException(ex);
         }
 
         return true;
     }
-
-    /**
-     * Shared code to check for illegal arguments passed to getPixels()
-     * or setPixels()
-     *
-     * @param x      left edge of the area of pixels to access
-     * @param y      top edge of the area of pixels to access
-     * @param width  width of the area of pixels to access
-     * @param height height of the area of pixels to access
-     * @param offset offset into pixels[] array
-     * @param stride number of elements in pixels[] between each logical row
-     * @param pixels array to hold the area of pixels being accessed
-     */
-    private void checkPixelsAccess(int x, int y, int width, int height,
-                                   int offset, int stride, int[] pixels) {
-        checkXYSign(x, y);
-        if (width < 0) {
-            throw new IllegalArgumentException("width must be >= 0");
-        }
-        if (height < 0) {
-            throw new IllegalArgumentException("height must be >= 0");
-        }
-        if (x + width > getWidth()) {
-            throw new IllegalArgumentException(
-                    "x + width must be <= bitmap.width()");
-        }
-        if (y + height > getHeight()) {
-            throw new IllegalArgumentException(
-                    "y + height must be <= bitmap.height()");
-        }
-        if (Math.abs(stride) < width) {
-            throw new IllegalArgumentException("abs(stride) must be >= width");
-        }
-        int lastScanline = offset + (height - 1) * stride;
-        int length = pixels.length;
-        if (offset < 0 || (offset + width > length)
-                || lastScanline < 0
-                || (lastScanline + width > length)) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-    }
-
-    public void getPixels(@ColorInt int[] pixels, int offset, int stride,
-                          int x, int y, int width, int height) {
-        checkPixelsAccess(x, y, width, height, offset, stride, pixels);
-
-        Raster raster = image.getData();
-        int[] rasterPixels = raster.getPixels(x, y, width, height, (int[]) null);
-
-        for (int ht = 0; ht < height; ht++) {
-            int rowOffset = offset + stride * ht;
-            System.arraycopy(rasterPixels, ht * width, pixels, rowOffset, width);
-        }
-    }
 }

AndroidCompat/src/main/java/android/os/Environment.java

@@ -1,7 +1,7 @@
 package android.os;
 
 import xyz.nulldev.androidcompat.io.AndroidFiles;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.File;
 
@@ -9,7 +9,7 @@ import java.io.File;
  * Android compatibility layer for files
  */
 public class Environment {
-    private static AndroidFiles androidFiles = KoinGlobalHelper.instance(AndroidFiles.class);
+    private static AndroidFiles androidFiles = KodeinGlobalHelper.instance(AndroidFiles.class);
 
     public static String DIRECTORY_ALARMS = getHomeDirectory("Alarms").getAbsolutePath();
     public static String DIRECTORY_DCIM = getHomeDirectory("DCIM").getAbsolutePath();

AndroidCompat/src/main/java/android/preference/PreferenceManager.kt

@@ -12,7 +12,7 @@ class PreferenceManager {
         fun getDefaultSharedPreferences(context: Context) =
             context.getSharedPreferences(
                 context.applicationInfo.packageName,
-                Context.MODE_PRIVATE,
+                Context.MODE_PRIVATE
             )!!
     }
 }

AndroidCompat/src/main/java/android/webkit/CookieManager.java

@@ -1,247 +0,0 @@
-package android.webkit;
-
-import android.annotation.Nullable;
-import xyz.nulldev.androidcompat.webkit.CookieManagerImpl;
-
-public abstract class CookieManager {
-    /**
-     * @deprecated This class should not be constructed by applications, use {@link #getInstance}
-     * instead to fetch the singleton instance.
-     */
-    // TODO(ntfschr): mark this as @SystemApi after a year.
-    @Deprecated
-    public CookieManager() {}
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        throw new CloneNotSupportedException("doesn't implement Cloneable");
-    }
-
-    private static CookieManager INSTANCE = null;
-    private static final Object lock = new Object();
-    /**
-     * Gets the singleton CookieManager instance.
-     *
-     * @return the singleton CookieManager instance
-     */
-    public static CookieManager getInstance() {
-        if (INSTANCE != null) {
-            return INSTANCE;
-        } else {
-            synchronized (lock) {
-                if (INSTANCE == null) {
-                    INSTANCE = new CookieManagerImpl();
-                }
-                return INSTANCE;
-            }
-        }
-    }
-    /**
-     * Sets whether the application's {@link WebView} instances should send and
-     * accept cookies.
-     * By default this is set to {@code true} and the WebView accepts cookies.
-     * <p>
-     * When this is {@code true}
-     * {@link CookieManager#setAcceptThirdPartyCookies setAcceptThirdPartyCookies} and
-     * {@link CookieManager#setAcceptFileSchemeCookies setAcceptFileSchemeCookies}
-     * can be used to control the policy for those specific types of cookie.
-     *
-     * @param accept whether {@link WebView} instances should send and accept
-     *               cookies
-     */
-    public abstract void setAcceptCookie(boolean accept);
-    /**
-     * Gets whether the application's {@link WebView} instances send and accept
-     * cookies.
-     *
-     * @return {@code true} if {@link WebView} instances send and accept cookies
-     */
-    public abstract boolean acceptCookie();
-    /**
-     * Sets whether the {@link WebView} should allow third party cookies to be set.
-     * Allowing third party cookies is a per WebView policy and can be set
-     * differently on different WebView instances.
-     * <p>
-     * Apps that target {@link android.os.Build.VERSION_CODES#KITKAT} or below
-     * default to allowing third party cookies. Apps targeting
-     * {@link android.os.Build.VERSION_CODES#LOLLIPOP} or later default to disallowing
-     * third party cookies.
-     *
-     * @param webview the {@link WebView} instance to set the cookie policy on
-     * @param accept whether the {@link WebView} instance should accept
-     *               third party cookies
-     */
-    public abstract void setAcceptThirdPartyCookies(WebView webview, boolean accept);
-    /**
-     * Gets whether the {@link WebView} should allow third party cookies to be set.
-     *
-     * @param webview the {@link WebView} instance to get the cookie policy for
-     * @return {@code true} if the {@link WebView} accepts third party cookies
-     */
-    public abstract boolean acceptThirdPartyCookies(WebView webview);
-    /**
-     * Sets a single cookie (key-value pair) for the given URL. Any existing cookie with the same
-     * host, path and name will be replaced with the new cookie. The cookie being set
-     * will be ignored if it is expired. To set multiple cookies, your application should invoke
-     * this method multiple times.
-     *
-     * <p>The {@code value} parameter must follow the format of the {@code Set-Cookie} HTTP
-     * response header defined by
-     * <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03">RFC6265bis</a>.
-     * This is a key-value pair of the form {@code "key=value"}, optionally followed by a list of
-     * cookie attributes delimited with semicolons (ex. {@code "key=value; Max-Age=123"}). Please
-     * consult the RFC specification for a list of valid attributes.
-     *
-     * <p class="note"><b>Note:</b> if specifying a {@code value} containing the {@code "Secure"}
-     * attribute, {@code url} must use the {@code "https://"} scheme.
-     *
-     * @param url the URL for which the cookie is to be set
-     * @param value the cookie as a string, using the format of the 'Set-Cookie'
-     *              HTTP response header
-     */
-    public abstract void setCookie(String url, String value);
-    /**
-     * Sets a single cookie (key-value pair) for the given URL. Any existing cookie with the same
-     * host, path and name will be replaced with the new cookie. The cookie being set
-     * will be ignored if it is expired. To set multiple cookies, your application should invoke
-     * this method multiple times.
-     *
-     * <p>The {@code value} parameter must follow the format of the {@code Set-Cookie} HTTP
-     * response header defined by
-     * <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03">RFC6265bis</a>.
-     * This is a key-value pair of the form {@code "key=value"}, optionally followed by a list of
-     * cookie attributes delimited with semicolons (ex. {@code "key=value; Max-Age=123"}). Please
-     * consult the RFC specification for a list of valid attributes.
-     *
-     * <p>This method is asynchronous. If a {@link ValueCallback} is provided,
-     * {@link ValueCallback#onReceiveValue} will be called on the current
-     * thread's {@link android.os.Looper} once the operation is complete.
-     * The value provided to the callback indicates whether the cookie was set successfully.
-     * You can pass {@code null} as the callback if you don't need to know when the operation
-     * completes or whether it succeeded, and in this case it is safe to call the method from a
-     * thread without a Looper.
-     *
-     * <p class="note"><b>Note:</b> if specifying a {@code value} containing the {@code "Secure"}
-     * attribute, {@code url} must use the {@code "https://"} scheme.
-     *
-     * @param url the URL for which the cookie is to be set
-     * @param value the cookie as a string, using the format of the 'Set-Cookie'
-     *              HTTP response header
-     * @param callback a callback to be executed when the cookie has been set
-     */
-    public abstract void setCookie(String url, String value, @Nullable ValueCallback<Boolean>
-            callback);
-    /**
-     * Gets all the cookies for the given URL. This may return multiple key-value pairs if multiple
-     * cookies are associated with this URL, in which case each cookie will be delimited by {@code
-     * "; "} characters (semicolon followed by a space). Each key-value pair will be of the form
-     * {@code "key=value"}.
-     *
-     * @param url the URL for which the cookies are requested
-     * @return value the cookies as a string, using the format of the 'Cookie'
-     *               HTTP request header
-     */
-    public abstract String getCookie(String url);
-
-    /**
-     * Removes all session cookies, which are cookies without an expiration
-     * date.
-     * @deprecated use {@link #removeSessionCookies(ValueCallback)} instead.
-     */
-    @Deprecated
-    public abstract void removeSessionCookie();
-    /**
-     * Removes all session cookies, which are cookies without an expiration
-     * date.
-     * <p>
-     * This method is asynchronous.
-     * If a {@link ValueCallback} is provided,
-     * {@link ValueCallback#onReceiveValue(Object)} will be called on the current
-     * thread's {@link android.os.Looper} once the operation is complete.
-     * The value provided to the callback indicates whether any cookies were removed.
-     * You can pass {@code null} as the callback if you don't need to know when the operation
-     * completes or whether any cookie were removed, and in this case it is safe to call the
-     * method from a thread without a Looper.
-     * @param callback a callback which is executed when the session cookies have been removed
-     */
-    public abstract void removeSessionCookies(@Nullable ValueCallback<Boolean> callback);
-    /**
-     * Removes all cookies.
-     * @deprecated Use {@link #removeAllCookies(ValueCallback)} instead.
-     */
-    @Deprecated
-    public abstract void removeAllCookie();
-    /**
-     * Removes all cookies.
-     * <p>
-     * This method is asynchronous.
-     * If a {@link ValueCallback} is provided,
-     * {@link ValueCallback#onReceiveValue(Object)}  will be called on the current
-     * thread's {@link android.os.Looper} once the operation is complete.
-     * The value provided to the callback indicates whether any cookies were removed.
-     * You can pass {@code null} as the callback if you don't need to know when the operation
-     * completes or whether any cookies were removed, and in this case it is safe to call the
-     * method from a thread without a Looper.
-     * @param callback a callback which is executed when the cookies have been removed
-     */
-    public abstract void removeAllCookies(@Nullable ValueCallback<Boolean> callback);
-    /**
-     * Gets whether there are stored cookies.
-     *
-     * @return {@code true} if there are stored cookies
-     */
-    public abstract boolean hasCookies();
-    /**
-     * Removes all expired cookies.
-     * @deprecated The WebView handles removing expired cookies automatically.
-     */
-    @Deprecated
-    public abstract void removeExpiredCookie();
-    /**
-     * Ensures all cookies currently accessible through the getCookie API are
-     * written to persistent storage.
-     * This call will block the caller until it is done and may perform I/O.
-     */
-    public abstract void flush();
-    /**
-     * Gets whether the application's {@link WebView} instances send and accept
-     * cookies for file scheme URLs.
-     *
-     * @return {@code true} if {@link WebView} instances send and accept cookies for
-     *         file scheme URLs
-     */
-    // Static for backward compatibility.
-    public static boolean allowFileSchemeCookies() {
-        return getInstance().allowFileSchemeCookiesImpl();
-    }
-
-    public abstract boolean allowFileSchemeCookiesImpl();
-
-    /**
-     * Sets whether the application's {@link WebView} instances should send and accept cookies for
-     * file scheme URLs.
-     * <p>
-     * Use of cookies with file scheme URLs is potentially insecure and turned off by default. All
-     * {@code file://} URLs share all their cookies, which may lead to leaking private app cookies
-     * (ex. any malicious file can access cookies previously set by other (trusted) files).
-     * <p class="note">
-     * Loading content via {@code file://} URLs is generally discouraged. See the note in
-     * {@link WebSettings#setAllowFileAccess}.
-     * Using <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
-     * androidx.webkit.WebViewAssetLoader</a> to load files over {@code http(s)://} URLs allows
-     * the standard web security model to be used for setting and sharing cookies for local files.
-     * <p>
-     * Note that calls to this method will have no effect if made after calling other
-     * {@link CookieManager} APIs.
-     *
-     * @deprecated This setting is not secure, please use
-     *             <a href="{@docRoot}reference/androidx/webkit/WebViewAssetLoader.html">
-     *             androidx.webkit.WebViewAssetLoader</a> instead.
-     */
-    // Static for backward compatibility.
-    @Deprecated
-    public static void setAcceptFileSchemeCookies(boolean accept) {
-        getInstance().setAcceptFileSchemeCookiesImpl(accept);
-    }
-
-    public abstract void setAcceptFileSchemeCookiesImpl(boolean accept);
-}

AndroidCompat/src/main/java/androidx/core/net/Uri.kt

@@ -1,45 +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.
- */
-
-@file:Suppress("NOTHING_TO_INLINE") // Aliases to public API.
-
-package androidx.core.net
-
-import android.net.Uri
-import java.io.File
-
-/**
- * Creates a Uri from the given encoded URI string.
- *
- * @see Uri.parse
- */
-public inline fun String.toUri(): Uri = Uri.parse(this)
-
-/**
- * Creates a Uri from the given file.
- *
- * @see Uri.fromFile
- */
-public inline fun File.toUri(): Uri = Uri.fromFile(this)
-
-/**
- * Creates a [File] from the given [Uri]. Note that this will throw an
- * [IllegalArgumentException] when invoked on a [Uri] that lacks `file` scheme.
- */
-public fun Uri.toFile(): File {
-    require(scheme == "file") { "Uri lacks 'file' scheme: $this" }
-    return File(requireNotNull(path) { "Uri path is null: $this" })
-}

AndroidCompat/src/main/java/androidx/preference/Preference.java

@@ -22,7 +22,6 @@ public class Preference {
     @JsonIgnore
     protected Context context;
 
-    private boolean isVisible;
     private String key;
     private CharSequence title;
     private CharSequence summary;
@@ -101,14 +100,6 @@ public class Preference {
         return sharedPreferences;
     }
 
-    public void setVisible(boolean visible) {
-        isVisible = visible;
-    }
-
-    public boolean getVisible() {
-        return isVisible;
-    }
-
     /** Tachidesk specific API */
     public void setSharedPreferences(SharedPreferences sharedPreferences) {
         this.sharedPreferences = sharedPreferences;

AndroidCompat/src/main/java/app/cash/quickjs/QuickJs.java

@@ -1,99 +1,69 @@
 package app.cash.quickjs;
 
-import org.graalvm.polyglot.*;
+import org.mozilla.javascript.ConsString;
+import org.mozilla.javascript.NativeArray;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
 import java.io.Closeable;
-import java.math.BigInteger;
-import java.util.Arrays;
 
 public final class QuickJs implements Closeable {
-    private Context context;
+    private ScriptEngine engine;
 
     public static QuickJs create() {
-        return new QuickJs();
+        return new QuickJs(new ScriptEngineManager());
     }
 
-    public QuickJs() {
+    public QuickJs(ScriptEngineManager manager) {
-        this.context = Context
+        this.engine = manager.getEngineByName("rhino");
-                .newBuilder("js")
-                .allowHostAccess(HostAccess.ALL)
-                .allowPolyglotAccess(PolyglotAccess.NONE)
-                .allowHostClassLoading(false)
-                .build();
-        context.enter();
     }
 
-    public Object evaluate(String script, String ignoredFileName) {
+    public Object evaluate(String script, String fileName) {
         return this.evaluate(script);
     }
 
     public Object evaluate(String script) {
         try {
-            Value value = context.eval("js", script);
+            Object value = engine.eval(script);
             return translateType(value);
         } catch (Exception exception) {
             throw new QuickJsException(exception.getMessage(), exception);
         }
     }
 
-    private Object translateType(Value obj) {
+    private Object translateType(Object obj) {
-        if (obj.isBoolean()) {
+        if (obj instanceof NativeArray) {
-            return obj.asBoolean();
+            NativeArray array = (NativeArray) obj;
-        } else if (obj.hasArrayElements()) {
+            long length = array.getLength();
-            if (obj.getArraySize() == 0) {
+            Object[] objects = new Object[(int) length];
-                return new int[0];
+            for (int i = 0; i < (int) length; i++) {
-            } else {
+                objects[i] = translateType(array.get(i));
-                Value element = obj.getArrayElement(0);
-                if (element.isBoolean()) {
-                    return obj.as(boolean[].class);
-                } else if (element.isNumber()) {
-                    if (element.fitsInInt()) {
-                        return obj.as(int[].class);
-                    } else if (element.fitsInBigInteger()) {
-                        return Arrays.stream(obj.as(BigInteger[].class)).map(BigInteger::longValue).toArray();
-                    } else {
-                        return obj.as(double[].class);
-                    }
-                } else if (element.isHostObject()) {
-                    return obj.as(Object[].class);
-                } else if (element.isString()) {
-                    return obj.as(String[].class);
-                }
             }
-        } else if (obj.isNumber()) {
+            return objects;
-            if (obj.fitsInInt()) {
+        }
-                return obj.asInt();
+        if (obj instanceof ConsString) {
-            } else if (obj.fitsInBigInteger()) {
+            ConsString consString = (ConsString) obj;
-                return obj.asBigInteger().longValue();
+            return consString.toString();
-            } else {
+        }
-                return obj.asDouble();
+        if (obj instanceof Long) {
-            }
+            Long value = (Long) obj;
-        } else if (obj.isHostObject()) {
+            return value.intValue();
-            return obj.asHostObject();
-        } else if (obj.isString()) {
-            return obj.asString();
         }
         return obj;
     }
 
-    public byte[] compile(String sourceCode, String ignoredFileName) {
+    public byte[] compile(String sourceCode, String fileName) {
         return sourceCode.getBytes();
     }
 
+
     public Object execute(byte[] bytecode) {
         return this.evaluate(new String(bytecode));
     }
 
-    public <T> void set(String name, Class<T> ignoredType, T object) {
-        context.getBindings("js").putMember(name, object);
-    }
 
     @Override
     public void close() {
-        if (this.context != null) {
+        this.engine = null;
-            this.context.leave();
-            this.context.close();
-            this.context = null;
-        }
     }
 }

AndroidCompat/src/main/java/dalvik/system/BaseDexClassLoader.java

@@ -17,7 +17,7 @@ package dalvik.system;
 
 import org.jetbrains.annotations.Nullable;
 import xyz.nulldev.androidcompat.pm.PackageController;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,7 @@ import java.util.Enumeration;
  * {@link ClassLoader} implementations.
  */
 public class BaseDexClassLoader extends ClassLoader {
-    private PackageController controller = KoinGlobalHelper.instance(PackageController.class);
+    private PackageController controller = KodeinGlobalHelper.instance(PackageController.class);
 
     private final URLClassLoader realClassloader;
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompat.kt

@@ -1,11 +1,14 @@
 package xyz.nulldev.androidcompat
 
 import android.app.Application
-import org.koin.mp.KoinPlatformTools
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import xyz.nulldev.androidcompat.androidimpl.CustomContext
 
 class AndroidCompat {
-    val context: CustomContext by KoinPlatformTools.defaultContext().get().inject()
+
+    val context: CustomContext by DI.global.instance()
 
     fun startApp(application: Application) {
         application.attach(context)

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt

@@ -1,5 +1,7 @@
 package xyz.nulldev.androidcompat
 
+import org.kodein.di.DI
+import org.kodein.di.conf.global
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.androidcompat.config.FilesConfigModule
 import xyz.nulldev.androidcompat.config.SystemConfigModule
@@ -10,17 +12,16 @@ import xyz.nulldev.ts.config.GlobalConfigManager
  */
 class AndroidCompatInitializer {
     fun init() {
+        DI.global.addImport(AndroidCompatModule().create())
+
         // Register config modules
         GlobalConfigManager.registerModules(
             FilesConfigModule.register(GlobalConfigManager.config),
             ApplicationInfoConfigModule.register(GlobalConfigManager.config),
-            SystemConfigModule.register(GlobalConfigManager.config),
+            SystemConfigModule.register(GlobalConfigManager.config)
         )
 
         // Set some properties extensions use
-        System.setProperty(
+        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")
-            "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",
-        )
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatModule.kt

@@ -1,8 +1,11 @@
 package xyz.nulldev.androidcompat
 
 import android.content.Context
-import org.koin.core.module.Module
+import org.kodein.di.DI
-import org.koin.dsl.module
+import org.kodein.di.bind
+import org.kodein.di.conf.global
+import org.kodein.di.instance
+import org.kodein.di.singleton
 import xyz.nulldev.androidcompat.androidimpl.CustomContext
 import xyz.nulldev.androidcompat.androidimpl.FakePackageManager
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl
@@ -14,19 +17,23 @@ import xyz.nulldev.androidcompat.service.ServiceSupport
  * AndroidCompatModule
  */
 
-fun androidCompatModule(): Module =
+class AndroidCompatModule {
-    module {
+    fun create() = DI.Module("AndroidCompat") {
-        single { AndroidFiles() }
+        bind<AndroidFiles>() with singleton { AndroidFiles() }
 
-        single { ApplicationInfoImpl(get()) }
+        bind<ApplicationInfoImpl>() with singleton { ApplicationInfoImpl() }
 
-        single { ServiceSupport() }
+        bind<ServiceSupport>() with singleton { ServiceSupport() }
 
-        single { FakePackageManager() }
+        bind<FakePackageManager>() with singleton { FakePackageManager() }
 
-        single { PackageController() }
+        bind<PackageController>() with singleton { PackageController() }
 
-        single { CustomContext() }
+        // Context
-
+        bind<CustomContext>() with singleton { CustomContext() }
-        single<Context> { get<CustomContext>() }
+        bind<Context>() with singleton {
+            val context: Context by DI.global.instance<CustomContext>()
+            context
+        }
     }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java

@@ -32,14 +32,15 @@ import android.os.*;
 import android.view.Display;
 import android.view.DisplayAdjustments;
 import org.jetbrains.annotations.NotNull;
-import org.koin.core.Koin;
+import org.jetbrains.annotations.Nullable;
+import org.kodein.di.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
 import xyz.nulldev.androidcompat.io.AndroidFiles;
 import xyz.nulldev.androidcompat.io.sharedprefs.JavaSharedPreferences;
 import xyz.nulldev.androidcompat.service.ServiceSupport;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.io.*;
 import java.util.HashMap;
@@ -50,25 +51,26 @@ import java.util.Map;
  * Custom context implementation.
  *
  */
-public class CustomContext extends Context {
+public class CustomContext extends Context implements DIAware {
-    private final Koin koin;
+    private final DI kodein;
     public CustomContext() {
-        this(KoinGlobalHelper.koin());
+        this(KodeinGlobalHelper.kodein());
     }
 
-    public CustomContext(Koin koin) {
+    public CustomContext(DI kodein) {
-        this.koin = koin;
+        this.kodein = kodein;
 
         //Init configs
-        androidFiles = KoinGlobalHelper.instance(AndroidFiles.class, getDi());
+        androidFiles = KodeinGlobalHelper.instance(AndroidFiles.class, getDi());
-        applicationInfo = KoinGlobalHelper.instance(ApplicationInfoImpl.class, getDi());
+        applicationInfo = KodeinGlobalHelper.instance(ApplicationInfoImpl.class, getDi());
-        serviceSupport = KoinGlobalHelper.instance(ServiceSupport.class, getDi());
+        serviceSupport = KodeinGlobalHelper.instance(ServiceSupport.class, getDi());
-        fakePackageManager = KoinGlobalHelper.instance(FakePackageManager.class, getDi());
+        fakePackageManager = KodeinGlobalHelper.instance(FakePackageManager.class, getDi());
     }
 
     @NotNull
-    public Koin getDi() {
+    @Override
-        return koin;
+    public DI getDi() {
+        return kodein;
     }
 
     private AndroidFiles androidFiles;
@@ -717,5 +719,17 @@ public class CustomContext extends Context {
     public boolean isCredentialProtectedStorage() {
         return false;
     }
+
+    @NotNull
+    @Override
+    public DIContext<?> getDiContext() {
+        return getDi().getDiContext();
+    }
+
+    @Nullable
+    @Override
+    public DITrigger getDiTrigger() {
+        return null;
+    }
 }
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/FakePackageManager.java

@@ -16,14 +16,14 @@ import android.os.UserHandle;
 import kotlin.NotImplementedError;
 import xyz.nulldev.androidcompat.pm.InstalledPackage;
 import xyz.nulldev.androidcompat.pm.PackageController;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class FakePackageManager extends PackageManager {
-    private PackageController controller = KoinGlobalHelper.instance(PackageController.class);
+    private PackageController controller = KodeinGlobalHelper.instance(PackageController.class);
 
     @Override
     public PackageInfo getPackageInfo(String packageName, int flags) throws NameNotFoundException {

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt

@@ -8,13 +8,12 @@ import xyz.nulldev.ts.config.ConfigModule
  * Application info config.
  */
 
-class ApplicationInfoConfigModule(
+class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) {
-    getConfig: () -> Config,
+    val packageName: String by config
-) : ConfigModule(getConfig) {
+    val debug: Boolean by config
-    val packageName: String by getConfig()
-    val debug: Boolean by getConfig()
 
     companion object {
-        fun register(config: Config) = ApplicationInfoConfigModule { config.getConfig("android.app") }
+        fun register(config: Config) =
+            ApplicationInfoConfigModule(config.getConfig("android.app"))
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt

@@ -8,28 +8,27 @@ import xyz.nulldev.ts.config.ConfigModule
  * Files configuration modules. Specifies where to store the Android files.
  */
 
-class FilesConfigModule(
+class FilesConfigModule(config: Config) : ConfigModule(config) {
-    getConfig: () -> Config,
+    val dataDir: String by config
-) : ConfigModule(getConfig) {
+    val filesDir: String by config
-    val dataDir: String by getConfig()
+    val noBackupFilesDir: String by config
-    val filesDir: String by getConfig()
+    val externalFilesDirs: MutableList<String> by config
-    val noBackupFilesDir: String by getConfig()
+    val obbDirs: MutableList<String> by config
-    val externalFilesDirs: MutableList<String> by getConfig()
+    val cacheDir: String by config
-    val obbDirs: MutableList<String> by getConfig()
+    val codeCacheDir: String by config
-    val cacheDir: String by getConfig()
+    val externalCacheDirs: MutableList<String> by config
-    val codeCacheDir: String by getConfig()
+    val externalMediaDirs: MutableList<String> by config
-    val externalCacheDirs: MutableList<String> by getConfig()
+    val rootDir: String by config
-    val externalMediaDirs: MutableList<String> by getConfig()
+    val externalStorageDir: String by config
-    val rootDir: String by getConfig()
+    val downloadCacheDir: String by config
-    val externalStorageDir: String by getConfig()
+    val databasesDir: String by config
-    val downloadCacheDir: String by getConfig()
-    val databasesDir: String by getConfig()
 
-    val prefsDir: String by getConfig()
+    val prefsDir: String by config
 
-    val packageDir: String by getConfig()
+    val packageDir: String by config
 
     companion object {
-        fun register(config: Config) = FilesConfigModule { config.getConfig("android.files") }
+        fun register(config: Config) =
+            FilesConfigModule(config.getConfig("android.files"))
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt

@@ -4,24 +4,19 @@ import com.typesafe.config.Config
 import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
-class SystemConfigModule(
+class SystemConfigModule(val config: Config) : ConfigModule(config) {
-    val getConfig: () -> Config,
+    val isDebuggable: Boolean by config
-) : ConfigModule(getConfig) {
-    val isDebuggable: Boolean by getConfig()
 
     val propertyPrefix = "properties."
 
-    fun getStringProperty(property: String) = getConfig().getString("$propertyPrefix$property")!!
+    fun getStringProperty(property: String) = config.getString("$propertyPrefix$property")!!
-
+    fun getIntProperty(property: String) = config.getInt("$propertyPrefix$property")
-    fun getIntProperty(property: String) = getConfig().getInt("$propertyPrefix$property")
+    fun getLongProperty(property: String) = config.getLong("$propertyPrefix$property")
-
+    fun getBooleanProperty(property: String) = config.getBoolean("$propertyPrefix$property")
-    fun getLongProperty(property: String) = getConfig().getLong("$propertyPrefix$property")
+    fun hasProperty(property: String) = config.hasPath("$propertyPrefix$property")
-
-    fun getBooleanProperty(property: String) = getConfig().getBoolean("$propertyPrefix$property")
-
-    fun hasProperty(property: String) = getConfig().hasPath("$propertyPrefix$property")
 
     companion object {
-        fun register(config: Config) = SystemConfigModule { config.getConfig("android.system") }
+        fun register(config: Config) =
+            SystemConfigModule(config.getConfig("android.system"))
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/info/ApplicationInfoImpl.kt

@@ -1,12 +1,16 @@
 package xyz.nulldev.androidcompat.info
 
 import android.content.pm.ApplicationInfo
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.ts.config.ConfigManager
 
-class ApplicationInfoImpl(
+class ApplicationInfoImpl(override val di: DI = DI.global) : ApplicationInfo(), DIAware {
-    private val configManager: ConfigManager,
+    val configManager: ConfigManager by di.instance()
-) : ApplicationInfo() {
+
     val appInfoConfig: ApplicationInfoConfigModule
         get() = configManager.module()
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt

@@ -8,9 +8,7 @@ import java.io.File
 /**
  * Android file constants.
  */
-class AndroidFiles(
+class AndroidFiles(val configManager: ConfigManager = GlobalConfigManager) {
-    val configManager: ConfigManager = GlobalConfigManager,
-) {
     val filesConfig: FilesConfigModule
         get() = configManager.module()
 
@@ -32,8 +30,9 @@ class AndroidFiles(
 
     val packagesDir: File get() = registerFile(filesConfig.packageDir)
 
-    fun registerFile(file: String): File =
+    fun registerFile(file: String): File {
-        File(file).apply {
+        return File(file).apply {
             mkdirs()
         }
+    }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt

@@ -9,87 +9,37 @@ package xyz.nulldev.androidcompat.io.sharedprefs
 
 import android.content.SharedPreferences
 import com.russhwolf.settings.ExperimentalSettingsApi
-import com.russhwolf.settings.PropertiesSettings
+import com.russhwolf.settings.PreferencesSettings
-import com.russhwolf.settings.Settings
 import com.russhwolf.settings.serialization.decodeValue
 import com.russhwolf.settings.serialization.decodeValueOrNull
 import com.russhwolf.settings.serialization.encodeValue
-import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.builtins.SetSerializer
 import kotlinx.serialization.builtins.serializer
-import xyz.nulldev.androidcompat.util.SafePath
+import java.util.prefs.PreferenceChangeListener
-import xyz.nulldev.ts.config.ApplicationRootDir
+import java.util.prefs.Preferences
-import java.util.Properties
-import kotlin.io.path.Path
-import kotlin.io.path.createParentDirectories
-import kotlin.io.path.deleteIfExists
-import kotlin.io.path.exists
-import kotlin.io.path.inputStream
-import kotlin.io.path.outputStream
 
 @OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
-class JavaSharedPreferences(
+class JavaSharedPreferences(key: String) : SharedPreferences {
-    key: String,
+    private val javaPreferences = Preferences.userRoot().node("suwayomi/tachidesk/$key")
-) : SharedPreferences {
+    private val preferences = PreferencesSettings(javaPreferences)
-    companion object {
+    private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, PreferenceChangeListener>()
-        private val logger = KotlinLogging.logger {}
-    }
-
-    private val file =
-        Path(
-            ApplicationRootDir,
-            "settings",
-            "${SafePath.buildValidFilename(key)}.xml",
-        )
-    private val properties =
-        Properties().also { properties ->
-            try {
-                if (file.exists()) {
-                    file.inputStream().use { properties.loadFromXML(it) }
-                }
-            } catch (e: Exception) {
-                logger.error(e) { "Error loading settings from $key" }
-            }
-        }
-    private val preferences =
-        PropertiesSettings(
-            properties,
-            onModify = { properties ->
-                try {
-                    if (properties.isEmpty) {
-                        file.deleteIfExists()
-                    } else {
-                        file.createParentDirectories()
-                        file.outputStream().use {
-                            properties.storeToXML(it, null)
-                        }
-                    }
-                } catch (e: Exception) {
-                    logger.error(e) { "Error saving settings in $key" }
-                }
-            },
-        )
-    private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, (String) -> Unit>()
 
     // TODO: 2021-05-29 Need to find a way to get this working with all pref types
-    override fun getAll(): MutableMap<String, *> = preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()
+    override fun getAll(): MutableMap<String, *> {
+        return preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()
+    }
 
-    override fun getString(
+    override fun getString(key: String, defValue: String?): String? {
-        key: String,
+        return if (defValue != null) {
-        defValue: String?,
-    ): String? =
-        if (defValue != null) {
             preferences.getString(key, defValue)
         } else {
             preferences.getStringOrNull(key)
         }
+    }
 
-    override fun getStringSet(
+    override fun getStringSet(key: String, defValues: Set<String>?): Set<String>? {
-        key: String,
-        defValues: Set<String>?,
-    ): Set<String>? {
         try {
             return if (defValues != null) {
                 preferences.decodeValue(SetSerializer(String.serializer()), key, defValues)
@@ -101,58 +51,40 @@ class JavaSharedPreferences(
         }
     }
 
-    override fun getInt(
+    override fun getInt(key: String, defValue: Int): Int {
-        key: String,
+        return preferences.getInt(key, defValue)
-        defValue: Int,
+    }
-    ): Int = preferences.getInt(key, defValue)
 
-    override fun getLong(
+    override fun getLong(key: String, defValue: Long): Long {
-        key: String,
+        return preferences.getLong(key, defValue)
-        defValue: Long,
+    }
-    ): Long = preferences.getLong(key, defValue)
 
-    override fun getFloat(
+    override fun getFloat(key: String, defValue: Float): Float {
-        key: String,
+        return preferences.getFloat(key, defValue)
-        defValue: Float,
+    }
-    ): Float = preferences.getFloat(key, defValue)
 
-    override fun getBoolean(
+    override fun getBoolean(key: String, defValue: Boolean): Boolean {
-        key: String,
+        return preferences.getBoolean(key, defValue)
-        defValue: Boolean,
+    }
-    ): Boolean = preferences.getBoolean(key, defValue)
 
-    override fun contains(key: String): Boolean = key in preferences.keys
+    override fun contains(key: String): Boolean {
+        return key in preferences.keys
+    }
 
-    override fun edit(): SharedPreferences.Editor =
+    override fun edit(): SharedPreferences.Editor {
-        Editor(preferences) { key ->
+        return Editor(preferences)
-            listeners.forEach { (_, listener) ->
+    }
-                listener(key)
-            }
-        }
 
-    class Editor(
+    class Editor(private val preferences: PreferencesSettings) : SharedPreferences.Editor {
-        private val preferences: Settings,
-        private val notify: (String) -> Unit,
-    ) : SharedPreferences.Editor {
         private val actions = mutableListOf<Action>()
 
         private sealed class Action {
-            data class Add(
+            data class Add(val key: String, val value: Any) : Action()
-                val key: String,
+            data class Remove(val key: String) : Action()
-                val value: Any,
+            object Clear : Action()
-            ) : Action()
-
-            data class Remove(
-                val key: String,
-            ) : Action()
-
-            data object Clear : Action()
         }
 
-        override fun putString(
+        override fun putString(key: String, value: String?): SharedPreferences.Editor {
-            key: String,
-            value: String?,
-        ): SharedPreferences.Editor {
             if (value != null) {
                 actions += Action.Add(key, value)
             } else {
@@ -163,7 +95,7 @@ class JavaSharedPreferences(
 
         override fun putStringSet(
             key: String,
-            values: MutableSet<String>?,
+            values: MutableSet<String>?
         ): SharedPreferences.Editor {
             if (values != null) {
                 actions += Action.Add(key, values)
@@ -173,34 +105,22 @@ class JavaSharedPreferences(
             return this
         }
 
-        override fun putInt(
+        override fun putInt(key: String, value: Int): SharedPreferences.Editor {
-            key: String,
-            value: Int,
-        ): SharedPreferences.Editor {
             actions += Action.Add(key, value)
             return this
         }
 
-        override fun putLong(
+        override fun putLong(key: String, value: Long): SharedPreferences.Editor {
-            key: String,
-            value: Long,
-        ): SharedPreferences.Editor {
             actions += Action.Add(key, value)
             return this
         }
 
-        override fun putFloat(
+        override fun putFloat(key: String, value: Float): SharedPreferences.Editor {
-            key: String,
-            value: Float,
-        ): SharedPreferences.Editor {
             actions += Action.Add(key, value)
             return this
         }
 
-        override fun putBoolean(
+        override fun putBoolean(key: String, value: Boolean): SharedPreferences.Editor {
-            key: String,
-            value: Boolean,
-        ): SharedPreferences.Editor {
             actions += Action.Add(key, value)
             return this
         }
@@ -228,17 +148,14 @@ class JavaSharedPreferences(
             actions.forEach {
                 @Suppress("UNCHECKED_CAST")
                 when (it) {
-                    is Action.Add -> {
+                    is Action.Add -> when (val value = it.value) {
-                        when (val value = it.value) {
+                        is Set<*> -> preferences.encodeValue(SetSerializer(String.serializer()), it.key, value as Set<String>)
-                            is Set<*> -> preferences.encodeValue(SetSerializer(String.serializer()), it.key, value as Set<String>)
+                        is String -> preferences.putString(it.key, value)
-                            is String -> preferences.putString(it.key, value)
+                        is Int -> preferences.putInt(it.key, value)
-                            is Int -> preferences.putInt(it.key, value)
+                        is Long -> preferences.putLong(it.key, value)
-                            is Long -> preferences.putLong(it.key, value)
+                        is Float -> preferences.putFloat(it.key, value)
-                            is Float -> preferences.putFloat(it.key, value)
+                        is Double -> preferences.putDouble(it.key, value)
-                            is Double -> preferences.putDouble(it.key, value)
+                        is Boolean -> preferences.putBoolean(it.key, value)
-                            is Boolean -> preferences.putBoolean(it.key, value)
-                        }
-                        notify(it.key)
                     }
                     is Action.Remove -> {
                         preferences.remove(it.key)
@@ -253,8 +170,6 @@ class JavaSharedPreferences(
                                 preferences.remove(key)
                             }
                         }
-
-                        notify(it.key)
                     }
                     Action.Clear -> preferences.clear()
                 }
@@ -263,18 +178,22 @@ class JavaSharedPreferences(
     }
 
     override fun registerOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
-        val javaListener: (String) -> Unit = {
+        val javaListener = PreferenceChangeListener {
-            listener.onSharedPreferenceChanged(this, it)
+            listener.onSharedPreferenceChanged(this, it.key)
         }
         listeners[listener] = javaListener
+        javaPreferences.addPreferenceChangeListener(javaListener)
     }
 
     override fun unregisterOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
-        listeners.remove(listener)
+        val registeredListener = listeners.remove(listener)
+        if (registeredListener != null) {
+            javaPreferences.removePreferenceChangeListener(registeredListener)
+        }
     }
 
     fun deleteAll(): Boolean {
-        preferences.clear()
+        javaPreferences.removeNode()
         return true
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt

@@ -14,60 +14,48 @@ import java.io.File
 import javax.imageio.ImageIO
 import javax.xml.parsers.DocumentBuilderFactory
 
-data class InstalledPackage(
+data class InstalledPackage(val root: File) {
-    val root: File,
-) {
     val apk = File(root, "package.apk")
     val jar = File(root, "translated.jar")
     val icon = File(root, "icon.png")
 
     val info: PackageInfo
-        get() =
+        get() = ApkParsers.getMetaInfo(apk).toPackageInfo(apk).also {
-            ApkParsers.getMetaInfo(apk).toPackageInfo(apk).also {
+            val parsed = ApkFile(apk)
-                val parsed = ApkFile(apk)
+            val dbFactory = DocumentBuilderFactory.newInstance()
-                val dbFactory = DocumentBuilderFactory.newInstance()
+            val dBuilder = dbFactory.newDocumentBuilder()
-                val dBuilder = dbFactory.newDocumentBuilder()
+            val doc = parsed.manifestXml.byteInputStream().use {
-                val doc =
+                dBuilder.parse(it)
-                    parsed.manifestXml.byteInputStream().use {
-                        dBuilder.parse(it)
-                    }
-
-                it.applicationInfo.metaData =
-                    Bundle().apply {
-                        val appTag = doc.getElementsByTagName("application").item(0)
-
-                        appTag
-                            ?.childNodes
-                            ?.toList()
-                            ?.filter {
-                                it.nodeType == Node.ELEMENT_NODE
-                            }?.map {
-                                it as Element
-                            }?.filter {
-                                it.tagName == "meta-data"
-                            }?.map {
-                                putString(
-                                    it.attributes.getNamedItem("android:name").nodeValue,
-                                    it.attributes.getNamedItem("android:value").nodeValue,
-                                )
-                            }
-                    }
-
-                it.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()
             }
 
+            it.applicationInfo.metaData = Bundle().apply {
+                val appTag = doc.getElementsByTagName("application").item(0)
+
+                appTag?.childNodes?.toList()?.filter {
+                    it.nodeType == Node.ELEMENT_NODE
+                }?.map {
+                    it as Element
+                }?.filter {
+                    it.tagName == "meta-data"
+                }?.map {
+                    putString(
+                        it.attributes.getNamedItem("android:name").nodeValue,
+                        it.attributes.getNamedItem("android:value").nodeValue
+                    )
+                }
+            }
+
+            it.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 verify(): Boolean {
-        val res =
+        val res = ApkVerifier.Builder(apk)
-            ApkVerifier
+            .build()
-                .Builder(apk)
+            .verify()
-                .build()
-                .verify()
 
         return res.isVerified
     }
@@ -76,15 +64,11 @@ data class InstalledPackage(
         try {
             val icons = ApkFile(apk).allIcons
 
-            val read =
+            val read = icons.filter { it.isFile }.map {
-                icons
+                it.data.inputStream().use {
-                    .filter { it.isFile }
+                    ImageIO.read(it)
-                    .map {
+                }
-                        it.data.inputStream().use {
+            }.sortedByDescending { it.width * it.height }.firstOrNull() ?: return
-                            ImageIO.read(it)
-                        }
-                    }.sortedByDescending { it.width * it.height }
-                    .firstOrNull() ?: return
 
             ImageIO.write(read, "png", icon)
         } catch (e: Exception) {
@@ -104,9 +88,8 @@ data class InstalledPackage(
         fun NodeList.toList(): List<Node> {
             val out = mutableListOf<Node>()
 
-            for (i in 0 until length) {
+            for (i in 0 until length)
                 out += item(i)
-            }
 
             return out
         }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt

@@ -1,12 +1,14 @@
 package xyz.nulldev.androidcompat.pm
 
 import net.dongliu.apk.parser.ApkParsers
-import org.koin.mp.KoinPlatformTools
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import xyz.nulldev.androidcompat.io.AndroidFiles
 import java.io.File
 
 class PackageController {
-    private val androidFiles: AndroidFiles by KoinPlatformTools.defaultContext().get().inject()
+    private val androidFiles by DI.global.instance<AndroidFiles>()
     private val uninstallListeners = mutableListOf<(String) -> Unit>()
 
     fun registerUninstallListener(listener: (String) -> Unit) {
@@ -23,10 +25,7 @@ class PackageController {
         return File(androidFiles.packagesDir, pn)
     }
 
-    fun installPackage(
+    fun installPackage(apk: File, allowReinstall: Boolean) {
-        apk: File,
-        allowReinstall: Boolean,
-    ) {
         val root = findRoot(apk)
 
         if (root.exists()) {
@@ -55,15 +54,13 @@ class PackageController {
         }
     }
 
-    fun listInstalled(): List<InstalledPackage> =
+    fun listInstalled(): List<InstalledPackage> {
-        androidFiles.packagesDir
+        return androidFiles.packagesDir.listFiles().orEmpty().filter {
-            .listFiles()
+            it.isDirectory
-            .orEmpty()
+        }.map {
-            .filter {
+            InstalledPackage(it)
-                it.isDirectory
+        }
-            }.map {
+    }
-                InstalledPackage(it)
-            }
 
     fun deletePackage(pack: InstalledPackage) {
         if (!pack.root.exists()) error("Package was never installed!")

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt

@@ -6,24 +6,22 @@ import android.content.pm.PackageInfo
 import net.dongliu.apk.parser.bean.ApkMeta
 import java.io.File
 
-fun ApkMeta.toPackageInfo(apk: File): PackageInfo =
+fun ApkMeta.toPackageInfo(apk: File): PackageInfo {
-    PackageInfo().also {
+    return PackageInfo().also {
         it.packageName = packageName
         it.versionCode = versionCode.toInt()
         it.versionName = versionName
 
-        it.reqFeatures =
+        it.reqFeatures = usesFeatures.map {
-            usesFeatures
+            FeatureInfo().apply {
-                .map {
+                name = it.name
-                    FeatureInfo().apply {
-                        name = it.name
-                    }
-                }.toTypedArray()
-
-        it.applicationInfo =
-            ApplicationInfo().apply {
-                packageName = it.packageName
-                nonLocalizedLabel = label
-                sourceDir = apk.absolutePath
             }
+        }.toTypedArray()
+
+        it.applicationInfo = ApplicationInfo().apply {
+            packageName = it.packageName
+            nonLocalizedLabel = label
+            sourceDir = apk.absolutePath
+        }
     }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/BuildConfigCompat.java

@@ -1,7 +1,7 @@
 package xyz.nulldev.androidcompat.res;
 
 import xyz.nulldev.androidcompat.info.ApplicationInfoImpl;
-import xyz.nulldev.androidcompat.util.KoinGlobalHelper;
+import xyz.nulldev.androidcompat.util.KodeinGlobalHelper;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -10,7 +10,7 @@ import java.util.Calendar;
  * BuildConfig compat class.
  */
 public class BuildConfigCompat {
-    private static ApplicationInfoImpl applicationInfo = KoinGlobalHelper.instance(ApplicationInfoImpl.class);
+    private static ApplicationInfoImpl applicationInfo = KodeinGlobalHelper.instance(ApplicationInfoImpl.class);
 
     public static final boolean DEBUG = applicationInfo.getDebug();
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/DrawableResource.kt

@@ -1,8 +1,6 @@
 package xyz.nulldev.androidcompat.res
 
-class DrawableResource(
+class DrawableResource(val location: String) : Resource {
-    val location: String,
-) : Resource {
     override fun getType() = DrawableResource::class.java
 
     override fun getValue() = javaClass.getResourceAsStream(location)

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/StringResource.kt

@@ -19,9 +19,7 @@ package xyz.nulldev.androidcompat.res
 /**
  * String resource.
  */
-class StringResource(
+class StringResource(val string: String) : Resource {
-    val string: String,
-) : Resource {
     override fun getValue() = string
 
     override fun getType() = StringResource::class.java

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/service/ServiceSupport.kt

@@ -3,7 +3,7 @@ package xyz.nulldev.androidcompat.service
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import io.github.oshai.kotlinlogging.KotlinLogging
+import mu.KotlinLogging
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.concurrent.thread
 
@@ -18,10 +18,7 @@ class ServiceSupport {
 
     private val logger = KotlinLogging.logger {}
 
-    fun startService(
+    fun startService(@Suppress("UNUSED_PARAMETER") context: Context, intent: Intent) {
-        @Suppress("UNUSED_PARAMETER") context: Context,
-        intent: Intent,
-    ) {
         val name = intentToClassName(intent)
 
         logger.debug { "Starting service: $name" }
@@ -38,10 +35,7 @@ class ServiceSupport {
         }
     }
 
-    fun stopService(
+    fun stopService(@Suppress("UNUSED_PARAMETER") context: Context, intent: Intent) {
-        @Suppress("UNUSED_PARAMETER") context: Context,
-        intent: Intent,
-    ) {
         val name = intentToClassName(intent)
         stopService(name)
     }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt

@@ -0,0 +1,67 @@
+package xyz.nulldev.androidcompat.util
+
+import android.content.Context
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import org.kodein.di.instance
+import xyz.nulldev.androidcompat.androidimpl.CustomContext
+import xyz.nulldev.androidcompat.androidimpl.FakePackageManager
+import xyz.nulldev.androidcompat.info.ApplicationInfoImpl
+import xyz.nulldev.androidcompat.io.AndroidFiles
+import xyz.nulldev.androidcompat.pm.PackageController
+import xyz.nulldev.androidcompat.service.ServiceSupport
+
+/**
+ * Helper class to allow access to Kodein from Java
+ */
+object KodeinGlobalHelper {
+    /**
+     * Get the Kodein object
+     */
+    @JvmStatic
+    fun kodein() = DI.global
+
+    /**
+     * Get a dependency
+     */
+    @JvmStatic
+    @Suppress("UNCHECKED_CAST")
+    fun <T : Any> instance(type: Class<T>, kodein: DI? = null): T {
+        return when (type) {
+            AndroidFiles::class.java -> {
+                val instance: AndroidFiles by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            ApplicationInfoImpl::class.java -> {
+                val instance: ApplicationInfoImpl by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            ServiceSupport::class.java -> {
+                val instance: ServiceSupport by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            FakePackageManager::class.java -> {
+                val instance: FakePackageManager by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            PackageController::class.java -> {
+                val instance: PackageController by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            CustomContext::class.java -> {
+                val instance: CustomContext by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            Context::class.java -> {
+                val instance: Context by (kodein ?: kodein()).instance()
+                instance as T
+            }
+            else -> throw IllegalArgumentException("Kodein instance not found")
+        }
+    }
+
+    @JvmStatic
+    fun <T : Any> instance(type: Class<T>): T {
+        return instance(type, null)
+    }
+}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KoinGlobalHelper.kt

@@ -1,27 +0,0 @@
-package xyz.nulldev.androidcompat.util
-
-import org.koin.core.Koin
-import org.koin.mp.KoinPlatformTools
-
-/**
- * Helper class to allow access to Kodein from Java
- */
-object KoinGlobalHelper {
-    /**
-     * Get the Kodein object
-     */
-    @JvmStatic
-    fun koin() = KoinPlatformTools.defaultContext().get()
-
-    /**
-     * Get a dependency
-     */
-    @JvmStatic
-    fun <T : Any> instance(
-        type: Class<T>,
-        koin: Koin? = null,
-    ): T = (koin ?: koin()).get(type.kotlin)
-
-    @JvmStatic
-    fun <T : Any> instance(type: Class<T>): T = instance(type, null)
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/UriExtensions.kt

@@ -24,7 +24,5 @@ import java.net.URI
  * Utilites to convert between Java and Android Uris.
  */
 fun Uri.java() = URI(this.toString())
-
 fun Uri.file() = File(this.path)
-
 fun URI.android() = Uri.parse(this.toString())!!

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CookieManagerImpl.kt

@@ -1,96 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import android.webkit.CookieManager
-import android.webkit.ValueCallback
-import android.webkit.WebView
-import java.net.CookieHandler
-import java.net.HttpCookie
-import java.net.URI
-
-@Suppress("DEPRECATION")
-class CookieManagerImpl : CookieManager() {
-    private val cookieHandler = CookieHandler.getDefault() as java.net.CookieManager
-    private var acceptCookie = true
-    private var acceptThirdPartyCookies = true
-    private var allowFileSchemeCookies = false
-
-    override fun setAcceptCookie(accept: Boolean) {
-        acceptCookie = accept
-    }
-
-    override fun acceptCookie(): Boolean = acceptCookie
-
-    override fun setAcceptThirdPartyCookies(
-        webview: WebView?,
-        accept: Boolean,
-    ) {
-        acceptThirdPartyCookies = accept
-    }
-
-    override fun acceptThirdPartyCookies(webview: WebView?): Boolean = acceptThirdPartyCookies
-
-    override fun setCookie(
-        url: String,
-        value: String?,
-    ) {
-        val uri =
-            if (url.startsWith("http")) {
-                URI(url)
-            } else {
-                URI("http://$url")
-            }
-
-        HttpCookie.parse(value).forEach {
-            cookieHandler.cookieStore.add(uri, it)
-        }
-    }
-
-    override fun setCookie(
-        url: String,
-        value: String?,
-        callback: ValueCallback<Boolean>?,
-    ) {
-        setCookie(url, value)
-        callback?.onReceiveValue(true)
-    }
-
-    override fun getCookie(url: String): String {
-        val uri =
-            if (url.startsWith("http")) {
-                URI(url)
-            } else {
-                URI("http://$url")
-            }
-        return cookieHandler.cookieStore
-            .get(uri)
-            .joinToString("; ") { "${it.name}=${it.value}" }
-    }
-
-    @Deprecated("Deprecated in Java")
-    override fun removeSessionCookie() {}
-
-    override fun removeSessionCookies(callback: ValueCallback<Boolean>?) {}
-
-    @Deprecated("Deprecated in Java")
-    override fun removeExpiredCookie() {}
-
-    @Deprecated("Deprecated in Java")
-    override fun removeAllCookie() {
-        cookieHandler.cookieStore.removeAll()
-    }
-
-    override fun removeAllCookies(callback: ValueCallback<Boolean>?) {
-        val removedCookies = cookieHandler.cookieStore.removeAll()
-        callback?.onReceiveValue(removedCookies)
-    }
-
-    override fun hasCookies(): Boolean = cookieHandler.cookieStore.cookies.isNotEmpty()
-
-    override fun flush() {}
-
-    override fun allowFileSchemeCookiesImpl(): Boolean = allowFileSchemeCookies
-
-    override fun setAcceptFileSchemeCookiesImpl(accept: Boolean) {
-        allowFileSchemeCookies = acceptCookie
-    }
-}

CHANGELOG-TEMPLATE.md

@@ -2,10 +2,10 @@
 ## TL;DR
 - N/A
 
-## Suwayomi-Server Changelog
+## Tachidesk-Server Changelog
 - N/A
 
-## Suwayomi-WebUI Changelog
+## Tachidesk-WebUI Changelog
 - N/A
 
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 ## Where should I start?
-Checkout [This Kanban Board](https://github.com/Suwayomi/Suwayomi-Server/projects/1) to see the rough development roadmap.
+Checkout [This Kanban Board](https://github.com/Suwayomi/Tachidesk/projects/1) to see the rough development roadmap.
 
 ### Important notes
 - Notify the developers on [Suwayomi discord](https://discord.gg/DDZdqZWaHA) (#tachidesk-server and #tachidesk-webui channels) or open a WIP pull request before starting if you decide to take on working on anything from/not from the roadmap in order to avoid parallel efforts on the same issue/feature.
@@ -8,54 +8,25 @@ Checkout [This Kanban Board](https://github.com/Suwayomi/Suwayomi-Server/project
 - We hate big pull requests, make them as small as possible, change one meaningful thing. Spam pull requests, we don't mind.
 
 ### Project goals and vision
-- Porting Mihon (Tachiyomi) and covering its features
+- Porting Tachiyomi and covering it's features
-- Syncing with Mihon (Tachiyomi), [main issue](https://github.com/Suwayomi/Suwayomi-Server/issues/159)
+- Syncing with Tachiyomi, [main issue](https://github.com/Suwayomi/Tachidesk-Server/issues/159)
-- Generally rejecting features that Mihon (Tachiyomi) (main app) doesn't have,
+- Generally rejecting features that Tachiyomi(main app) doesn't have,
     - Unless it's something that makes sense for desktop sizes or desktop form factor (keyboard + mouse)
     - Additional/crazy features can go in forks and alternative clients
-- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI) should
+- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) should
     - be responsive
     - support both desktop and mobile form factors well
      
-## How does Suwayomi-Server work?
+## How does Tachidesk-Server work?
 This project has two components: 
-1. **Server:** contains the implementation of [Mihon (Tachiyomi)'s source library](https://github.com/mihonapp/mihon/tree/main/source-api) and uses an Android compatibility library to run jar libraries converted from apk extensions. All this concludes to serving a GraphQL API.
+1. **Server:** contains the implementation of [tachiyomi's extensions library](https://github.com/tachiyomiorg/extensions-lib) and uses an Android compatibility library to run jar libraries converted from apk extensions. All this concludes to serving a REST API.
-2. **WebUI:** A React SPA(`create-react-app`) project that works with the server to do the presentation located at https://github.com/Suwayomi/Suwayomi-WebUI
+2. **WebUI:** A React SPA(`create-react-app`) project that works with the server to do the presentation located at https://github.com/Suwayomi/Tachidesk-WebUI
-
-### API
-#### GraphQL
-The GraphQL API can be queried with a POST request to `/api/graphql`. There is also the GraphiQL IDE accessible by the browser at `/api/graphql` to perform ad-hoc queries and explore the API.
-
-#### REST
-> [!WARNING]
->
-> Soon to be deprecated
-
-The REST API can be queried at `/api/v1`. An interactive Swagger API explorer is available at `/api/swagger-ui`.
-
-### Tracker client authorization
-#### OAuth
-Since the url of a Suwayomi-Server is not known, it is not possible to redirect directly to the client.<br/>
-Thus, to provide tracker support via oauth, the tracker clients redirect to the [suwayomi website](https://suwayomi.org/)
-and there the actual redirection to the client takes place.
-
-When implementing the login process in your client you have to make sure to follow some preconditions:
-
-To be able to redirect to the client you have to attach a `state` object to the query of the auth url
-- this `state` object has to have a `redirectUrl` which points to the client route at which you want to handle the auth result
-- besides the `redirectUrl` you can pass any information you require to handle the result (e.g. the server `id` of the tracker client)
-- example URL for AniList: `https://anilist.co/api/v2/oauth/authorize?client_id=ID&response_type=token&state={ redirectUrl: "http://localhost:4567/handle/oauth/result", trackerId: 1, anyOtherInfo: "your client requires" }`
-
-Once the permission has been granted, you will get redirected to the client at the provided route (`redirectUrl`).<br/>
-- Example URL (decoded) for AniList: `http://localhost:4567/handle/oauth/result?access_token=TOKEN&token_type=Bearer&expires_in=31622400&state={ redirectUrl: "http://localhost:4567/handle/oauth/result", trackerId: 1, anyOtherInfo: "your client requires" }`).<br/>
-
-Finally, to finish the login process, you just have to pass this URL to the server as the `callbackUrl`.
 
 ## Why a web app?
 This structure is chosen to
 - Achieve the maximum multi-platform-ness
-- Gives the ability to access Suwayomi-Server from a remote client e.g., your phone, tablet or smart TV
+- Gives the ability to access Tachidesk-Server from a remote client e.g., your phone, tablet or smart TV
-- Ease development of user interfaces for Suwayomi
+- Ease development of user interfaces for Tachidesk
 
 ## Building from source
 ### Prerequisites
@@ -63,14 +34,14 @@ 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)
 
-### building the full-blown jar (Suwayomi-Server + Suwayomi-WebUI bundle)
+### building the full-blown jar (Tachidesk-Server + Tachidesk-WebUI bundle)
-Run `./gradlew server:downloadWebUI server:shadowJar`, the resulting built jar file will be `server/build/Suwayomi-Server-vX.Y.Z-rxxx.jar`.
+Run `./gradlew server:downloadWebUI server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx.jar`.
 
 ### building without `webUI` bundled (server only)
-Delete `server/src/main/resources/WebUI.zip` if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Suwayomi-Server-vX.Y.Z-rxxx.jar`.
+Delete `server/src/main/resources/WebUI.zip` if exists from previous runs, then run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx.jar`.
 
 ### building the Windows package
-First Build the jar, then cd into the `scripts` directory and run `./windows-bundler.sh win32` or `./windows-bundler.sh win64` depending on the target architecture, the resulting built zip package file will be `server/build/Suwayomi-Server-vX.Y.Z-rxxx-winXX.zip`.
+First Build the jar, then cd into the `scripts` directory and run `./windows-bundler.sh win32` or `./windows-bundler.sh win64` depending on the target architecture, the resulting built zip package file will be `server/build/Tachidesk-Server-vX.Y.Z-rxxx-winXX.zip`.
 
 ## Running in development mode
 run `./gradlew :server:run --stacktrace` to run the server

README.md

@@ -1,104 +1,99 @@
 
-| Build                                                                                         | Stable                                                                                                                                                                   | Preview                                                                                                                                                                                                                                           | Support Server |
+| Build | Stable | Preview | Support Server |
-|-----------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
+|-------|----------|---------|---------|
-| ![CI](https://github.com/Suwayomi/Suwayomi-Server/actions/workflows/build_push.yml/badge.svg) | [![stable release](https://img.shields.io/github/release/Suwayomi/Suwayomi-Server.svg?maxAge=3600&label=download)](https://github.com/Suwayomi/Suwayomi-Server/releases) | [![preview](https://img.shields.io/badge/dynamic/json?url=https://github.com/Suwayomi/Suwayomi-Server-preview/raw/main/index.json&label=download&query=$.latest&color=blue)](https://github.com/Suwayomi/Suwayomi-Server-preview/releases/latest) | [![Discord](https://img.shields.io/discord/801021177333940224.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/DDZdqZWaHA) |
+| ![CI](https://github.com/Suwayomi/Tachidesk/actions/workflows/build_push.yml/badge.svg) | [![stable release](https://img.shields.io/github/release/Suwayomi/Tachidesk.svg?maxAge=3600&label=download)](https://github.com/Suwayomi/Tachidesk/releases) | [![preview](https://img.shields.io/badge/dynamic/json?url=https://github.com/Suwayomi/Tachidesk-preview/raw/main/index.json&label=download&query=$.latest&color=blue)](https://github.com/Suwayomi/Tachidesk-preview/releases/latest) | [![Discord](https://img.shields.io/discord/801021177333940224.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/DDZdqZWaHA) |
 
 ## Table of Content
-- [What is Suwayomi?](#what-is-suwayomi)
+- [What is Tachidesk?](#what-is-tachidesk)
-- [Features](#Features)
+- [Tachidesk client projects](#tachidesk-client-projects)
-- [Suwayomi client projects](#Suwayomi-client-projects)
+  * [Is this application usable? Should I test it?](#is-this-application-usable-should-i-test-it)
 - [Downloading and Running the app](#downloading-and-running-the-app)
   * [Using Operating System Specific Bundles](#using-operating-system-specific-bundles)
       - [Launcher Scripts](#launcher-scripts)
     + [Windows](#windows)
     + [macOS](#macos)
     + [GNU/Linux](#gnulinux)
-  * [Other methods of getting Suwayomi](#other-methods-of-getting-suwayomi)
+  * [Other methods of getting Tachidesk](#other-methods-of-getting-tachidesk)
     + [Arch Linux](#arch-linux)
     + [Ubuntu-based distributions](#ubuntu-based-distributions)
     + [Docker](#docker)
   * [Advanced Methods](#advanced-methods)
     + [Running the jar release directly](#running-the-jar-release-directly)
-    + [Using Suwayomi Remotely](#using-suwayomi-remotely)
+    + [Using Tachidesk Remotely](#using-tachidesk-remotely)
-- [Syncing With Mihon (Tachiyomi)](#syncing-with-mihon-tachiyomi)
+- [Syncing With Tachiyomi](#syncing-with-tachiyomi)
 - [Troubleshooting and Support](#troubleshooting-and-support)
 - [Contributing and Technical info](#contributing-and-technical-info)
 - [Credit](#credit)
 - [License](#license)
 <!-- Generated with https://ecotrust-canada.github.io/markdown-toc/ -->
 
-# What is Suwayomi?
+# What is Tachidesk?
-<img src="https://github.com/Suwayomi/Suwayomi-Server/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"/>
 
-A free and open source manga reader server that runs extensions built for [Mihon (Tachiyomi)](https://mihon.app/). 
+A free and open source manga reader server that runs extensions built for [Tachiyomi](https://tachiyomi.org/). 
 
-Suwayomi is an independent Mihon (Tachiyomi) compatible software and is **not a Fork of** Mihon (Tachiyomi).
+Tachidesk is an independent Tachiyomi compatible software and is **not a Fork of** Tachiyomi.
 
-Suwayomi-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc. Follow [Downloading and Running the app](#downloading-and-running-the-app) for installation instructions.
+Tachidesk-Server is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it. This includes Windows, Linux, macOS, chrome OS, etc. Follow [Downloading and Running the app](#downloading-and-running-the-app) for installation instructions.
 
-You can use Mihon (Tachiyomi) to access your Suwayomi-Server. For more info look [here](#syncing-with-mihon-tachiyomi).
+Ability to sync with Tachiyomi is a planned feature, for more info look [here](#syncing-with-tachiyomi).
 
-## Features
+# Tachidesk client projects
-> [!NOTE]
+**You need a client/user interface app as a front-end for Tachidesk-Server, if you [Directly Download Tachidesk-Server](https://github.com/Suwayomi/Tachidesk-Server/releases/latest) you'll get a bundled version of [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) with it.**
->
-> These are capabilities of Suwayomi-Server, the actual working support is provided by each front-end app, checkout their respective readme for more info.
 
-- Installing and executing Mihon (Tachiyomi)'s Extensions, So you'll get the same sources
+Here's a list of known clients/user interfaces for Tachidesk-Server:
-- Searching and browsing installed sources
+##### Actively Developed Cients
-- A library to save your mangas and categories to put them into
+- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI): The web/ElectronJS front-end that Tachidesk-Server ships with by default.
-- Automated library updates to check for new chapters
+- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Tachidesk-Server. Currently the most advanced.
-- Automated download of new chapters
-- Viewing latest updated chapters
-- Ability to download Manga for offline read
-- Backup and restore support powered by Mihon (Tachiyomi)-compatible Backups
-- Automated backup creations
-- Tracking via [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/), [MangaUpdates](https://www.mangaupdates.com/)
-- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) support to bypass Cloudflare protection
-- Automated WebUI updates (supports the default WebUI and VUI)
-
-# Suwayomi client projects
-**You need a client/user interface app as a front-end for Suwayomi-Server, if you [Directly Download Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/releases/latest) you'll get a bundled version of [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI) with it.**
-
-Here's a list of known clients/user interfaces for Suwayomi-Server (checkout the respective GitHub repository for their features):
-##### Actively Developed Clients
-- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI): The web front-end that Suwayomi-Server ships with by default.
-- [Suwayomi-VUI](https://github.com/Suwayomi/Suwayomi-VUI): A Suwayomi-Server preview focused web frontend built with svelte
-- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): A Web front-end for Suwayomi-Server built with Vaadin.
-##### Inactive Clients (functional but outdated)
-- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Suwayomi-Server.
-- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): A Flutter front-end for Desktop(Linux, windows, etc.), Web and Android with a User Interface inspired by Mihon (Tachiyomi).
-#####  Abandoned Clients (functionality unknown)
 - [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), feature support is basic.
-- [Tachidesk-GTK](https://github.com/mahor1221/Tachidesk-GTK): A native Rust/GTK desktop client.
+- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): A Flutter front-end for Desktop(Linux, windows, etc.), Web and Android with a User Inerface inspired by Tachiyomi.
+##### Inctive/Abandoned Cients
 - [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js.
+- [Tachidesk-GTK](https://github.com/mahor1221/Tachidesk-GTK): A native Rust/GTK desktop client.
+
+## Is this application usable? Should I test it?
+Here is a list of current features:
+
+- Installing and executing Tachiyomi's Extensions, So you'll get the same sources
+- A library to save your mangas and categories to put them into
+- Searching and browsing installed sources
+- Ability to download Manga for offline read
+- Backup and restore support powered by Tachiyomi-compatible Backups
+- Viewing latest updated chapters.
+
+**Note:** These are capabilities of Tachidesk-Server, the actual working support is provided by each front-end app, checkout their respective readme for more info.
 
 # Downloading and Running the app
 ## Using Operating System Specific Bundles
-To facilitate the use of Suwayomi we provide bundle releases that include The Java Runtime Environment, ElectronJS and the Suwayomi-Launcher.
+To facilitate the use of Tachidesk we provide bundle releases that include The Java Runtime Environment, ElectronJS and 3 Tachidesk Launcher Scripts.
 
-If a bundle for your operating system or cpu architecture is not provided then refer to [Advanced Methods](#advanced-methods)
+If a bundle for your operating system or cpu architecture is not provided then refer to [Advanced Methods](#advanced-methods) 
+
+#### Launcher Scripts
+- `Tachidesk Electron Launcher`: Launches Tachidesk inside Electron as a desktop applicaton
+- `Tachidesk Browser Launcher`: Launches Tachidesk in a browser window
+- `Tachidesk Debug Launcher`: Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why.
+
+**Node:** Linux launcher scripts are named a bit differently but work the same. 
 
 ### Windows
-Download the latest `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases).
+Download the latest `win32`(Windows 32-bit) or `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-Server-preview/releases).
 
-Unzip the downloaded file and double-click on one of the launcher scripts.
+Unzip the downloaded file and double click on one of the launcher scripts.
 
 ### macOS
-Download the latest `macOS-x64`(older macOS systems) or `macOS-arm64`(Apple M1 and newer) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases).
+Download the latest `macOS-x64`(older macOS systems) or `macOS-arm64`(Apple M1 and newer) release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-Server-preview/releases).
 
-Unzip the downloaded file and double-click on one of the launcher scripts.
+Unzip the downloaded file and double click on one of the launcher scripts.
 
 ### GNU/Linux
-Download the latest `linux-x64`(x86_64) release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases).
+Download the latest `linux-x64`(x86_64) release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-Server-preview/releases).
 
-`tar xvf` the downloaded file and double-click on one of the launcher scripts or run them using the terminal.
+`tar xvf` the downloaded file and double click on one of the launcher scripts or run them using the terminal.
-
-## Other methods of getting Suwayomi
-### Docker
-Check our Official Docker release [Suwayomi Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) for running Suwayomi Server in a docker container. Source code for our container is available at [docker-tachidesk](https://github.com/Suwayomi/docker-tachidesk), an example compose file can also be found there. By default, the server will be running on http://localhost:4567 open this url in your browser.
 
+## Other methods of getting Tachidesk
 ### Arch Linux
-You can install Suwayomi from the AUR:
+You can install Tachidesk from the AUR:
 ```
 yay -S tachidesk
 ```
@@ -106,67 +101,60 @@ yay -S tachidesk
 ### Debian/Ubuntu
 Download the latest deb package from the release section or Install from the MPR
 ```
-git clone https://mpr.makedeb.org/suwayomi-server.git
+git clone https://mpr.makedeb.org/tachidesk-server.git
-cd suwayomi-server
+cd tachidesk-server
 makedeb -si
 ```
 
 ### Ubuntu
 ```
-sudo add-apt-repository ppa:suwayomi/suwayomi-server
+sudo add-apt-repository ppa:suwayomi/tachidesk-server
 sudo apt update
-sudo apt install suwayomi-server
+sudo apt install tachidesk-server
 ```
 
-### NixOS
+### Docker
-You can deploy Suwayomi on NixOS using the module `services.suwayomi-server` in your configuration:
+Check our Official Docker release [Tachidesk Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) for running Tachidesk Server in a docker container. 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
-  services.suwayomi-server = {
+```
-    enable = true;
+Run Container from the command line:
-  };
+```
-}
+    $ docker run -p 4567:4567 ghcr.io/suwayomi/tachidesk
 ```
-
-For more information, see [the NixOS manual](https://nixos.org/manual/nixos/stable/#module-services-suwayomi-server).
-
-You can also directly use the package from [nixpkgs](https://search.nixos.org/packages?channel=unstable&type=packages&query=suwayomi-server).
 
 ## Advanced Methods
 ### Running the jar release directly
 In order to run the app you need the following:
-- The jar release of Suwayomi-Server
+- The jar release of Tachidesk-Server
-- The Java Runtime Environment(JRE) 21 or newer
+- The Java Runtime Environment(JRE) 8 or newer
 - A Browser like Google Chrome, Firefox, Edge, etc.
 - ElectronJS (optional)
 
-Download the latest `.jar` release from [the releases section](https://github.com/Suwayomi/Suwayomi-Server/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Suwayomi-Server-preview/releases).
+Download the latest `.jar` release from [the releases section](https://github.com/Suwayomi/Tachidesk-Server/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
 
-Make sure you have The Java Runtime Environment installed on your system, Double-click on the jar file or run `java -jar Suwayomi-Server-vX.Y.Z-rxxxx.jar` from a Terminal/Command Prompt window to run the app which will open a new browser window automatically.
+Make sure you have The Java Runtime Environment installed on your system, Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxxx.jar` from a Terminal/Command Prompt window to run the app which will open a new browser window automatically.
 
-### Using Suwayomi Remotely
+### Using Tachidesk Remotely
-You can run Suwayomi on your computer or a server and connect to it remotely through one of our clients or the bundled web interface with a web browser. This method of using Suwayomi is requiring a bit of networking/firewall/port forwarding/server configuration/etc. knowledge on your side, if you can run a Minecraft server and configure it, then you are good to go.
+You can run Tachidesk on your computer or a server and connect to it remotely through one of our clients or the bundled web interface with a web browser. This method of using Tachidesk is requires a bit of networking/firewall/port forwarding/server configuration/etc. knowledge on your side, if you can run a Minecraft server and configure it, then you are good to go.
 
-Check out [this wiki page](https://github.com/Suwayomi/Suwayomi-Server/wiki/Configuring-Tachidesk-Server) for a guide on configuring Suwayomi-Server. 
+Check out [this wiki page](https://github.com/Suwayomi/Tachidesk-Server/wiki/Configuring-Tachidesk-Server) for a guide on configuring Tachidesk-Server. 
 
-If you face issues with your setup then we are happy to provide help, just join our discord server(a discord badge is on the top of the page, you are just a click-clack away!).
+If you face issues with your setup then we are happy to provide help, just join our discord server(a discord badge is on the top of the page, you are just a click clack away!).
 
-## Syncing With Mihon (Tachiyomi)
+## Syncing With Tachiyomi
-### The Suwayomi extension and tracker
+### The Tachidesk extension
-- You can install the `Suwayomi` extension inside Mihon (Tachiyomi).
+- You can install the `Tachidesk` extension inside tachiyomi.
-- The extension will load your Suwayomi library.
+- The extension will load Tachidesk library. 
-- By manipulating extension search filters you can browse your categories.
+- By manipulating filters you can browse your categories.
-- You can enable the Suwayomi tracker to track reading progress with your Suwayomi server.
-  - Note: to sync from
-    - Mihon (Tachiyomi) to Suwayomi: Mihon (Tachiyomi) automatically updates the chapters read status when it's updating the tracker (e.g. while reading)
-    - Suwayomi to Mihon (Tachiyomi): To sync Mihon (Tachiyomi) with Suwayomi, you have to open the manga's track information, then, Mihon (Tachiyomi) will automatically update its chapter list with the state from Suwayomi
 
 ### Other methods
-Checkout [this issue](https://github.com/Suwayomi/Suwayomi-Server/issues/159) for tracking progress.
+Checkout [this issue](https://github.com/Suwayomi/Tachidesk-Server/issues/159) for tracking progress.
 
 ## Troubleshooting and Support
-See [this troubleshooting wiki page](https://github.com/Suwayomi/Suwayomi-Server/wiki/Troubleshooting).
+See [this troubleshooting wiki page](https://github.com/Suwayomi/Tachidesk/wiki/Troubleshooting).
 
 ## Contributing and Technical info
 See [CONTRIBUTING.md](./CONTRIBUTING.md).
@@ -176,7 +164,7 @@ This project is a spiritual successor of [TachiWeb-Server](https://github.com/Ta
 
 The `AndroidCompat` module was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0` and `Copyright 2019 Andy Bao and contributors`.
 
-Parts of [Mihon (Tachiyomi)](https://github.com/mihonapp/mihon) is adopted into this codebase, also licensed under `Apache License Version 2.0` and `Copyright 2015 Javier Tomás`.
+Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0` and `Copyright 2015 Javier Tomás`.
 
 You can obtain a copy of `Apache License Version 2.0` from  http://www.apache.org/licenses/LICENSE-2.0
 

build.gradle.kts

@@ -1,12 +1,12 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-import org.jlleitschuh.gradle.ktlint.KtlintExtension
+import org.jmailen.gradle.kotlinter.tasks.FormatTask
-import org.jlleitschuh.gradle.ktlint.KtlintPlugin
+import org.jmailen.gradle.kotlinter.tasks.LintTask
 
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.ktlint)
+    alias(libs.plugins.kotlinter)
     alias(libs.plugins.buildconfig) apply false
     alias(libs.plugins.download)
 }
@@ -19,7 +19,7 @@ allprojects {
     repositories {
         mavenCentral()
         google()
-        maven("https://github.com/Suwayomi/Suwayomi-Server/raw/android-jar/")
+        maven("https://github.com/Suwayomi/Tachidesk-Server/raw/android-jar/")
         maven("https://jitpack.io")
     }
 }
@@ -27,27 +27,25 @@ allprojects {
 subprojects {
     plugins.withType<JavaPlugin> {
         extensions.configure<JavaPluginExtension> {
-            sourceCompatibility = JavaVersion.VERSION_21
+            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_21
+            targetCompatibility = JavaVersion.VERSION_1_8
-        }
-    }
-
-    plugins.withType<KtlintPlugin> {
-        extensions.configure<KtlintExtension>("ktlint") {
-            version.set(libs.versions.ktlint.get())
-            filter {
-                exclude("**/generated/**")
-            }
         }
     }
 
     tasks {
         withType<KotlinJvmCompile> {
-            dependsOn("ktlintFormat")
+            dependsOn("formatKotlin")
-            compilerOptions {
+            kotlinOptions {
-                jvmTarget = JvmTarget.JVM_21
+                jvmTarget = JavaVersion.VERSION_1_8.toString()
-                freeCompilerArgs.add("-Xcontext-receivers")
             }
         }
+
+        withType<LintTask> {
+            source(files("src/kotlin"))
+        }
+
+        withType<FormatTask> {
+            source(files("src/kotlin"))
+        }
     }
-}
+}

buildSrc/build.gradle.kts

@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    implementation(libs.zip4j)
+    implementation("net.lingala.zip4j:zip4j:2.9.0")
-}
+}

buildSrc/settings.gradle.kts

@@ -1,9 +0,0 @@
-rootProject.name = "buildSrc"
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}

buildSrc/src/main/kotlin/Constants.kt

@@ -10,26 +10,22 @@ import java.io.BufferedReader
 const val MainClass = "suwayomi.tachidesk.MainKt"
 
 // should be bumped with each stable release
-val getTachideskVersion = { "v2.0.${getCommitCount()}" }
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.7.0"
 
-val webUIRevisionTag = "r2467"
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r1045"
 
-private val getCommitCount = {
+// counts commits on the master branch
-    runCatching {
+val tachideskRevision = runCatching {
-        ProcessBuilder()
+    System.getenv("ProductRevision") ?: ProcessBuilder()
-            .command("git", "rev-list", "HEAD", "--count")
+        .command("git", "rev-list", "HEAD", "--count")
-            .start()
+        .start()
-            .let { process ->
+        .let { process ->
-                process.waitFor()
+            process.waitFor()
-                val output = process.inputStream.use {
+            val output = process.inputStream.use {
-                    it.bufferedReader().use(BufferedReader::readText)
+                it.bufferedReader().use(BufferedReader::readText)
-                }
-                process.destroy()
-                output.trim()
             }
-    }.getOrDefault("0")
+            process.destroy()
-}
+            "r" + output.trim()
-
+        }
-// counts commits on the current checked out branch
+}.getOrDefault("r0")
-val getTachideskRevision = { "r${getCommitCount()}" }
 

gradle/libs.versions.toml

@@ -1,19 +1,15 @@
 [versions]
-kotlin = "2.1.20"
+kotlin = "1.8.0"
-coroutines = "1.10.1"
+coroutines = "1.6.4"
-serialization = "1.8.0"
+serialization = "1.4.1"
-okhttp = "5.0.0-alpha.14" # Major version is locked by Tachiyomi extensions
+okhttp = "5.0.0-alpha.11" # Major version is locked by Tachiyomi extensions
-javalin = "6.5.0"
+javalin = "4.6.6" # Javalin 5.0.0+ requires Java 11
-jackson = "2.18.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "2.13.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
-exposed = "0.59.0"
+exposed = "0.40.1"
-dex2jar = "v64" # Stuck until https://github.com/ThexXTURBOXx/dex2jar/issues/27 is fixed
+dex2jar = "v60"
-polyglot = "24.2.0"
+rhino = "1.7.14"
-settings = "1.3.0"
+settings = "1.0.0-RC"
-twelvemonkeys = "3.12.0"
+twelvemonkeys = "3.9.4"
-graphqlkotlin = "8.4.0"
-xmlserialization = "0.90.3"
-ktlint = "1.5.0"
-koin = "4.0.2"
 
 [libraries]
 # Kotlin
@@ -28,22 +24,18 @@ coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", ve
 
 # Serialization
 serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
-serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization" }
 serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization" }
-serialization-xml-core = { module = "io.github.pdvrieze.xmlutil:core", version.ref = "xmlserialization" }
-serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-jvm", version.ref = "xmlserialization" }
 
 # Logging
-slf4japi = "org.slf4j:slf4j-api:2.0.17"
+slf4japi = "org.slf4j:slf4j-api:2.0.6"
-logback = "ch.qos.logback:logback-classic:1.5.18"
+logback = "ch.qos.logback:logback-classic:1.3.5"
-kotlinlogging = "io.github.oshai:kotlin-logging-jvm:7.0.5"
+kotlinlogging = "io.github.microutils:kotlin-logging:3.0.5"
 
 # OkHttp
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
-okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" }
+okio = "com.squareup.okio:okio:3.3.0"
-okio = "com.squareup.okio:okio:3.10.2"
 
 # Javalin api
 javalin-core = { module = "io.javalin:javalin", version.ref = "javalin" }
@@ -52,12 +44,6 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", ver
 jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 
-# GraphQL
-graphql-kotlin-server = { module = "com.expediagroup:graphql-kotlin-server", version.ref = "graphqlkotlin" }
-graphql-kotlin-scheme = { module = "com.expediagroup:graphql-kotlin-schema-generator", version.ref = "graphqlkotlin" }
-graphql-java-core = "com.graphql-java:graphql-java:22.3" # Major version locked by graphql-kotlin
-graphql-java-scalars = "com.graphql-java:graphql-java-extended-scalars:22.0"
-
 # Exposed ORM
 exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" }
 exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
@@ -66,24 +52,24 @@ exposed-javatime = { module = "org.jetbrains.exposed:exposed-java-time", version
 h2 = "com.h2database:h2:1.4.200" # current database driver, can't update to h2 v2 without sql migration
 
 # Exposed Migrations
-exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.7.0"
+exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.2.0"
 
 # Dependency Injection
-koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
+kodein = "org.kodein.di:kodein-di-conf-jvm:7.15.0"
 
 # tray icon
-systemtray-core = "com.dorkbox:SystemTray:4.4"
+systemtray-core = "com.dorkbox:SystemTray:4.2.1"
-systemtray-utils = "com.dorkbox:Utilities:1.46" # version locked by SystemTray
+systemtray-utils = "com.dorkbox:Utilities:1.39" # version locked by SystemTray
-systemtray-desktop = "com.dorkbox:Desktop:1.1" # version locked by SystemTray
+systemtray-desktop = "com.dorkbox:Desktop:1.0"
 
 # dependencies of Tachiyomi extensions
-injekt = "com.github.null2264:injekt-koin:ee267b2e27"
+injekt = "com.github.inorichi.injekt:injekt-core:65b0440"
 rxjava = "io.reactivex:rxjava:1.3.8"
-jsoup = "org.jsoup:jsoup:1.19.1"
+jsoup = "org.jsoup:jsoup:1.15.3"
 
 # Config
-config = "com.typesafe:config:1.4.3"
+config = "com.typesafe:config:1.4.2"
-config4k = "io.github.config4k:config4k:0.7.0"
+config4k = "io.github.config4k:config4k:0.5.0"
 
 # Sort
 sort = "com.github.gpanther:java-nat-sort:natural-comparator-1.1"
@@ -92,40 +78,38 @@ sort = "com.github.gpanther:java-nat-sort:natural-comparator-1.1"
 android-stubs = "com.github.Suwayomi:android-jar:1.0.0"
 
 # Asm modificiation
-asm = "org.ow2.asm:asm:9.5" # version locked by Dex2Jar
+asm = "org.ow2.asm:asm:9.4" # version locked by Dex2Jar
 dex2jar-translator = { module = "com.github.ThexXTURBOXx.dex2jar:dex-translator", version.ref = "dex2jar" }
 dex2jar-tools = { module = "com.github.ThexXTURBOXx.dex2jar:dex-tools", version.ref = "dex2jar" }
 
 # APK
 apk-parser = "net.dongliu:apk-parser:2.6.10"
-apksig = "com.android.tools.build:apksig:8.9.0"
+apksig = "com.android.tools.build:apksig:7.2.1"
 
 # Xml
 xmlpull = "xmlpull:xmlpull:1.1.3.4a"
 
 # Disk & File
-appdirs = "net.harawata:appdirs:1.4.0"
+appdirs = "net.harawata:appdirs:1.2.1"
-cache4k = "io.github.reactivecircus.cache4k:cache4k:0.14.0"
+zip4j = "net.lingala.zip4j:zip4j:2.11.2"
-zip4j = "net.lingala.zip4j:zip4j:2.11.5"
+junrar = "com.github.junrar:junrar:7.5.3"
-commonscompress = "org.apache.commons:commons-compress:1.27.1"
-junrar = "com.github.junrar:junrar:7.5.5"
 
 # AES/CBC/PKCS7Padding Cypher provider
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.72"
 
 # AndroidX annotations
-android-annotations = "androidx.annotation:annotation:1.9.1"
+android-annotations = "androidx.annotation:annotation:1.5.0"
 
 # Substitute for duktape-android
-polyglot-core = { module = "org.graalvm.polyglot:polyglot", version.ref = "polyglot" }
+rhino-runtime = { module = "org.mozilla:rhino-runtime", version.ref = "rhino" }  # slimmer version of 'org.mozilla:rhino'
-polyglot-graaljs = { module = "org.graalvm.polyglot:js-community", version.ref = "polyglot" }
+rhino-engine = { module = "org.mozilla:rhino-engine", version.ref = "rhino" } # provides the same interface as 'javax.script' a.k.a Nashorn
 
 # Settings
 settings-core = { module = "com.russhwolf:multiplatform-settings-jvm", version.ref = "settings" }
 settings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization-jvm", version.ref = "settings" }
 
 # ICU4J
-icu4j = "com.ibm.icu:icu4j:77.1"
+icu4j = "com.ibm.icu:icu4j:72.1"
 
 # Image Decoding implementation provider
 twelvemonkeys-common-lang = { module = "com.twelvemonkeys.common:common-lang", version.ref = "twelvemonkeys" }
@@ -137,16 +121,7 @@ twelvemonkeys-imageio-jpeg = { module = "com.twelvemonkeys.imageio:imageio-jpeg"
 twelvemonkeys-imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys" }
 
 # Testing
-mockk = "io.mockk:mockk:1.13.17"
+mockk = "io.mockk:mockk:1.13.2"
-
-# cron scheduler
-cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
-
-# cron-utils
-cronUtils = "com.cronutils:cron-utils:9.2.1"
-
-# lint - used for renovate to update ktlint version
-ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
 
 [plugins]
 # Kotlin
@@ -154,16 +129,16 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"}
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"}
 
 # Linter
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.2.0"}
+kotlinter = { id = "org.jmailen.kotlinter", version = "3.12.0"}
 
 # Build config
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.5.4"}
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "3.1.0"}
 
 # Download
-download = { id = "de.undercouch.download", version = "5.6.0"}
+download = { id = "de.undercouch.download", version = "5.3.0"}
 
 # ShadowJar
-shadowjar = { id = "com.github.johnrengelman.shadow", version = "8.1.1"}
+shadowjar = { id = "com.github.johnrengelman.shadow", version = "7.1.2"}
 
 [bundles]
 shared = [
@@ -172,9 +147,8 @@ shared = [
     "coroutines-core",
     "coroutines-jdk8",
     "serialization-json",
-    "serialization-json-okio",
     "serialization-protobuf",
-    "koin-core",
+    "kodein",
     "slf4japi",
     "logback",
     "kotlinlogging",
@@ -198,11 +172,10 @@ okhttp = [
     "okhttp-core",
     "okhttp-logging",
     "okhttp-dnsoverhttps",
-    "okhttp-brotli",
 ]
 javalin = [
     "javalin-core",
-    #"javalin-openapi",
+    "javalin-openapi",
 ]
 jackson = [
     "jackson-databind",
@@ -220,9 +193,9 @@ systemtray = [
     "systemtray-utils",
     "systemtray-desktop"
 ]
-polyglot = [
+rhino = [
-    "polyglot-core",
+    "rhino-runtime",
-    "polyglot-graaljs",
+    "rhino-engine",
 ]
 settings = [
     "settings-core",

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -82,11 +80,13 @@ do
     esac
 done
 
-# This is normally unused
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-# shellcheck disable=SC2034
+
+APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,29 +133,22 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -200,15 +193,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
+# Collect all arguments for the java command;
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+#     shell script including quotes and variable substitutions, so put them in
-
+#     double quotes to make sure that they get re-expanded; and
-# Collect all arguments for the java command:
+#   * put everything else in single quotes, so that it's not re-expanded.
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -28,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -45,11 +42,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 

renovate.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "semanticCommits": "disabled",
-  "customManagers": [
-    {
-      "customType": "regex",
-      "fileMatch": [
-        "scripts/bundler.sh"
-      ],
-      "matchStrings": [
-        "JRE_RELEASE=[\"'](?<currentValue>.+?)[\"']\\s+"
-      ],
-      "datasourceTemplate": "github-releases",
-      "depNameTemplate": "adoptium/temurin21-binaries",
-      "versioningTemplate": "regex:^jdk-?(?<major>\\d+).(?<minor>\\d+).+?(?<patch>[\\d+]+)$"
-    }
-  ]
-}

scripts/bundler.sh

@@ -28,16 +28,14 @@ main() {
   OS="$1"
   JAR="$(ls server/build/*.jar | tail -n1)"
   RELEASE_NAME="$(echo "${JAR%.*}" | xargs basename)-$OS"
-  RELEASE_VERSION=$(echo "$JAR" | grep -oP "v\K[0-9]+\.[0-9]+\.[0-9]+")
+  RELEASE_VERSION="$(tmp="${JAR%-*}"; echo "${tmp##*-}" | tr -d v)"
   #RELEASE_REVISION_NUMBER="$(tmp="${JAR%.*}" && echo "${tmp##*-}" | tr -d r)"
-  local electron_version="v28.1.3"
+  local electron_version="v14.0.0"
 
   # clean temporary directory on function return
   trap "rm -rf $RELEASE_NAME/" RETURN
   mkdir "$RELEASE_NAME/"
 
-  download_launcher
-
   case "$OS" in
     debian-all)
       RELEASE="$RELEASE_NAME.deb"
@@ -51,64 +49,85 @@ main() {
       move_release_to_output_dir
       ;;
     linux-x64)
-      # https://github.com/adoptium/temurin21-binaries/releases/
+      JRE="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
-      JRE_RELEASE="jdk-21.0.6+7"
+      JRE_RELEASE="jdk8u302-b08"
-      JRE="OpenJDK21U-jre_x64_linux_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').tar.gz"
       JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
+      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-linux-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
-      download_electron
+      download_jre_and_electron
-      setup_jre
+
-      tree "$RELEASE_NAME"
+      PLAYWRIGHT_PLATFORM="linux"
+      setup_playwright
 
       RELEASE="$RELEASE_NAME.tar.gz"
       make_linux_bundle
       move_release_to_output_dir
       ;;
     macOS-x64)
-      # https://github.com/adoptium/temurin21-binaries/releases/
+      JRE="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
-      JRE_RELEASE="jdk-21.0.6+7"
+      JRE_RELEASE="jdk8u302-b08"
-      JRE="OpenJDK21U-jre_x64_mac_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').tar.gz"
       JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
+      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-darwin-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
-      download_electron
+      download_jre_and_electron
-      setup_jre
-      tree "$RELEASE_NAME"
 
-      RELEASE="$RELEASE_NAME.tar.gz"
+      PLAYWRIGHT_PLATFORM="mac"
+      setup_playwright
+
+      RELEASE="$RELEASE_NAME.zip"
       make_macos_bundle
       move_release_to_output_dir
       ;;
     macOS-arm64)
-      # https://github.com/adoptium/temurin21-binaries/releases/
+      JRE="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
-      JRE_RELEASE="jdk-21.0.6+7"
+      JRE_RELEASE="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64"
-      JRE="OpenJDK21U-jre_aarch64_mac_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').tar.gz"
+      JRE_DIR="$JRE_RELEASE/zulu-8.jre"
-      JRE_DIR="$JRE_RELEASE-jre"
+      JRE_URL="https://cdn.azul.com/zulu/bin/$JRE"
-      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-darwin-arm64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
-      download_electron
+      download_jre_and_electron
-      setup_jre
-      tree "$RELEASE_NAME"
 
-      RELEASE="$RELEASE_NAME.tar.gz"
+      PLAYWRIGHT_PLATFORM="mac-arm64"
+      setup_playwright
+
+      RELEASE="$RELEASE_NAME.zip"
       make_macos_bundle
       move_release_to_output_dir
       ;;
-    windows-x64)
+    windows-x86)
-      # https://github.com/adoptium/temurin21-binaries/releases/
+      JRE="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
-      JRE_RELEASE="jdk-21.0.6+7"
+      JRE_RELEASE="jdk8u292-b10"
-      JRE="OpenJDK21U-jre_x64_windows_hotspot_$(echo "$JRE_RELEASE" | sed 's/jdk//;s/-//g;s/+/_/g').zip"
       JRE_DIR="$JRE_RELEASE-jre"
-      JRE_URL="https://github.com/adoptium/temurin21-binaries/releases/download/$JRE_RELEASE/$JRE"
+      JRE_URL="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$JRE_RELEASE/$JRE"
+      ELECTRON="electron-$electron_version-win32-ia32.zip"
+      ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
+      download_jre_and_electron
+
+      PLAYWRIGHT_PLATFORM="win64"
+      setup_playwright
+
+      RELEASE="$RELEASE_NAME.zip"
+      make_windows_bundle
+      move_release_to_output_dir
+
+      RELEASE="$RELEASE_NAME.msi"
+      make_windows_package
+      move_release_to_output_dir
+      ;;
+    windows-x64)
+      JRE="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
+      JRE_RELEASE="jdk8u302-b08"
+      JRE_DIR="$JRE_RELEASE-jre"
+      JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/$JRE_RELEASE/$JRE"
       ELECTRON="electron-$electron_version-win32-x64.zip"
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
-      download_electron
+      download_jre_and_electron
-      setup_jre
+
-      tree "$RELEASE_NAME"
+      PYTHON=Winpython64-3.10.9.0dot.exe
+      PYTHON_URL=https://github.com/winpython/winpython/releases/download/5.3.20221233/Winpython64-3.10.9.0dot.exe
+      setup_undetected_chromedriver_and_python
 
       RELEASE="$RELEASE_NAME.zip"
       make_windows_bundle
@@ -132,81 +151,66 @@ move_release_to_output_dir() {
    mv "$RELEASE" "$OUTPUT_DIR/"
 }
 
-download_launcher() {
+download_jre_and_electron() {
-  LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
+  if [ ! -f "$JRE" ]; then
-  curl -L "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
+    curl -L "$JRE_URL" -o "$JRE"
-  mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar"
+  fi
-}
-
-download_electron() {
   if [ ! -f "$ELECTRON" ]; then
     curl -L "$ELECTRON_URL" -o "$ELECTRON"
   fi
 
-  unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
+  local ext="${JRE##*.}"
-}
+  if [ "$ext" = "zip" ]; then
-
+    unzip "$JRE"
-setup_jre() {
-  if [ -d "jre" ]; then
-    chmod +x ./jre/bin/java
-    chmod +x ./jre/lib/jspawnhelper
-    mv "jre" "$RELEASE_NAME/jre"
   else
-    if [ ! -f "$JRE" ]; then
+    tar xvf "$JRE"
-      curl -L "$JRE_URL" -o "$JRE"
-    fi
-
-    local ext="${JRE##*.}"
-    if [ "$ext" = "zip" ]; then
-      unzip "$JRE"
-    else
-      tar xvf "$JRE"
-    fi
-    mv "$JRE_DIR" "$RELEASE_NAME/jre"
   fi
+  mv "$JRE_DIR" "$RELEASE_NAME/jre"
+  unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
+  tree
 }
 
 copy_linux_package_assets_to() {
   local output_dir
   output_dir="$(readlink -e "$1" || exit 1)"
 
-  cp "scripts/resources/pkg/suwayomi-server.sh" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server-browser-launcher.sh" "$output_dir/"
-  cp "scripts/resources/pkg/suwayomi-server.desktop" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server-debug-launcher.sh" "$output_dir/"
-  cp "scripts/resources/pkg/suwayomi-launcher.sh" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server-electron-launcher.sh" "$output_dir/"
-  cp "scripts/resources/pkg/suwayomi-launcher.desktop" "$output_dir/"
+  cp "scripts/resources/pkg/tachidesk-server.desktop" "$output_dir/"
   cp "scripts/resources/pkg/systemd"/* "$output_dir/"
-  cp "server/src/main/resources/icon/faviconlogo-128.png" \
+  cp "server/src/main/resources/icon/faviconlogo.png" \
-    "$output_dir/suwayomi-server.png"
+    "$output_dir/tachidesk-server.png"
 }
 
 make_linux_bundle() {
-  mkdir "$RELEASE_NAME/bin"
+  cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
+  cp "scripts/resources/tachidesk-server-browser-launcher.sh" "$RELEASE_NAME/"
-  cp "scripts/resources/suwayomi-launcher.sh" "$RELEASE_NAME/"
+  cp "scripts/resources/tachidesk-server-debug-launcher.sh" "$RELEASE_NAME/"
-  cp "scripts/resources/suwayomi-server.sh" "$RELEASE_NAME/"
+  cp "scripts/resources/tachidesk-server-electron-launcher.sh" "$RELEASE_NAME/"
 
   tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
 }
 
 make_macos_bundle() {
-  mkdir "$RELEASE_NAME/bin"
+  cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
+  cp "scripts/resources/Tachidesk Browser Launcher.command" "$RELEASE_NAME/"
-  cp "scripts/resources/Suwayomi Launcher.command" "$RELEASE_NAME/"
+  cp "scripts/resources/Tachidesk Debug Launcher.command" "$RELEASE_NAME/"
+  cp "scripts/resources/Tachidesk Electron Launcher.command" "$RELEASE_NAME/"
 
-  tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
+  zip -9 -r "$RELEASE" "$RELEASE_NAME/"
 }
 
 # https://wiki.debian.org/SimplePackagingTutorial
 # https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.pdf
 make_deb_package() {
   #behind $RELEASE_VERSION is hyphen "-"
-  local source_dir="suwayomi-server-$RELEASE_VERSION"
+  local source_dir="tachidesk-server-$RELEASE_VERSION"
   #behind $RELEASE_VERSION is underscore "_"
-  local upstream_source="suwayomi-server_$RELEASE_VERSION.orig.tar.gz"
+  local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz"
 
   mkdir "$RELEASE_NAME/$source_dir/"
-  mv "$RELEASE_NAME/Suwayomi-Launcher.jar" "$RELEASE_NAME/$source_dir/Suwayomi-Launcher.jar"
+  cp "$JAR" "$RELEASE_NAME/$source_dir/Tachidesk-Server.jar"
-  cp "$JAR" "$RELEASE_NAME/$source_dir/Suwayomi-Server.jar"
   copy_linux_package_assets_to "$RELEASE_NAME/$source_dir/"
   tar -I "gzip" -C "$RELEASE_NAME/" -cvf "$upstream_source" "$source_dir"
 
@@ -214,13 +218,12 @@ make_deb_package() {
   sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/$source_dir/debian/changelog"
   sed -i "s/\$pkgrel/1/"                "$RELEASE_NAME/$source_dir/debian/changelog"
 
-  sudo apt update
   sudo apt install devscripts build-essential dh-exec
   cd "$RELEASE_NAME/$source_dir/"
   dpkg-buildpackage --no-sign --build=all
   cd -
 
-  local deb="suwayomi-server_$RELEASE_VERSION-1_all.deb"
+  local deb="tachidesk-server_$RELEASE_VERSION-1_all.deb"
   mv "$RELEASE_NAME/$deb" "$RELEASE"
 }
 
@@ -253,16 +256,16 @@ make_windows_bundle() {
   #WINEARCH=win32 wine "$rcedit" "$RELEASE_NAME/electron/electron.exe" \
   #    --set-icon "$icon"
 
-  mkdir "$RELEASE_NAME/bin"
+  cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar"
-  cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar"
+  cp "scripts/resources/Tachidesk Browser Launcher.bat" "$RELEASE_NAME"
-  cp "scripts/resources/Suwayomi Launcher.bat" "$RELEASE_NAME"
+  cp "scripts/resources/Tachidesk Debug Launcher.bat" "$RELEASE_NAME"
+  cp "scripts/resources/Tachidesk Electron Launcher.bat" "$RELEASE_NAME"
 
   zip -9 -r "$RELEASE" "$RELEASE_NAME"
 }
 
 make_windows_package() {
   if [ "$CI" = true ]; then
-    sudo apt update
     sudo apt install -y wixl
   fi
 
@@ -273,16 +276,31 @@ make_windows_package() {
   | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
     --directory-ref electron --component-group electron >"$RELEASE_NAME/electron.wxs"
 
-  find "$RELEASE_NAME/bin" \
-  | wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
-    --directory-ref bin --component-group bin >"$RELEASE_NAME/bin.wxs"
-
   local icon="server/src/main/resources/icon/faviconlogo.ico"
   local arch=${OS##*-}
 
   wixl -D ProductVersion="$RELEASE_VERSION" -D SourceDir="$RELEASE_NAME" \
-    -D Icon="$icon" --arch "$arch" "scripts/resources/msi/suwayomi-server-$arch.wxs" \
+    -D Icon="$icon" --arch "$arch" "scripts/resources/msi/tachidesk-server-$arch.wxs" \
-    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" "$RELEASE_NAME/bin.wxs" -o "$RELEASE"
+    "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" -o "$RELEASE"
+}
+
+setup_python() {
+  mkdir "$RELEASE_NAME/"
+  curl -L "$PYTHON_URL" -o "$PYTHON"
+  7z x $PYTHON
+  mv WPy64-31090/python-3.10.9.amd64 "$RELEASE_NAME/python"
+}
+
+setup_undetected_chromedriver() {
+  curl -L "https://github.com/Suwayomi/undetected-chromedriver/archive/refs/heads/master.zip" -o undetected-chromedriver-master.zip
+  unzip undetected-chromedriver-master.zip
+  mv undetected-chromedriver-master "$RELEASE_NAME/undetected-chromedriver"
+}
+
+
+setup_undetected_chromedriver_and_python() {
+  setup_python
+  setup_undetected_chromedriver
 }
 
 # Error handler

scripts/resources/Suwayomi Launcher.bat

@@ -1 +0,0 @@
-start "" jre/bin/javaw -jar Suwayomi-Launcher.jar

scripts/resources/Suwayomi Launcher.command

@@ -1,3 +0,0 @@
-cd "`dirname "$0"`"
-
-./jre/bin/java -jar Suwayomi-Launcher.jar

scripts/resources/Tachidesk Browser Launcher.bat

@@ -0,0 +1 @@
+start "" jre/bin/javaw -jar Tachidesk-Server.jar

scripts/resources/Tachidesk Browser Launcher.command

@@ -0,0 +1,3 @@
+cd "`dirname "$0"`"
+
+./jre/Contents/Home/bin/java -jar Tachidesk-Server.jar

scripts/resources/Tachidesk Debug Launcher.bat

@@ -0,0 +1,7 @@
+:: cleaner output
+@echo off
+
+jre\bin\java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk-Server.jar
+
+:: Prevent cmd from closing when Tachidesk crashes
+pause

scripts/resources/Tachidesk Debug Launcher.command

@@ -0,0 +1,3 @@
+cd "`dirname "$0"`"
+
+./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk-Server.jar

scripts/resources/Tachidesk Electron Launcher.bat

@@ -0,0 +1 @@
+jre\bin\javaw "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron.exe" -jar Tachidesk-Server.jar

scripts/resources/Tachidesk Electron Launcher.command

@@ -0,0 +1,3 @@
+cd "`dirname "$0"`"
+
+./jre/Contents/Home/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/Electron.app/Contents/MacOS/Electron" -jar Tachidesk-Server.jar

scripts/resources/deb/changelog

@@ -1,5 +1,5 @@
-suwayomi-server ($pkgver-$pkgrel) unstable; urgency=medium
+tachidesk-server ($pkgver-$pkgrel) unstable; urgency=medium
 
-  * See CHANGELOG.md on https://github.com/Suwayomi/Suwayomi-Server
+  * See CHANGELOG.md on https://github.com/Suwayomi/Tachidesk-Server
 
  -- Mahor1221 <mahor1221@pm.me>  Fri, 14 Jan 2022 00:00:00 +0000

scripts/resources/deb/control

@@ -1,14 +1,14 @@
-Source: suwayomi-server
+Source: tachidesk-server
 Section: web
 Priority: optional
 Maintainer: Mahor1221 <mahor1221@pm.me>
 Build-Depends: debhelper-compat (= 13), dh-exec
 Standards-Version: 4.5.1
-Homepage: https://github.com/Suwayomi/Suwayomi-Server
+Homepage: https://github.com/Suwayomi/Tachidesk-Server
 
-Package: suwayomi-server
+Package: tachidesk-server
 Architecture: all
-Depends: ${misc:Depends}, openjdk-21-jre, libc++-dev
+Depends: ${misc:Depends}, java8-runtime-headless, libc++-dev
 Description: Manga Reader
  A free and open source manga reader server that runs extensions built for Tachiyomi.
- Suwayomi is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.
+ Tachidesk is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.

scripts/resources/deb/copyright

@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: suwayomi-server
+Upstream-Name: tachidesk-server
 Upstream-Contact: https://discord.gg/DDZdqZWaHA
-Source: https://github.com/Suwayomi/Suwayomi-Server
+Source: https://github.com/Suwayomi/Tachidesk-Server
 
 Files: *
 Copyright: Contributors to the Suwayomi project

scripts/resources/deb/install

@@ -1,13 +1,12 @@
 #!/usr/bin/dh-exec
 
-Suwayomi-Server.jar         usr/share/java/suwayomi-server/bin/
+Tachidesk-Server.jar         usr/share/java/tachidesk-server/
-Suwayomi-Launcher.jar       usr/share/java/suwayomi-server/
+tachidesk-server.png         usr/share/pixmaps/
-suwayomi-server.png         usr/share/pixmaps/
+tachidesk-server.desktop     usr/share/applications/
-suwayomi-server.desktop     usr/share/applications/
+tachidesk-server.service     usr/lib/systemd/system/
-suwayomi-launcher.desktop   usr/share/applications/
+tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf
-suwayomi-server.service     usr/lib/systemd/system/
+tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf
-suwayomi-server.sysusers => usr/lib/sysusers.d/suwayomi-server.conf
+tachidesk-server.conf     => etc/tachidesk/server.conf
-suwayomi-server.tmpfiles => usr/lib/tmpfiles.d/suwayomi-server.conf
+tachidesk-server-browser-launcher.sh  => usr/bin/tachidesk-server-browser
-suwayomi-server.conf     => etc/suwayomi/server.conf
+tachidesk-server-debug-launcher.sh    => usr/bin/tachidesk-server-debug
-suwayomi-server.sh       => usr/bin/suwayomi-server
+tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron
-suwayomi-launcher.sh     => usr/bin/suwayomi-launcher

scripts/resources/deb/source/include-binaries

@@ -1 +1 @@
-suwayomi-server.png
+tachidesk-server.png

scripts/resources/msi/suwayomi-server-x64.wxs

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="174c8f36-0bec-4585-9ddd-469c3d889dc1"
-    Version="$(var.ProductVersion)" Language="1033" Name="Suwayomi Server" Manufacturer="Suwayomi">
-    <Package InstallerVersion="300" Compressed="yes" />
-    <Media Id="1" Cabinet="Suwayomi_Server.cab" EmbedCab="yes" />
-
-    <Condition Message="This version of Windows does not support deploying 64-bit packages.">
-      VersionNT64
-    </Condition>
-
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-    <!-- Directory -->
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFiles64Folder">
-        <Directory Id="INSTALLDIR" Name="Suwayomi-Server" >
-          <Directory Id="jre"/>
-          <Directory Id="electron"/>
-          <Directory Id="bin"/>
-        </Directory>
-      </Directory>
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ProgramMenuDir" Name="Suwayomi-Server">
-          <Component Id="ProgramMenuDir" Guid="*">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
-            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
-          </Component>
-        </Directory>
-      </Directory>
-      <Directory Id="DesktopFolder" />
-    </Directory>
-
-    <!-- Component -->
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="SuwayomiJAR" Guid="*" Win64="yes">
-          <File Id="Suwayomi-Launcher.jar" Source="$(var.SourceDir)/Suwayomi-Launcher.jar" KeyPath="yes" />
-      </Component>
-
-      <Component Id="SuwayomiLauncherBAT" Guid="*" Win64="yes">
-        <File Id="SuwayomiLauncher.bat" Source="$(var.SourceDir)/Suwayomi Launcher.bat" KeyPath="yes" >
-          <Shortcut Id="SuwayomiLauncher.lnk" Name="Suwayomi Launcher" Directory="INSTALLDIR"
-            WorkingDirectory="INSTALLDIR" Icon="Suwayomi.ico" IconIndex="0" Advertise="yes" />
-          <Shortcut Id="DesktopSuwayomiLauncher.lnk" Name="Suwayomi Launcher" Directory="DesktopFolder"
-            WorkingDirectory="INSTALLDIR" Icon="Suwayomi.ico" IconIndex="0" Advertise="yes" />
-          <Shortcut Id="ProgramMenuSuwayomiLauncher.lnk" Name="Suwayomi Launcher" Directory="ProgramMenuDir"
-            WorkingDirectory="INSTALLDIR" Icon="Suwayomi.ico" IconIndex="0" Advertise="yes"
-            Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
-        </File>
-      </Component>
-    </DirectoryRef>
-
-    <InstallExecuteSequence>
-      <RemoveExistingProducts After="InstallValidate" />
-    </InstallExecuteSequence>
-
-    <!-- Feature -->
-    <Feature Id="Suwayomi_Server" Title="Suwayomi-Server" Level="1">
-      <ComponentGroupRef Id="jre" />
-      <ComponentGroupRef Id="bin" />
-      <ComponentRef Id="SuwayomiJAR" />
-      <ComponentRef Id="SuwayomiLauncherBAT" />
-      <ComponentRef Id="ProgramMenuDir" />
-      <ComponentGroupRef Id="electron" />
-    </Feature>
-
-    <Icon Id="Suwayomi.ico" SourceFile="$(var.Icon)" />
-    <Property Id="ARPPRODUCTICON" Value="Suwayomi.ico" /> <!-- Icon in Add/Remove Programs -->
-  </Product>
-</Wix>

scripts/resources/msi/tachidesk-server-x64.wxs

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*" UpgradeCode="*"
+    Version="$(var.ProductVersion)" Language="1033" Name="Tachidesk Server" Manufacturer="Suwayomi">
+    <Package InstallerVersion="300" Compressed="yes" />
+    <Media Id="1" Cabinet="Tachidesk_Server.cab" EmbedCab="yes" />
+
+    <Condition Message="This version of Windows does not support deploying 64-bit packages.">
+      VersionNT64
+    </Condition>
+
+    <!-- Directory -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFiles64Folder">
+        <Directory Id="INSTALLDIR" Name="Tachidesk-Server" >
+          <Directory Id="jre"/>
+          <Directory Id="electron"/>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ProgramMenuDir" Name="Tachidesk-Server">
+          <Component Id="ProgramMenuDir" Guid="*">
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
+            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
+          </Component>
+        </Directory>
+      </Directory>
+      <Directory Id="DesktopFolder" />
+    </Directory>
+
+    <!-- Component -->
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="TachideskJAR" Guid="*" Win64="yes">
+          <File Id="Tachidesk-Server.jar" Source="$(var.SourceDir)/Tachidesk-Server.jar" KeyPath="yes" />
+      </Component>
+
+      <Component Id="TachideskBrowserBAT" Guid="*" Win64="yes">
+        <File Id="TachideskBrowser.bat" Source="$(var.SourceDir)/Tachidesk Browser Launcher.bat" KeyPath="yes" >
+          <Shortcut Id="TachideskBrowser.lnk" Name="Tachidesk Browser" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskDebugBAT" Guid="*" Win64="yes">
+        <File Id="TachideskDebug.bat" Source="$(var.SourceDir)/Tachidesk Debug Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskDebug.lnk" Name="Tachidesk Debug" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskDebug.lnk" Name="Tachidesk Debug" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskElectronBAT" Guid="*" Win64="yes">
+        <File Id="TachideskElectron.bat" Source="$(var.SourceDir)/Tachidesk Electron Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskElectron.lnk" Name="Tachidesk Electron" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskElectron.lnk" Name="Tachidesk Electron" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskElectron.lnk" Name="Tachidesk Electron" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk inside Electron as a desktop applicaton." />
+        </File>
+      </Component>
+    </DirectoryRef>
+
+    <!-- Feature -->
+    <Feature Id="Tachidesk_Server" Title="Tachidesk-Server" Level="1">
+      <ComponentGroupRef Id="jre" />
+      <ComponentRef Id="TachideskJAR" />
+      <ComponentRef Id="TachideskBrowserBAT" />
+      <ComponentRef Id="TachideskDebugBAT" />
+      <ComponentRef Id="ProgramMenuDir" />
+      <ComponentGroupRef Id="electron" />
+      <ComponentRef Id="TachideskElectronBAT" />
+    </Feature>
+
+    <Icon Id="Tachidesk.ico" SourceFile="$(var.Icon)" />
+    <Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
+  </Product>
+</Wix>

scripts/resources/msi/tachidesk-server-x86.wxs

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*" UpgradeCode="*"
+    Version="$(var.ProductVersion)" Language="1033" Name="Tachidesk Server" Manufacturer="Suwayomi">
+    <Package InstallerVersion="300" Compressed="yes" />
+    <Media Id="1" Cabinet="Tachidesk_Server.cab" EmbedCab="yes" />
+
+    <!-- Directory -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLDIR" Name="Tachidesk-Server" >
+          <Directory Id="jre"/>
+          <Directory Id="electron"/>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ProgramMenuDir" Name="Tachidesk-Server">
+          <Component Id="ProgramMenuDir" Guid="*">
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
+            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
+          </Component>
+        </Directory>
+      </Directory>
+      <Directory Id="DesktopFolder" />
+    </Directory>
+
+    <!-- Component -->
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="TachideskJAR" Guid="*">
+          <File Id="Tachidesk-Server.jar" Source="$(var.SourceDir)/Tachidesk-Server.jar" KeyPath="yes" />
+      </Component>
+
+      <Component Id="TachideskBrowserBAT" Guid="*">
+        <File Id="TachideskBrowser.bat" Source="$(var.SourceDir)/Tachidesk Browser Launcher.bat" KeyPath="yes" >
+          <Shortcut Id="TachideskBrowser.lnk" Name="Tachidesk Browser" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskDebugBAT" Guid="*">
+        <File Id="TachideskDebug.bat" Source="$(var.SourceDir)/Tachidesk Debug Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskDebug.lnk" Name="Tachidesk Debug" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskDebug.lnk" Name="Tachidesk Debug" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskElectronBAT" Guid="*">
+        <File Id="TachideskElectron.bat" Source="$(var.SourceDir)/Tachidesk Electron Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskElectron.lnk" Name="Tachidesk Electron" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskElectron.lnk" Name="Tachidesk Electron" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskElectron.lnk" Name="Tachidesk Electron" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk inside Electron as a desktop applicaton." />
+        </File>
+      </Component>
+    </DirectoryRef>
+
+    <!-- Feature -->
+    <Feature Id="Tachidesk_Server" Title="Tachidesk-Server" Level="1">
+      <ComponentGroupRef Id="jre" />
+      <ComponentRef Id="TachideskJAR" />
+      <ComponentRef Id="TachideskBrowserBAT" />
+      <ComponentRef Id="TachideskDebugBAT" />
+      <ComponentRef Id="ProgramMenuDir" />
+      <ComponentGroupRef Id="electron" />
+      <ComponentRef Id="TachideskElectronBAT" />
+    </Feature>
+
+    <Icon Id="Tachidesk.ico" SourceFile="$(var.Icon)" />
+    <Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
+  </Product>
+</Wix>

scripts/resources/pkg/suwayomi-launcher.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Suwayomi-Launcher
-Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/suwayomi-server/Suwayomi-Launcher.jar "\\$@"
-Icon=suwayomi-server
-Terminal=false
-Categories=Network;

scripts/resources/pkg/suwayomi-launcher.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/java -jar /usr/share/java/suwayomi-server/Suwayomi-Launcher.jar

scripts/resources/pkg/suwayomi-server.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Suwayomi-Server
-Comment=Manga Reader
-Exec=/usr/bin/java -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar "\\$@"
-Icon=suwayomi-server
-Terminal=false
-Categories=Network;

scripts/resources/pkg/suwayomi-server.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/java -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar

scripts/resources/pkg/systemd/suwayomi-server.sysusers

@@ -1,2 +0,0 @@
-#Type    Name              ID    GECOS                                 Home directory              Shell
-u        suwayomi-server   -     "Suwayomi Manga Server"               /var/lib/suwayomi

scripts/resources/pkg/systemd/suwayomi-server.tmpfiles

@@ -1,2 +0,0 @@
-#Type  Path                Mode  User              Group             Age  Argument
-d      /var/lib/suwayomi   0755  suwayomi-server   suwayomi-server

scripts/resources/pkg/systemd/tachidesk-server.conf

@@ -1,4 +1,4 @@
-TACHIDESK_ROOT_DIR="/var/lib/suwayomi"
+TACHIDESK_ROOT_DIR="/var/lib/tachidesk"
 
 # Extra arguments passed to the java command
 # The default value disables the system tray icon, and launching a browser on service start.

scripts/resources/pkg/systemd/tachidesk-server.service

@@ -5,12 +5,12 @@ After=network-online.target
 
 [Service]
 Type=simple
-User=suwayomi-server
+User=tachidesk
-Group=suwayomi-server
+Group=tachidesk
-SyslogIdentifier=suwayomi-server
+SyslogIdentifier=tachidesk
 
-EnvironmentFile=/etc/suwayomi/server.conf
+EnvironmentFile=/etc/tachidesk/server.conf
-ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
+ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar
 Restart=on-failure
 
 ProtectSystem=full

scripts/resources/pkg/systemd/tachidesk-server.sysusers

@@ -0,0 +1,2 @@
+#Type    Name       ID    GECOS                                 Home directory              Shell
+u        tachidesk  -     "Tachidesk Manga Server"              /var/lib/tachidesk

scripts/resources/pkg/systemd/tachidesk-server.tmpfiles

@@ -0,0 +1,2 @@
+#Type  Path                Mode  User       Group      Age  Argument
+d      /var/lib/tachidesk  0755  tachidesk  tachidesk

scripts/resources/pkg/tachidesk-server-browser-launcher.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server-debug-launcher.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec /usr/bin/java \
+    -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true \
+    -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server-electron-launcher.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ ! -f /usr/bin/electron ]; then
+    echo "Electron executable was not found!
+In order to run this launcher, you need Electron installed."
+    exit 1
+fi
+
+exec /usr/bin/java \
+    -Dsuwayomi.tachidesk.config.server.webUIInterface=electron \
+    -Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron \
+    -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar

scripts/resources/pkg/tachidesk-server.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tachidesk-Server
+Comment=Manga Reader
+Exec=/usr/bin/java -jar /usr/share/java/tachidesk-server/Tachidesk-Server.jar "\\$@"
+Icon=tachidesk-server
+Terminal=false
+Categories=Network;

scripts/resources/suwayomi-launcher.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec ./jre/bin/java -jar ./Suwayomi-Launcher.jar

scripts/resources/suwayomi-server.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec ./jre/bin/java -jar ./bin/Suwayomi-Server.jar