bump version

* Create docker_build_stable

Add docker build workflow

* Rename docker_build_stable to docker_build_stable.yml

* Update docker_build_stable.yml

* Update docker_build_stable.yml

.github/workflows/build_push.yml

@@ -78,11 +78,14 @@ jobs:
           echo "$genTag"
           echo "::set-output name=value::$genTag"
 
-      - name: make windows packages
+      - name: make bundle packages
         run: |
           cd master/scripts
           ./windows-bundler.sh win32
           ./windows-bundler.sh win64
+          ./unix-bundler.sh linux-x64
+          ./unix-bundler.sh macOS-x64
+          ./unix-bundler.sh macOS-arm64
 
 #      - name: Mock make windows packages
 #        run: |
@@ -116,11 +119,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-          artifacts: "master/server/build/*.jar,master/server/build/*.zip"
+          artifacts: "master/server/build/*.jar,master/server/build/*.zip,master/server/build/*.tar.gz"
           owner: "Suwayomi"
           repo: "Tachidesk-Server-preview"
           tag: ${{ steps.GenTagName.outputs.value }}
-
-      - name: Run Docker build workflow
-        run: |
-          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "preview"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches

.github/workflows/docker_build_stable.yml

@@ -0,0 +1,15 @@
+name: Docker Build Stable
+
+on:
+  release:
+    types: [published]
+  
+jobs:
+  build_publish_docker_container:
+    runs-on: ubuntu-latest
+
+    steps:         
+      - name: run docker build and publish script
+        run: |
+          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
+          

.github/workflows/publish.yml

@@ -51,13 +51,6 @@ jobs:
           cd master
           curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Cache node_modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            **/webUI/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
-
       - name: Build and copy webUI, Build Jar
         uses: eskatos/gradle-command-action@v1
         env:
@@ -70,24 +63,21 @@ jobs:
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
-      - name: make windows packages
+      - name: make bundle packages
         run: |
           cd master/scripts
           ./windows-bundler.sh win32
           ./windows-bundler.sh win64
+          ./unix-bundler.sh linux-x64
+          ./unix-bundler.sh macOS-x64
+          ./unix-bundler.sh macOS-arm64
 
       - name: Upload Release
         uses: xresloader/upload-to-github-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          file: "master/server/build/*.jar;master/server/build/*.zip"
+          file: "master/server/build/*.jar;master/server/build/*.zip;master/server/build/*.tar.gz"
           tags: true
           draft: true
           verbose: true
-
-      - name: Run Docker build workflow
-        run: |
-          sleep 10 # sleep a bit to make sure the release is actually inside github db
-          curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.DEPLOY_PREVIEW_TOKEN }}" -d '{"ref":"main", "inputs":{"tachidesk_release_type": "stable"}}' https://api.github.com/repos/suwayomi/docker-tachidesk/actions/workflows/build_container_images.yml/dispatches
-          

.gitignore

@@ -11,6 +11,7 @@ server/tmp/
 server/tachiserver-data/
 
 # bundle asset downlaods
-OpenJDK*.zip
-electron-*.zip
+OpenJDK*.*
+zulu*jre*
+electron-*.*
 rcedit-*

CHANGELOG-TEMPLATE.md

@@ -0,0 +1,28 @@
+# Server: v0.X.Y-rXXX + WebUI: rXXX
+## TL;DR
+<!-- TODO: fill before release -->
+
+## Tachidesk-Server
+### Public API
+#### Non-breaking changes
+- N/A
+
+#### Breaking changes
+- N/A
+
+#### Bug fixes
+- N/A
+
+### Private API
+- N/A
+
+
+## Tachidesk-WebUI
+#### Visible changes
+- N/A
+
+#### Bug fixes
+- N/A
+
+#### Internal changes
+- N/A

CHANGELOG.md

@@ -0,0 +1,126 @@
+# Server: v0.5.0 + WebUI: r789
+## TL;DR
+- You can now install APK extensions from the extensions page
+- WebUI now comes with an updated Material Design looks and is faster a little bit.
+- WebUI now shows Nsfw content by default, disable it in settings if you prefer to not see Nsfw stuff
+- Added support for configuration of sources, this enables MangaDex, Komga, Cubari and many other sources
+- Chapters in the Manga page and Sources in the source page now look nicer and will glow with mouse hover
+
+## Tachidesk-Server
+### Public API
+#### Non-breaking changes
+- (r888) add installing APK from external sources endpoint
+
+#### Breaking changes
+- (r877 [#188](https://github.com/Suwayomi/Tachidesk-Server/pull/188) by @Syer10) `MangaDataClass.genre` changed type to `List<String>`
+
+#### Bug fixes
+- (r899-r901) fix when an external apk is installed and it doesn't have the default tachiyomi-extensions name
+- (r905) fix a bug where if two sources return the same URL, a false duplicate might be detected
+
+### Private API
+- (r887) the `run` task won't call `downloadWebUI` now
+- (r902) cleanup print/ln instances
+- (r906) better handling of uninstalling Extensions
+
+## Tachidesk-WebUI
+#### Visible changes
+- (r770) add support for the new genre type
+- (r771) set the default value of `showNsfw` to `true` so we won't have visual artifacts with a clean install
+- (r774 [#21](https://github.com/Suwayomi/Tachidesk-WebUI/pull/21) by @voltrare) `ReaderNavbar.jsx`: Swap close and retract Navbar buttons
+- (r775 [#23](https://github.com/Suwayomi/Tachidesk-WebUI/pull/23) by @voltrare) `yarn.lock`: Fixes version inconsistency after commit 9b866811b
+- (r776 [#23](https://github.com/Suwayomi/Tachidesk-WebUI/pull/23) by @voltrare) add margin between Source and Extension cards, make the Search button look nicer
+- (r777) add support for installing external APK files
+- (r778) fix the makeToaster?
+- (r779) Action button for installing external extension
+- (r780 Suwayomi/Tachidesk-WebUI#25) add on hover, active effect to Chapter/Episode card
+- (r782-r785) updating material-ui to v5 changed the theme
+- (r785-r788) better `SourceCard` looks on mobile, move `SourceDataClass.isConfigurable` gear button to `SourceMangas`
+- (r789) implement source configuration
+
+#### Bug fixes
+- N/A
+
+#### Internal changes
+- (r782-r785) update dependencies, migrate material-ui from v4 to v5
+
+
+
+# Server: v0.4.9 + WebUI: r769
+## Tachidesk-Server
+### Public API
+#### Non-breaking changes
+- N/A
+
+#### Breaking changes
+- (r857) renamed: `SourceDataClass.isNSFW` -> `SourceDataClass.isNsfw`
+
+#### Bug fixes
+- N/A
+
+### Private API
+- (r850) Bump WebUI version to r767
+- (r861) Bump WebUI version to r769
+
+#### Non-code changes
+- (r851) Add this changelog file and `CHANGELOG-TEMPLATE.md`
+- (r852-r853) `CONTRIBUTING.md`: Add a note about this maintaining this file changelog
+- (r855) `CONTRIBUTING.md`: text cleanup
+- (r859) `CONTRIBUTING.md`: remove dumb rule
+- (r862) `windows-bundler.sh`: update jre
+- (r864) add linux and macOS bundler script and launcher scripts
+- (r865) fix macOS bundler script and launcher scripts
+- (r866) bump electron version to v14.0.0
+- (r868) add linux and macOS bundlers to the publish workflow
+- (r871) `publish.yml`: remove node module cache, won't need it anymore
+- (r873) `publish.yml` and `build_push.yml`: fix oopsies
+
+
+## Tachidesk-WebUI
+#### Visible changes
+- (r767-r769) Support for hiding NSFW content in settings screen, extensions screen, sources screen
+
+#### Bug fixes
+- N/A
+
+#### Internal changes
+- (r767) Remove some duplicate dependency declaration from `package.json`
+
+#### Non-code changes
+- (r42-r45) Change `README.md`: some links and stuff 
+- (r45-r765) Add all of the commit history from when WebUI was separated from Server, jumping from r45 to r765 (r45 is exactly the same as r765)
+- (r766) Steal `.gitattributes` from Tachidesk-Server
+- (r767) Dependency cleanup in `package.json`
+
+
+
+
+# Server: v0.4.8 + WebUI: r41
+## Tachidesk-Server
+### Public API
+#### Non-breaking changes
+- Added support for serializing Search Filters
+- `SourceDataClass` now has a `isNsfw` key
+
+#### Breaking changes
+- N/A
+
+#### Bug fixes
+- Fixed a bug where backup restore reversed chapter order
+- Open Site feature now works properly (https://github.com/Suwayomi/Tachidesk-WebUI/issues/19)
+
+### Private API
+- Added `CloudflareInterceptor` from TachiWeb-Server
+- Restoring backup for mangas in library(merging manga data) is now supported
+
+## Tachidesk-WebUI
+#### Visible changes
+- Better looking manga card titles
+- Better reader title, next, prev buttons
+
+#### Bug fixes
+- Open Site feature now works properly (https://github.com/Suwayomi/Tachidesk-WebUI/issues/19)
+- Re-ordering categories now works
+
+#### Internal changes
+- N/A

CONTRIBUTING.md

@@ -2,18 +2,20 @@
 ## Where should I start?
 Checkout [This Kanban Board](https://github.com/Suwayomi/Tachidesk/projects/1) to see the rough development roadmap.
 
-**Note to potential contributors:** Notify the developers on [Suwayomi discord](https://discord.gg/DDZdqZWaHA) (#programming channel) 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.
+**Note 1:** Notify the developers on [Suwayomi discord](https://discord.gg/DDZdqZWaHA) (#programming channel) 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.
+
+**Note 2:** Store all changes with each direct commit/PR in [CHANGELOG.md](./CHANGELOG.md).
 
 ## How does Tachidesk-Server work?
 This project has two components: 
 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/Tachidesk-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
 
-## Why a web server app?
+## Why a web app?
 This structure is chosen to
 - Achieve the maximum multi-platform-ness
-- Gives the ability to acces Tachidesk-Server from a remote client e.g. your phone, tablet or smart TV
-- Eaise development of user intefaces for Tachidesk
+- 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 Tachidesk
 
 ## Building from source
 ### Prerequisites
@@ -22,7 +24,7 @@ You need these software packages installed in order to build the project
 - Java Development Kit and Java Runtime Environment version 8 or newer(both Oracle JDK and OpenJDK works)
 - Android stubs jar
     - **Manual download:** Download [android.jar](https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
-    - **Automated download:** Run `AndroidCompat/getAndroid.sh`(MacOS/Linux) or `AndroidCompat/getAndroid.ps1`(Windows) from project's root directory to download and rebuild the jar file from Google's repository.
+    - **Automated download:** Run `AndroidCompat/getAndroid.sh`(macOS/Linux) or `AndroidCompat/getAndroid.ps1`(Windows) from project's root directory to download and rebuild the jar file from Google's repository.
 
 ### 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/Tachidesk-Server-vX.Y.Z-rxxx.jar`.

README.md

@@ -4,11 +4,11 @@
 | ![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) |
 
 # Tachidesk-Server is a server app! You may not want to Download Tachidesk-Server directly.
-Yes, you need a client/user interface app as a front-end for Tachidesk-Server, if you Directly Download Tachidesk-Server you'll get a bundled version of [Tachodesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) with it.
+Yes, you need a client/user interface app as a front-end for Tachidesk-Server, if you Directly Download Tachidesk-Server you'll get a bundled version of [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) with it.
 
 Here's a list of known clients/user interfaces for Tachidesk-Server:
 - [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The "official" front-end for Tachidesk-Server, A native desktop Application.
-- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI): The web/electrion front-end that Tachidesk is traditionally shipped with.
+- [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI): The web/electrion front-end that Tachidesk-Server is traditionally shipped with.
 - [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), in super early stage of development.
 - [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stage of development.
 
@@ -41,23 +41,45 @@ Here is a list of current features:
 
 **Note:** Tachidesk-Server is alpha software and can break rarely and/or with each update. See [Troubleshooting](https://github.com/Suwayomi/Tachidesk-Server/wiki/Troubleshooting) if it happens.
 
-## Downloading and Running the app
-### All Operating Systems
-You should have The Java Runtime Environment(JRE) 8 or newer and a modern browser installed(Google is your friend for seeking assitance). Also an internet connection is required as almost everything this app does is downloading stuff. 
+# Downloading and Running the app
+## General Requirements
+In order to use the app effectively you need the following:
+- The jar release of Tachideesk-Server
+- The Java Runtime Environment(JRE) 8 or newer (included in bundle releases)
+- A Modern Browser like Google Chrome, Firefox, etc.
+- ElectronJS (optional) (included in bundle releases)
+- An internet connection (when you want to use online features)
+## Using the jar release directly 
+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).
 
-Download the latest "Stable" jar release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview jar build from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
+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-rxxx.jar` (or `java -jar Tachidesk-latest.jar` if you have the latest preview) from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
 
-Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxx.jar` (or `java -jar Tachidesk-latest.jar` if you have the latest preview) from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
+## Using Operating System Specific Bundles
+To facilitate the use of Tachidesk we provide bundle releases that include The Java Runtime Environment, ElectronJS and 3 Tachidesk Launcher Scripts.
+
+#### 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 "Stable" win32 or win64 (depending on your system, usually you want win64) release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
+Download the latest `win32`(Windows 32-bit) or `win64`(Windows 64-bit) release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
 
-The Windows specific build has java bundled inside, so you don't have to install java to use it. Unzip `Tachidesk-vX.Y.Z-rxxx-win64.zip` and run one of the Launcher files depending on what you want(see bellow). The rest works like the previous section.
-#### Windows Launchers
-- `Tachidesk Electron Launcher.bat`: Launches Tachidesk inside Electron as a desktop applicaton
-- `Tachidesk Browser Launcher.bat`: Launches Tachidesk in a browser window
-- `Tachidesk Debug Launcher.bat`: Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why.
+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) release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
+
+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/Tachidesk/releases) or a preview one from [the preview repository](https://github.com/Suwayomi/Tachidesk-preview/releases).
+
+`tar xvf` the downloaded file and double click on one of the launcher scripts or run them using the terminal.
+
+## Other methods of getting Tachidesk
 ### Arch Linux
 You can install Tachidesk from the AUR
 ```
@@ -65,7 +87,7 @@ yay -S tachidesk
 ```
 
 ### Docker
-Check our Offical Docker release [Tachidesk Container](https://github.com/orgs/Suwayomi/packages/container/package/tachidesk) or use [arbuilder's](https://github.com/arbuilder/Tachidesk-docker) tachidesk docker repo for installation. Source code for our container is available at [docker-tachidesk](https://github.com/Suwayomi/docker-tachidesk). By default the server will be running on http://localhost:4567 open this url in your browser.
+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:
 ```

build.gradle.kts

@@ -46,18 +46,18 @@ configure(projects) {
         testImplementation(kotlin("test-junit5"))
 
         // coroutines
-        val coroutinesVersion = "1.5.0"
+        val coroutinesVersion = "1.5.1"
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
 
-        val kotlinSerializationVersion = "1.2.1"
+        val kotlinSerializationVersion = "1.3.0-RC"
         implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
         implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")
 
 
         // Dependency Injection
-        implementation("org.kodein.di:kodein-di-conf-jvm:7.5.0")
+        implementation("org.kodein.di:kodein-di-conf-jvm:7.7.0")
 
         // Logging
         implementation("org.slf4j:slf4j-api:1.7.30")
@@ -69,8 +69,8 @@ configure(projects) {
         implementation("io.reactivex:rxkotlin:1.0.0")
         implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
 
-        // JSoup
-        implementation("org.jsoup:jsoup:1.13.1")
+        // dependency both in AndroidCompat and extensions, version locked by Tachiyomi app/extensions
+        implementation("org.jsoup:jsoup:1.14.1")
 
         // dependency of :AndroidCompat:Config
         implementation("com.typesafe:config:1.4.1")
@@ -80,14 +80,15 @@ configure(projects) {
         implementation("net.harawata:appdirs:1.2.1")
 
         // dex2jar
-        val dex2jarVersion = "v21"
+        val dex2jarVersion = "v26"
         implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion")
         implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion")
 
         // APK parser
         implementation("net.dongliu:apk-parser:2.6.10")
 
-        // Jackson
+
+        // dependency both in AndroidCompat and server, version locked by javalin
         implementation("com.fasterxml.jackson.core:jackson-annotations:2.10.3")
     }
 }

buildSrc/src/main/kotlin/Constants.kt

@@ -7,16 +7,16 @@ import java.io.BufferedReader
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-const val kotlinVersion = "1.5.21"
+const val kotlinVersion = "1.5.30"
 
 const val MainClass = "suwayomi.tachidesk.MainKt"
 
 // should be bumped with each stable release
-val tachideskVersion = System.getenv("ProductVersion") ?: "v0.4.8"
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.5.0"
 
-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r41"
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r789"
 
-// counts commits on the the master branch
+// counts commits on the master branch
 val tachideskRevision = runCatching {
     System.getenv("ProductRevision") ?: Runtime
         .getRuntime()

scripts/resources/Tachidesk Browser Launcher.command

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

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.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.jar

scripts/resources/tachidesk-browser-launcher.sh

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

scripts/resources/tachidesk-debug-launcher.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar

scripts/resources/tachidesk-electron-launcher.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java "-Dsuwayomi.tachidesk.config.server.webUIInterface=electron" "-Dsuwayomi.tachidesk.config.server.electronPath=electron/electron" -jar Tachidesk.jar

scripts/unix-bundler.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Copyright (C) Contributors to the Suwayomi project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+electron_version="v14.0.0"
+
+if [ $1 = "linux-x64" ]; then
+  jre="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
+  jre_release="jdk8u302-b08"
+  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
+  jre_dir="$jre_release-jre"
+  electron="electron-$electron_version-linux-x64.zip"
+elif [ $1 = "macOS-x64" ]; then
+  jre="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
+  jre_release="jdk8u302-b08"
+  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
+  jre_dir="$jre_release-jre"
+  electron="electron-$electron_version-darwin-x64.zip"
+elif [ $1 = "macOS-arm64" ]; then
+  jre="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
+  jre_release="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64"
+  jre_url="https://cdn.azul.com/zulu/bin/$jre"
+  jre_dir="$jre_release"
+  electron="electron-$electron_version-darwin-arm64.zip"
+else
+  echo "Unsupported arch value: $1"
+  exit 1
+fi
+
+arch="$1"
+os=$(echo $arch | cut -d '-' -f1)
+
+echo "creating $arch bundle"
+
+jar=$(ls ../server/build/*.jar | tail -n1)
+jar_name=$(echo $jar | cut -d'/' -f4)
+release_name=$(echo $jar_name | sed 's/.jar//')-$arch
+
+
+# make release dir
+mkdir $release_name
+
+
+echo "Dealing with jre..."
+if [ ! -f $jre ]; then
+  curl -L $jre_url -o $jre
+fi
+tar xvf $jre
+mv $jre_dir $release_name/jre
+
+echo "Dealing with electron"
+if [ ! -f $electron ]; then
+  curl -L "https://github.com/electron/electron/releases/download/$electron_version/$electron" -o $electron
+fi
+unzip $electron -d $release_name/electron
+
+# copy artifacts
+cp $jar $release_name/Tachidesk.jar
+if [ $os = linux ]; then
+  cp "resources/tachidesk-browser-launcher.sh" $release_name
+  cp "resources/tachidesk-debug-launcher.sh" $release_name
+  cp "resources/tachidesk-electron-launcher.sh" $release_name
+elif [ $os = macOS ]; then
+  cp "resources/Tachidesk Browser Launcher.command" $release_name
+  cp "resources/Tachidesk Debug Launcher.command" $release_name
+  cp "resources/Tachidesk Electron Launcher.command" $release_name
+fi
+
+archive_name=""
+if [ $os = linux ]; then
+  archive_name=$release_name.tar.gz
+  GZIP=-9 tar cvzf $archive_name $release_name
+elif [ $os = macOS ]; then
+  archive_name=$release_name.zip
+  zip -9 -r $archive_name $release_name
+fi
+
+rm -rf $release_name
+
+# clean up from possible previous runs
+if [ -f ../server/build/$archive_name ]; then
+  rm ../server/build/$archive_name
+fi
+
+mv $archive_name ../server/build/

scripts/windows-bundler.sh

@@ -6,19 +6,23 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-electron_version="v12.0.9"
+electron_version="v14.0.0"
 
 if [ $1 = "win32" ]; then
   jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
+  jre_release="jdk8u292-b10"
+  jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$jre_release/$jre"
   arch="win32"
   electron="electron-$electron_version-win32-ia32.zip"
 else
-  jre="OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip"
+  jre="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
+  jre_release="jdk8u302-b08"
+  jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/$jre_release/$jre"
   arch="win64"
   electron="electron-$electron_version-win32-x64.zip"
 fi
 
-jre_dir="jdk8u292-b10-jre"
+jre_dir="$jre_release-jre"
 
 echo "creating windows bundle"
 
@@ -33,7 +37,7 @@ mkdir $release_name
 
 echo "Dealing with jre..."
 if [ ! -f $jre ]; then
-  curl -L "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/$jre" -o $jre
+  curl -L $jre_url -o $jre
 fi
 unzip $jre
 mv $jre_dir $release_name/jre

server/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     application
     kotlin("plugin.serialization")
     id("com.github.johnrengelman.shadow") version "7.0.0"
-    id("org.jmailen.kotlinter") version "3.5.0"
+    id("org.jmailen.kotlinter") version "3.6.0"
     id("com.github.gmazzo.buildconfig") version "3.0.2"
 }
 
@@ -31,13 +31,13 @@ dependencies {
     implementation("com.squareup.okio:okio:2.10.0")
 
     // Javalin api
-    implementation("io.javalin:javalin:3.13.6")
-    // jackson version is tied to javalin, ref: `io.javalin.core.util.OptionalDependency`
+    implementation("io.javalin:javalin:3.13.11")
+    // jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
     implementation("com.fasterxml.jackson.core:jackson-databind:2.10.3")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.10.3")
 
     // Exposed ORM
-    val exposedVersion = "0.31.1"
+    val exposedVersion = "0.34.1"
     implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
@@ -46,12 +46,12 @@ dependencies {
     implementation("com.h2database:h2:1.4.200")
 
     // Exposed Migrations
-    val exposedMigrationsVersion = "3.1.1"
+    val exposedMigrationsVersion = "3.1.2"
     implementation("com.github.Suwayomi:exposed-migrations:$exposedMigrationsVersion")
 
     // tray icon
     implementation("com.dorkbox:SystemTray:4.1")
-    implementation("com.dorkbox:Utilities:1.9")
+    implementation("com.dorkbox:Utilities:1.9") // version locked by SystemTray
 
 
     // dependencies of Tachiyomi extensions, some are duplicate, keeping it here for reference
@@ -162,7 +162,7 @@ tasks {
     }
 
     named("run") {
-        dependsOn("formatKotlin", "lintKotlin", "downloadWebUI")
+        dependsOn("formatKotlin", "lintKotlin")
     }
 
     named<Copy>("processResources") {

server/src/main/kotlin/suwayomi/tachidesk/anime/model/table/AnimeTable.kt

@@ -12,6 +12,7 @@ import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.toGenreList
 import suwayomi.tachidesk.manga.model.table.MangaStatus.Companion
 
 object AnimeTable : IntIdTable() {
@@ -48,7 +49,7 @@ fun AnimeTable.toDataClass(mangaEntry: ResultRow) =
         mangaEntry[artist],
         mangaEntry[author],
         mangaEntry[description],
-        mangaEntry[genre],
+        mangaEntry[genre].toGenreList(),
         Companion.valueOf(mangaEntry[status]).name,
         mangaEntry[inLibrary]
     )

server/src/main/kotlin/suwayomi/tachidesk/manga/MangaAPI.kt

@@ -26,6 +26,7 @@ object MangaAPI {
             get("list", ExtensionController::list)
 
             get("install/:pkgName", ExtensionController::install)
+            post("install", ExtensionController::installFile)
             get("update/:pkgName", ExtensionController::update)
             get("uninstall/:pkgName", ExtensionController::uninstall)
 

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt

@@ -29,6 +29,7 @@ object BackupController {
 
     /** expects a Tachiyomi protobuf backup as a file upload, the file must be named "backup.proto.gz" */
     fun protobufImportFile(ctx: Context) {
+        // TODO: rewrite this with ctx.uploadedFiles(), don't call the multipart field "backup.proto.gz"
         ctx.json(
             JavalinSetup.future {
                 ProtoBackupImport.performRestore(ctx.uploadedFile("backup.proto.gz")!!.content)

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt

@@ -8,11 +8,14 @@ package suwayomi.tachidesk.manga.controller
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import io.javalin.http.Context
+import mu.KotlinLogging
 import suwayomi.tachidesk.manga.impl.extension.Extension
 import suwayomi.tachidesk.manga.impl.extension.ExtensionsList
 import suwayomi.tachidesk.server.JavalinSetup.future
 
 object ExtensionController {
+    private val logger = KotlinLogging.logger {}
+
     /** list all extensions */
     fun list(ctx: Context) {
         ctx.json(
@@ -33,6 +36,19 @@ object ExtensionController {
         )
     }
 
+    /** install the uploaded apk file */
+    fun installFile(ctx: Context) {
+
+        val uploadedFile = ctx.uploadedFile("file")!!
+        logger.debug { "Uploaded extension file name: " + uploadedFile.filename }
+
+        ctx.json(
+            future {
+                Extension.installExternalExtension(uploadedFile.content, uploadedFile.filename)
+            }
+        )
+    }
+
     /** update extension identified with "pkgName" */
     fun update(ctx: Context) {
         val pkgName = ctx.pathParam("pkgName")

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt

@@ -25,6 +25,7 @@ import suwayomi.tachidesk.manga.impl.util.network.await
 import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.clearCachedImage
 import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.toGenreList
 import suwayomi.tachidesk.manga.model.table.MangaMetaTable
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -56,7 +57,7 @@ object Manga {
                 mangaEntry[MangaTable.artist],
                 mangaEntry[MangaTable.author],
                 mangaEntry[MangaTable.description],
-                mangaEntry[MangaTable.genre],
+                mangaEntry[MangaTable.genre].toGenreList(),
                 MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
                 mangaEntry[MangaTable.inLibrary],
                 getSource(mangaEntry[MangaTable.sourceReference]),
@@ -106,7 +107,7 @@ object Manga {
                 fetchedManga.artist,
                 fetchedManga.author,
                 fetchedManga.description,
-                fetchedManga.genre,
+                fetchedManga.genre.toGenreList(),
                 MangaStatus.valueOf(fetchedManga.status).name,
                 mangaEntry[MangaTable.inLibrary],
                 getSource(mangaEntry[MangaTable.sourceReference]),

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt

@@ -8,6 +8,7 @@ package suwayomi.tachidesk.manga.impl
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.source.model.MangasPage
+import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -16,6 +17,7 @@ import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
 import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
+import suwayomi.tachidesk.manga.model.dataclass.toGenreList
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
 
@@ -41,7 +43,9 @@ object MangaList {
         val mangasPage = this
         val mangaList = transaction {
             return@transaction mangasPage.mangas.map { manga ->
-                var mangaEntry = MangaTable.select { MangaTable.url eq manga.url }.firstOrNull()
+                var mangaEntry = MangaTable.select {
+                    (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId)
+                }.firstOrNull()
                 if (mangaEntry == null) { // create manga entry
                     val mangaId = MangaTable.insertAndGetId {
                         it[url] = manga.url
@@ -57,7 +61,9 @@ object MangaList {
                         it[sourceReference] = sourceId
                     }.value
 
-                    mangaEntry = MangaTable.select { MangaTable.url eq manga.url }.first()
+                    mangaEntry = MangaTable.select {
+                        (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId)
+                    }.first()
 
                     MangaDataClass(
                         mangaId,
@@ -72,7 +78,7 @@ object MangaList {
                         manga.artist,
                         manga.author,
                         manga.description,
-                        manga.genre,
+                        manga.genre.toGenreList(),
                         MangaStatus.valueOf(manga.status).name,
                         false, // It's a new manga entry
                         meta = getMangaMetaMap(mangaId),
@@ -94,7 +100,7 @@ object MangaList {
                         mangaEntry[MangaTable.artist],
                         mangaEntry[MangaTable.author],
                         mangaEntry[MangaTable.description],
-                        mangaEntry[MangaTable.genre],
+                        mangaEntry[MangaTable.genre].toGenreList(),
                         MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
                         mangaEntry[MangaTable.inLibrary],
                         meta = getMangaMetaMap(mangaId),

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt

@@ -43,6 +43,7 @@ object ProtoBackupExport : ProtoBackupBase() {
             Backup(
                 backupManga(databaseManga, flags),
                 backupCategories(),
+                emptyList(),
                 backupExtensionInfo(databaseManga)
             )
         }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt

@@ -62,7 +62,7 @@ object ProtoBackupImport : ProtoBackupBase() {
         }
 
         // Store source mapping for error messages
-        sourceMapping = backup.backupSources.map { it.sourceId to it.name }.toMap()
+        sourceMapping = backup.getSourceMap()
 
         // Restore individual manga
         backup.backupManga.forEach {
@@ -103,7 +103,7 @@ object ProtoBackupImport : ProtoBackupBase() {
         val manga = backupManga.getMangaImpl()
         val chapters = backupManga.getChaptersImpl()
         val categories = backupManga.categories
-        val history = backupManga.history
+        val history = backupManga.brokenHistory.map { BackupHistory(it.url, it.lastRead) } + backupManga.history
         val tracks = backupManga.getTrackingImpl()
 
         try {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt

@@ -24,7 +24,7 @@ object ProtoBackupValidator : AbstractBackupValidator() {
             throw Exception("Backup does not contain any manga.")
         }
 
-        val sources = backup.backupSources.map { it.sourceId to it.name }.toMap()
+        val sources = backup.getSourceMap()
 
         val missingSources = transaction {
             sources

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/Backup.kt

@@ -8,5 +8,11 @@ data class Backup(
     @ProtoNumber(1) val backupManga: List<BackupManga>,
     @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
     // Bump by 100 to specify this is a 0.x value
-    @ProtoNumber(100) var backupSources: List<BackupSource> = emptyList(),
-)
+    @ProtoNumber(100) var brokenBackupSources: List<BrokenBackupSource> = emptyList(),
+    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
+) {
+    fun getSourceMap(): Map<Long, String> {
+        return (brokenBackupSources.map { BackupSource(it.name, it.sourceId) } + backupSources)
+            .associate { it.sourceId to it.name }
+    }
+}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupHistory.kt

@@ -4,7 +4,13 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 
 @Serializable
-data class BackupHistory(
+data class BrokenBackupHistory(
     @ProtoNumber(0) var url: String,
     @ProtoNumber(1) var lastRead: Long
 )
+
+@Serializable
+data class BackupHistory(
+    @ProtoNumber(1) var url: String,
+    @ProtoNumber(2) var lastRead: Long
+)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt

@@ -33,8 +33,9 @@ data class BackupManga(
     // Bump by 100 for values that are not saved/implemented in 1.x but are used in 0.x
     @ProtoNumber(100) var favorite: Boolean = true,
     @ProtoNumber(101) var chapterFlags: Int = 0,
-    @ProtoNumber(102) var history: List<BackupHistory> = emptyList(),
-    @ProtoNumber(103) var viewer_flags: Int? = null
+    @ProtoNumber(102) var brokenHistory: List<BrokenBackupHistory> = emptyList(),
+    @ProtoNumber(103) var viewer_flags: Int? = null,
+    @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),
 ) {
     fun getMangaImpl(): MangaImpl {
         return MangaImpl().apply {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupSource.kt

@@ -5,9 +5,15 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 
 @Serializable
-data class BackupSource(
+data class BrokenBackupSource(
     @ProtoNumber(0) var name: String = "",
     @ProtoNumber(1) var sourceId: Long
+)
+
+@Serializable
+data class BackupSource(
+    @ProtoNumber(1) var name: String = "",
+    @ProtoNumber(2) var sourceId: Long
 ) {
     companion object {
         fun copyFrom(source: Source): BackupSource {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt

@@ -8,6 +8,7 @@ package suwayomi.tachidesk.manga.impl.download
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
@@ -21,6 +22,8 @@ import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Queued
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import java.util.concurrent.CopyOnWriteArrayList
 
+private val logger = KotlinLogging.logger {}
+
 class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter>, val notifier: () -> Unit) : Thread() {
     var shouldStop: Boolean = false
 
@@ -67,10 +70,10 @@ class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter
                 downloadQueue.removeIf { it.mangaId == download.mangaId && it.chapterIndex == download.chapterIndex }
                 step()
             } catch (e: DownloadShouldStopException) {
-                println("Downloader was stopped")
+                logger.debug("Downloader was stopped")
                 downloadQueue.filter { it.state == Downloading }.forEach { it.state = Queued }
             } catch (e: Exception) {
-                println("Downloader faced an exception")
+                logger.debug("Downloader faced an exception")
                 downloadQueue.filter { it.state == Downloading }.forEach { it.state = Error; it.tries++ }
                 e.printStackTrace()
             } finally {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt

@@ -17,6 +17,7 @@ import mu.KotlinLogging
 import okhttp3.Request
 import okio.buffer
 import okio.sink
+import okio.source
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
@@ -27,6 +28,8 @@ import org.kodein.di.conf.global
 import org.kodein.di.instance
 import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.extensionTableAsDataClass
 import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource
+import suwayomi.tachidesk.manga.impl.util.PackageTools
 import suwayomi.tachidesk.manga.impl.util.PackageTools.EXTENSION_FEATURE
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
@@ -36,7 +39,6 @@ import suwayomi.tachidesk.manga.impl.util.PackageTools.dex2jar
 import suwayomi.tachidesk.manga.impl.util.PackageTools.getPackageInfo
 import suwayomi.tachidesk.manga.impl.util.PackageTools.getSignatureHash
 import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources
-import suwayomi.tachidesk.manga.impl.util.PackageTools.trustedSignatures
 import suwayomi.tachidesk.manga.impl.util.network.await
 import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
@@ -68,7 +70,23 @@ object Extension {
         }
     }
 
-    suspend fun installAPK(fetcher: suspend () -> String): Int {
+    suspend fun installExternalExtension(inputStream: InputStream, apkName: String): Int {
+        return installAPK(true) {
+            val savePath = "${applicationDirs.extensionsRoot}/$apkName"
+            logger.debug { "Saving apk at $apkName" }
+            // download apk file
+            val downloadedFile = File(savePath)
+            downloadedFile.sink().buffer().use { sink ->
+                inputStream.source().use { source ->
+                    sink.writeAll(source)
+                    sink.flush()
+                }
+            }
+            savePath
+        }
+    }
+
+    suspend fun installAPK(forceReinstall: Boolean = false, fetcher: suspend () -> String): Int {
         val apkFilePath = fetcher()
         val apkName = File(apkFilePath).name
 
@@ -78,16 +96,19 @@ object Extension {
             ExtensionTable.select { ExtensionTable.apkName eq apkName }.firstOrNull()
         }?.get(ExtensionTable.isInstalled) ?: false
 
-        if (!isInstalled) {
-            val fileNameWithoutType = apkName.substringBefore(".apk")
+        val fileNameWithoutType = apkName.substringBefore(".apk")
 
-            val dirPathWithoutType = "${applicationDirs.extensionsRoot}/$fileNameWithoutType"
-            val jarFilePath = "$dirPathWithoutType.jar"
-            val dexFilePath = "$dirPathWithoutType.dex"
+        val dirPathWithoutType = "${applicationDirs.extensionsRoot}/$fileNameWithoutType"
+        val jarFilePath = "$dirPathWithoutType.jar"
+        val dexFilePath = "$dirPathWithoutType.dex"
 
-            val packageInfo = getPackageInfo(apkFilePath)
-            val pkgName = packageInfo.packageName
+        val packageInfo = getPackageInfo(apkFilePath)
+        val pkgName = packageInfo.packageName
+        if (isInstalled && forceReinstall) {
+            uninstallExtension(pkgName)
+        }
 
+        if (!isInstalled || forceReinstall) {
             if (!packageInfo.reqFeatures.orEmpty().any { it.name == EXTENSION_FEATURE }) {
                 throw Exception("This apk is not a Tachiyomi extension")
             }
@@ -103,12 +124,12 @@ object Extension {
 
             val signatureHash = getSignatureHash(packageInfo)
 
-            if (signatureHash == null) {
-                throw Exception("Package $pkgName isn't signed")
-            } else if (signatureHash !in trustedSignatures) {
-                // TODO: allow trusting keys
-                throw Exception("This apk is not a signed with the official tachiyomi signature")
-            }
+//            if (signatureHash == null) {
+//                throw Exception("Package $pkgName isn't signed")
+//            } else if (signatureHash !in trustedSignatures) {
+//                // TODO: allow trusting keys
+//                throw Exception("This apk is not a signed with the official tachiyomi signature")
+//            }
 
             val isNsfw = packageInfo.applicationInfo.metaData.getString(METADATA_NSFW) == "1"
 
@@ -120,7 +141,7 @@ object Extension {
             dex2jar(apkFilePath, jarFilePath, fileNameWithoutType)
 
             // clean up
-//            File(apkFilePath).delete()
+            File(apkFilePath).delete()
             File(dexFilePath).delete()
 
             // collect sources from the extension
@@ -155,6 +176,7 @@ object Extension {
                 }
 
                 ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
+                    it[this.apkName] = apkName
                     it[this.isInstalled] = true
                     it[this.classFQName] = className
                 }
@@ -200,19 +222,30 @@ object Extension {
         val extensionRecord = transaction { ExtensionTable.select { ExtensionTable.pkgName eq pkgName }.first() }
         val fileNameWithoutType = extensionRecord[ExtensionTable.apkName].substringBefore(".apk")
         val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
-        transaction {
+        val sources = transaction {
             val extensionId = extensionRecord[ExtensionTable.id].value
 
+            val sources = SourceTable.select { SourceTable.extension eq extensionId }.map { it[SourceTable.id].value }
+
             SourceTable.deleteWhere { SourceTable.extension eq extensionId }
+
             if (extensionRecord[ExtensionTable.isObsolete])
                 ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName }
             else
                 ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
                     it[isInstalled] = false
                 }
+
+            sources
         }
 
         if (File(jarPath).exists()) {
+            // free up the file descriptor if exists
+            PackageTools.jarLoaderMap.remove(jarPath)?.close()
+
+            // clear all loaded sources
+            sources.forEach { GetHttpSource.invalidateSourceCache(it) }
+
             File(jarPath).delete()
         }
     }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt

@@ -45,7 +45,7 @@ object PackageTools {
 
     private const val officialSignature = "7ce04da7773d41b489f4693a366c36bcd0a11fc39b547168553c285bd7348e23" // inorichi's key
     private const val unofficialSignature = "64feb21075ba97ebc9cc981243645b331595c111cef1b0d084236a0403b00581" // ArMor's key
-    var trustedSignatures = mutableSetOf<String>() + officialSignature + unofficialSignature
+    val trustedSignatures = mutableSetOf<String>() + officialSignature + unofficialSignature
 
     /**
      * Convert dex to jar, a wrapper for the dex2jar library
@@ -136,13 +136,19 @@ object PackageTools {
         }
     }
 
+    val jarLoaderMap = mutableMapOf<String, URLClassLoader>()
+
     /**
      * loads the extension main class called [className] from the jar located at [jarPath]
      * It may return an instance of HttpSource or SourceFactory depending on the extension.
      */
     fun loadExtensionSources(jarPath: String, className: String): Any {
-        val classLoader = URLClassLoader(arrayOf<URL>(URL("file:$jarPath")))
+        logger.debug { "loading jar with path: $jarPath" }
+        val classLoader = jarLoaderMap[jarPath] ?: URLClassLoader(arrayOf<URL>(URL("file:$jarPath")))
         val classToLoad = Class.forName(className, false, classLoader)
+
+        jarLoaderMap[jarPath] = classLoader
+
         return classToLoad.getDeclaredConstructor().newInstance()
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/List.kt

@@ -0,0 +1,3 @@
+package suwayomi.tachidesk.manga.impl.util.lang
+
+fun List<String>.trimAll() = map { it.trim() }

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt

@@ -7,6 +7,7 @@ package suwayomi.tachidesk.manga.model.dataclass
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+import suwayomi.tachidesk.manga.impl.util.lang.trimAll
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 
 data class MangaDataClass(
@@ -22,7 +23,7 @@ data class MangaDataClass(
     val artist: String? = null,
     val author: String? = null,
     val description: String? = null,
-    val genre: String? = null,
+    val genre: List<String> = emptyList(),
     val status: String = MangaStatus.UNKNOWN.name,
     val inLibrary: Boolean = false,
     val source: SourceDataClass? = null,
@@ -39,3 +40,5 @@ data class PagedMangaListDataClass(
     val mangaList: List<MangaDataClass>,
     val hasNextPage: Boolean
 )
+
+internal fun String?.toGenreList() = this?.split(",")?.trimAll().orEmpty()

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/SourceDataClass.kt

@@ -22,5 +22,5 @@ data class SourceDataClass(
     val isConfigurable: Boolean?,
 
     /** The Source class has a @Nsfw annotation */
-    val isNSFW: Boolean?,
+    val isNsfw: Boolean?,
 )

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt

@@ -13,6 +13,7 @@ import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.toGenreList
 import suwayomi.tachidesk.manga.model.table.MangaStatus.Companion
 
 object MangaTable : IntIdTable() {
@@ -52,7 +53,7 @@ fun MangaTable.toDataClass(mangaEntry: ResultRow) =
         mangaEntry[artist],
         mangaEntry[author],
         mangaEntry[description],
-        mangaEntry[genre],
+        mangaEntry[genre].toGenreList(),
         Companion.valueOf(mangaEntry[status]).name,
         mangaEntry[inLibrary],
         meta = getMangaMetaMap(mangaEntry[id].value),