bump version

update WebUI
better CHANGELOG
2021-09-13 19:32:05 +04:30 · 2021-09-13 19:31:07 +04:30 · 2021-09-13 19:29:54 +04:30 · 2021-09-12 04:04:48 +04:30 · 2021-09-11 19:47:06 +04:30 · 2021-09-11 16:26:04 +04:30
63 changed files with 1103 additions and 499 deletions
@@ -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
@@ -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
+          
@@ -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,23 +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: |
-          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
-          
@@ -11,6 +11,7 @@ server/tmp/
 server/tachiserver-data/

 # bundle asset downlaods
-OpenJDK*.zip
-electron-*.zip
+OpenJDK*.*
+zulu*jre*
+electron-*.*
 rcedit-*
@@ -9,11 +9,12 @@ package xyz.nulldev.ts.config

 import net.harawata.appdirs.AppDirsFactory

+const val CONFIG_PREFIX = "suwayomi.tachidesk.config"

 val ApplicationRootDir: String
    get(): String {
        return System.getProperty(
-                "suwayomi.tachidesk.server.rootDir",
+                "$CONFIG_PREFIX.server.rootDir",
                AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
        )
    }
@@ -48,7 +48,7 @@ open class ConfigManager {
        val baseConfig =
                ConfigFactory.parseMap(
                        mapOf(
-                                "ts.server.rootDir" to ApplicationRootDir
+                                "androidcompat.rootDir" to "$ApplicationRootDir/android-compat" // override AndroidCompat's rootDir
                        )
                )

@@ -14,26 +14,31 @@ import kotlin.reflect.KProperty
 /**
 * Abstract config module.
 */
-abstract class ConfigModule(config: Config, moduleName: String = "") {
-    val overridableWithSysProperty = SystemPropertyOverrideDelegate(config, moduleName)
+@Suppress("UNUSED_PARAMETER")
+abstract class ConfigModule(config: Config)
+
+/**
+ * Abstract jvm-commandline-argument-overridable config module.
+ */
+abstract class SystemPropertyOverridableConfigModule(config: Config, moduleName: String): ConfigModule(config) {
+    val overridableConfig = SystemPropertyOverrideDelegate(config, moduleName)
 }

+/** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */
 class SystemPropertyOverrideDelegate(val config: Config, val moduleName: String) {
    inline operator fun <R, reified T> getValue(thisRef: R, property: KProperty<*>): T {
        val configValue: T = config.getValue(thisRef, property)

        val combined = System.getProperty(
-            "suwayomi.tachidesk.config.$moduleName.${property.name}",
+            "$CONFIG_PREFIX.$moduleName.${property.name}",
            configValue.toString()
        )

-        val asT = when(T::class.simpleName) {
+        return when(T::class.simpleName) {
            "Int" -> combined.toInt()
            "Boolean" -> combined.toBoolean()
            // add more types as needed
-            else -> combined
-        }
-
-        return asT as T
+            else -> combined // covers String
+        } as T
    }
 }
@@ -1,6 +1,7 @@
 package xyz.nulldev.androidcompat.config

 import com.typesafe.config.Config
+import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule

 /**
@@ -8,8 +9,8 @@ import xyz.nulldev.ts.config.ConfigModule
 */

 class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) {
-    val packageName = config.getString("packageName")!!
-    val debug = config.getBoolean("debug")
+    val packageName: String by config
+    val debug: Boolean by config

    companion object {
        fun register(config: Config)
@@ -1,6 +1,7 @@
 package xyz.nulldev.androidcompat.config

 import com.typesafe.config.Config
+import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule

 /**
@@ -8,23 +9,23 @@ import xyz.nulldev.ts.config.ConfigModule
 */

 class FilesConfigModule(config: Config) : ConfigModule(config) {
-    val dataDir = config.getString("dataDir")!!
-    val filesDir = config.getString("filesDir")!!
-    val noBackupFilesDir = config.getString("noBackupFilesDir")!!
-    val externalFilesDirs: MutableList<String> = config.getStringList("externalFilesDirs")!!
-    val obbDirs: MutableList<String> = config.getStringList("obbDirs")!!
-    val cacheDir = config.getString("cacheDir")!!
-    val codeCacheDir = config.getString("codeCacheDir")!!
-    val externalCacheDirs: MutableList<String> = config.getStringList("externalCacheDirs")!!
-    val externalMediaDirs: MutableList<String> = config.getStringList("externalMediaDirs")!!
-    val rootDir = config.getString("rootDir")!!
-    val externalStorageDir = config.getString("externalStorageDir")!!
-    val downloadCacheDir = config.getString("downloadCacheDir")!!
-    val databasesDir = config.getString("databasesDir")!!
+    val dataDir:String by config
+    val filesDir:String by config
+    val noBackupFilesDir:String by config
+    val externalFilesDirs: MutableList<String> by config
+    val obbDirs: MutableList<String> by config
+    val cacheDir:String by config
+    val codeCacheDir:String by config
+    val externalCacheDirs: MutableList<String> by config
+    val externalMediaDirs: MutableList<String> by config
+    val rootDir:String by config
+    val externalStorageDir:String by config
+    val downloadCacheDir:String by config
+    val databasesDir:String by config

-    val prefsDir = config.getString("prefsDir")!!
+    val prefsDir:String by config

-    val packageDir = config.getString("packageDir")!!
+    val packageDir:String by config

    companion object {
        fun register(config: Config)
@@ -2,9 +2,10 @@ package xyz.nulldev.androidcompat.config

 import com.typesafe.config.Config
 import xyz.nulldev.ts.config.ConfigModule
+import io.github.config4k.getValue

 class SystemConfigModule(val config: Config) : ConfigModule(config) {
-    val isDebuggable = config.getBoolean("isDebuggable")
+    val isDebuggable: Boolean by config

    val propertyPrefix = "properties."

@@ -1,36 +1,12 @@
+# AndroidComapt Root dir
+androidcompat.rootDir = androidcompat-root

-# Allow/disallow preference changes (useful for demos)
-ts.server.allowConfigChanges = true
-
-# Enable the WebUI? Note: The API and multi-user sync server ui will remain available even if the WebUI is disabled
-ts.server.enableWebUi = true
-
-# 'true' to use the old, buggy/memory-leaking WebUI
-ts.server.useOldWebUi = false
-
-# 'true' to pretty print all JSON API responses
-ts.server.prettyPrintApi = false
-
-# List of blacklisted/whitelisted API endpoints/operation IDs
-ts.server.disabledApiEndpoints = []
-ts.server.enabledApiEndpoints = []
-
-# Message to print in the console when the API has finished booting
-ts.server.httpInitializedPrintMessage = ""
-
-# Use external folder for static files
-ts.server.useExternalStaticFiles = false
-ts.server.externalStaticFilesFolder = ""
-
-# Root storage dir
-ts.server.rootDir = tachiserver-data
-# Dir to store JVM patches
-ts.server.patchesDir = ${ts.server.rootDir}/patches
+####################### `android.files` (FilesConfigModule) #######################

 # Storage dir for the emulated Android app
-android.files.rootDir = ${ts.server.rootDir}/android-compat/appdata
+android.files.rootDir = ${androidcompat.rootDir}/appdata
 # External storage dir for the emulated Android app's
-android.files.externalStorageDir = ${ts.server.rootDir}/android-compat/extappdata
+android.files.externalStorageDir = ${androidcompat.rootDir}/extappdata

 # Internal Android directories
 android.files.dataDir = ${android.files.rootDir}/data
@@ -48,37 +24,16 @@ android.files.externalCacheDirs = [${android.files.externalStorageDir}/cache]
 android.files.externalMediaDirs = [${android.files.externalStorageDir}/media]
 android.files.downloadCacheDir = ${android.files.externalStorageDir}/downloadCache

-android.files.packageDir = ${ts.server.rootDir}/android-compat/packages
+android.files.packageDir = ${androidcompat.rootDir}/android-compat/packages
+
+####################### `android.app` (ApplicationInfoConfigModule) #######################

 # Emulated Android app package name
 android.app.packageName = eu.kanade.tachiyomi
 # Debug mode for the emulated Android app
 android.app.debug = true

+####################### `android.system` (SystemConfigModule) #######################
+
 # Whether or not the emulated Android system is debuggable
 android.system.isDebuggable = true
-
-# Is the multi-user sync server enabled? Does not affect the single-user sync server included in the API.
-ts.syncd.enable = false
-
-# The URL of this server (displayed in the sync server web ui)
-ts.syncd.baseUrl = "http://example.com"
-
-# 'true' to disable the API and only enable the multi-user sync server
-ts.syncd.syncOnlyMode = false
-
-# The root directory to store synchronized data
-ts.syncd.rootDir = ${ts.server.rootDir}/sync/accounts
-
-# Location to store config files for the sandbox
-ts.syncd.sandboxedConfig = ${ts.server.rootDir}/sync/sandboxed_config.config
-
-# Recaptcha stuff for signup/login
-ts.syncd.recaptcha.siteKey = ""
-ts.syncd.recaptcha.secret = ""
-
-# Sync server display name
-ts.syncd.name = "Tachiyomi sync server"
-
-# Header used to forward the IP to the multi-user sync server if the server is behind a reverse proxy
-ts.syncd.ipHeader = ""
@@ -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
@@ -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
@@ -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`.
@@ -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.

@@ -31,7 +31,7 @@ Here is a list of current features:
    - 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 Legacy Backups
+    - Backup and restore support powered by Tachiyomi Backups
 - From Aniyomi
    - Installing and executing Aniyomi's Extensions
    - Searching and browsing installed sources.
@@ -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:
 ```
@@ -88,9 +110,9 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md).
 ## Credit
 This project is a spiritual successor of [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server), Many of the ideas and the groundwork adopted in this project comes from TachiWeb.

-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`.
+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 [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`.
+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

@@ -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")
@@ -79,14 +79,16 @@ configure(projects) {
        // to get application content root
        implementation("net.harawata:appdirs:1.2.1")

-        // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon
-        // note: watch https://github.com/ThexXTURBOXx/dex2jar for future developments
-        implementation("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon")
+        // dex2jar
+        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")
    }
 }
@@ -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.7"
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.5.0"

-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r36"
+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()
@@ -0,0 +1,3 @@
+cd "`dirname "$0"`"
+
+./jre/Contents/Home/bin/java -jar Tachidesk.jar
@@ -0,0 +1,3 @@
+cd "`dirname "$0"`"
+
+./jre/Contents/Home/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
@@ -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
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java -jar Tachidesk.jar
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./jre/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar  Tachidesk.jar
@@ -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
@@ -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/
@@ -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
@@ -9,7 +9,7 @@ plugins {
    application
    kotlin("plugin.serialization")
    id("com.github.johnrengelman.shadow") version "7.0.0"
-    id("org.jmailen.kotlinter") version "3.4.3"
+    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,29 +46,32 @@ dependencies {
    implementation("com.h2database:h2:1.4.200")

    // Exposed Migrations
-    val exposedMigrationsVersion = "3.1.0"
+    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
    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
    implementation("com.squareup.okhttp3:okhttp:4.9.1")
    implementation("io.reactivex:rxjava:1.3.8")
-    implementation("org.jsoup:jsoup:1.13.1")
-    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("org.jsoup:jsoup:1.14.1")
+    implementation("com.google.code.gson:gson:2.8.7")
    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")


-    // asm for fixing SimpleDateFormat (must match Dex2Jar version)
-    implementation("org.ow2.asm:asm-debug-all:5.0.3")
+    // asm for ByteCodeEditor(fixing SimpleDateFormat) (must match Dex2Jar version)
+    implementation("org.ow2.asm:asm:9.2")

    // extracting zip files
    implementation("net.lingala.zip4j:zip4j:2.9.0")

+    // CloudflareInterceptor
+    implementation("net.sourceforge.htmlunit:htmlunit:2.52.0")
+
    // Source models and interfaces from Tachiyomi 1.x
    // using source class from tachiyomi commit 9493577de27c40ce8b2b6122cc447d025e34c477 to not depend on tachiyomi.sourceapi
 //    implementation("tachiyomi.sourceapi:source-api:1.1")
@@ -159,7 +162,7 @@ tasks {
    }

    named("run") {
-        dependsOn("formatKotlin", "lintKotlin", "downloadWebUI")
+        dependsOn("formatKotlin", "lintKotlin")
    }

    named<Copy>("processResources") {
@@ -1,177 +0,0 @@
-package eu.kanade.tachiyomi.network
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-// import android.annotation.SuppressLint
-// import android.content.Context
-// import android.os.Build
-// import android.os.Handler
-// import android.os.Looper
-// import android.webkit.WebSettings
-// import android.webkit.WebView
-// import android.widget.Toast
-// import eu.kanade.tachiyomi.R
-// import eu.kanade.tachiyomi.util.lang.launchUI
-// import eu.kanade.tachiyomi.util.system.WebViewClientCompat
-// import eu.kanade.tachiyomi.util.system.WebViewUtil
-// import eu.kanade.tachiyomi.util.system.isOutdated
-// import eu.kanade.tachiyomi.util.system.setDefaultSettings
-// import eu.kanade.tachiyomi.util.system.toast
-import okhttp3.Interceptor
-import okhttp3.Response
-// import uy.kohesive.injekt.injectLazy
-
-class CloudflareInterceptor() : Interceptor {
-
-//    private val handler = Handler(Looper.getMainLooper())
-
-//    private val networkHelper = NetworkHelper()
-
-    /**
-     * When this is called, it initializes the WebView if it wasn't already. We use this to avoid
-     * blocking the main thread too much. If used too often we could consider moving it to the
-     * Application class.
-     */
-//    private val initWebView by lazy {
-//        WebSettings.getDefaultUserAgent(context)
-//    }
-
-    @Synchronized
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val originalRequest = chain.request()
-        return chain.proceed(originalRequest)
-
-//        if (!WebViewUtil.supportsWebView(context)) {
-//            launchUI {
-//                context.toast(R.string.information_webview_required, Toast.LENGTH_LONG)
-//            }
-//            return chain.proceed(originalRequest)
-//        }
-//
-//        initWebView
-//
-//        val response = chain.proceed(originalRequest)
-//
-//        // Check if Cloudflare anti-bot is on
-//        if (response.code != 503 || response.header("Server") !in SERVER_CHECK) {
-//            return response
-//        }
-//
-//        try {
-//            response.close()
-//            networkHelper.cookieManager.remove(originalRequest.url, COOKIE_NAMES, 0)
-//            val oldCookie = networkHelper.cookieManager.get(originalRequest.url)
-//                .firstOrNull { it.name == "cf_clearance" }
-//            resolveWithWebView(originalRequest, oldCookie)
-//
-//            return chain.proceed(originalRequest)
-//        } catch (e: Exception) {
-//            // Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
-//            // we don't crash the entire app
-//            throw IOException(e)
-//        }
-    }
-//
-// //    @SuppressLint("SetJavaScriptEnabled")
-//    private fun resolveWithWebView(request: Request, oldCookie: Cookie?) {
-//        // We need to lock this thread until the WebView finds the challenge solution url, because
-//        // OkHttp doesn't support asynchronous interceptors.
-//        val latch = CountDownLatch(1)
-//
-//        var webView: WebView? = null
-//
-//        var challengeFound = false
-//        var cloudflareBypassed = false
-//        var isWebViewOutdated = false
-//
-//        val origRequestUrl = request.url.toString()
-//        val headers = request.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
-//        headers["X-Requested-With"] = WebViewUtil.REQUESTED_WITH
-//
-//        handler.post {
-//            val webview = WebView(context)
-//            webView = webview
-//            webview.setDefaultSettings()
-//
-//            // Avoid sending empty User-Agent, Chromium WebView will reset to default if empty
-//            webview.settings.userAgentString = request.header("User-Agent")
-//                ?: HttpSource.DEFAULT_USERAGENT
-//
-//            webview.webViewClient = object : WebViewClientCompat() {
-//                override fun onPageFinished(view: WebView, url: String) {
-//                    fun isCloudFlareBypassed(): Boolean {
-//                        return networkHelper.cookieManager.get(origRequestUrl.toHttpUrl())
-//                            .firstOrNull { it.name == "cf_clearance" }
-//                            .let { it != null && it != oldCookie }
-//                    }
-//
-//                    if (isCloudFlareBypassed()) {
-//                        cloudflareBypassed = true
-//                        latch.countDown()
-//                    }
-//
-//                    // HTTP error codes are only received since M
-//                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-//                        url == origRequestUrl && !challengeFound
-//                    ) {
-//                        // The first request didn't return the challenge, abort.
-//                        latch.countDown()
-//                    }
-//                }
-//
-//                override fun onReceivedErrorCompat(
-//                    view: WebView,
-//                    errorCode: Int,
-//                    description: String?,
-//                    failingUrl: String,
-//                    isMainFrame: Boolean
-//                ) {
-//                    if (isMainFrame) {
-//                        if (errorCode == 503) {
-//                            // Found the Cloudflare challenge page.
-//                            challengeFound = true
-//                        } else {
-//                            // Unlock thread, the challenge wasn't found.
-//                            latch.countDown()
-//                        }
-//                    }
-//                }
-//            }
-//
-//            webView?.loadUrl(origRequestUrl, headers)
-//        }
-//
-//        // Wait a reasonable amount of time to retrieve the solution. The minimum should be
-//        // around 4 seconds but it can take more due to slow networks or server issues.
-//        latch.await(12, TimeUnit.SECONDS)
-//
-//        handler.post {
-//            if (!cloudflareBypassed) {
-//                isWebViewOutdated = webView?.isOutdated() == true
-//            }
-//
-//            webView?.stopLoading()
-//            webView?.destroy()
-//        }
-//
-//        // Throw exception if we failed to bypass Cloudflare
-//        if (!cloudflareBypassed) {
-//            // Prompt user to update WebView if it seems too outdated
-//            if (isWebViewOutdated) {
-//                context.toast(R.string.information_webview_outdated, Toast.LENGTH_LONG)
-//            }
-//
-//            throw Exception(context.getString(R.string.information_cloudflare_bypass_failure))
-//        }
-//    }
-//
-//    companion object {
-//        private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
-//        private val COOKIE_NAMES = listOf("__cfduid", "cf_clearance")
-//    }
-}
@@ -10,12 +10,16 @@ package eu.kanade.tachiyomi.network
 // import android.content.Context
 // import eu.kanade.tachiyomi.BuildConfig
 // import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import android.content.Context
 // import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 // import okhttp3.dnsoverhttps.DnsOverHttps
 // import okhttp3.logging.HttpLoggingInterceptor
 // import uy.kohesive.injekt.injectLazy
+import android.content.Context
+import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import suwayomi.tachidesk.server.serverConfig
 import java.util.concurrent.TimeUnit

@Suppress("UNUSED_PARAMETER")
@@ -25,55 +29,44 @@ class NetworkHelper(context: Context) {

 //    private val cacheDir = File(context.cacheDir, "network_cache")

-    private val cacheSize = 5L * 1024 * 1024 // 5 MiB
+//    private val cacheSize = 5L * 1024 * 1024 // 5 MiB

-    val cookieManager = MemoryCookieJar()
+    val cookieManager = PersistentCookieJar(context)

-    val client by lazy {
-        val builder = OkHttpClient.Builder()
-            .cookieJar(cookieManager)
-//            .cache(Cache(cacheDir, cacheSize))
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(5, TimeUnit.MINUTES)
-            .writeTimeout(5, TimeUnit.MINUTES)
-//            .dispatcher(Dispatcher(Executors.newFixedThreadPool(1)))
+    private val baseClientBuilder: OkHttpClient.Builder
+        get() {
+            val builder = OkHttpClient.Builder()
+                .cookieJar(cookieManager)
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
+                .addInterceptor(UserAgentInterceptor())

-//            .addInterceptor(UserAgentInterceptor())
+            if (serverConfig.debugLogsEnabled) {
+                val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
+                    level = HttpLoggingInterceptor.Level.BASIC
+                }
+                builder.addInterceptor(httpLoggingInterceptor)
+            }

-//        if (BuildConfig.DEBUG) {
-//            val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
-//                level = HttpLoggingInterceptor.Level.HEADERS
+//            when (preferences.dohProvider()) {
+//                PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
+//                PREF_DOH_GOOGLE -> builder.dohGoogle()
 //            }
-//            builder.addInterceptor(httpLoggingInterceptor)
-//        }

-//        if (preferences.enableDoh()) {
-//            builder.dns(
-//                DnsOverHttps.Builder().client(builder.build())
-//                    .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
-//                    .bootstrapDnsHosts(
-//                        listOf(
-//                            InetAddress.getByName("162.159.36.1"),
-//                            InetAddress.getByName("162.159.46.1"),
-//                            InetAddress.getByName("1.1.1.1"),
-//                            InetAddress.getByName("1.0.0.1"),
-//                            InetAddress.getByName("162.159.132.53"),
-//                            InetAddress.getByName("2606:4700:4700::1111"),
-//                            InetAddress.getByName("2606:4700:4700::1001"),
-//                            InetAddress.getByName("2606:4700:4700::0064"),
-//                            InetAddress.getByName("2606:4700:4700::6400")
-//                        )
-//                    )
-//                    .build()
-//            )
-//        }
+            return builder
+        }

-        builder.build()
-    }
+//    val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() }
+    val client by lazy { baseClientBuilder.build() }

    val cloudflareClient by lazy {
        client.newBuilder()
            .addInterceptor(CloudflareInterceptor())
            .build()
    }
+
+    // Tachidesk -->
+    val cookies: PersistentCookieStore
+        get() = cookieManager.store
+    // Tachidesk <--
 }
@@ -0,0 +1,20 @@
+package eu.kanade.tachiyomi.network
+
+import android.content.Context
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+
+// from TachiWeb-Server
+class PersistentCookieJar(context: Context) : CookieJar {
+
+    val store = PersistentCookieStore(context)
+
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+        store.addAll(url, cookies)
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        return store.get(url)
+    }
+}
@@ -0,0 +1,79 @@
+package eu.kanade.tachiyomi.network
+
+import android.content.Context
+import okhttp3.Cookie
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import java.net.URI
+import java.util.concurrent.ConcurrentHashMap
+
+// from TachiWeb-Server
+class PersistentCookieStore(context: Context) {
+
+    private val cookieMap = ConcurrentHashMap<String, List<Cookie>>()
+    private val prefs = context.getSharedPreferences("cookie_store", Context.MODE_PRIVATE)
+
+    init {
+        for ((key, value) in prefs.all) {
+            @Suppress("UNCHECKED_CAST")
+            val cookies = value as? Set<String>
+            if (cookies != null) {
+                try {
+                    val url = "http://$key".toHttpUrlOrNull() ?: continue
+                    val nonExpiredCookies = cookies.mapNotNull { Cookie.parse(url, it) }
+                        .filter { !it.hasExpired() }
+                    cookieMap.put(key, nonExpiredCookies)
+                } catch (e: Exception) {
+                    // Ignore
+                }
+            }
+        }
+    }
+
+    @Synchronized
+    fun addAll(url: HttpUrl, cookies: List<Cookie>) {
+        val key = url.toUri().host
+
+        // Append or replace the cookies for this domain.
+        val cookiesForDomain = cookieMap[key].orEmpty().toMutableList()
+        for (cookie in cookies) {
+            // Find a cookie with the same name. Replace it if found, otherwise add a new one.
+            val pos = cookiesForDomain.indexOfFirst { it.name == cookie.name }
+            if (pos == -1) {
+                cookiesForDomain.add(cookie)
+            } else {
+                cookiesForDomain[pos] = cookie
+            }
+        }
+        cookieMap.put(key, cookiesForDomain)
+
+        // Get cookies to be stored in disk
+        val newValues = cookiesForDomain.asSequence()
+            .filter { it.persistent && !it.hasExpired() }
+            .map(Cookie::toString)
+            .toSet()
+
+        prefs.edit().putStringSet(key, newValues).apply()
+    }
+
+    @Synchronized
+    fun removeAll() {
+        prefs.edit().clear().apply()
+        cookieMap.clear()
+    }
+
+    fun remove(uri: URI) {
+        prefs.edit().remove(uri.host).apply()
+        cookieMap.remove(uri.host)
+    }
+
+    fun get(url: HttpUrl) = get(url.toUri().host)
+
+    fun get(uri: URI) = get(uri.host)
+
+    private fun get(url: String): List<Cookie> {
+        return cookieMap[url].orEmpty().filter { !it.hasExpired() }
+    }
+
+    private fun Cookie.hasExpired() = System.currentTimeMillis() >= expiresAt
+}
@@ -0,0 +1,110 @@
+package eu.kanade.tachiyomi.network.interceptor
+
+import com.gargoylesoftware.htmlunit.BrowserVersion
+import com.gargoylesoftware.htmlunit.WebClient
+import com.gargoylesoftware.htmlunit.html.HtmlPage
+import eu.kanade.tachiyomi.network.NetworkHelper
+import mu.KotlinLogging
+import okhttp3.Cookie
+import okhttp3.HttpUrl
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.injectLazy
+import java.io.IOException
+
+// from TachiWeb-Server
+class CloudflareInterceptor : Interceptor {
+    private val logger = KotlinLogging.logger {}
+
+    private val network: NetworkHelper by injectLazy()
+
+    @Synchronized
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+
+        logger.trace { "CloudflareInterceptor is being used." }
+
+        val response = chain.proceed(originalRequest)
+
+        // Check if Cloudflare anti-bot is on
+        if (response.code != 503 || response.header("Server") !in SERVER_CHECK) {
+            return response
+        }
+
+        logger.debug { "Cloudflare anti-bot is on, CloudflareInterceptor is kicking in..." }
+
+        return try {
+            response.close()
+            network.cookies.remove(originalRequest.url.toUri())
+
+            chain.proceed(resolveChallenge(response))
+        } catch (e: Exception) {
+            // Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
+            // we don't crash the entire app
+            throw IOException(e)
+        }
+    }
+
+    private fun resolveChallenge(response: Response): Request {
+        val browserVersion = BrowserVersion.BrowserVersionBuilder(BrowserVersion.BEST_SUPPORTED)
+            .setUserAgent(response.request.header("User-Agent") ?: BrowserVersion.BEST_SUPPORTED.userAgent)
+            .build()
+        val convertedCookies = WebClient(browserVersion).use { webClient ->
+            webClient.options.isThrowExceptionOnFailingStatusCode = false
+            webClient.options.isThrowExceptionOnScriptError = false
+            webClient.getPage<HtmlPage>(response.request.url.toString())
+            webClient.waitForBackgroundJavaScript(10000)
+            // Challenge solved, process cookies
+            webClient.cookieManager.cookies.filter {
+                // Only include Cloudflare cookies
+                it.name.startsWith("__cf") || it.name.startsWith("cf_")
+            }.map {
+                // Convert cookies -> OkHttp format
+                Cookie.Builder()
+                    .domain(it.domain.removePrefix("."))
+                    .expiresAt(it.expires?.time ?: Long.MAX_VALUE)
+                    .name(it.name)
+                    .path(it.path)
+                    .value(it.value).apply {
+                        if (it.isHttpOnly) httpOnly()
+                        if (it.isSecure) secure()
+                    }.build()
+            }
+        }
+
+        // Copy cookies to cookie store
+        convertedCookies.forEach {
+            network.cookies.addAll(
+                HttpUrl.Builder()
+                    .scheme("http")
+                    .host(it.domain)
+                    .build(),
+                listOf(it)
+            )
+        }
+        // Merge new and existing cookies for this request
+        // Find the cookies that we need to merge into this request
+        val convertedForThisRequest = convertedCookies.filter {
+            it.matches(response.request.url)
+        }
+        // Extract cookies from current request
+        val existingCookies = Cookie.parseAll(
+            response.request.url,
+            response.request.headers
+        )
+        // Filter out existing values of cookies that we are about to merge in
+        val filteredExisting = existingCookies.filter { existing ->
+            convertedForThisRequest.none { converted -> converted.name == existing.name }
+        }
+        val newCookies = filteredExisting + convertedForThisRequest
+        return response.request.newBuilder()
+            .header("Cookie", newCookies.map { it.toString() }.joinToString("; "))
+            .build()
+    }
+
+    companion object {
+        private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
+        private val COOKIE_NAMES = listOf("cf_clearance")
+    }
+}
@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.network.interceptor
+
+import eu.kanade.tachiyomi.source.online.HttpSource
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class UserAgentInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+
+        return if (originalRequest.header("User-Agent").isNullOrEmpty()) {
+            val newRequest = originalRequest
+                .newBuilder()
+                .removeHeader("User-Agent")
+                .addHeader("User-Agent", HttpSource.DEFAULT_USER_AGENT)
+                .build()
+            chain.proceed(newRequest)
+        } else {
+            chain.proceed(originalRequest)
+        }
+    }
+}
@@ -75,7 +75,7 @@ abstract class HttpSource : CatalogueSource {
     * Headers builder for requests. Implementations can override this method for custom headers.
     */
    protected open fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", DEFAULT_USERAGENT)
+        add("User-Agent", DEFAULT_USER_AGENT)
    }

    /**
@@ -372,6 +372,6 @@ abstract class HttpSource : CatalogueSource {
    override fun getFilterList() = FilterList()

    companion object {
-        const val DEFAULT_USERAGENT = "Mozilla/5.0 (Windows NT 6.3; WOW64)"
+        const val DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36 Edg/88.0.705.63"
    }
 }
@@ -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]
    )
@@ -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)

@@ -42,10 +43,10 @@ object MangaAPI {
            get(":sourceId/preferences", SourceController::getPreferences)
            post(":sourceId/preferences", SourceController::setPreference)

-            post(":sourceId/filters", SourceController::filters) // TODO
+            get(":sourceId/filters", SourceController::filters)

            get(":sourceId/search/:searchTerm/:pageNum", SourceController::searchSingle)
-            get("search/:searchTerm/:pageNum", SourceController::searchSingle) // TODO
+//            get("search/:searchTerm/:pageNum", SourceController::searchGlobal)
        }

        path("manga") {
@@ -78,10 +79,7 @@ object MangaAPI {
            patch(":categoryId", CategoryController::categoryModify)
            delete(":categoryId", CategoryController::categoryDelete)

-            patch(
-                ":categoryId/reorder",
-                CategoryController::categoryReorder
-            ) // TODO: the underlying code doesn't need `:categoryId`, remove it
+            patch("reorder", CategoryController::categoryReorder)
        }

        path("backup") {
@@ -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)
@@ -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")
@@ -12,7 +12,6 @@ import suwayomi.tachidesk.manga.impl.MangaList
 import suwayomi.tachidesk.manga.impl.Search
 import suwayomi.tachidesk.manga.impl.Source
 import suwayomi.tachidesk.manga.impl.Source.SourcePreferenceChange
-import suwayomi.tachidesk.server.JavalinSetup
 import suwayomi.tachidesk.server.JavalinSetup.future

 object SourceController {
@@ -63,9 +62,11 @@ object SourceController {
    }

    /** fetch filters of source with id `sourceId` */
-    fun filters(ctx: Context) { // TODO
+    fun filters(ctx: Context) {
        val sourceId = ctx.pathParam("sourceId").toLong()
-        ctx.json(Search.sourceFilters(sourceId))
+        val reset = ctx.queryParam("reset", "false").toBoolean()
+
+        ctx.json(Search.getInitialFilterList(sourceId, reset))
    }

    /** single source search */
@@ -73,7 +74,7 @@ object SourceController {
        val sourceId = ctx.pathParam("sourceId").toLong()
        val searchTerm = ctx.pathParam("searchTerm")
        val pageNum = ctx.pathParam("pageNum").toInt()
-        ctx.json(JavalinSetup.future { Search.sourceSearch(sourceId, searchTerm, pageNum) })
+        ctx.json(future { Search.sourceSearch(sourceId, searchTerm, pageNum) })
    }

    /** all source search */
@@ -28,15 +28,17 @@ object Category {
     * The new category will be placed at the end of the list
     */
    fun createCategory(name: String) {
+        // creating a category named Default is illegal
        if (name.equals(DEFAULT_CATEGORY_NAME, ignoreCase = true)) return

        transaction {
-            val count = CategoryTable.selectAll().count()
-            if (CategoryTable.select { CategoryTable.name eq name }.firstOrNull() == null)
+            if (CategoryTable.select { CategoryTable.name eq name }.firstOrNull() == null) {
                CategoryTable.insert {
                    it[CategoryTable.name] = name
-                    it[CategoryTable.order] = count.toInt() + 1
+                    it[CategoryTable.order] = Int.MAX_VALUE
                }
+                normalizeCategories()
+            }
        }
    }

@@ -50,7 +52,7 @@ object Category {
    }

    /**
-     * Move the category from position `from` to `to`
+     * Move the category from order number `from` to `to`
     */
    fun reorderCategory(from: Int, to: Int) {
        transaction {
@@ -70,6 +72,19 @@ object Category {
                removeMangaFromCategory(it[CategoryMangaTable.manga].value, categoryId)
            }
            CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
+            normalizeCategories()
+        }
+    }
+
+    /** make sure category order numbers starts from 1 and is consecutive */
+    private fun normalizeCategories() {
+        transaction {
+            val categories = CategoryTable.selectAll().orderBy(CategoryTable.order to SortOrder.ASC)
+            categories.forEachIndexed { index, cat ->
+                CategoryTable.update({ CategoryTable.id eq cat[CategoryTable.id].value }) {
+                    it[CategoryTable.order] = index + 1
+                }
+            }
        }
    }

@@ -9,7 +9,6 @@ package suwayomi.tachidesk.manga.impl

 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.SManga
-import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
@@ -26,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
@@ -57,21 +57,21 @@ 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]),
-                getMangaMetaMap(mangaEntry[MangaTable.id]),
+                getMangaMetaMap(mangaId),
+                mangaEntry[MangaTable.realUrl],
                false
            )
        } else { // initialize manga
            val source = getHttpSource(mangaEntry[MangaTable.sourceReference])
-            val fetchedManga = source.fetchMangaDetails(
-                SManga.create().apply {
-                    url = mangaEntry[MangaTable.url]
-                    title = mangaEntry[MangaTable.title]
-                }
-            ).awaitSingle()
+            val sManga = SManga.create().apply {
+                url = mangaEntry[MangaTable.url]
+                title = mangaEntry[MangaTable.title]
+            }
+            val fetchedManga = source.fetchMangaDetails(sManga).awaitSingle()

            transaction {
                MangaTable.update({ MangaTable.id eq mangaId }) {
@@ -85,6 +85,8 @@ object Manga {
                    it[MangaTable.status] = fetchedManga.status
                    if (fetchedManga.thumbnail_url != null && fetchedManga.thumbnail_url.orEmpty().isNotEmpty())
                        it[MangaTable.thumbnail_url] = fetchedManga.thumbnail_url
+
+                    it[MangaTable.realUrl] = try { source.mangaDetailsRequest(sManga).url.toString() } catch (e: Exception) { null }
                }
            }

@@ -105,17 +107,18 @@ 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]),
-                getMangaMetaMap(mangaEntry[MangaTable.id]),
+                getMangaMetaMap(mangaId),
+                mangaEntry[MangaTable.realUrl],
                true
            )
        }
    }

-    fun getMangaMetaMap(manga: EntityID<Int>): Map<String, String> {
+    fun getMangaMetaMap(manga: Int): Map<String, String> {
        return transaction {
            MangaMetaTable.select { MangaMetaTable.ref eq manga }
                .associate { it[MangaMetaTable.key] to it[MangaMetaTable.value] }
@@ -126,7 +129,8 @@ object Manga {
        transaction {
            val manga = MangaMetaTable.select { (MangaTable.id eq mangaId) }
                .first()[MangaTable.id]
-            val meta = transaction { MangaMetaTable.select { (MangaMetaTable.ref eq manga) and (MangaMetaTable.key eq key) } }.firstOrNull()
+            val meta =
+                transaction { MangaMetaTable.select { (MangaMetaTable.ref eq manga) and (MangaMetaTable.key eq key) } }.firstOrNull()
            if (meta == null) {
                MangaMetaTable.insert {
                    it[MangaMetaTable.key] = key
@@ -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 ->
-                val 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,6 +61,10 @@ object MangaList {
                        it[sourceReference] = sourceId
                    }.value

+                    mangaEntry = MangaTable.select {
+                        (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId)
+                    }.first()
+
                    MangaDataClass(
                        mangaId,
                        sourceId.toString(),
@@ -70,8 +78,12 @@ object MangaList {
                        manga.artist,
                        manga.author,
                        manga.description,
-                        manga.genre,
-                        MangaStatus.valueOf(manga.status).name
+                        manga.genre.toGenreList(),
+                        MangaStatus.valueOf(manga.status).name,
+                        false, // It's a new manga entry
+                        meta = getMangaMetaMap(mangaId),
+                        realUrl = mangaEntry[MangaTable.realUrl],
+                        freshData = true
                    )
                } else {
                    val mangaId = mangaEntry[MangaTable.id].value
@@ -88,10 +100,12 @@ 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(mangaEntry[MangaTable.id])
+                        meta = getMangaMetaMap(mangaId),
+                        realUrl = mangaEntry[MangaTable.realUrl],
+                        freshData = false
                    )
                }
            }
@@ -7,6 +7,8 @@ package suwayomi.tachidesk.manga.impl
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
 import suwayomi.tachidesk.manga.impl.MangaList.processEntries
 import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
@@ -15,28 +17,53 @@ import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
 object Search {
    suspend fun sourceSearch(sourceId: Long, searchTerm: String, pageNum: Int): PagedMangaListDataClass {
        val source = getHttpSource(sourceId)
-        val searchManga = source.fetchSearchManga(pageNum, searchTerm, source.getFilterList()).awaitSingle()
+        val searchManga = source.fetchSearchManga(pageNum, searchTerm, getFilterListOf(sourceId)).awaitSingle()
        return searchManga.processEntries(sourceId)
    }

-    // TODO
-    @Suppress("UNUSED_PARAMETER", "UNUSED_VARIABLE")
-    fun sourceFilters(sourceId: Long) {
-        val source = getHttpSource(sourceId)
-        // source.getFilterList().toItems()
+    private val filterListCache = mutableMapOf<Long, FilterList>()
+
+    private fun getFilterListOf(sourceId: Long, reset: Boolean = false): FilterList {
+        if (reset || !filterListCache.containsKey(sourceId)) {
+            filterListCache[sourceId] = getHttpSource(sourceId).getFilterList()
+        }
+        return filterListCache[sourceId]!!
    }

+    fun getInitialFilterList(sourceId: Long, reset: Boolean): List<FilterObject> {
+        return getFilterListOf(sourceId, reset).list.map {
+            FilterObject(
+                when (it) {
+                    is Filter.Header -> "Header"
+                    is Filter.Separator -> "Separator"
+                    is Filter.CheckBox -> "CheckBox"
+                    is Filter.TriState -> "TriState"
+                    is Filter.Text -> "Text"
+                    is Filter.Select<*> -> "Select"
+                    is Filter.Group<*> -> "Group"
+                    is Filter.Sort -> "Sort"
+                },
+//                when (it) {
+//                    is Filter.Select<*> -> it.getValuesType()
+//                    else -> null
+//                },
+                it
+            )
+        }
+    }
+
+//    private fun Filter.Select<*>.getValuesType(): String = values::class.java.componentType!!.simpleName
+
+    data class FilterObject(
+        val type: String,
+        val filter: Filter<*>
+    )
+
    @Suppress("UNUSED_PARAMETER")
    fun sourceGlobalSearch(searchTerm: String) {
        // TODO
    }

-    @Suppress("unused")
-    data class FilterWrapper(
-        val type: String,
-        val filter: Any
-    )
-
    /**
     * Note: Exhentai had a filter serializer (now in SY) that we might be able to steal
     */
@@ -35,29 +35,42 @@ object Source {
    fun getSourceList(): List<SourceDataClass> {
        return transaction {
            SourceTable.selectAll().map {
+                val httpSource = getHttpSource(it[SourceTable.id].value)
+                val sourceExtension = ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()
+
                SourceDataClass(
                    it[SourceTable.id].value.toString(),
                    it[SourceTable.name],
                    it[SourceTable.lang],
-                    getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()[ExtensionTable.apkName]),
-                    getHttpSource(it[SourceTable.id].value).supportsLatest,
-                    getHttpSource(it[SourceTable.id].value) is ConfigurableSource
+                    getExtensionIconUrl(sourceExtension[ExtensionTable.apkName]),
+                    httpSource.supportsLatest,
+                    httpSource is ConfigurableSource,
+                    it[SourceTable.isNsfw]
                )
            }
        }
    }

-    fun getSource(sourceId: Long): SourceDataClass {
+    fun getSource(sourceId: Long): SourceDataClass { // all the data extracted fresh form the source instance
        return transaction {
            val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()
+            val httpSource = source?.let { getHttpSource(sourceId) }
+            val extension = source?.let {
+                ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()
+            }

            SourceDataClass(
                sourceId.toString(),
                source?.get(SourceTable.name),
                source?.get(SourceTable.lang),
-                source?.let { getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()[ExtensionTable.apkName]) },
-                source?.let { getHttpSource(sourceId).supportsLatest },
-                source?.let { getHttpSource(sourceId) is ConfigurableSource },
+                source?.let {
+                    getExtensionIconUrl(
+                        extension!![ExtensionTable.apkName]
+                    )
+                },
+                httpSource?.supportsLatest,
+                httpSource?.let { it is ConfigurableSource },
+                source?.get(SourceTable.isNsfw)
            )
        }
    }
@@ -65,7 +78,7 @@ object Source {
    private val context by DI.global.instance<CustomContext>()

    /**
-     * Clients should support these types for extensions to work properly (in order of importance)
+     * (2021-08) Clients should support these types for extensions to work properly
     * - EditTextPreference
     * - SwitchPreferenceCompat
     * - ListPreference
@@ -85,7 +98,8 @@ object Source {
        val source = getHttpSource(sourceId)

        if (source is ConfigurableSource) {
-            val sourceShardPreferences = Injekt.get<Application>().getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE)
+            val sourceShardPreferences =
+                Injekt.get<Application>().getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE)

            val screen = PreferenceScreen(context)
            screen.sharedPreferences = sourceShardPreferences
@@ -43,6 +43,7 @@ object ProtoBackupExport : ProtoBackupBase() {
            Backup(
                backupManga(databaseManga, flags),
                backupCategories(),
+                emptyList(),
                backupExtensionInfo(databaseManga)
            )
        }
@@ -16,6 +16,7 @@ import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
 import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.impl.CategoryManga
 import suwayomi.tachidesk.manga.impl.backup.AbstractBackupValidator.ValidationResult
@@ -31,6 +32,7 @@ import suwayomi.tachidesk.manga.model.table.CategoryTable
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import java.io.InputStream
+import java.lang.Integer.max
 import java.util.Date

 object ProtoBackupImport : ProtoBackupBase() {
@@ -60,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 {
@@ -70,7 +72,7 @@ object ProtoBackupImport : ProtoBackupBase() {
        logger.info {
            """
                Restore Errors:
-                ${ errors.joinToString("\n") { "${it.first} - ${it.second}" } }
+                ${errors.joinToString("\n") { "${it.first} - ${it.second}" }}
                Restore Summary:
                - Missing Sources:
                    ${validationResult.missingSources.joinToString("\n                    ")}
@@ -97,11 +99,11 @@ object ProtoBackupImport : ProtoBackupBase() {
        backupManga: BackupManga,
        backupCategories: List<BackupCategory>,
        categoryMapping: Map<Int, Int>
-    ) { // TODO
+    ) {
        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 {
@@ -112,6 +114,7 @@ object ProtoBackupImport : ProtoBackupBase() {
        }
    }

+    @Suppress("UNUSED_PARAMETER") // TODO: remove
    private fun restoreMangaData(
        manga: Manga,
        chapters: List<Chapter>,
@@ -125,6 +128,7 @@ object ProtoBackupImport : ProtoBackupBase() {
            MangaTable.select { (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq manga.source) }
                .firstOrNull()
        }
+
        if (dbManga == null) { // Manga not in database
            transaction {
                // insert manga to database
@@ -143,10 +147,11 @@ object ProtoBackupImport : ProtoBackupBase() {

                    it[initialized] = manga.description != null

-                    it[inLibrary] = true
+                    it[inLibrary] = manga.favorite
                }.value

                // insert chapter data
+                val chaptersLength = chapters.size
                chapters.forEach { chapter ->
                    ChapterTable.insert {
                        it[url] = chapter.url
@@ -155,7 +160,7 @@ object ProtoBackupImport : ProtoBackupBase() {
                        it[chapter_number] = chapter.chapter_number
                        it[scanlator] = chapter.scanlator

-                        it[chapterIndex] = chapter.source_order
+                        it[chapterIndex] = chaptersLength - chapter.source_order
                        it[ChapterTable.manga] = mangaId

                        it[isRead] = chapter.read
@@ -170,9 +175,59 @@ object ProtoBackupImport : ProtoBackupBase() {
                }
            }
        } else { // Manga in database
-            // merge chapter data
+            transaction {
+                val mangaId = dbManga[MangaTable.id].value

-            // merge categories
+                // Merge manga data
+                MangaTable.update({ MangaTable.id eq mangaId }) {
+                    it[artist] = manga.artist ?: dbManga[artist]
+                    it[author] = manga.author ?: dbManga[author]
+                    it[description] = manga.description ?: dbManga[description]
+                    it[genre] = manga.genre ?: dbManga[genre]
+                    it[status] = manga.status
+                    it[thumbnail_url] = manga.thumbnail_url ?: dbManga[thumbnail_url]
+
+                    it[initialized] = dbManga[initialized] || manga.description != null
+
+                    it[inLibrary] = manga.favorite || dbManga[inLibrary]
+                }
+
+                // merge chapter data
+                val chaptersLength = chapters.size
+                val dbChapters = ChapterTable.select { ChapterTable.manga eq mangaId }
+
+                chapters.forEach { chapter ->
+                    val dbChapter = dbChapters.find { it[ChapterTable.url] == chapter.url }
+
+                    if (dbChapter == null) {
+                        ChapterTable.insert {
+                            it[url] = chapter.url
+                            it[name] = chapter.name
+                            it[date_upload] = chapter.date_upload
+                            it[chapter_number] = chapter.chapter_number
+                            it[scanlator] = chapter.scanlator
+
+                            it[chapterIndex] = chaptersLength - chapter.source_order
+                            it[ChapterTable.manga] = mangaId
+
+                            it[isRead] = chapter.read
+                            it[lastPageRead] = chapter.last_page_read
+                            it[isBookmarked] = chapter.bookmark
+                        }
+                    } else {
+                        ChapterTable.update({ (ChapterTable.url eq dbChapter[ChapterTable.url]) and (ChapterTable.manga eq mangaId) }) {
+                            it[isRead] = chapter.read || dbChapter[isRead]
+                            it[lastPageRead] = max(chapter.last_page_read, dbChapter[lastPageRead])
+                            it[isBookmarked] = chapter.bookmark || dbChapter[isBookmarked]
+                        }
+                    }
+                }
+
+                // merge categories
+                categories.forEach { backupCategoryOrder ->
+                    CategoryManga.addMangaToCategory(mangaId, categoryMapping[backupCategoryOrder]!!)
+                }
+            }
        }

        // TODO: insert/merge history
@@ -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
@@ -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 }
+    }
+}
@@ -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
+)
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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
@@ -50,10 +52,8 @@ object Extension {
    private val logger = KotlinLogging.logger {}
    private val applicationDirs by DI.global.instance<ApplicationDirs>()

-    data class InstallableAPK(
-        val apkFilePath: String,
-        val pkgName: String
-    )
+    private fun Any.isNsfw(): Boolean =
+        this::class.annotations.any { it.toString() == "@eu.kanade.tachiyomi.annotations.Nsfw()" }

    suspend fun installExtension(pkgName: String): Int {
        logger.debug("Installing $pkgName")
@@ -70,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

@@ -80,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")
            }
@@ -105,30 +124,32 @@ 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"

-            val className = packageInfo.packageName + packageInfo.applicationInfo.metaData.getString(METADATA_SOURCE_CLASS)
+            val className =
+                packageInfo.packageName + packageInfo.applicationInfo.metaData.getString(METADATA_SOURCE_CLASS)

            logger.debug("Main class for extension is $className")

            dex2jar(apkFilePath, jarFilePath, fileNameWithoutType)

            // clean up
-//            File(apkFilePath).delete()
+            File(apkFilePath).delete()
            File(dexFilePath).delete()

            // collect sources from the extension
-            val sources: List<CatalogueSource> = when (val instance = loadExtensionSources(jarFilePath, className)) {
-                is Source -> listOf(instance)
-                is SourceFactory -> instance.createSources()
-                else -> throw RuntimeException("Unknown source class type! ${instance.javaClass}")
+            val extensionMainClassInstance = loadExtensionSources(jarFilePath, className)
+            val sources: List<CatalogueSource> = when (extensionMainClassInstance) {
+                is Source -> listOf(extensionMainClassInstance)
+                is SourceFactory -> extensionMainClassInstance.createSources()
+                else -> throw RuntimeException("Unknown source class type! ${extensionMainClassInstance.javaClass}")
            }.map { it as CatalogueSource }

            val langs = sources.map { it.lang }.toSet()
@@ -155,11 +176,13 @@ object Extension {
                }

                ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) {
+                    it[this.apkName] = apkName
                    it[this.isInstalled] = true
                    it[this.classFQName] = className
                }

-                val extensionId = ExtensionTable.select { ExtensionTable.pkgName eq pkgName }.first()[ExtensionTable.id].value
+                val extensionId =
+                    ExtensionTable.select { ExtensionTable.pkgName eq pkgName }.first()[ExtensionTable.id].value

                sources.forEach { httpSource ->
                    SourceTable.insert {
@@ -167,8 +190,9 @@ object Extension {
                        it[name] = httpSource.name
                        it[lang] = httpSource.lang
                        it[extension] = extensionId
+                        it[SourceTable.isNsfw] = isNsfw || extensionMainClassInstance.isNsfw()
                    }
-                    logger.debug("Installed source ${httpSource.name} (${httpSource.lang}) with id:${httpSource.id}")
+                    logger.debug { "Installed source ${httpSource.name} (${httpSource.lang}) with id:${httpSource.id}" }
                }
            }
            return 201 // we installed successfully
@@ -198,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()
        }
    }
@@ -234,7 +269,8 @@ object Extension {
    }

    suspend fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
-        val iconUrl = transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl]
+        val iconUrl =
+            transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl]

        val saveDir = "${applicationDirs.extensionsRoot}/icon"

@@ -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
+     * 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()
    }
 }
@@ -0,0 +1,3 @@
+package suwayomi.tachidesk.manga.impl.util.lang
+
+fun List<String>.trimAll() = map { it.trim() }
@@ -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,16 +23,22 @@ 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,
+
+    /** meta data for clients */
    val meta: Map<String, String> = emptyMap(),

-    val freshData: Boolean = false
+    val realUrl: String? = null,
+
+    val freshData: Boolean = false,
 )

 data class PagedMangaListDataClass(
    val mangaList: List<MangaDataClass>,
    val hasNextPage: Boolean
 )
+
+internal fun String?.toGenreList() = this?.split(",")?.trimAll().orEmpty()
@@ -1,5 +1,7 @@
 package suwayomi.tachidesk.manga.model.dataclass

+import eu.kanade.tachiyomi.source.ConfigurableSource
+
 /*
 * Copyright (C) Contributors to the Suwayomi project
 * 
@@ -12,6 +14,13 @@ data class SourceDataClass(
    val name: String?,
    val lang: String?,
    val iconUrl: String?,
+
+    /** The Source provides a latest listing */
    val supportsLatest: Boolean?,
-    val isConfigurable: Boolean?
+
+    /** The Source implements [ConfigurableSource] */
+    val isConfigurable: Boolean?,
+
+    /** The Source class has a @Nsfw annotation */
+    val isNsfw: Boolean?,
 )
@@ -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() {
@@ -31,8 +32,11 @@ object MangaTable : IntIdTable() {
    val inLibrary = bool("in_library").default(false)
    val defaultCategory = bool("default_category").default(true)

-    // source is used by some ancestor of IntIdTable
+    // the [source] field name is used by some ancestor of IntIdTable
    val sourceReference = long("source")
+
+    /** the real url of a manga used for the "open in WebView" feature */
+    val realUrl = varchar("real_url", 2048).nullable()
 }

 fun MangaTable.toDataClass(mangaEntry: ResultRow) =
@@ -49,10 +53,11 @@ 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])
+        meta = getMangaMetaMap(mangaEntry[id].value),
+        realUrl = mangaEntry[realUrl],
    )

 enum class MangaStatus(val value: Int) {
@@ -14,5 +14,5 @@ object SourceTable : IdTable<Long>() {
    val name = varchar("name", 128)
    val lang = varchar("lang", 10)
    val extension = reference("extension", ExtensionTable)
-    val partOfFactorySource = bool("part_of_factory_source").default(false)
+    val isNsfw = bool("is_nsfw").default(false)
 }
@@ -8,31 +8,32 @@ package suwayomi.tachidesk.server
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

 import com.typesafe.config.Config
-import xyz.nulldev.ts.config.ConfigModule
 import xyz.nulldev.ts.config.GlobalConfigManager
+import xyz.nulldev.ts.config.SystemPropertyOverridableConfigModule
 import xyz.nulldev.ts.config.debugLogsEnabled

-class ServerConfig(config: Config, moduleName: String = "") : ConfigModule(config, moduleName) {
-    val ip: String by overridableWithSysProperty
-    val port: Int by overridableWithSysProperty
+private const val MODULE_NAME = "server"
+class ServerConfig(config: Config, moduleName: String = MODULE_NAME) : SystemPropertyOverridableConfigModule(config, moduleName) {
+    val ip: String by overridableConfig
+    val port: Int by overridableConfig

    // proxy
-    val socksProxyEnabled: Boolean by overridableWithSysProperty
+    val socksProxyEnabled: Boolean by overridableConfig

-    val socksProxyHost: String by overridableWithSysProperty
-    val socksProxyPort: String by overridableWithSysProperty
+    val socksProxyHost: String by overridableConfig
+    val socksProxyPort: String by overridableConfig

    // misc
    val debugLogsEnabled: Boolean = debugLogsEnabled(GlobalConfigManager.config)
-    val systemTrayEnabled: Boolean by overridableWithSysProperty
+    val systemTrayEnabled: Boolean by overridableConfig

    // webUI
-    val webUIEnabled: Boolean by overridableWithSysProperty
-    val initialOpenInBrowserEnabled: Boolean by overridableWithSysProperty
-    val webUIInterface: String by overridableWithSysProperty
-    val electronPath: String by overridableWithSysProperty
+    val webUIEnabled: Boolean by overridableConfig
+    val initialOpenInBrowserEnabled: Boolean by overridableConfig
+    val webUIInterface: String by overridableConfig
+    val electronPath: String by overridableConfig

    companion object {
-        fun register(config: Config) = ServerConfig(config.getConfig("server"), "server")
+        fun register(config: Config) = ServerConfig(config.getConfig(MODULE_NAME))
    }
 }
@@ -0,0 +1,16 @@
+package suwayomi.tachidesk.server.database.migration
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import de.neonew.exposed.migrations.helpers.DropColumnMigration
+
+@Suppress("ClassName", "unused")
+class M0011_SourceDropPartOfFactorySource : DropColumnMigration(
+    "Source",
+    "part_of_factory_source",
+)
@@ -0,0 +1,18 @@
+package suwayomi.tachidesk.server.database.migration
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import de.neonew.exposed.migrations.helpers.AddColumnMigration
+
+@Suppress("ClassName", "unused")
+class M0012_SourceIsNsfw : AddColumnMigration(
+    "Source",
+    "is_nsfw",
+    "BOOLEAN",
+    "FALSE"
+)
@@ -0,0 +1,18 @@
+package suwayomi.tachidesk.server.database.migration
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import de.neonew.exposed.migrations.helpers.AddColumnMigration
+
+@Suppress("ClassName", "unused")
+class M0013_MangaRealUrl : AddColumnMigration(
+    "Manga",
+    "real_url",
+    "VARCHAR(2048)",
+    "NULL"
+)
@@ -3,11 +3,16 @@ server.ip = "0.0.0.0"
 server.port = 4567

 # Socks5 proxy
-server.socksProxy = false
+server.socksProxyEnabled = false
 server.socksProxyHost = ""
 server.socksProxyPort = ""

 # misc
 server.debugLogsEnabled = true
 server.systemTrayEnabled = false
+
+# webUI
+server.webUIEnabled = true
 server.initialOpenInBrowserEnabled = true
+server.webUIInterface = "browser" # "browser" or "electron"
+server.electronPath = ""
Author	SHA1	Message	Date
Aria Moradi	6a11d2e357	bump version CI Publish / Validate Gradle Wrapper (push) Successful in 11s Details CI Publish / Build artifacts and release (push) Failing after 16s Details	2021-09-13 19:32:05 +04:30
Aria Moradi	0a9e0bc9e4	update WebUI	2021-09-13 19:31:07 +04:30
Aria Moradi	5914e367d1	better CHANGELOG	2021-09-13 19:29:54 +04:30
Mitchell Syer	aeaed888d4	Update Proto models to match Tachi preview (#192 )	2021-09-12 04:04:48 +04:30
Aria Moradi	a0f054b005	CHANGELOG.md	2021-09-11 19:47:06 +04:30
Aria Moradi	4498e9d444	beter handling of uninstalling Extensions	2021-09-11 16:26:04 +04:30
Aria Moradi	43e0763fef	fix a bug where if two sources return the same URL, a false duplicate might be detected	2021-09-11 14:47:03 +04:30
Aria Moradi	a519c8a482	better PR links	2021-09-11 03:18:36 +04:30
Aria Moradi	19bc595a2a	update CHANGELOG.md	2021-09-11 03:13:26 +04:30
Aria Moradi	db07825c58	remove println instance	2021-09-11 03:09:26 +04:30
Aria Moradi	b199e3bf0e	fix installing apk with weird name	2021-09-11 01:21:22 +04:30
Aria Moradi	1f9ea0891e	add some logging	2021-09-11 00:48:17 +04:30
Aria Moradi	0a7aa48f1e	fix apk log and apk name	2021-09-11 00:14:52 +04:30
Aria Moradi	4b65b7da6c	rm dummy	2021-09-10 21:42:52 +04:30
Mosei	183a7dac4b	Create docker_build_stable (#184 ) * 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	2021-09-10 21:42:31 +04:30
Aria Moradi	6726f008c1	add dummy file to trigger workflow	2021-09-10 21:22:28 +04:30
Mosei	89cf0c140f	Update publish.yml (#190 )	2021-09-10 20:49:57 +04:30
Mosei	504025ce80	Update build_push.yml (#191 )	2021-09-10 20:49:33 +04:30
Aria Moradi	fee9e914f1	fix exposed crash	2021-09-10 00:45:00 +04:30
Aria Moradi	76efa71c68	update WebUI	2021-09-09 23:05:58 +04:30
Aria Moradi	26e61959ae	update WebUI	2021-09-09 16:46:19 +04:30
Aria Moradi	9a8956ef9d	update dependencies	2021-09-09 16:41:41 +04:30
Aria Moradi	10d3ffc2f6	better UX	2021-09-09 06:05:09 +04:30
Aria Moradi	090399f61d	add support for installing external APK	2021-09-09 05:22:45 +04:30
Aria Moradi	ae7d975a92	run won't get stuck now	2021-09-09 05:15:51 +04:30
Aria Moradi	55ec6bcafe	add TODO for changing later	2021-09-09 05:15:08 +04:30
Aria Moradi	f0566d15af	fix compiler warning	2021-09-08 20:27:29 +04:30
Aria Moradi	a730b692bc	update WebUI	2021-09-08 20:24:22 +04:30
Aria Moradi	826d767423	[SKIP CI] update CHANGELOG.md	2021-09-08 20:23:45 +04:30
Aria Moradi	6d227c7fcd	Fix typo	2021-09-06 22:23:26 +04:30
Aria Moradi	7d9d97840e	Update README.md	2021-09-06 14:41:00 +04:30
Mosei	110ded45a0	Update README.md (#189 ) Remove depreciated arbuilder’s docker link	2021-09-05 21:16:25 +04:30
Aria Moradi	7872b593c7	Credit to @Syer10	2021-09-05 17:50:45 +04:30
Aria Moradi	90be30bddb	add support for the new gnere type in WebUI	2021-09-05 01:40:34 +04:30
Mitchell Syer	a298c61dab	Change type of Manga.genre to a List<String> (#188 )	2021-09-05 01:36:52 +04:30
Aria Moradi	eb416c45bd	remove not-code changes from CHANGELOG	2021-09-05 00:54:01 +04:30
Aria Moradi	b05b817aeb	Update README.md	2021-09-03 18:52:06 +04:30
Aria Moradi	666602283a	update CI Publish / Validate Gradle Wrapper (push) Successful in 12s Details CI Publish / Build artifacts and release (push) Failing after 15s Details	2021-09-03 07:59:41 +04:30
Aria Moradi	ac040a4bae	fix oopsies n'shit	2021-09-03 07:57:53 +04:30
Aria Moradi	b4982c8f22	update	2021-09-03 07:55:15 +04:30
Aria Moradi	ce3ad92095	remove node module cache, won't need it anymore	2021-09-03 07:54:07 +04:30
Aria Moradi	8e1ac8698c	bump version	2021-09-03 07:48:31 +04:30
Aria Moradi	b60a39c7cb	update	2021-09-03 07:46:11 +04:30
Aria Moradi	3b3e8ba4c8	add new unix bundles to release	2021-09-03 07:45:11 +04:30
Aria Moradi	e387f6d3be	update	2021-09-03 07:44:00 +04:30
Aria Moradi	799d469cb6	bump electron version	2021-09-03 07:43:13 +04:30
Aria Moradi	a54a596fa7	fix macOS bundler	2021-09-03 07:39:28 +04:30
Aria Moradi	92d73d0285	add linux and macOS bundler script	2021-09-03 06:50:42 +04:30
Aria Moradi	acb752e4e8	update jre	2021-09-03 05:43:33 +04:30
Aria Moradi	9e377abba6	update CHANGELOG	2021-09-03 04:55:01 +04:30
Aria Moradi	04552c0923	update WebUI	2021-09-03 04:52:34 +04:30
Aria Moradi	2e1fb85b73	[skip ci] update changelog	2021-09-03 04:49:38 +04:30
Aria Moradi	50db32d9b4	this is dumb	2021-09-03 04:48:32 +04:30
Aria Moradi	28743d953e	[skip ci] r857	2021-09-03 04:41:00 +04:30
Aria Moradi	b109d26aa7	fixed typo	2021-09-03 04:39:45 +04:30
Aria Moradi	7fd21bd06d	[skip ci] r855	2021-09-02 17:45:52 +04:30
Aria Moradi	12e0ffb466	text cleanup	2021-09-02 17:43:43 +04:30
Aria Moradi	9259341df8	missed this changelog	2021-09-02 17:31:30 +04:30
Aria Moradi	8e8aca7e7b	Update CONTRIBUTING.md	2021-09-02 17:29:26 +04:30
Aria Moradi	7f0bcd987b	Update CONTRIBUTING.md	2021-09-02 17:24:32 +04:30
Aria Moradi	ef21de95cb	add continues changelog file	2021-09-02 17:20:53 +04:30
Aria Moradi	ca3246de02	bump version	2021-09-02 15:21:27 +04:30
Aria Moradi	f0940b7926	bump version CI Publish / Validate Gradle Wrapper (push) Successful in 15s Details CI Publish / Build artifacts and release (push) Failing after 17s Details	2021-08-31 17:43:23 +04:30
Aria Moradi	0066e0b901	suppress warnings	2021-08-31 17:33:29 +04:30
Aria Moradi	9771f566b0	better comments	2021-08-30 02:48:10 +04:30
Aria Moradi	38ad4c6dec	refactor	2021-08-30 02:44:35 +04:30
Aria Moradi	37cf80a188	code cleanup	2021-08-30 02:38:15 +04:30
Aria Moradi	c86ee53f66	resolve compiler warnings	2021-08-29 22:25:43 +04:30
Aria Moradi	c2cea7e797	can serialize Search Filters	2021-08-29 22:19:44 +04:30
Aria Moradi	a8ef6cdd4f	change category re-order url	2021-08-29 21:52:23 +04:30
Aria Moradi	53d157fee8	update	2021-08-29 21:47:09 +04:30
Aria Moradi	c2e07b13f6	fix categories not being normalized	2021-08-29 20:09:17 +04:30
Aria Moradi	2e8cc48311	update WebUI	2021-08-29 02:11:11 +04:30
Aria Moradi	f6f811eb77	update WebUI	2021-08-29 01:59:36 +04:30
Aria Moradi	ac5528fb15	add when the statement was true	2021-08-27 04:49:53 +04:30
Aria Moradi	940d2b7862	bump version	2021-08-26 22:31:06 +04:30
Aria Moradi	835fe3dad3	sorround with try, catch as it might throw an exception	2021-08-26 22:24:54 +04:30
Aria Moradi	dfaecc08c5	add realUrl to Manga, reperesents open in WebView URL	2021-08-26 22:11:51 +04:30
Aria Moradi	87f5e9b847	fix migration number	2021-08-26 22:10:51 +04:30
Aria Moradi	3d3939e808	better logs	2021-08-26 22:10:27 +04:30
Aria Moradi	90822e3858	merge manga data while restoring backup	2021-08-26 16:28:45 +04:30
Aria Moradi	14eec47e9c	correct value for inLibrary	2021-08-26 01:34:56 +04:30
Aria Moradi	15ed3fcc69	actual fix for source order	2021-08-26 01:31:59 +04:30
Aria Moradi	fd8fa9f3ef	fix chapter restore order	2021-08-26 01:28:42 +04:30
Aria Moradi	b81075f4a7	fix docker builds faling?	2021-08-24 22:23:39 +04:30
Aria Moradi	f11a52e8e1	we don't need that feild anymore	2021-08-24 22:23:00 +04:30
Aria Moradi	9c007483d4	better method of detemining if a source is Nsfw	2021-08-24 02:44:13 +04:30
Aria Moradi	ff4e818e4c	add some comments	2021-08-23 21:48:27 +04:30
Aria Moradi	45a50ca0c1	add isNsfw to SourceDataClass	2021-08-23 21:46:28 +04:30
Aria Moradi	65d9021c37	close response	2021-08-23 06:10:31 +04:30
Aria Moradi	66481a0391	NPE fix suggested by @syer10	2021-08-23 06:05:04 +04:30
Aria Moradi	a14a82bc9a	fix oppsie, sync dependencies with tachiyomi	2021-08-23 05:27:39 +04:30
Aria Moradi	756c57a16e	also intercept on 403	2021-08-23 04:56:27 +04:30
Aria Moradi	8b19e34dc5	Update README.md	2021-08-23 04:38:32 +04:30
Aria Moradi	50083019ee	add copyright notices	2021-08-23 04:37:30 +04:30
Aria Moradi	155272e638	add new keys	2021-08-23 04:28:07 +04:30
Aria Moradi	08443ceb3d	remove comment	2021-08-23 04:20:04 +04:30
Aria Moradi	c215696f04	have a lighter log level	2021-08-23 04:17:40 +04:30
Aria Moradi	5ca42bf9b6	make it compile	2021-08-23 04:02:55 +04:30
Aria Moradi	3272b9dec5	add CloudflareInterceptor from TachiWeb-Server	2021-08-23 03:45:10 +04:30
Aria Moradi	2ebd5da4aa	bump kotlinter version	2021-08-22 19:00:33 +04:30
Aria Moradi	34f024ace2	migrate dex2jar dependency to @ThexXTURBOXx version	2021-08-21 16:36:34 +04:30
Aria Moradi	b31f2d50f6	No more legacy backup	2021-08-21 06:39:12 +04:30