continues gap switch

getAndroid.ps1: Silently continue if it cant remove the tmp folder

.gitattributes

@@ -1,6 +1,27 @@
-#
+* text=auto
-# https://help.github.com/articles/dealing-with-line-endings/
+* text eol=lf
-#
-# These are explicitly windows files and should use crlf
-*.bat           text eol=crlf
 
+# Windows forced line-endings
+/.idea/* text eol=crlf
+*.bat    text eol=crlf
+*.ps1    text eol=crlf
+
+# Gradle wrapper
+*.jar binary
+
+# Images
+*.webp binary
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.eot binary
+*.woff binary
+*.pyc binary
+*.swp binary
+*.pdf binary

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/runner-files/ci-gradle.properties

@@ -0,0 +1,7 @@
+org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx5120m
+org.gradle.workers.max=5
+org.gradle.parallel=true
+
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process

.github/scripts/commit-repo.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+git lfs install
+#git lfs track "*.zip"
+
+cp ../master/repo/* .
+new_jar_build=$(ls *.jar| tail -1)
+echo "last jar build file name: $new_jar_build"
+
+new_win32_build=$(ls *.zip| tail -1)
+echo "last win32 build file name: $new_win32_build"
+
+cp -f $new_jar_build Tachidesk-latest.jar
+cp -f $new_win32_build Tachidesk-latest-win32.zip
+
+git config --global user.email "github-actions[bot]@users.noreply.github.com"
+git config --global user.name "github-actions[bot]"
+git status
+if [ -n "$(git status --porcelain)" ]; then
+    git add .
+    git commit -m "Update repo"
+    git push
+else
+    echo "No changes to commit"
+fi

.github/scripts/create-repo.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Get last commit message
+#last_commit_log=$(git log -1 --pretty=format:"%s")
+#echo "last commit log: $last_commit_log"
+#
+#filter_count=$(echo "$last_commit_log" | grep -e '\[RELEASE CI\]' -e '\[CI RELEASE\]' | wc -c)
+#echo "count is: $filter_count"
+
+mkdir -p repo/
+cp server/build/Tachidesk-*.jar repo/
+cp server/build/Tachidesk-*.zip repo/
+
+ls repo
+pwd
+
+#if [ "$filter_count" -gt 0 ]; then
+#  cp server/build/Tachidesk-*.jar repo/
+#  cp server/build/Tachidesk-*.zip repo/
+#fi

.github/workflows/build.yml

@@ -0,0 +1,71 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  check_wrapper:
+    name: Validate Gradle Wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+  build:
+    name: Build FatJar
+    needs: check_wrapper
+    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.5.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout master branch
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          path: master
+          fetch-depth: 0
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Copy CI gradle.properties
+        run: |
+          cd master
+          mkdir -p ~/.gradle
+          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Download android.jar
+        run: |
+          cd master
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+
+      - name: Cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/react/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/react/yarn.lock') }}
+
+      - name: Build Jar and launch4j
+        uses: eskatos/gradle-command-action@v1
+        with:
+          build-root-directory: master
+          wrapper-directory: master
+          arguments: :server:windowsPackage --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true

.github/workflows/issue_closer.yml

@@ -0,0 +1,37 @@
+name: Issue closer
+
+on:
+  issues:
+    types: [opened, edited, reopened]
+
+jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Autoclose issues
+        uses: arkon/issue-closer-action@v3.0
+        with:
+          repo-token: ${{ github.token }}
+          rules: |
+            [
+              {
+                "type": "title",
+                "regex": ".*<short description>*",
+                "message": "You did not fill out the description in the title"
+              },
+              {
+                "type": "body",
+                "regex": ".*DELETE THIS SECTION IF YOU HAVE READ AND ACKNOWLEDGED IT.*",
+                "message": "The acknowledgment section was not removed"
+              },
+              {
+                "type": "body",
+                "regex": "(Tachidesk version|Server Operating System|Server Desktop Environment|Server JVM version|Client Operating System|Client Web Browser):.*(\\(Example:|<usually).*",
+                "message": "The requested information was not filled out"
+              },
+              {
+                "type": "body",
+                "regex": ".*Remove this line after you are done.*",
+                "message": "The lines requesting to be removed were not removed."
+              }
+            ]

.github/workflows/publish.yml

@@ -0,0 +1,115 @@
+name: Publish
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  check_wrapper:
+    name: Validate Gradle Wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+  build:
+    name: Build FatJar
+    needs: check_wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.5.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout master branch
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          path: master
+          fetch-depth: 0
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Copy CI gradle.properties
+        run: |
+          cd master
+          mkdir -p ~/.gradle
+          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Download android.jar
+        run: |
+          cd master
+          curl https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
+
+      - name: Cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/react/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Build Jar and launch4j
+        uses: eskatos/gradle-command-action@v1
+        with:
+          build-root-directory: master
+          wrapper-directory: master
+          arguments: :server:windowsPackage --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+
+
+      - name: Create repo artifacts
+        run: |
+          cd master
+          ./.github/scripts/create-repo.sh
+
+      - name: Upload Release
+        uses: xresloader/upload-to-github-release@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          file: "master/repo/*"
+          tags: true
+          draft: true
+          verbose: true
+
+#      - name: Create Release
+#        id: create_release
+#        uses: actions/create-release@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          tag_name: ${{ github.ref }}
+#          release_name: Release ${{ github.ref }}
+#          body: |
+#                  Release body
+#          draft: false
+#          prerelease: true
+#
+#      - name: Get the Ref
+#        id: get-ref
+#        uses: ankitvgupta/ref-to-tag-action@master
+#        with:
+#          ref: ${{ github.ref }}
+#          head_ref: ${{ github.head_ref }}
+#
+#      - name: Get the tag
+#        run: echo "The tag was ${{ steps.get-ref.outputs.tag }}"
+#
+#      - name: Upload Release
+#        uses: AButler/upload-release-assets@v2.0
+#        with:
+#          files: 'master/repo/*'
+#          repo-token: ${{ secrets.GITHUB_TOKEN }}
+#          release-tag: ${{ steps.get-ref.outputs.tag }}

AndroidCompat/Config/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    // Config API
+    // Config API, moved to the global build.gradle
 //    implementation("com.typesafe:config:1.4.0")
 }

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

@@ -1,57 +1,65 @@
 package xyz.nulldev.ts.config
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigRenderOptions
 import mu.KotlinLogging
+import net.harawata.appdirs.AppDirsFactory
 import java.io.File
 
 /**
  * Manages app config.
  */
 open class ConfigManager {
-    private val generatedModules
+    private val dataRoot by lazy { AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)!! }
-            = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
+
+    private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
     val config by lazy { loadConfigs() }
 
     //Public read-only view of modules
     val loadedModules: Map<Class<out ConfigModule>, ConfigModule>
         get() = generatedModules
 
-    open val configFolder: String
+    open val appConfigFile: String = "$dataRoot/server.conf"
-        get() = System.getProperty("compat-configdirs") ?: "tachiserver-data/config"
 
     val logger = KotlinLogging.logger {}
 
     /**
      * Get a config module
      */
-    inline fun <reified T : ConfigModule> module(): T
+    inline fun <reified T : ConfigModule> module(): T = loadedModules[T::class.java] as T
-            = loadedModules[T::class.java] as T
 
     /**
      * Get a config module (Java API)
      */
-    fun <T : ConfigModule> module(type: Class<T>): T
+    fun <T : ConfigModule> module(type: Class<T>): T = loadedModules[type] as T
-            = loadedModules[type] as T
 
     /**
      * Load configs
      */
     fun loadConfigs(): Config {
-        val configs = mutableListOf<Config>()
+        //Load reference configs
+        val compatConfig =  ConfigFactory.parseResources("compat-reference.conf")
+        val serverConfig = ConfigFactory.parseResources("server-reference.conf")
 
-        //Load reference config
+        //Load user config
-        configs += ConfigFactory.parseResources("reference.conf")
+        val userConfig =
+            File(appConfigFile).let{
+                    ConfigFactory.parseFile(it)
+            }
 
-        //Load custom configs from dir
+        val config = ConfigFactory.empty()
-        File(configFolder).listFiles()?.map {
+                .withFallback(userConfig)
-            ConfigFactory.parseFile(it)
+                .withFallback(compatConfig)
-        }?.filterNotNull()?.forEach {
+                .withFallback(serverConfig)
-            configs += it.withFallback(configs.last())
+                .resolve()
-        }
-
-        val config = configs.last().resolve()
 
         logger.debug {
             "Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true))

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

@@ -1,35 +0,0 @@
-package xyz.nulldev.ts.config
-
-import com.typesafe.config.Config
-import java.io.File
-
-class ServerConfig(config: Config) : ConfigModule(config) {
-    val ip = config.getString("ip")
-    val port = config.getInt("port")
-
-    val allowConfigChanges = config.getBoolean("allowConfigChanges")
-    val enableWebUi = config.getBoolean("enableWebUi")
-    val useOldWebUi = config.getBoolean("useOldWebUi")
-    val prettyPrintApi = config.getBoolean("prettyPrintApi")
-    // TODO Apply to operation IDs
-    val disabledApiEndpoints = config.getStringList("disabledApiEndpoints").map(String::toLowerCase)
-    val enabledApiEndpoints = config.getStringList("enabledApiEndpoints").map(String::toLowerCase)
-    val httpInitializedPrintMessage = config.getString("httpInitializedPrintMessage")
-
-    val useExternalStaticFiles = config.getBoolean("useExternalStaticFiles")
-    val externalStaticFilesFolder = config.getString("externalStaticFilesFolder")
-
-    val rootDir = registerFile(config.getString("rootDir"))
-    val patchesDir = registerFile(config.getString("patchesDir"))
-
-    fun registerFile(file: String): File {
-        return File(file).apply {
-            mkdirs()
-        }
-    }
-
-    companion object {
-        fun register(config: Config)
-                = ServerConfig(config.getConfig("ts.server"))
-    }
-}

AndroidCompat/build.gradle.kts

@@ -18,9 +18,7 @@ repositories {
 
 dependencies {
     // Android stub library
-//    compileOnly( fileTree(File(rootProject.rootDir, "libs/android"), include: "*.jar")
     implementation(fileTree("lib/"))
-    implementation(fileTree("${rootProject.rootDir}/server/lib/dex2jar/"))
 
 
     // Android JAR libs
@@ -41,10 +39,10 @@ dependencies {
     compileOnly( group= "xmlpull", name= "xmlpull", version= "1.1.3.1")
 
     // Config API
-    implementation( project(":AndroidCompat:Config"))
+    implementation(project(":AndroidCompat:Config"))
 
-    // dex2jar
+    // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon
-//    compileOnly( "dex2jar:dex-translator")
+    compileOnly("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon")
 
     // APK parser
     compileOnly("net.dongliu:apk-parser:2.6.10")
@@ -55,7 +53,11 @@ dependencies {
     // AndroidX annotations
     compileOnly( "androidx.annotation:annotation:1.2.0-alpha01")
 
-//    compileOnly("io.reactivex:rxjava:1.3.8")
+    // substitute for duktape-android
+    // 'org.mozilla:rhino' includes some code that we don't need so use 'org.mozilla:rhino-runtime' instead
+    implementation("org.mozilla:rhino-runtime:1.7.13")
+    // 'org.mozilla:rhino-engine' provides the same interface as 'javax.script' a.k.a Nashorn
+    implementation("org.mozilla:rhino-engine:1.7.13")
 }
 
 //def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar')

AndroidCompat/getAndroid.ps1

@@ -0,0 +1,99 @@
+# 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/.
+
+# This is a windows only PowerShell script to create android.jar stubs
+
+# foolproof against running from AndroidCompat dir instead of running from project root
+if ($(Split-Path -Path (Get-Location) -Leaf) -eq "AndroidCompat" ) {
+    Set-Location ..
+}
+
+Write-Output "Getting required Android.jar..."
+Remove-Item -Recurse -Force "tmp" -ErrorAction SilentlyContinue | Out-Null
+New-Item -ItemType Directory -Force -Path "tmp" | Out-Null
+
+$androidEncoded = (Invoke-WebRequest -Uri "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT").content
+
+$android_jar = (Get-Location).Path + "\tmp\android.jar"
+
+[IO.File]::WriteAllBytes($android_jar, [Convert]::FromBase64String($androidEncoded))
+
+# We need to remove any stub classes that we have implementations for
+Write-Output "Patching JAR..."
+
+function Remove-Files-Zip($zipfile, $path)
+{
+    [Reflection.Assembly]::LoadWithPartialName('System.IO.Compression') | Out-Null
+
+    $stream = New-Object IO.FileStream($zipfile, [IO.FileMode]::Open)
+    $mode   = [IO.Compression.ZipArchiveMode]::Update
+    $zip    = New-Object IO.Compression.ZipArchive($stream, $mode)
+
+    ($zip.Entries | Where-Object { $_.FullName -like $path }) | ForEach-Object { Write-Output "Deleting: $($_.FullName)"; $_.Delete() }
+
+    $zip.Dispose()
+    $stream.Close()
+    $stream.Dispose()
+}
+
+Write-Output "Removing org.json..."
+Remove-Files-Zip $android_jar 'org/json/*'
+
+Write-Output "Removing org.apache..."
+Remove-Files-Zip $android_jar 'org/apache/*'
+
+Write-Output "Removing org.w3c..."
+Remove-Files-Zip $android_jar 'org/w3c/*'
+
+Write-Output "Removing org.xml..."
+Remove-Files-Zip $android_jar 'org/xml/*'
+
+Write-Output "Removing org.xmlpull..."
+Remove-Files-Zip $android_jar 'org/xmlpull/*'
+
+Write-Output "Removing junit..."
+Remove-Files-Zip $android_jar 'junit/*'
+
+Write-Output "Removing javax..."
+Remove-Files-Zip $android_jar 'javax/*'
+
+Write-Output "Removing java..."
+Remove-Files-Zip $android_jar 'java/*'
+
+Write-Output "Removing overriden classes..."
+Remove-Files-Zip $android_jar 'android/app/Application.class'
+Remove-Files-Zip $android_jar 'android/app/Service.class'
+Remove-Files-Zip $android_jar 'android/net/Uri.class'
+Remove-Files-Zip $android_jar 'android/net/Uri$Builder.class'
+Remove-Files-Zip $android_jar 'android/os/Environment.class'
+Remove-Files-Zip $android_jar 'android/text/format/Formatter.class'
+Remove-Files-Zip $android_jar 'android/text/Html.class'
+
+function Dedupe($path)
+{
+    Push-Location $path
+    $classes = Get-ChildItem . *.* -Recurse | Where-Object { !$_.PSIsContainer }
+    $classes | ForEach-Object {
+        "Processing class: $($_.FullName)"
+        Remove-Files-Zip $android_jar "$($_.Name).class" | Out-Null
+        Remove-Files-Zip $android_jar "$($_.Name)$*.class" | Out-Null
+        Remove-Files-Zip $android_jar "$($_.Name)Kt.class" | Out-Null
+        Remove-Files-Zip $android_jar "$($_.Name)Kt$*.class" | Out-Null
+    }
+    Pop-Location
+}
+
+Dedupe "AndroidCompat/src/main/java"
+Dedupe "server/src/main/java"
+Dedupe "server/src/main/kotlin"
+
+Write-Output "Copying Android.jar to library folder..."
+Move-Item -Force $android_jar "AndroidCompat/lib/android.jar"
+
+Write-Output "Cleaning up..."
+Remove-Item -Recurse -Force "tmp"
+
+Write-Output "Done!"

AndroidCompat/getAndroid.sh

@@ -1,4 +1,19 @@
 #!/usr/bin/env 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/.
+
+# This is a bash script to create android.jar stubs
+
+# foolproof against running from AndroidCompat dir instead of running from project root
+if [ "$(basename $(pwd))" = "AndroidCompat" ]; then
+  cd ..
+fi
+
+
 echo "Getting required Android.jar..."
 rm -rf "tmp"
 mkdir -p "tmp"
@@ -6,7 +21,7 @@ pushd "tmp"
 
 curl "https://android.googlesource.com/platform/prebuilts/sdk/+/3b8a524d25fa6c3d795afb1eece3f24870c60988/27/public/android.jar?format=TEXT" | base64 --decode > android.jar
 
-# We need to remove any stub classes that we might use
+# We need to remove any stub classes that we have implementations for
 echo "Patching JAR..."
 
 echo "Removing org.json..."
@@ -58,9 +73,8 @@ function dedup() {
 
 pushd ..
 dedup AndroidCompat/src/main/java
-dedup TachiServer/src/main/java
+dedup server/src/main/java
-dedup Tachiyomi-App/src/main/java
+dedup server/src/main/kotlin
-dedup Tachiyomi-App/src/compat/java
 popd
 
 popd

AndroidCompat/src/main/java/com/squareup/duktape/Duktape.java

@@ -1,20 +1,12 @@
-/*
- * Copyright (C) 2015 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.squareup.duktape;
 
+/*
+ * 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 kotlin.NotImplementedError;
 
 import javax.script.ScriptEngine;
@@ -22,11 +14,18 @@ import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.io.Closeable;
 
-/** A simple EMCAScript (Javascript) interpreter. */
+/* Note (March 2021):
+ * The old implementation for duktape-android used the nashorn engine which is deprecated.
+ * This new implementation uses Mozilla's Rhino: https://github.com/mozilla/rhino
+ */
+
+/**
+ * A simple EMCAScript (Javascript) interpreter.
+ */
 public final class Duktape implements Closeable, AutoCloseable {
 
     private ScriptEngineManager factory = new ScriptEngineManager();
-    private ScriptEngine engine = factory.getEngineByName("JavaScript");
+    private ScriptEngine engine = factory.getEngineByName("rhino");
 
     /**
    * Create a new interpreter instance. Calls to this method <strong>must</strong> matched with
@@ -38,17 +37,6 @@ public final class Duktape implements Closeable, AutoCloseable {
 
     private Duktape() {}
 
-    /**
-   * Evaluate {@code script} and return a result. {@code fileName} will be used in error
-   * reporting. Note that the result must be one of the supported Java types or the call will
-   * return null.
-   *
-   * @throws DuktapeException if there is an error evaluating the script.
-   */
-    public synchronized Object evaluate(String script, String fileName) {
-        throw new NotImplementedError("Not implemented!");
-    }
-
     /**
    * Evaluate {@code script} and return a result. Note that the result must be one of the
    * supported Java types or the call will return null.
@@ -76,18 +64,18 @@ public final class Duktape implements Closeable, AutoCloseable {
         throw new NotImplementedError("Not implemented!");
     }
 
-    /**
+//    /**
-   * Attaches to a global JavaScript object called {@code name} that implements {@code type}.
+//   * Attaches to a global JavaScript object called {@code name} that implements {@code type}.
-   * {@code type} defines the interface implemented in JavaScript that will be accessible to Java.
+//   * {@code type} defines the interface implemented in JavaScript that will be accessible to Java.
-   * {@code type} must be an interface that does not extend any other interfaces, and cannot define
+//   * {@code type} must be an interface that does not extend any other interfaces, and cannot define
-   * any overloaded methods.
+//   * any overloaded methods.
-   * <p>Methods of the interface may return {@code void} or any of the following supported argument
+//   * <p>Methods of the interface may return {@code void} or any of the following supported argument
-   * types: {@code boolean}, {@link Boolean}, {@code int}, {@link Integer}, {@code double},
+//   * types: {@code boolean}, {@link Boolean}, {@code int}, {@link Integer}, {@code double},
-   * {@link Double}, {@link String}.
+//   * {@link Double}, {@link String}.
-   */
+//   */
-    public synchronized <T> T get(final String name, final Class<T> type) {
+//    public synchronized <T> T get(final String name, final Class<T> type) {
-        throw new NotImplementedError("Not implemented!");
+//        throw new NotImplementedError("Not implemented!");
-    }
+//    }
 
     /**
    * Release the native resources associated with this object. You <strong>must</strong> call this

AndroidCompat/src/main/java/com/squareup/duktape/DuktapeStub.java

@@ -0,0 +1,37 @@
+package com.squareup.duktape;
+
+/*
+ * 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/. */
+// part of tachiyomi-extensions which was originally licensed under Apache License Version 2.0
+
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/** This is the reference Duktape stub that tachiyomi's extensions depend on.
+ * Intended to be used as a reference.
+ */
+public class DuktapeStub implements Closeable {
+
+    public static Duktape create() {
+        throw new RuntimeException("Stub!");
+    }
+
+    @Override
+    public synchronized void close() throws IOException {
+        throw new RuntimeException("Stub!");
+    }
+
+    public synchronized Object evaluate(String script) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public synchronized <T> void set(String name, Class<T> type, T object) {
+        throw new RuntimeException("Stub!");
+    }
+
+}

AndroidCompat/src/main/resources/compat-reference.conf

@@ -1,6 +1,3 @@
-# Server ip and port bindings
-ts.server.ip = 0.0.0.0
-ts.server.port = 4567
 
 # Allow/disallow preference changes (useful for demos)
 ts.server.allowConfigChanges = true

README.md

@@ -1,33 +1,107 @@
+
+![image](https://github.com/Suwayomi/Tachidesk/raw/master/server/src/main/resources/icon/faviconlogo.png)
 # Tachidesk
-A not so much port of [Tachiyomi](https://tachiyomi.org/) to the web (and later Electron for the desktop experience)!
+A free and open source manga reader that runs extensions built for [Tachiyomi](https://tachiyomi.org/). 
 
+Tachidesk is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it.
+
+Ability to read and write Tachiyomi compatible backups and syncing is a planned feature.
+
+## Is this application usable? Should I test it?
+Here is a list of current features:
+
+- Installing and executing Tachiyomi's Extensions, So you'll get the same sources.
+- A library to save your mangas and categories to put them into.
+- Searching and browsing installed sources.
+- A minimal chapter reader.
+- Ability to download Mangas for offline read(This partially works)
+
+**Note:** Keep in mind that Tachidesk is alpha software and can break rarely and/or with each update, so you may have to delete your data to fix it. See [General troubleshooting](#general-troubleshooting) and [Support and help](#support-and-help) if it happens.
+
+Anyways, for more info checkout [finished milestone #1](https://github.com/Suwayomi/Tachidesk/issues/2) and [milestone #2](https://github.com/Suwayomi/Tachidesk/projects/1) to see what's implemented in more detail.
+
+## Downloading and Running the app
+### All Operating Systems
+You should have The Java Runtime Environment(JRE) 8 or newer and a modern browser installed. Also an internet connection is required as almost everything this app does is downloading stuff. 
+
+Download the latest jar release from [the releases section](https://github.com/Suwayomi/Tachidesk/releases).
+
+Double click on the jar file or run `java -jar Tachidesk-vX.Y.Z-rxxx.jar` from a Terminal/Command Prompt window to run the app which will open a new browser window automatically. Also the System Tray Icon is your friend if you need to open the browser window again or close Tachidesk.
+
+### Windows
+Download the latest win32 release from [the releases section](https://github.com/Suwayomi/Tachidesk/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-win32.zip` and run `server.exe`. The rest works like the previous section.
+
+### Arch Linux
+You can install Tachidesk from the AUR
+```
+yay -S tachidesk
+```
+
+### Docker
+Check [arbuilder's repo](https://github.com/arbuilder/Tachidesk-docker) out for more details and the dockerfile.
+
+## General troubleshooting
+If the app breaks try deleting the directory below and re-running the app (**This will delete all your data!**) and if the problem persists open an issue. 
+
+On Mac OS X : `/Users/<Account>/Library/Application Support/Tachidesk`
+
+On Windows XP : `C:\Documents and Settings\<Account>\Application Data\Local Settings\Tachidesk`
+
+On Windows 7 and later : `C:\Users\<Account>\AppData\Local\Tachidesk`
+
+On Unix/Linux : `/home/<account>/.local/share/Tachidesk`
+
+## Support and help
+Join Tachidesk's [discord server](https://discord.gg/wgPyb7hE5d) to hang out with the community and receive support and help.
+
+## How does it work?
 This project has two components: 
-1. **server:** contains some of the original Tachiyomi code and serves a REST API
+1. **server:** contains the implementation of [tachiyomi's extensions library](https://github.com/tachiyomiorg/extensions-lib) and uses an Android compatibility library to run apk extensions. All this concludes to serving a REST API to `webUI`.
-2. **webUI:** A react project that works with the server to do the presentation
+2. **webUI:** A react SPA project that works with the server to do the presentation.
 
-## How do I run the thing?
+## Building from source
-### Get Android stubs jar(do this only once)
+### Prerequisite: Get Android stubs jar
 #### Manual download
-Download [android.jar](https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
+Download [android.jar](https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
-#### Building from source(needs `bash`, `curl`, `base64`, `zip` to work)
+#### Automated download(needs `bash`, `curl`, `base64`, `zip` to work)
-run `scripts/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository.
+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 jar
+### Prerequisite: Software dependencies
-run `./gradlew :server:fatJar` the resulting jar file will be `server/build/server-1.0-all.jar`. Simply double click on it or run `java -jar server-1.0-all.jar`. The server will be running on `http://localhost:4567` open this url in your browser.
+You need this software packages installed in order to build this project:
-## running for development purposes
+- Java Development Kit and Java Runtime Environment version 8 or newer(both Oracle JDK and OpenJDK works)
-### The Server
+- Nodejs LTS or latest
-run `./gradlew :server:run -x :webUI:yarn_build --stacktrace` to run the server
+- Yarn
-### the webUI
+### building the full-blown jar
-how to do it is described in `webUI/react/README.md` but for short,
+Run `./gradlew server:shadowJar`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
+### building without `webUI` bundled
+Delete the `server/src/main/resources/react` directory if exists from previous runs, then run `./gradlew server:shadowJar -x :webUI:copyBuild`, the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
+### building the Windows package
+Run `./gradlew windowsPackage`, the resulting built zip package file will be `server/build/Tachidesk-vX.Y.Z-rxxx-win32.zip`.
+## Running for development purposes
+### `server` module
+Follow [Get Android stubs jar](#prerequisite-get-android-stubs-jar) then run `./gradlew :server:run -x :webUI:copyBuild --stacktrace` to run the server
+### `webUI` module
+How to do it is described in `webUI/react/README.md` but for short,
  first cd into `webUI/react` then run `yarn` to install the node modules(do this only once)
  then `yarn start` to start the client if a new browser window doesn't start automatically,
- then open `http://127.0.0.1:3000` in a modern browser.
+ then open `http://127.0.0.1:3000` in a modern browser. This is a `create-react-app` project
+ and supports HMR and all the other goodies you'll need.
 
-## Is the application usable? Should I test it?
+## Credit
-Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2) to see what's implemented.
+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`.
+
+Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`.
+
+You can obtain a copy of `Apache License Version 2.0` from  http://www.apache.org/licenses/LICENSE-2.0
+
+Changes to both codebases is licensed under `MPL v. 2.0` as the rest of this project.
 
 ## License
 
-    Copyright (C) 2020 Aria Moradi
+    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

build.gradle.kts

@@ -61,7 +61,7 @@ configure(listOf(
 
         // Logging
         implementation("org.slf4j:slf4j-api:1.7.30")
-        implementation("org.slf4j:slf4j-simple:1.7.30")
+        implementation("ch.qos.logback:logback-classic:1.2.3")
         implementation("io.github.microutils:kotlin-logging:2.0.3")
 
         // RxJava
@@ -76,5 +76,10 @@ configure(listOf(
 
         // dependency of :AndroidCompat:Config
         implementation("com.typesafe:config:1.4.0")
+        implementation("io.github.config4k:config4k:0.4.2")
+
+
+        // to get application content root
+        implementation("net.harawata:appdirs:1.2.0")
     }
 }

server/build.gradle.kts

@@ -1,11 +1,16 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import java.io.BufferedReader
 
 plugins {
 //    id("org.jetbrains.kotlin.jvm") version "1.4.21"
     application
     id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("org.jmailen.kotlinter") version "3.3.0"
+    id("edu.sc.seis.launch4j") version "2.4.9"
 }
 
+val TachideskVersion = "v0.2.6"
+
 
 repositories {
     mavenCentral()
@@ -52,42 +57,40 @@ dependencies {
 
     implementation("org.jsoup:jsoup:1.13.1")
     implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
-    implementation("com.squareup.duktape:duktape-android:1.3.0")
 
 
     val coroutinesVersion = "1.3.9"
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
 
-    // dex2jar
+    // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon
-    implementation(fileTree("lib/dex2jar/"))
+    implementation("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon")
+
 
     // api
     implementation("io.javalin:javalin:3.12.0")
-    implementation("org.slf4j:slf4j-simple:1.8.0-beta4")
-    implementation("org.slf4j:slf4j-api:1.8.0-beta4")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.10.3")
 
-    // to get application content root
-    implementation("net.harawata:appdirs:1.2.0")
-
     // Exposed ORM
     val exposed_version = "0.28.1"
-    implementation ("org.jetbrains.exposed:exposed-core:$exposed_version")
+    implementation("org.jetbrains.exposed:exposed-core:$exposed_version")
-    implementation ("org.jetbrains.exposed:exposed-dao:$exposed_version")
+    implementation("org.jetbrains.exposed:exposed-dao:$exposed_version")
-    implementation ("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
+    implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
-    implementation ("org.xerial:sqlite-jdbc:3.30.1")
+    implementation("com.h2database:h2:1.4.199")
+
+    // tray icon
+    implementation("com.dorkbox:SystemTray:3.17")
+
 
     // AndroidCompat
     implementation(project(":AndroidCompat"))
     implementation(project(":AndroidCompat:Config"))
 
-
+    // uncomment to test extensions directly
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
+//    implementation(fileTree("lib/"))
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
 }
 
+val name = "ir.armor.tachidesk.Main"
 application {
-    val name = "ir.armor.tachidesk.Main"
     mainClass.set(name)
 
     // Required by ShadowJar.
@@ -102,6 +105,19 @@ sourceSets {
     }
 }
 
+val TachideskRevision = Runtime
+        .getRuntime()
+        .exec("git rev-list master --count")
+        .let { process ->
+            process.waitFor()
+            val output = process.inputStream.use {
+                it.bufferedReader().use(BufferedReader::readText)
+            }
+            process.destroy()
+            "r" + output.trim()
+
+        }
+
 tasks {
     jar {
         manifest {
@@ -115,15 +131,81 @@ tasks {
     }
     shadowJar {
         manifest.inheritFrom(jar.get().manifest) //will make your shadowJar (produced by jar task) runnable
+        archiveBaseName.set("Tachidesk")
+        archiveVersion.set(TachideskVersion)
+        archiveClassifier.set(TachideskRevision)
     }
 }
 
+launch4j { //used for windows
+    mainClassName = name
+    bundledJrePath = "jre"
+    bundledJre64Bit = true
+    jreMinVersion = "8"
+    outputDir = "Tachidesk-$TachideskVersion-$TachideskRevision-win32"
+    icon = "${projectDir}/src/main/resources/icon/faviconlogo.ico"
+    jar = "${projectDir}/build/Tachidesk-$TachideskVersion-$TachideskRevision.jar"
+}
+
+tasks.register<Zip>("windowsPackage") {
+    from(fileTree("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32"))
+    destinationDirectory.set(File("$buildDir"))
+    archiveFileName.set("Tachidesk-$TachideskVersion-$TachideskRevision-win32.zip")
+    dependsOn("windowsPackageWorkaround2")
+}
+
+tasks.register<Delete>("windowsPackageWorkaround2") {
+    delete(
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/jre",
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/lib",
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/server.exe",
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/Tachidesk-$TachideskVersion-$TachideskRevision-win32/Tachidesk-$TachideskVersion-$TachideskRevision-win32"
+    )
+    dependsOn("windowsPackageWorkaround")
+}
+
+tasks.register<Copy>("windowsPackageWorkaround") {
+    from("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32")
+    into("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/Tachidesk-$TachideskVersion-$TachideskRevision-win32")
+    dependsOn("deleteUnwantedJreDir")
+}
+
+tasks.register<Delete>("deleteUnwantedJreDir") {
+    delete(
+            "$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32/jdk8u282-b08-jre"
+    )
+    dependsOn("addJreToDistributable")
+}
+
+tasks.register<Copy>("addJreToDistributable") {
+    from(zipTree("$buildDir/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip"))
+    into("$buildDir/Tachidesk-$TachideskVersion-$TachideskRevision-win32")
+    eachFile {
+        path = path.replace(".*-jre".toRegex(),"jre")
+    }
+    dependsOn("downloadJre")
+    dependsOn("createExe")
+}
+
+tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadJre") {
+    src("https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x86-32_windows_hotspot_8u282b08.zip")
+    dest(buildDir)
+    overwrite(false)
+    onlyIfModified(true)
+}
+
 tasks.withType<ShadowJar> {
     destinationDir = File("$rootDir/server/build")
-    //dependsOn(":webUI:copyBuild")
+    dependsOn("lintKotlin")
 }
 
 tasks.named("processResources") {
     dependsOn(":webUI:copyBuild")
 }
 
+tasks.named("run") {
+    dependsOn("formatKotlin", "lintKotlin")
+}
+
+
+

server/src/main/kotlin/eu/kanade/tachiyomi/App.kt

@@ -1,10 +1,17 @@
 package eu.kanade.tachiyomi
 
+/*
+ * 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.app.Application
 import android.content.Context
-//import android.content.res.Configuration
+// import android.content.res.Configuration
-//import android.support.multidex.MultiDex
+// import android.support.multidex.MultiDex
-//import timber.log.Timber
+// import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.InjektScope
 import uy.kohesive.injekt.registry.default.DefaultRegistrar

server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt

@@ -1,20 +1,30 @@
 package eu.kanade.tachiyomi
 
+/*
+ * 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.app.Application
 import com.google.gson.Gson
-//import eu.kanade.tachiyomi.data.cache.ChapterCache
+// import eu.kanade.tachiyomi.data.cache.ChapterCache
-//import eu.kanade.tachiyomi.data.cache.CoverCache
+// import eu.kanade.tachiyomi.data.cache.CoverCache
-//import eu.kanade.tachiyomi.data.database.DatabaseHelper
+// import eu.kanade.tachiyomi.data.database.DatabaseHelper
-//import eu.kanade.tachiyomi.data.download.DownloadManager
+// import eu.kanade.tachiyomi.data.download.DownloadManager
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-//import eu.kanade.tachiyomi.data.sync.LibrarySyncManager
+// import eu.kanade.tachiyomi.data.sync.LibrarySyncManager
-//import eu.kanade.tachiyomi.data.track.TrackManager
+// import eu.kanade.tachiyomi.data.track.TrackManager
-//import eu.kanade.tachiyomi.extension.ExtensionManager
+// import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceManager
 import rx.Observable
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.api.*
+import uy.kohesive.injekt.api.InjektModule
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addSingleton
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
 
 class AppModule(val app: Application) : InjektModule {
 
@@ -56,11 +66,9 @@ class AppModule(val app: Application) : InjektModule {
         }
 
 //        rxAsync { get<DatabaseHelper>() }
-
     }
 
     private fun rxAsync(block: () -> Unit) {
         Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe()
     }
-
 }

server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt

@@ -1,17 +1,24 @@
 package eu.kanade.tachiyomi.extension.api
 
-//import android.content.Context
+/*
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// import android.content.Context
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.util.ExtensionLoader
 import ir.armor.tachidesk.database.dataclass.ExtensionDataClass
-//import kotlinx.coroutines.Dispatchers
+// import kotlinx.coroutines.Dispatchers
-//import kotlinx.coroutines.withContext
+// import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.int
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
 
 internal class ExtensionGithubApi {
 
@@ -27,7 +34,7 @@ internal class ExtensionGithubApi {
 //    suspend fun checkForUpdates(): List<Extension.Installed> {
 //        val extensions = fin   dExtensions()
 //
-////        preferences.lastExtCheck().set(Date().time)
+// //        preferences.lastExtCheck().set(Date().time)
 //
 //        val installedExtensions = ExtensionLoader.loadExtensions(context)
 //            .filterIsInstance<LoadResult.Success>()
@@ -49,23 +56,23 @@ internal class ExtensionGithubApi {
 
     private fun parseResponse(json: JsonArray): List<Extension.Available> {
         return json
-                .filter { element ->
+            .filter { element ->
-                    val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
+                val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
-                    val libVersion = versionName.substringBeforeLast('.').toDouble()
+                val libVersion = versionName.substringBeforeLast('.').toDouble()
-                    libVersion >= ExtensionLoader.LIB_VERSION_MIN && libVersion <= ExtensionLoader.LIB_VERSION_MAX
+                libVersion >= ExtensionLoader.LIB_VERSION_MIN && libVersion <= ExtensionLoader.LIB_VERSION_MAX
-                }
+            }
-                .map { element ->
+            .map { element ->
-                    val name = element.jsonObject["name"]!!.jsonPrimitive.content.substringAfter("Tachiyomi: ")
+                val name = element.jsonObject["name"]!!.jsonPrimitive.content.substringAfter("Tachiyomi: ")
-                    val pkgName = element.jsonObject["pkg"]!!.jsonPrimitive.content
+                val pkgName = element.jsonObject["pkg"]!!.jsonPrimitive.content
-                    val apkName = element.jsonObject["apk"]!!.jsonPrimitive.content
+                val apkName = element.jsonObject["apk"]!!.jsonPrimitive.content
-                    val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
+                val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
-                    val versionCode = element.jsonObject["code"]!!.jsonPrimitive.int
+                val versionCode = element.jsonObject["code"]!!.jsonPrimitive.int
-                    val lang = element.jsonObject["lang"]!!.jsonPrimitive.content
+                val lang = element.jsonObject["lang"]!!.jsonPrimitive.content
-                    val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1
+                val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1
-                    val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
+                val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
 
-                    Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
+                Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
-                }
+            }
     }
 
     fun getApkUrl(extension: Extension.Available): String {

server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt

@@ -9,7 +9,7 @@ import retrofit2.Retrofit
 import retrofit2.http.GET
 import uy.kohesive.injekt.injectLazy
 
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
 
 /**
  * Used to get the extension repo listing from GitHub.

server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -1,28 +1,29 @@
 package eu.kanade.tachiyomi.extension.util
 
-//import android.annotation.SuppressLint
+/*
-//import android.content.Context
+ * Copyright (C) Contributors to the Suwayomi project
-//import android.content.pm.PackageInfo
+ *
-//import android.content.pm.PackageManager
+ * This Source Code Form is subject to the terms of the Mozilla Public
-//import dalvik.system.PathClassLoader
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-import eu.kanade.tachiyomi.annoations.Nsfw
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-//import eu.kanade.tachiyomi.data.preference.PreferenceValues
+
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+// import android.annotation.SuppressLint
-import eu.kanade.tachiyomi.extension.model.Extension
+// import android.content.Context
-import eu.kanade.tachiyomi.extension.model.LoadResult
+// import android.content.pm.PackageInfo
-import eu.kanade.tachiyomi.source.CatalogueSource
+// import android.content.pm.PackageManager
-import eu.kanade.tachiyomi.source.Source
+// import dalvik.system.PathClassLoader
-import eu.kanade.tachiyomi.source.SourceFactory
+// import eu.kanade.tachiyomi.data.preference.PreferenceValues
-//import eu.kanade.tachiyomi.util.lang.Hash
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-//import kotlinx.coroutines.async
+// import eu.kanade.tachiyomi.util.lang.Hash
-//import kotlinx.coroutines.runBlocking
+// import kotlinx.coroutines.async
-//import timber.log.Timber
+// import kotlinx.coroutines.runBlocking
-//import uy.kohesive.injekt.injectLazy
+// import timber.log.Timber
+// import uy.kohesive.injekt.injectLazy
 
 /**
  * Class that handles the loading of the extensions installed in the system.
  */
-//@SuppressLint("PackageManagerGetSignatures")
+// @SuppressLint("PackageManagerGetSignatures")
 internal object ExtensionLoader {
 
 //    private val preferences: PreferencesHelper by injectLazy()

server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt

@@ -1,30 +1,30 @@
 package eu.kanade.tachiyomi.network
 
-//import android.annotation.SuppressLint
+/*
-//import android.content.Context
+ * Copyright (C) Contributors to the Suwayomi project
-//import android.os.Build
+ *
-//import android.os.Handler
+ * This Source Code Form is subject to the terms of the Mozilla Public
-//import android.os.Looper
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-//import android.webkit.WebSettings
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-//import android.webkit.WebView
+
-//import android.widget.Toast
+// import android.annotation.SuppressLint
-//import eu.kanade.tachiyomi.R
+// import android.content.Context
-import eu.kanade.tachiyomi.source.online.HttpSource
+// import android.os.Build
-//import eu.kanade.tachiyomi.util.lang.launchUI
+// import android.os.Handler
-//import eu.kanade.tachiyomi.util.system.WebViewClientCompat
+// import android.os.Looper
-//import eu.kanade.tachiyomi.util.system.WebViewUtil
+// import android.webkit.WebSettings
-//import eu.kanade.tachiyomi.util.system.isOutdated
+// import android.webkit.WebView
-//import eu.kanade.tachiyomi.util.system.setDefaultSettings
+// import android.widget.Toast
-//import eu.kanade.tachiyomi.util.system.toast
+// import eu.kanade.tachiyomi.R
-import okhttp3.Cookie
+// import eu.kanade.tachiyomi.util.lang.launchUI
-import okhttp3.HttpUrl.Companion.toHttpUrl
+// 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.Request
 import okhttp3.Response
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
-import java.io.IOException
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 class CloudflareInterceptor() : Interceptor {
 
@@ -77,7 +77,7 @@ class CloudflareInterceptor() : Interceptor {
 //        }
     }
 //
-////    @SuppressLint("SetJavaScriptEnabled")
+// //    @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.

server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt

@@ -0,0 +1,79 @@
+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 okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+
+class MemoryCookieJar : CookieJar {
+    private val cache = mutableSetOf<WrappedCookie>()
+
+    @Synchronized
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        val cookiesToRemove = mutableSetOf<WrappedCookie>()
+        val validCookies = mutableSetOf<WrappedCookie>()
+
+        cache.forEach { cookie ->
+            if (cookie.isExpired()) {
+                cookiesToRemove.add(cookie)
+            } else if (cookie.matches(url)) {
+                validCookies.add(cookie)
+            }
+        }
+
+        cache.removeAll(cookiesToRemove)
+
+        return validCookies.toList().map(WrappedCookie::unwrap)
+    }
+
+    @Synchronized
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+        val cookiesToAdd = cookies.map { WrappedCookie.wrap(it) }
+
+        cache.removeAll(cookiesToAdd)
+        cache.addAll(cookiesToAdd)
+    }
+
+    @Synchronized
+    fun clear() {
+        cache.clear()
+    }
+}
+
+class WrappedCookie private constructor(val cookie: Cookie) {
+    fun unwrap() = cookie
+
+    fun isExpired() = cookie.expiresAt < System.currentTimeMillis()
+
+    fun matches(url: HttpUrl) = cookie.matches(url)
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is WrappedCookie) return false
+
+        return other.cookie.name == cookie.name &&
+            other.cookie.domain == cookie.domain &&
+            other.cookie.path == cookie.path &&
+            other.cookie.secure == cookie.secure &&
+            other.cookie.hostOnly == cookie.hostOnly
+    }
+
+    override fun hashCode(): Int {
+        var hash = 17
+        hash = 31 * hash + cookie.name.hashCode()
+        hash = 31 * hash + cookie.domain.hashCode()
+        hash = 31 * hash + cookie.path.hashCode()
+        hash = 31 * hash + if (cookie.secure) 0 else 1
+        hash = 31 * hash + if (cookie.hostOnly) 0 else 1
+        return hash
+    }
+
+    companion object {
+        fun wrap(cookie: Cookie) = WrappedCookie(cookie)
+    }
+}

server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -1,17 +1,21 @@
 package eu.kanade.tachiyomi.network
 
-//import android.content.Context
+/*
-//import eu.kanade.tachiyomi.BuildConfig
+ * Copyright (C) Contributors to the Suwayomi project
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// import android.content.Context
+// import eu.kanade.tachiyomi.BuildConfig
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import android.content.Context
-import okhttp3.Cache
+// import okhttp3.HttpUrl.Companion.toHttpUrl
-//import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-//import okhttp3.dnsoverhttps.DnsOverHttps
+// import okhttp3.dnsoverhttps.DnsOverHttps
-//import okhttp3.logging.HttpLoggingInterceptor
+// import okhttp3.logging.HttpLoggingInterceptor
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
-import java.io.File
-import java.net.InetAddress
 import java.util.concurrent.TimeUnit
 
 class NetworkHelper(context: Context) {
@@ -22,14 +26,17 @@ class NetworkHelper(context: Context) {
 
     private val cacheSize = 5L * 1024 * 1024 // 5 MiB
 
-//    val cookieManager = AndroidCookieJar()
+    val cookieManager = MemoryCookieJar()
 
     val client by lazy {
         val builder = OkHttpClient.Builder()
-//            .cookieJar(cookieManager)
+            .cookieJar(cookieManager)
 //            .cache(Cache(cacheDir, cacheSize))
             .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(5, TimeUnit.MINUTES)
+            .writeTimeout(5, TimeUnit.MINUTES)
+//            .dispatcher(Dispatcher(Executors.newFixedThreadPool(1)))
+
 //            .addInterceptor(UserAgentInterceptor())
 
 //        if (BuildConfig.DEBUG) {

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -1,18 +1,14 @@
 package eu.kanade.tachiyomi.network
 
-//import kotlinx.coroutines.suspendCancellableCoroutine
+// import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
 import rx.Producer
 import rx.Subscription
-import java.io.IOException
 import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 fun Call.asObservable(): Observable<Response> {
     return Observable.unsafeCreate { subscriber ->
@@ -38,7 +34,7 @@ fun Call.asObservable(): Observable<Response> {
             }
 
             override fun unsubscribe() {
-                call.cancel()
+                // call.cancel()
             }
 
             override fun isUnsubscribed(): Boolean {
@@ -52,7 +48,7 @@ fun Call.asObservable(): Observable<Response> {
 }
 
 // Based on https://github.com/gildor/kotlin-coroutines-okhttp
-//suspend fun Call.await(assertSuccess: Boolean = false): Response {
+// suspend fun Call.await(assertSuccess: Boolean = false): Response {
 //    return suspendCancellableCoroutine { continuation ->
 //        enqueue(
 //            object : Callback {
@@ -81,20 +77,21 @@ fun Call.asObservable(): Observable<Response> {
 //            }
 //        }
 //    }
-//}
+// }
 
 fun Call.asObservableSuccess(): Observable<Response> {
-    return asObservable().doOnNext { response ->
+    return asObservable()
-        if (!response.isSuccessful) {
+        .doOnNext { response ->
-            response.close()
+            if (!response.isSuccessful) {
-            throw Exception("HTTP error ${response.code}")
+                response.close()
+                throw Exception("HTTP error ${response.code}")
+            }
         }
-    }
 }
 
-//fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
+// fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
 //    val progressClient = newBuilder()
-//        .cache(null)
+//        .cache(nasObservableSuccessull)
 //        .addNetworkInterceptor { chain ->
 //            val originalResponse = chain.proceed(chain.request())
 //            originalResponse.newBuilder()
@@ -104,11 +101,11 @@ fun Call.asObservableSuccess(): Observable<Response> {
 //        .build()
 //
 //    return progressClient.newCall(request)
-//}
+// }
 
 fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
     val progressClient = newBuilder()
-        .cache(null)
+//        .cache(null)
 //        .addNetworkInterceptor { chain ->
 //            val originalResponse = chain.proceed(chain.request())
 //            originalResponse.newBuilder()

server/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.source
 
-//import androidx.preference.PreferenceScreen
+// import androidx.preference.PreferenceScreen
 
 interface ConfigurableSource : Source {
 

server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.source
 
-//import android.graphics.drawable.Drawable
+// import android.graphics.drawable.Drawable
-//import eu.kanade.tachiyomi.extension.ExtensionManager
+// import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import rx.Observable
-//import uy.kohesive.injekt.Injekt
+// import uy.kohesive.injekt.Injekt
-//import uy.kohesive.injekt.api.get
+// import uy.kohesive.injekt.api.get
 
 /**
  * A basic interface for creating a source. It could be an online source, a local source, etc...
@@ -46,6 +46,6 @@ interface Source {
     fun fetchPageList(chapter: SChapter): Observable<List<Page>>
 }
 
-//fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
+// fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
 
-//fun Source.getPreferenceKey(): String = "source_$id"
+// fun Source.getPreferenceKey(): String = "source_$id"

server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.source
 
-//import android.content.Context
+// import android.content.Context
-//import eu.kanade.tachiyomi.R
+// import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt

@@ -9,7 +9,7 @@ open class Page(
     val url: String = "",
     var imageUrl: String? = null,
     @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions
-): ProgressListener {
+) : ProgressListener {
 
     val number: Int
         get() = index + 1

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt

@@ -12,7 +12,7 @@ interface SChapter : Serializable {
 
     var chapter_number: Float
 
-        var scanlator: String?
+    var scanlator: String?
 
     fun copyFrom(other: SChapter) {
         name = other.name

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -16,7 +16,7 @@ import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
 import java.net.URI
 import java.net.URISyntaxException
 import java.security.MessageDigest
@@ -29,7 +29,7 @@ abstract class HttpSource : CatalogueSource {
     /**
      * Network service.
      */
-    protected val network: NetworkHelper by injectLazy()
+    val network: NetworkHelper by injectLazy()
 
 //    /**
 //     * Preferences that a source may need.
@@ -311,7 +311,7 @@ abstract class HttpSource : CatalogueSource {
      *
      * @param page the chapter whose page list has to be fetched
      */
-    protected open fun imageRequest(page: Page): Request {
+    open fun imageRequest(page: Page): Request {
         return GET(page.imageUrl!!, headers)
     }
 

server/src/main/kotlin/ir/armor/tachidesk/Config.kt

@@ -1,8 +0,0 @@
-package ir.armor.tachidesk
-
-import net.harawata.appdirs.AppDirsFactory
-
-object Config {
-    val dataRoot = AppDirsFactory.getInstance().getUserDataDir("Tachidesk",null, null)
-    val extensionsRoot = "$dataRoot/extensions"
-}

server/src/main/kotlin/ir/armor/tachidesk/Main.kt

@@ -1,99 +1,22 @@
 package ir.armor.tachidesk
 
-import eu.kanade.tachiyomi.App
+/*
-import io.javalin.Javalin
+ * Copyright (C) Contributors to the Suwayomi project
-import ir.armor.tachidesk.util.*
+ * 
-import org.kodein.di.DI
+ * This Source Code Form is subject to the terms of the Mozilla Public
-import org.kodein.di.conf.global
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-import xyz.nulldev.androidcompat.AndroidCompat
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-import xyz.nulldev.androidcompat.AndroidCompatInitializer
+
-import xyz.nulldev.ts.config.ConfigKodeinModule
+import ir.armor.tachidesk.server.applicationSetup
-import xyz.nulldev.ts.config.GlobalConfigManager
+import ir.armor.tachidesk.server.javalinSetup
 
 class Main {
     companion object {
-        val androidCompat by lazy { AndroidCompat() }
-
-        fun registerConfigModules() {
-            GlobalConfigManager.registerModules(
-//                    ServerConfig.register(GlobalConfigManager.config),
-//                    SyncConfigModule.register(GlobalConfigManager.config)
-            )
-        }
 
         @JvmStatic
         fun main(args: Array<String>) {
-            // make sure everything we need exists
             applicationSetup()
-
+            javalinSetup()
-            registerConfigModules()
-
-            //Load config API
-            DI.global.addImport(ConfigKodeinModule().create())
-            //Load Android compatibility dependencies
-            AndroidCompatInitializer().init()
-            // start app
-            androidCompat.startApp(App())
-
-
-
-            val app = Javalin.create { config ->
-    //                config.addSinglePageRoot("/", "")
-                config.addStaticFiles("/react")
-            }.start(4567)
-
-
-
-            app.before() { ctx ->
-                // allow the client which is running on another port
-                ctx.header("Access-Control-Allow-Origin", "*")
-            }
-
-            app.get("/api/v1/extension/list") { ctx ->
-                ctx.json(getExtensionList())
-            }
-
-
-            app.get("/api/v1/extension/install/:apkName") { ctx ->
-                val apkName = ctx.pathParam("apkName")
-                println(apkName)
-                ctx.status(
-                        installAPK(apkName)
-                )
-            }
-            app.get("/api/v1/source/list") { ctx ->
-                ctx.json(getSourceList())
-            }
-
-            app.get("/api/v1/source/:sourceId/popular/:pageNum") { ctx ->
-                val sourceId = ctx.pathParam("sourceId").toLong()
-                val pageNum = ctx.pathParam("pageNum").toInt()
-                ctx.json(getMangaList(sourceId,pageNum,popular = true))
-            }
-            app.get("/api/v1/source/:sourceId/latest/:pageNum") { ctx ->
-                val sourceId = ctx.pathParam("sourceId").toLong()
-                val pageNum = ctx.pathParam("pageNum").toInt()
-                ctx.json(getMangaList(sourceId,pageNum,popular = false))
-            }
-
-            app.get("/api/v1/manga/:mangaId/") { ctx ->
-                val mangaId = ctx.pathParam("mangaId").toInt()
-                ctx.json(getManga(mangaId))
-            }
-
-            app.get("/api/v1/manga/:mangaId/chapters") { ctx ->
-                val mangaId = ctx.pathParam("mangaId").toInt()
-                ctx.json(getChapterList(mangaId))
-            }
-
-            app.get("/api/v1/manga/:mangaId/chapter/:chapterId") { ctx ->
-                val chapterId = ctx.pathParam("chapterId").toInt()
-                val mangaId = ctx.pathParam("mangaId").toInt()
-                ctx.json(getPages(chapterId,mangaId))
-            }
         }
-
-
     }
 }
-

server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt

@@ -1,28 +1,44 @@
 package ir.armor.tachidesk.database
 
-import ir.armor.tachidesk.Config
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.table.CategoryMangaTable
+import ir.armor.tachidesk.database.table.CategoryTable
 import ir.armor.tachidesk.database.table.ChapterTable
-import ir.armor.tachidesk.database.table.ExtensionsTable
+import ir.armor.tachidesk.database.table.ExtensionTable
 import ir.armor.tachidesk.database.table.MangaTable
+import ir.armor.tachidesk.database.table.PageTable
 import ir.armor.tachidesk.database.table.SourceTable
+import ir.armor.tachidesk.server.applicationDirs
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.SchemaUtils
 import org.jetbrains.exposed.sql.transactions.transaction
 
 object DBMangaer {
     val db by lazy {
-        Database.connect("jdbc:sqlite:${Config.dataRoot}/database.db", "org.sqlite.JDBC")
+        Database.connect("jdbc:h2:${applicationDirs.dataRoot}/database", "org.h2.Driver")
     }
 }
 
 fun makeDataBaseTables() {
-    // mention db object to connect
+    // must mention db object so the lazy block executes
-    DBMangaer.db
+    val db = DBMangaer.db
+    db.useNestedTransactions = true
 
     transaction {
-        SchemaUtils.create(ExtensionsTable)
+        SchemaUtils.createMissingTablesAndColumns(
-        SchemaUtils.create(SourceTable)
+            ExtensionTable,
-        SchemaUtils.create(MangaTable)
+            SourceTable,
-        SchemaUtils.create(ChapterTable)
+            MangaTable,
+            ChapterTable,
+            PageTable,
+            CategoryTable,
+            CategoryMangaTable,
+        )
     }
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/CategoryDataClass.kt

@@ -0,0 +1,15 @@
+package ir.armor.tachidesk.database.dataclass
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+data class CategoryDataClass(
+    val id: Int,
+    val order: Int,
+    val name: String,
+    val isLanding: Boolean
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ChapterDataClass.kt

@@ -1,11 +1,21 @@
 package ir.armor.tachidesk.database.dataclass
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class ChapterDataClass(
-        val id: Int,
+    val id: Int,
-        val url: String,
+    val url: String,
-        val name: String,
+    val name: String,
-        val date_upload: Long,
+    val date_upload: Long,
-        val chapter_number: Float,
+    val chapter_number: Float,
-        val scanlator: String?,
+    val scanlator: String?,
-        val mangaId: Int,
+    val mangaId: Int,
-)
+    val chapterIndex: Int,
+    val chapterCount: Int,
+    val pageCount: Int? = null,
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ExtensionDataClass.kt

@@ -1,14 +1,21 @@
 package ir.armor.tachidesk.database.dataclass
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class ExtensionDataClass(
-        val name: String,
+    val name: String,
-        val pkgName: String,
+    val pkgName: String,
-        val versionName: String,
+    val versionName: String,
-        val versionCode: Int,
+    val versionCode: Int,
-        val lang: String,
+    val lang: String,
-        val isNsfw: Boolean,
+    val isNsfw: Boolean,
-        val apkName: String,
+    val apkName: String,
-        val iconUrl: String,
+    val iconUrl: String,
-        val installed: Boolean,
+    val installed: Boolean,
-        val classFQName: String,
+    val classFQName: String,
-)
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/MangaDataClass.kt

@@ -1,20 +1,34 @@
 package ir.armor.tachidesk.database.dataclass
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.MangaStatus
 
 data class MangaDataClass(
-        val id: Int,
+    val id: Int,
-        val sourceId: Long,
+    val sourceId: String,
 
-        val url: String,
+    val url: String,
-        val title: String,
+    val title: String,
-        val thumbnail_url: String? = null,
+    val thumbnailUrl: String? = null,
 
-        val initialized: Boolean = false,
+    val initialized: Boolean = false,
 
-        val artist: String? = null,
+    val artist: String? = null,
-        val author: String? = null,
+    val author: String? = null,
-        val description: String? = null,
+    val description: String? = null,
-        val genre: String? = null,
+    val genre: String? = null,
-        val status: String = MangaStatus.UNKNOWN.name
+    val status: String = MangaStatus.UNKNOWN.name,
-)
+    val inLibrary: Boolean = false,
+    val source: SourceDataClass? = null
+)
+
+data class PagedMangaListDataClass(
+    val mangaList: List<MangaDataClass>,
+    val hasNextPage: Boolean
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/PageDataClass.kt

@@ -1,6 +1,13 @@
 package ir.armor.tachidesk.database.dataclass
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class PageDataClass(
-        val index: Int,
+    val index: Int,
-        var imageUrl: String,
+    var imageUrl: String,
-)
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/SourceDataClass.kt

@@ -1,9 +1,16 @@
 package ir.armor.tachidesk.database.dataclass
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class SourceDataClass(
-        val id: String,
+    val id: String,
-        val name: String,
+    val name: String?,
-        val lang: String,
+    val lang: String?,
-        val iconUrl: String,
+    val iconUrl: String?,
-        val supportsLatest: Boolean
+    val supportsLatest: Boolean?
-)
+)

server/src/main/kotlin/ir/armor/tachidesk/database/entity/ExtensionEntity.kt

@@ -1,21 +1,28 @@
 package ir.armor.tachidesk.database.entity
 
-import ir.armor.tachidesk.database.table.ExtensionsTable
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.table.ExtensionTable
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 
 class ExtensionEntity(id: EntityID<Int>) : IntEntity(id) {
-    companion object : IntEntityClass<ExtensionEntity>(ExtensionsTable)
+    companion object : IntEntityClass<ExtensionEntity>(ExtensionTable)
 
-    var name by ExtensionsTable.name
+    var name by ExtensionTable.name
-    var pkgName by ExtensionsTable.pkgName
+    var pkgName by ExtensionTable.pkgName
-    var versionName by ExtensionsTable.versionName
+    var versionName by ExtensionTable.versionName
-    var versionCode by ExtensionsTable.versionCode
+    var versionCode by ExtensionTable.versionCode
-    var lang by ExtensionsTable.lang
+    var lang by ExtensionTable.lang
-    var isNsfw by ExtensionsTable.isNsfw
+    var isNsfw by ExtensionTable.isNsfw
-    var apkName by ExtensionsTable.apkName
+    var apkName by ExtensionTable.apkName
-    var iconUrl by ExtensionsTable.iconUrl
+    var iconUrl by ExtensionTable.iconUrl
-    var installed by ExtensionsTable.installed
+    var installed by ExtensionTable.installed
-    var classFQName by ExtensionsTable.classFQName
+    var classFQName by ExtensionTable.classFQName
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/entity/MangaEntity.kt

@@ -1,5 +1,12 @@
 package ir.armor.tachidesk.database.entity
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.MangaTable
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
@@ -20,4 +27,4 @@ class MangaEntity(id: EntityID<Int>) : IntEntity(id) {
     var thumbnail_url by MangaTable.thumbnail_url
 
     var sourceReference by MangaEntity referencedOn MangaTable.sourceReference
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt

@@ -1,7 +1,15 @@
 package ir.armor.tachidesk.database.entity
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.SourceTable
-import org.jetbrains.exposed.dao.*
+import org.jetbrains.exposed.dao.EntityClass
+import org.jetbrains.exposed.dao.LongEntity
 import org.jetbrains.exposed.dao.id.EntityID
 
 class SourceEntity(id: EntityID<Long>) : LongEntity(id) {
@@ -13,4 +21,4 @@ class SourceEntity(id: EntityID<Long>) : LongEntity(id) {
     var extension by ExtensionEntity referencedOn SourceTable.extension
     var partOfFactorySource by SourceTable.partOfFactorySource
     var positionInFactorySource by SourceTable.positionInFactorySource
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryMangaTable.kt

@@ -0,0 +1,15 @@
+package ir.armor.tachidesk.database.table
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import org.jetbrains.exposed.dao.id.IntIdTable
+
+object CategoryMangaTable : IntIdTable() {
+    val category = reference("category", CategoryTable)
+    val manga = reference("manga", MangaTable)
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryTable.kt

@@ -0,0 +1,25 @@
+package ir.armor.tachidesk.database.table
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.dataclass.CategoryDataClass
+import org.jetbrains.exposed.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ResultRow
+
+object CategoryTable : IntIdTable() {
+    val name = varchar("name", 64)
+    val isLanding = bool("is_landing").default(false)
+    val order = integer("order").default(0)
+}
+
+fun CategoryTable.toDataClass(categoryEntry: ResultRow) = CategoryDataClass(
+    categoryEntry[CategoryTable.id].value,
+    categoryEntry[CategoryTable.order],
+    categoryEntry[CategoryTable.name],
+    categoryEntry[CategoryTable.isLanding],
+)

server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt

@@ -1,6 +1,12 @@
 package ir.armor.tachidesk.database.table
 
-import eu.kanade.tachiyomi.source.model.SManga
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import org.jetbrains.exposed.dao.id.IntIdTable
 
 object ChapterTable : IntIdTable() {
@@ -8,7 +14,9 @@ object ChapterTable : IntIdTable() {
     val name = varchar("name", 512)
     val date_upload = long("date_upload").default(0)
     val chapter_number = float("chapter_number").default(-1f)
-    val scanlator = varchar("scanlator",128).nullable()
+    val scanlator = varchar("scanlator", 128).nullable()
+
+    val chapterIndex = integer("number_in_list")
 
     val manga = reference("manga", MangaTable)
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt

@@ -1,9 +1,15 @@
 package ir.armor.tachidesk.database.table
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import org.jetbrains.exposed.dao.id.IntIdTable
 
-
+object ExtensionTable : IntIdTable() {
-object ExtensionsTable : IntIdTable() {
     val name = varchar("name", 128)
     val pkgName = varchar("pkg_name", 128)
     val versionName = varchar("version_name", 16)
@@ -15,4 +21,4 @@ object ExtensionsTable : IntIdTable() {
 
     val installed = bool("installed").default(false)
     val classFQName = varchar("class_name", 256).default("") // fully qualified name
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/MangaTable.kt

@@ -1,7 +1,17 @@
 package ir.armor.tachidesk.database.table
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.source.model.SManga
+import ir.armor.tachidesk.database.dataclass.MangaDataClass
+import ir.armor.tachidesk.impl.proxyThumbnailUrl
 import org.jetbrains.exposed.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ResultRow
 
 object MangaTable : IntIdTable() {
     val url = varchar("url", 2048)
@@ -17,10 +27,32 @@ object MangaTable : IntIdTable() {
     val status = integer("status").default(SManga.UNKNOWN)
     val thumbnail_url = varchar("thumbnail_url", 2048).nullable()
 
+    val inLibrary = bool("in_library").default(false)
+    val defaultCategory = bool("default_category").default(true)
+
     // source is used by some ancestor of IntIdTable
-    val sourceReference = reference("source", SourceTable)
+    val sourceReference = long("source")
 }
 
+fun MangaTable.toDataClass(mangaEntry: ResultRow) =
+    MangaDataClass(
+        mangaEntry[MangaTable.id].value,
+        mangaEntry[sourceReference].toString(),
+
+        mangaEntry[MangaTable.url],
+        mangaEntry[MangaTable.title],
+        proxyThumbnailUrl(mangaEntry[MangaTable.id].value),
+
+        mangaEntry[MangaTable.initialized],
+
+        mangaEntry[MangaTable.artist],
+        mangaEntry[MangaTable.author],
+        mangaEntry[MangaTable.description],
+        mangaEntry[MangaTable.genre],
+        MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
+        mangaEntry[MangaTable.inLibrary]
+    )
+
 enum class MangaStatus(val status: Int) {
     UNKNOWN(0),
     ONGOING(1),
@@ -30,4 +62,4 @@ enum class MangaStatus(val status: Int) {
     companion object {
         fun valueOf(value: Int): MangaStatus = values().find { it.status == value } ?: UNKNOWN
     }
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/PageTable.kt

@@ -0,0 +1,18 @@
+package ir.armor.tachidesk.database.table
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import org.jetbrains.exposed.dao.id.IntIdTable
+
+object PageTable : IntIdTable() {
+    val index = integer("index")
+    val url = varchar("url", 2048)
+    val imageUrl = varchar("imageUrl", 2048).nullable()
+
+    val chapter = reference("chapter", ChapterTable)
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/SourceTable.kt

@@ -1,12 +1,19 @@
 package ir.armor.tachidesk.database.table
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import org.jetbrains.exposed.dao.id.IdTable
 
 object SourceTable : IdTable<Long>() {
     override val id = long("id").entityId()
-    val name= varchar("name", 128)
+    val name = varchar("name", 128)
     val lang = varchar("lang", 10)
-    val extension = reference("extension", ExtensionsTable)
+    val extension = reference("extension", ExtensionTable)
     val partOfFactorySource = bool("part_of_factory_source").default(false)
     val positionInFactorySource = integer("position_in_factory_source").nullable()
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/Category.kt

@@ -0,0 +1,69 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.dataclass.CategoryDataClass
+import ir.armor.tachidesk.database.table.CategoryMangaTable
+import ir.armor.tachidesk.database.table.CategoryTable
+import ir.armor.tachidesk.database.table.toDataClass
+import org.jetbrains.exposed.sql.SortOrder
+import org.jetbrains.exposed.sql.deleteWhere
+import org.jetbrains.exposed.sql.insert
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+
+fun createCategory(name: String) {
+    transaction {
+        val count = CategoryTable.selectAll().count()
+        if (CategoryTable.select { CategoryTable.name eq name }.firstOrNull() == null)
+            CategoryTable.insert {
+                it[CategoryTable.name] = name
+                it[CategoryTable.order] = count.toInt() + 1
+            }
+    }
+}
+
+fun updateCategory(categoryId: Int, name: String?, isLanding: Boolean?) {
+    transaction {
+        CategoryTable.update({ CategoryTable.id eq categoryId }) {
+            if (name != null) it[CategoryTable.name] = name
+            if (isLanding != null) it[CategoryTable.isLanding] = isLanding
+        }
+    }
+}
+
+fun reorderCategory(categoryId: Int, from: Int, to: Int) {
+    transaction {
+        val categories = CategoryTable.selectAll().orderBy(CategoryTable.order to SortOrder.ASC).toMutableList()
+        categories.add(to - 1, categories.removeAt(from - 1))
+        categories.forEachIndexed { index, cat ->
+            CategoryTable.update({ CategoryTable.id eq cat[CategoryTable.id].value }) {
+                it[CategoryTable.order] = index + 1
+            }
+        }
+    }
+}
+
+fun removeCategory(categoryId: Int) {
+    transaction {
+        CategoryMangaTable.select { CategoryMangaTable.category eq categoryId }.forEach {
+            removeMangaFromCategory(it[CategoryMangaTable.manga].value, categoryId)
+        }
+        CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
+    }
+}
+
+fun getCategoryList(): List<CategoryDataClass> {
+    return transaction {
+        CategoryTable.selectAll().orderBy(CategoryTable.order to SortOrder.ASC).map {
+            CategoryTable.toDataClass(it)
+        }
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/CategoryManga.kt

@@ -0,0 +1,64 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.dataclass.CategoryDataClass
+import ir.armor.tachidesk.database.dataclass.MangaDataClass
+import ir.armor.tachidesk.database.table.CategoryMangaTable
+import ir.armor.tachidesk.database.table.CategoryTable
+import ir.armor.tachidesk.database.table.MangaTable
+import ir.armor.tachidesk.database.table.toDataClass
+import org.jetbrains.exposed.sql.SortOrder
+import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.deleteWhere
+import org.jetbrains.exposed.sql.insert
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+
+fun addMangaToCategory(mangaId: Int, categoryId: Int) {
+    transaction {
+        if (CategoryMangaTable.select { (CategoryMangaTable.category eq categoryId) and (CategoryMangaTable.manga eq mangaId) }.firstOrNull() == null) {
+            CategoryMangaTable.insert {
+                it[CategoryMangaTable.category] = categoryId
+                it[CategoryMangaTable.manga] = mangaId
+            }
+
+            MangaTable.update({ MangaTable.id eq mangaId }) {
+                it[MangaTable.defaultCategory] = false
+            }
+        }
+    }
+}
+
+fun removeMangaFromCategory(mangaId: Int, categoryId: Int) {
+    transaction {
+        CategoryMangaTable.deleteWhere { (CategoryMangaTable.category eq categoryId) and (CategoryMangaTable.manga eq mangaId) }
+        if (CategoryMangaTable.select { CategoryMangaTable.manga eq mangaId }.count() == 0L) {
+            MangaTable.update({ MangaTable.id eq mangaId }) {
+                it[MangaTable.defaultCategory] = true
+            }
+        }
+    }
+}
+
+fun getCategoryMangaList(categoryId: Int): List<MangaDataClass> {
+    return transaction {
+        CategoryMangaTable.innerJoin(MangaTable).select { CategoryMangaTable.category eq categoryId }.map {
+            MangaTable.toDataClass(it)
+        }
+    }
+}
+
+fun getMangaCategories(mangaId: Int): List<CategoryDataClass> {
+    return transaction {
+        CategoryMangaTable.innerJoin(CategoryTable).select { CategoryMangaTable.manga eq mangaId }.orderBy(CategoryTable.order to SortOrder.ASC).map {
+            CategoryTable.toDataClass(it)
+        }
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt

@@ -0,0 +1,141 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
+import ir.armor.tachidesk.database.dataclass.ChapterDataClass
+import ir.armor.tachidesk.database.table.ChapterTable
+import ir.armor.tachidesk.database.table.MangaTable
+import ir.armor.tachidesk.database.table.PageTable
+import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.insert
+import org.jetbrains.exposed.sql.insertAndGetId
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+
+fun getChapterList(mangaId: Int): List<ChapterDataClass> {
+    val mangaDetails = getManga(mangaId)
+    val source = getHttpSource(mangaDetails.sourceId.toLong())
+
+    val chapterList = source.fetchChapterList(
+        SManga.create().apply {
+            title = mangaDetails.title
+            url = mangaDetails.url
+        }
+    ).toBlocking().first()
+
+    val chapterCount = chapterList.count()
+
+    return transaction {
+        chapterList.reversed().forEachIndexed { index, fetchedChapter ->
+            val chapterEntry = ChapterTable.select { ChapterTable.url eq fetchedChapter.url }.firstOrNull()
+            if (chapterEntry == null) {
+                ChapterTable.insertAndGetId {
+                    it[url] = fetchedChapter.url
+                    it[name] = fetchedChapter.name
+                    it[date_upload] = fetchedChapter.date_upload
+                    it[chapter_number] = fetchedChapter.chapter_number
+                    it[scanlator] = fetchedChapter.scanlator
+
+                    it[chapterIndex] = index + 1
+                    it[manga] = mangaId
+                }
+            } else {
+                ChapterTable.update({ ChapterTable.url eq fetchedChapter.url }) {
+                    it[name] = fetchedChapter.name
+                    it[date_upload] = fetchedChapter.date_upload
+                    it[chapter_number] = fetchedChapter.chapter_number
+                    it[scanlator] = fetchedChapter.scanlator
+
+                    it[chapterIndex] = index + 1
+                    it[manga] = mangaId
+                }
+            }
+        }
+
+        // clear any orphaned chapters
+        val dbChapterCount = transaction { ChapterTable.selectAll().count() }
+        if (dbChapterCount > chapterCount) { // we got some clean up due
+            // TODO
+        }
+
+        return@transaction chapterList.mapIndexed { index, it ->
+            ChapterDataClass(
+                ChapterTable.select { ChapterTable.url eq it.url }.firstOrNull()!![ChapterTable.id].value,
+                it.url,
+                it.name,
+                it.date_upload,
+                it.chapter_number,
+                it.scanlator,
+                mangaId,
+                chapterCount - index,
+                chapterCount
+            )
+        }
+    }
+}
+
+fun getChapter(chapterIndex: Int, mangaId: Int): ChapterDataClass {
+    return transaction {
+        val chapterEntry = ChapterTable.select {
+            ChapterTable.chapterIndex eq chapterIndex and (ChapterTable.manga eq mangaId)
+        }.firstOrNull()!!
+        val mangaEntry = MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!!
+        val source = getHttpSource(mangaEntry[MangaTable.sourceReference])
+
+        val pageList = source.fetchPageList(
+            SChapter.create().apply {
+                url = chapterEntry[ChapterTable.url]
+                name = chapterEntry[ChapterTable.name]
+            }
+        ).toBlocking().first()
+
+        val chapterId = chapterEntry[ChapterTable.id].value
+        val chapterCount = transaction { ChapterTable.selectAll().count() }
+
+        val chapter = ChapterDataClass(
+            chapterId,
+            chapterEntry[ChapterTable.url],
+            chapterEntry[ChapterTable.name],
+            chapterEntry[ChapterTable.date_upload],
+            chapterEntry[ChapterTable.chapter_number],
+            chapterEntry[ChapterTable.scanlator],
+            mangaId,
+            chapterEntry[ChapterTable.chapterIndex],
+            chapterCount.toInt(),
+
+            pageList.count()
+        )
+
+        pageList.forEach { page ->
+            val pageEntry = transaction { PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }.firstOrNull() }
+            if (pageEntry == null) {
+                transaction {
+                    PageTable.insert {
+                        it[index] = page.index
+                        it[url] = page.url
+                        it[imageUrl] = page.imageUrl
+                        it[this.chapter] = chapterId
+                    }
+                }
+            } else {
+                transaction {
+                    PageTable.update({ (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }) {
+                        it[url] = page.url
+                        it[imageUrl] = page.imageUrl
+                    }
+                }
+            }
+        }
+
+        return@transaction chapter
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/Extension.kt

@@ -0,0 +1,207 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import com.googlecode.d2j.dex.Dex2jar
+import com.googlecode.d2j.reader.MultiDexFileReader
+import com.googlecode.dex2jar.tools.BaksmaliBaseDexExceptionHandler
+import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.source.SourceFactory
+import eu.kanade.tachiyomi.source.online.HttpSource
+import ir.armor.tachidesk.database.table.ExtensionTable
+import ir.armor.tachidesk.database.table.SourceTable
+import ir.armor.tachidesk.impl.util.APKExtractor
+import ir.armor.tachidesk.server.applicationDirs
+import kotlinx.coroutines.runBlocking
+import mu.KotlinLogging
+import okhttp3.Request
+import okio.buffer
+import okio.sink
+import org.jetbrains.exposed.sql.deleteWhere
+import org.jetbrains.exposed.sql.insert
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+import uy.kohesive.injekt.injectLazy
+import java.io.File
+import java.io.InputStream
+import java.net.URL
+import java.net.URLClassLoader
+import java.nio.file.Files
+import java.nio.file.Path
+
+private val logger = KotlinLogging.logger {}
+
+private fun dex2jar(dexFile: String, jarFile: String, fileNameWithoutType: String) {
+    // adopted from com.googlecode.dex2jar.tools.Dex2jarCmd.doCommandLine
+    // source at: https://github.com/DexPatcher/dex2jar/tree/v2.1-20190905-lanchon/dex-tools/src/main/java/com/googlecode/dex2jar/tools/Dex2jarCmd.java
+
+    val jarFilePath = File(jarFile).toPath()
+    val reader = MultiDexFileReader.open(Files.readAllBytes(File(dexFile).toPath()))
+    val handler = BaksmaliBaseDexExceptionHandler()
+    Dex2jar
+        .from(reader)
+        .withExceptionHandler(handler)
+        .reUseReg(false)
+        .topoLogicalSort()
+        .skipDebug(true)
+        .optimizeSynchronized(false)
+        .printIR(false)
+        .noCode(false)
+        .skipExceptions(false)
+        .to(jarFilePath)
+    if (handler.hasException()) {
+        val errorFile: Path = File(applicationDirs.extensionsRoot).toPath().resolve("$fileNameWithoutType-error.txt")
+        logger.error(
+            "Detail Error Information in File $errorFile\n" +
+                "Please report this file to one of following link if possible (any one).\n" +
+                "    https://sourceforge.net/p/dex2jar/tickets/\n" +
+                "    https://bitbucket.org/pxb1988/dex2jar/issues\n" +
+                "    https://github.com/pxb1988/dex2jar/issues\n" +
+                "    dex2jar@googlegroups.com"
+        )
+        handler.dump(errorFile, emptyArray<String>())
+    }
+}
+
+fun installAPK(apkName: String): Int {
+    logger.debug("Installing $apkName")
+    val extensionRecord = getExtensionList(true).first { it.apkName == apkName }
+    val fileNameWithoutType = apkName.substringBefore(".apk")
+    val dirPathWithoutType = "${applicationDirs.extensionsRoot}/$fileNameWithoutType"
+
+    // check if we don't have the dex file already downloaded
+    val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
+    if (!File(jarPath).exists()) {
+        runBlocking {
+            val api = ExtensionGithubApi()
+            val apkToDownload = api.getApkUrl(extensionRecord)
+
+            val apkFilePath = "$dirPathWithoutType.apk"
+            val jarFilePath = "$dirPathWithoutType.jar"
+            val dexFilePath = "$dirPathWithoutType.dex"
+
+            // download apk file
+            downloadAPKFile(apkToDownload, apkFilePath)
+
+            val className: String = APKExtractor.extract_dex_and_read_className(apkFilePath, dexFilePath)
+            logger.debug(className)
+            // dex -> jar
+            dex2jar(dexFilePath, jarFilePath, fileNameWithoutType)
+
+            // clean up
+            File(apkFilePath).delete()
+            File(dexFilePath).delete()
+
+            // update sources of the extension
+            val child = URLClassLoader(arrayOf<URL>(URL("file:$jarFilePath")), this::class.java.classLoader)
+            val classToLoad = Class.forName(className, true, child)
+            val instance = classToLoad.newInstance()
+
+            val extensionId = transaction {
+                return@transaction ExtensionTable.select { ExtensionTable.name eq extensionRecord.name }.first()[ExtensionTable.id]
+            }
+
+            if (instance is HttpSource) { // single source
+                val httpSource = instance as HttpSource
+                transaction {
+                    if (SourceTable.select { SourceTable.id eq httpSource.id }.count() == 0L) {
+                        SourceTable.insert {
+                            it[this.id] = httpSource.id
+                            it[name] = httpSource.name
+                            it[this.lang] = httpSource.lang
+                            it[extension] = extensionId
+                        }
+                    }
+                    logger.debug("Installed source ${httpSource.name} with id {httpSource.id}")
+                }
+            } else { // multi source
+                val sourceFactory = instance as SourceFactory
+                transaction {
+                    sourceFactory.createSources().forEachIndexed { index, source ->
+                        val httpSource = source as HttpSource
+                        if (SourceTable.select { SourceTable.id eq httpSource.id }.count() == 0L) {
+                            SourceTable.insert {
+                                it[this.id] = httpSource.id
+                                it[name] = httpSource.name
+                                it[this.lang] = httpSource.lang
+                                it[extension] = extensionId
+                                it[partOfFactorySource] = true
+                                it[positionInFactorySource] = index
+                            }
+                        }
+                        logger.debug("Installed source ${httpSource.name} with id:${httpSource.id}")
+                    }
+                }
+            }
+
+            // update extension info
+            transaction {
+                ExtensionTable.update({ ExtensionTable.name eq extensionRecord.name }) {
+                    it[installed] = true
+                    it[classFQName] = className
+                }
+            }
+        }
+        return 201 // we downloaded successfully
+    } else {
+        return 302
+    }
+}
+
+val networkHelper: NetworkHelper by injectLazy()
+
+private fun downloadAPKFile(url: String, apkPath: String) {
+    val request = Request.Builder().url(url).build()
+    val response = networkHelper.client.newCall(request).execute()
+
+    val downloadedFile = File(apkPath)
+    val sink = downloadedFile.sink().buffer()
+    sink.writeAll(response.body!!.source())
+    sink.close()
+}
+
+fun removeExtension(apkName: String) {
+    logger.debug("Uninstalling $apkName")
+
+    val extensionRecord = getExtensionList(true).first { it.apkName == apkName }
+    val fileNameWithoutType = apkName.substringBefore(".apk")
+    val jarPath = "${applicationDirs.extensionsRoot}/$fileNameWithoutType.jar"
+    transaction {
+        val extensionId = ExtensionTable.select { ExtensionTable.name eq extensionRecord.name }.first()[ExtensionTable.id]
+
+        SourceTable.deleteWhere { SourceTable.extension eq extensionId }
+        ExtensionTable.update({ ExtensionTable.name eq extensionRecord.name }) {
+            it[ExtensionTable.installed] = false
+        }
+    }
+
+    if (File(jarPath).exists()) {
+        File(jarPath).delete()
+    }
+}
+
+val network: NetworkHelper by injectLazy()
+
+fun getExtensionIcon(apkName: String): Pair<InputStream, String> {
+    val iconUrl = transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.firstOrNull()!! }[ExtensionTable.iconUrl]
+
+    val saveDir = "${applicationDirs.extensionsRoot}/icon"
+
+    return getCachedImageResponse(saveDir, apkName) {
+        network.client.newCall(
+            GET(iconUrl)
+        ).execute()
+    }
+}
+
+fun getExtensionIconUrl(apkName: String): String {
+    return "/api/v1/extension/icon/$apkName"
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/ExtensionsList.kt

@@ -1,31 +1,40 @@
-package ir.armor.tachidesk.util
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.extension.model.Extension
 import ir.armor.tachidesk.database.dataclass.ExtensionDataClass
-import ir.armor.tachidesk.database.table.ExtensionsTable
+import ir.armor.tachidesk.database.table.ExtensionTable
 import kotlinx.coroutines.runBlocking
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import mu.KotlinLogging
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
 
+private val logger = KotlinLogging.logger {}
+
 private object Data {
     var lastExtensionCheck: Long = 0
 }
 
 private fun extensionDatabaseIsEmtpy(): Boolean {
     return transaction {
-        return@transaction ExtensionsTable.selectAll().count() == 0L
+        return@transaction ExtensionTable.selectAll().count() == 0L
     }
 }
 
 fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
     // update if 60 seconds has passed or requested offline and database is empty
     if (Data.lastExtensionCheck + 60 * 1000 < System.currentTimeMillis() || (offline && extensionDatabaseIsEmtpy())) {
-        println("Getting extensions list from the internet")
+        logger.debug("Getting extensions list from the internet")
         Data.lastExtensionCheck = System.currentTimeMillis()
         var foundExtensions: List<Extension.Available>
         runBlocking {
@@ -33,10 +42,10 @@ fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
             foundExtensions = api.findExtensions()
             transaction {
                 foundExtensions.forEach { foundExtension ->
-                    val extensionRecord = ExtensionsTable.select { ExtensionsTable.name eq foundExtension.name }.firstOrNull()
+                    val extensionRecord = ExtensionTable.select { ExtensionTable.name eq foundExtension.name }.firstOrNull()
                     if (extensionRecord != null) {
                         // update the record
-                        ExtensionsTable.update({ ExtensionsTable.name eq foundExtension.name }) {
+                        ExtensionTable.update({ ExtensionTable.name eq foundExtension.name }) {
                             it[name] = foundExtension.name
                             it[pkgName] = foundExtension.pkgName
                             it[versionName] = foundExtension.versionName
@@ -48,7 +57,7 @@ fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
                         }
                     } else {
                         // insert new record
-                        ExtensionsTable.insert {
+                        ExtensionTable.insert {
                             it[name] = foundExtension.name
                             it[pkgName] = foundExtension.pkgName
                             it[versionName] = foundExtension.versionName
@@ -62,23 +71,24 @@ fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
                 }
             }
         }
+    } else {
+        logger.debug("used cached extension list")
     }
 
     return transaction {
-        return@transaction ExtensionsTable.selectAll().map {
+        return@transaction ExtensionTable.selectAll().map {
             ExtensionDataClass(
-                    it[ExtensionsTable.name],
+                it[ExtensionTable.name],
-                    it[ExtensionsTable.pkgName],
+                it[ExtensionTable.pkgName],
-                    it[ExtensionsTable.versionName],
+                it[ExtensionTable.versionName],
-                    it[ExtensionsTable.versionCode],
+                it[ExtensionTable.versionCode],
-                    it[ExtensionsTable.lang],
+                it[ExtensionTable.lang],
-                    it[ExtensionsTable.isNsfw],
+                it[ExtensionTable.isNsfw],
-                    it[ExtensionsTable.apkName],
+                it[ExtensionTable.apkName],
-                    it[ExtensionsTable.iconUrl],
+                getExtensionIconUrl(it[ExtensionTable.apkName]),
-                    it[ExtensionsTable.installed],
+                it[ExtensionTable.installed],
-                    it[ExtensionsTable.classFQName]
+                it[ExtensionTable.classFQName]
             )
         }
-
     }
 }

server/src/main/kotlin/ir/armor/tachidesk/impl/Library.kt

@@ -0,0 +1,50 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.dataclass.MangaDataClass
+import ir.armor.tachidesk.database.table.CategoryMangaTable
+import ir.armor.tachidesk.database.table.MangaTable
+import ir.armor.tachidesk.database.table.toDataClass
+import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.deleteWhere
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+
+fun addMangaToLibrary(mangaId: Int) {
+    val manga = getManga(mangaId)
+    if (!manga.inLibrary) {
+        transaction {
+            MangaTable.update({ MangaTable.id eq manga.id }) {
+                it[inLibrary] = true
+            }
+        }
+    }
+}
+
+fun removeMangaFromLibrary(mangaId: Int) {
+    val manga = getManga(mangaId)
+    if (manga.inLibrary) {
+        transaction {
+            MangaTable.update({ MangaTable.id eq manga.id }) {
+                it[inLibrary] = false
+                it[defaultCategory] = true
+            }
+            CategoryMangaTable.deleteWhere { CategoryMangaTable.manga eq mangaId }
+        }
+    }
+}
+
+fun getLibraryMangas(): List<MangaDataClass> {
+    return transaction {
+        MangaTable.select { (MangaTable.inLibrary eq true) and (MangaTable.defaultCategory eq true) }.map {
+            MangaTable.toDataClass(it)
+        }
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/Manga.kt

@@ -0,0 +1,108 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.source.model.SManga
+import ir.armor.tachidesk.database.dataclass.MangaDataClass
+import ir.armor.tachidesk.database.table.MangaStatus
+import ir.armor.tachidesk.database.table.MangaTable
+import ir.armor.tachidesk.server.applicationDirs
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+import java.io.InputStream
+
+fun getManga(mangaId: Int, proxyThumbnail: Boolean = true): MangaDataClass {
+    var mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
+
+    return if (mangaEntry[MangaTable.initialized]) {
+        MangaDataClass(
+            mangaId,
+            mangaEntry[MangaTable.sourceReference].toString(),
+
+            mangaEntry[MangaTable.url],
+            mangaEntry[MangaTable.title],
+            if (proxyThumbnail) proxyThumbnailUrl(mangaId) else mangaEntry[MangaTable.thumbnail_url],
+
+            true,
+
+            mangaEntry[MangaTable.artist],
+            mangaEntry[MangaTable.author],
+            mangaEntry[MangaTable.description],
+            mangaEntry[MangaTable.genre],
+            MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
+            mangaEntry[MangaTable.inLibrary],
+            getSource(mangaEntry[MangaTable.sourceReference])
+        )
+    } else { // initialize manga
+        val source = getHttpSource(mangaEntry[MangaTable.sourceReference])
+        val fetchedManga = source.fetchMangaDetails(
+            SManga.create().apply {
+                url = mangaEntry[MangaTable.url]
+                title = mangaEntry[MangaTable.title]
+            }
+        ).toBlocking().first()
+
+        transaction {
+            MangaTable.update({ MangaTable.id eq mangaId }) {
+
+                it[MangaTable.initialized] = true
+
+                it[MangaTable.artist] = fetchedManga.artist
+                it[MangaTable.author] = fetchedManga.author
+                it[MangaTable.description] = fetchedManga.description
+                it[MangaTable.genre] = fetchedManga.genre
+                it[MangaTable.status] = fetchedManga.status
+                if (fetchedManga.thumbnail_url != null && fetchedManga.thumbnail_url!!.isNotEmpty())
+                    it[MangaTable.thumbnail_url] = fetchedManga.thumbnail_url
+            }
+        }
+
+        mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
+        val newThumbnail = mangaEntry[MangaTable.thumbnail_url]
+
+        MangaDataClass(
+            mangaId,
+            mangaEntry[MangaTable.sourceReference].toString(),
+
+            mangaEntry[MangaTable.url],
+            mangaEntry[MangaTable.title],
+            if (proxyThumbnail) proxyThumbnailUrl(mangaId) else newThumbnail,
+
+            true,
+
+            fetchedManga.artist,
+            fetchedManga.author,
+            fetchedManga.description,
+            fetchedManga.genre,
+            MangaStatus.valueOf(fetchedManga.status).name,
+            false,
+            getSource(mangaEntry[MangaTable.sourceReference])
+        )
+    }
+}
+
+fun getThumbnail(mangaId: Int): Pair<InputStream, String> {
+    val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
+    val saveDir = applicationDirs.thumbnailsRoot
+    val fileName = mangaId.toString()
+
+    return getCachedImageResponse(saveDir, fileName) {
+        val sourceId = mangaEntry[MangaTable.sourceReference]
+        val source = getHttpSource(sourceId)
+        var thumbnailUrl = mangaEntry[MangaTable.thumbnail_url]
+        if (thumbnailUrl == null || thumbnailUrl.isEmpty()) {
+            thumbnailUrl = getManga(mangaId, proxyThumbnail = false).thumbnailUrl!!
+        }
+
+        source.client.newCall(
+            GET(thumbnailUrl, source.headers)
+        ).execute()
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/MangaDexHelper.kt

@@ -0,0 +1,98 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.source.online.HttpSource
+import okhttp3.FormBody
+import okhttp3.OkHttpClient
+import java.net.URLEncoder
+
+class MangaDexHelper(private val mangaDexSource: HttpSource) {
+
+    private fun clientBuilder(): OkHttpClient = clientBuilder(0)
+
+    private fun clientBuilder(
+        r18Toggle: Int,
+        okHttpClient: OkHttpClient = mangaDexSource.network.client
+    ): OkHttpClient = okHttpClient.newBuilder()
+        .addNetworkInterceptor { chain ->
+            val originalCookies = chain.request().header("Cookie") ?: ""
+            val newReq = chain
+                .request()
+                .newBuilder()
+                .header("Cookie", "$originalCookies; ${cookiesHeader(r18Toggle)}")
+                .build()
+            chain.proceed(newReq)
+        }.build()
+
+    private fun cookiesHeader(r18Toggle: Int): String {
+        val cookies = mutableMapOf<String, String>()
+        cookies["mangadex_h_toggle"] = r18Toggle.toString()
+        return buildCookies(cookies)
+    }
+
+    private fun buildCookies(cookies: Map<String, String>) =
+        cookies.entries.joinToString(separator = "; ", postfix = ";") {
+            "${URLEncoder.encode(it.key, "UTF-8")}=${URLEncoder.encode(it.value, "UTF-8")}"
+        }
+
+//    fun isLogged(): Boolean {
+//        val httpUrl = mangaDexSource.baseUrl.toHttpUrlOrNull()!!
+//        return network.cookieManager.get(httpUrl).any { it.name == REMEMBER_ME }
+//    }
+
+    fun login(username: String, password: String, twoFactorCode: String = ""): Boolean {
+        val formBody = FormBody.Builder()
+            .add("login_username", username)
+            .add("login_password", password)
+            .add("no_js", "1")
+            .add("remember_me", "1")
+
+        twoFactorCode.let {
+            formBody.add("two_factor", it)
+        }
+
+        val response = clientBuilder().newCall(
+            POST(
+                "${mangaDexSource.baseUrl}/ajax/actions.ajax.php?function=login",
+                mangaDexSource.headers,
+                formBody.build()
+            )
+        ).execute()
+        return response.body!!.string().isEmpty()
+    }
+//
+//    fun logout(): Boolean {
+//        return withContext(Dispatchers.IO) {
+//            // https://mangadex.org/ajax/actions.ajax.php?function=logout
+//            val httpUrl = baseUrl.toHttpUrlOrNull()!!
+//            val listOfDexCookies = network.cookieManager.get(httpUrl)
+//            val cookie = listOfDexCookies.find { it.name == REMEMBER_ME }
+//            val token = cookie?.value
+//            if (token.isNullOrEmpty()) {
+//                return@withContext true
+//            }
+//            val result = clientBuilder().newCall(
+//                    POSTWithCookie(
+//                            "$baseUrl/ajax/actions.ajax.php?function=logout",
+//                            REMEMBER_ME,
+//                            token,
+//                            headers
+//                    )
+//            ).execute()
+//            val resultStr = result.body!!.string()
+//            if (resultStr.contains("success", true)) {
+//                network.cookieManager.remove(httpUrl)
+//                return@withContext true
+//            }
+//
+//            false
+//        }
+//    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/MangaList.kt

@@ -0,0 +1,98 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.source.model.MangasPage
+import ir.armor.tachidesk.database.dataclass.MangaDataClass
+import ir.armor.tachidesk.database.dataclass.PagedMangaListDataClass
+import ir.armor.tachidesk.database.table.MangaStatus
+import ir.armor.tachidesk.database.table.MangaTable
+import org.jetbrains.exposed.sql.insertAndGetId
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+
+fun proxyThumbnailUrl(mangaId: Int): String {
+    return "/api/v1/manga/$mangaId/thumbnail"
+}
+
+fun getMangaList(sourceId: Long, pageNum: Int = 1, popular: Boolean): PagedMangaListDataClass {
+    val source = getHttpSource(sourceId.toLong())
+    val mangasPage = if (popular) {
+        source.fetchPopularManga(pageNum).toBlocking().first()
+    } else {
+        if (source.supportsLatest)
+            source.fetchLatestUpdates(pageNum).toBlocking().first()
+        else
+            throw Exception("Source $source doesn't support latest")
+    }
+    return mangasPage.processEntries(sourceId)
+}
+
+fun MangasPage.processEntries(sourceId: Long): PagedMangaListDataClass {
+    val mangasPage = this
+    val mangaList = transaction {
+        return@transaction mangasPage.mangas.map { manga ->
+            var mangaEntry = MangaTable.select { MangaTable.url eq manga.url }.firstOrNull()
+            if (mangaEntry == null) { // create manga entry
+                val mangaId = MangaTable.insertAndGetId {
+                    it[url] = manga.url
+                    it[title] = manga.title
+
+                    it[artist] = manga.artist
+                    it[author] = manga.author
+                    it[description] = manga.description
+                    it[genre] = manga.genre
+                    it[status] = manga.status
+                    it[thumbnail_url] = manga.thumbnail_url
+
+                    it[sourceReference] = sourceId
+                }.value
+
+                MangaDataClass(
+                    mangaId,
+                    sourceId.toString(),
+
+                    manga.url,
+                    manga.title,
+                    proxyThumbnailUrl(mangaId),
+
+                    manga.initialized,
+
+                    manga.artist,
+                    manga.author,
+                    manga.description,
+                    manga.genre,
+                    MangaStatus.valueOf(manga.status).name
+                )
+            } else {
+                val mangaId = mangaEntry[MangaTable.id].value
+                MangaDataClass(
+                    mangaId,
+                    sourceId.toString(),
+
+                    manga.url,
+                    manga.title,
+                    proxyThumbnailUrl(mangaId),
+
+                    true,
+
+                    mangaEntry[MangaTable.artist],
+                    mangaEntry[MangaTable.author],
+                    mangaEntry[MangaTable.description],
+                    mangaEntry[MangaTable.genre],
+                    MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
+                    mangaEntry[MangaTable.inLibrary]
+                )
+            }
+        }
+    }
+    return PagedMangaListDataClass(
+        mangaList,
+        mangasPage.hasNextPage
+    )
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/Page.kt

@@ -0,0 +1,85 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.online.HttpSource
+import ir.armor.tachidesk.database.table.ChapterTable
+import ir.armor.tachidesk.database.table.MangaTable
+import ir.armor.tachidesk.database.table.PageTable
+import ir.armor.tachidesk.database.table.SourceTable
+import ir.armor.tachidesk.server.applicationDirs
+import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+import java.io.File
+import java.io.InputStream
+
+fun getTrueImageUrl(page: Page, source: HttpSource): String {
+    if (page.imageUrl == null) {
+        page.imageUrl = source.fetchImageUrl(page).toBlocking().first()!!
+    }
+    return page.imageUrl!!
+}
+
+fun getPageImage(mangaId: Int, chapterIndex: Int, index: Int): Pair<InputStream, String> {
+    val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
+    val source = getHttpSource(mangaEntry[MangaTable.sourceReference])
+    val chapterEntry = transaction {
+        ChapterTable.select {
+            (ChapterTable.chapterIndex eq chapterIndex) and (ChapterTable.manga eq mangaId)
+        }.firstOrNull()!!
+    }
+    val chapterId = chapterEntry[ChapterTable.id].value
+
+    val pageEntry = transaction { PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq index) }.firstOrNull()!! }
+
+    val tachiPage = Page(
+        pageEntry[PageTable.index],
+        pageEntry[PageTable.url],
+        pageEntry[PageTable.imageUrl]
+    )
+
+    if (pageEntry[PageTable.imageUrl] == null) {
+        transaction {
+            PageTable.update({ (PageTable.chapter eq chapterId) and (PageTable.index eq index) }) {
+                it[imageUrl] = getTrueImageUrl(tachiPage, source)
+            }
+        }
+    }
+
+    val saveDir = getChapterDir(mangaId, chapterId)
+    File(saveDir).mkdirs()
+    val fileName = index.toString()
+
+    return getCachedImageResponse(saveDir, fileName) {
+        source.fetchImage(tachiPage).toBlocking().first()
+    }
+}
+
+fun getChapterDir(mangaId: Int, chapterId: Int): String {
+    val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!! }
+    val sourceId = mangaEntry[MangaTable.sourceReference]
+    val source = getHttpSource(sourceId)
+    val sourceEntry = transaction { SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()!! }
+    val chapterEntry = transaction { ChapterTable.select { ChapterTable.id eq chapterId }.firstOrNull()!! }
+
+    val chapterDir = when {
+        chapterEntry[ChapterTable.scanlator] != null -> "${chapterEntry[ChapterTable.scanlator]}_${chapterEntry[ChapterTable.name]}"
+        else -> chapterEntry[ChapterTable.name]
+    }
+
+    val mangaTitle = mangaEntry[MangaTable.title]
+    val sourceName = source.toString()
+
+    val mangaDir = "${applicationDirs.mangaRoot}/$sourceName/$mangaTitle/$chapterDir"
+    // make sure dirs exist
+    File(mangaDir).mkdirs()
+    return mangaDir
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/Search.kt

@@ -0,0 +1,66 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.dataclass.PagedMangaListDataClass
+
+fun sourceFilters(sourceId: Long) {
+    val source = getHttpSource(sourceId)
+    // source.getFilterList().toItems()
+}
+
+fun sourceSearch(sourceId: Long, searchTerm: String, pageNum: Int): PagedMangaListDataClass {
+    val source = getHttpSource(sourceId)
+    val searchManga = source.fetchSearchManga(pageNum, searchTerm, source.getFilterList()).toBlocking().first()
+    return searchManga.processEntries(sourceId)
+}
+
+fun sourceGlobalSearch(searchTerm: String) {
+    // TODO
+}
+
+data class FilterWrapper(
+    val type: String,
+    val filter: Any
+)
+
+// private fun FilterList.toFilterWrapper(): List<FilterWrapper> {
+//    return mapNotNull { filter ->
+//        when (filter) {
+//            is Filter.Header -> FilterWrapper("Header",filter)
+//            is Filter.Separator -> FilterWrapper("Separator",filter)
+//            is Filter.CheckBox -> FilterWrapper("CheckBox",filter)
+//            is Filter.TriState -> FilterWrapper("TriState",filter)
+//            is Filter.Text -> FilterWrapper("Text",filter)
+//            is Filter.Select<*> -> FilterWrapper("Select",filter)
+//            is Filter.Group<*> -> {
+//                val group = GroupItem(filter)
+//                val subItems = filter.state.mapNotNull {
+//                    when (it) {
+//                        is Filter.CheckBox -> FilterWrapper("CheckBox",filter)
+//                        is Filter.TriState -> FilterWrapper("TriState",filter)
+//                        is Filter.Text -> FilterWrapper("Text",filter)
+//                        is Filter.Select<*> -> FilterWrapper("Select",filter)
+//                        else -> null
+//                    } as? ISectionable<*, *>
+//                }
+//                subItems.forEach { it.header = group }
+//                group.subItems = subItems
+//                group
+//            }
+//            is Filter.Sort -> {
+//                val group = SortGroup(filter)
+//                val subItems = filter.values.map {
+//                    SortItem(it, group)
+//                }
+//                group.subItems = subItems
+//                group
+//            }
+//        }
+//    }
+// }

server/src/main/kotlin/ir/armor/tachidesk/impl/SourceList.kt

@@ -1,54 +1,65 @@
-package ir.armor.tachidesk.util
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.Config
 import ir.armor.tachidesk.database.dataclass.SourceDataClass
 import ir.armor.tachidesk.database.entity.ExtensionEntity
 import ir.armor.tachidesk.database.entity.SourceEntity
-import ir.armor.tachidesk.database.table.ExtensionsTable
+import ir.armor.tachidesk.database.table.ExtensionTable
 import ir.armor.tachidesk.database.table.SourceTable
+import ir.armor.tachidesk.server.applicationDirs
+import mu.KotlinLogging
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
+import java.lang.NullPointerException
 import java.net.URL
 import java.net.URLClassLoader
-import java.util.*
+
+private val logger = KotlinLogging.logger {}
 
 private val sourceCache = mutableListOf<Pair<Long, HttpSource>>()
 private val extensionCache = mutableListOf<Pair<String, Any>>()
 
 fun getHttpSource(sourceId: Long): HttpSource {
+    val sourceRecord = transaction {
+        SourceEntity.findById(sourceId)
+    } ?: throw NullPointerException("Source with id $sourceId is not installed")
+
     val cachedResult: Pair<Long, HttpSource>? = sourceCache.firstOrNull { it.first == sourceId }
     if (cachedResult != null) {
-        println("used cached HttpSource: ${cachedResult.second.name}")
+        logger.debug("used cached HttpSource: ${cachedResult.second.name}")
         return cachedResult.second
     }
 
     val result: HttpSource = transaction {
-        val sourceRecord = SourceEntity.findById(sourceId)!!
         val extensionId = sourceRecord.extension.id.value
         val extensionRecord = ExtensionEntity.findById(extensionId)!!
         val apkName = extensionRecord.apkName
         val className = extensionRecord.classFQName
         val jarName = apkName.substringBefore(".apk") + ".jar"
-        val jarPath = "${Config.extensionsRoot}/$jarName"
+        val jarPath = "${applicationDirs.extensionsRoot}/$jarName"
-
-        println(jarName)
 
         val cachedExtensionPair = extensionCache.firstOrNull { it.first == jarPath }
         var usedCached = false
         val instance =
-                if (cachedExtensionPair != null) {
+            if (cachedExtensionPair != null) {
-                    usedCached = true
+                usedCached = true
-                    println("Used cached Extension")
+                logger.debug("Used cached Extension")
-                    cachedExtensionPair.second
+                cachedExtensionPair.second
-                } else {
+            } else {
-                    println("No Extension cache")
+                logger.debug("No Extension cache")
-                    val child = URLClassLoader(arrayOf<URL>(URL("file:$jarPath")), this::class.java.classLoader)
+                val child = URLClassLoader(arrayOf<URL>(URL("file:$jarPath")), this::class.java.classLoader)
-                    val classToLoad = Class.forName(className, true, child)
+                val classToLoad = Class.forName(className, true, child)
-                    classToLoad.newInstance()
+                classToLoad.newInstance()
-                }
+            }
         if (sourceRecord.partOfFactorySource) {
             return@transaction if (usedCached) {
                 (instance as List<HttpSource>)[sourceRecord.positionInFactorySource!!]
@@ -71,12 +82,26 @@ fun getSourceList(): List<SourceDataClass> {
     return transaction {
         return@transaction SourceTable.selectAll().map {
             SourceDataClass(
-                    it[SourceTable.id].value.toString(),
+                it[SourceTable.id].value.toString(),
-                    it[SourceTable.name],
+                it[SourceTable.name],
-                    Locale(it[SourceTable.lang]).getDisplayLanguage(Locale(it[SourceTable.lang])),
+                it[SourceTable.lang],
-                    ExtensionsTable.select { ExtensionsTable.id eq it[SourceTable.extension] }.first()[ExtensionsTable.iconUrl],
+                getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()[ExtensionTable.apkName]),
-                    getHttpSource(it[SourceTable.id].value).supportsLatest
+                getHttpSource(it[SourceTable.id].value).supportsLatest
             )
         }
     }
-}
+}
+
+fun getSource(sourceId: Long): SourceDataClass {
+    return transaction {
+        val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()
+
+        return@transaction SourceDataClass(
+            sourceId.toString(),
+            source?.get(SourceTable.name),
+            source?.get(SourceTable.lang),
+            source?.let { ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()[ExtensionTable.iconUrl] },
+            source?.let { getHttpSource(sourceId).supportsLatest }
+        )
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/impl/util/APKExtractor.java

@@ -1,4 +1,11 @@
-package ir.armor.tachidesk;
+package ir.armor.tachidesk.impl.util;
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -12,7 +19,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
 
 public class APKExtractor {
     // decompressXML -- Parse the 'compressed' binary form of Android XML docs

server/src/main/kotlin/ir/armor/tachidesk/impl/util/File.kt

@@ -0,0 +1,85 @@
+package ir.armor.tachidesk.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import okhttp3.Response
+import okio.BufferedSource
+import okio.buffer
+import okio.sink
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileInputStream
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.file.Files
+import java.nio.file.Paths
+
+// fun writeStream(fileStream: InputStream, path: String) {
+//    Files.newOutputStream(Paths.get(path)).use { os ->
+//        val buffer = ByteArray(128 * 1024)
+//        var len: Int
+//        while (fileStream.read(buffer).also { len = it } > 0) {
+//            os.write(buffer, 0, len)
+//        }
+//    }
+// }
+
+fun pathToInputStream(path: String): InputStream {
+    return BufferedInputStream(FileInputStream(path))
+}
+
+fun findFileNameStartingWith(directoryPath: String, fileName: String): String? {
+    File(directoryPath).listFiles().forEach { file ->
+        if (file.name.startsWith(fileName))
+            return "$directoryPath/${file.name}"
+    }
+    return null
+}
+
+/**
+ * Saves the given source to an output stream and closes both resources.
+ *
+ * @param stream the stream where the source is copied.
+ */
+private fun BufferedSource.saveTo(stream: OutputStream) {
+    use { input ->
+        stream.sink().buffer().use {
+            it.writeAll(input)
+            it.flush()
+        }
+    }
+}
+
+fun getCachedImageResponse(saveDir: String, fileName: String, fetcher: () -> Response): Pair<InputStream, String> {
+    val cachedFile = findFileNameStartingWith(saveDir, fileName)
+    val filePath = "$saveDir/$fileName"
+    if (cachedFile != null) {
+        val fileType = cachedFile.substringAfter(filePath)
+        return Pair(
+            pathToInputStream(cachedFile),
+            "image/$fileType"
+        )
+    }
+
+    val response = fetcher()
+
+    if (response.code == 200) {
+        val contentType = response.headers["content-type"]!!
+        val fullPath = filePath + "." + contentType.substringAfter("image/")
+
+        Files.newOutputStream(Paths.get(fullPath)).use { os ->
+            response.body!!.source().saveTo(os)
+        }
+        return Pair(
+            pathToInputStream(fullPath),
+            contentType
+        )
+    } else {
+        throw Exception("request error! ${response.code}")
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt

@@ -0,0 +1,260 @@
+package ir.armor.tachidesk.server
+
+import io.javalin.Javalin
+import ir.armor.tachidesk.Main
+import ir.armor.tachidesk.impl.addMangaToCategory
+import ir.armor.tachidesk.impl.addMangaToLibrary
+import ir.armor.tachidesk.impl.createCategory
+import ir.armor.tachidesk.impl.getCategoryList
+import ir.armor.tachidesk.impl.getCategoryMangaList
+import ir.armor.tachidesk.impl.getChapter
+import ir.armor.tachidesk.impl.getChapterList
+import ir.armor.tachidesk.impl.getExtensionIcon
+import ir.armor.tachidesk.impl.getExtensionList
+import ir.armor.tachidesk.impl.getLibraryMangas
+import ir.armor.tachidesk.impl.getManga
+import ir.armor.tachidesk.impl.getMangaCategories
+import ir.armor.tachidesk.impl.getMangaList
+import ir.armor.tachidesk.impl.getPageImage
+import ir.armor.tachidesk.impl.getSource
+import ir.armor.tachidesk.impl.getSourceList
+import ir.armor.tachidesk.impl.getThumbnail
+import ir.armor.tachidesk.impl.installAPK
+import ir.armor.tachidesk.impl.removeCategory
+import ir.armor.tachidesk.impl.removeExtension
+import ir.armor.tachidesk.impl.removeMangaFromCategory
+import ir.armor.tachidesk.impl.removeMangaFromLibrary
+import ir.armor.tachidesk.impl.reorderCategory
+import ir.armor.tachidesk.impl.sourceFilters
+import ir.armor.tachidesk.impl.sourceGlobalSearch
+import ir.armor.tachidesk.impl.sourceSearch
+import ir.armor.tachidesk.impl.updateCategory
+import ir.armor.tachidesk.server.util.openInBrowser
+import mu.KotlinLogging
+
+/*
+ * 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/. */
+
+private val logger = KotlinLogging.logger {}
+
+fun javalinSetup() {
+    var hasWebUiBundled = false
+
+    val app = Javalin.create { config ->
+        try {
+            Main::class.java.getResource("/react/index.html")
+            hasWebUiBundled = true
+            config.addStaticFiles("/react")
+            config.addSinglePageRoot("/", "/react/index.html")
+        } catch (e: RuntimeException) {
+            logger.warn("react build files are missing.")
+            hasWebUiBundled = false
+        }
+        config.enableCorsForAllOrigins()
+    }.start(serverConfig.ip, serverConfig.port)
+    if (hasWebUiBundled && serverConfig.initialOpenInBrowserEnabled) {
+        openInBrowser()
+    }
+
+    app.exception(NullPointerException::class.java) { e, ctx ->
+        logger.error("NullPointerException while handling the request", e)
+        ctx.status(404)
+    }
+
+    app.get("/api/v1/extension/list") { ctx ->
+        ctx.json(getExtensionList())
+    }
+
+    app.get("/api/v1/extension/install/:apkName") { ctx ->
+        val apkName = ctx.pathParam("apkName")
+
+        ctx.status(
+            installAPK(apkName)
+        )
+    }
+
+    app.get("/api/v1/extension/uninstall/:apkName") { ctx ->
+        val apkName = ctx.pathParam("apkName")
+
+        removeExtension(apkName)
+        ctx.status(200)
+    }
+
+    // icon for extension named `apkName`
+    app.get("/api/v1/extension/icon/:apkName") { ctx ->
+        val apkName = ctx.pathParam("apkName")
+        val result = getExtensionIcon(apkName)
+
+        ctx.result(result.first)
+        ctx.header("content-type", result.second)
+    }
+
+    // list of sources
+    app.get("/api/v1/source/list") { ctx ->
+        ctx.json(getSourceList())
+    }
+
+    // fetch source with id `sourceId`
+    app.get("/api/v1/source/:sourceId") { ctx ->
+        val sourceId = ctx.pathParam("sourceId").toLong()
+        ctx.json(getSource(sourceId))
+    }
+
+    // popular mangas from source with id `sourceId`
+    app.get("/api/v1/source/:sourceId/popular/:pageNum") { ctx ->
+        val sourceId = ctx.pathParam("sourceId").toLong()
+        val pageNum = ctx.pathParam("pageNum").toInt()
+        ctx.json(getMangaList(sourceId, pageNum, popular = true))
+    }
+
+    // latest mangas from source with id `sourceId`
+    app.get("/api/v1/source/:sourceId/latest/:pageNum") { ctx ->
+        val sourceId = ctx.pathParam("sourceId").toLong()
+        val pageNum = ctx.pathParam("pageNum").toInt()
+        ctx.json(getMangaList(sourceId, pageNum, popular = false))
+    }
+
+    // get manga info
+    app.get("/api/v1/manga/:mangaId/") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        ctx.json(getManga(mangaId))
+    }
+
+    // manga thumbnail
+    app.get("api/v1/manga/:mangaId/thumbnail") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        val result = getThumbnail(mangaId)
+
+        ctx.result(result.first)
+        ctx.header("content-type", result.second)
+    }
+
+    // adds the manga to library
+    app.get("api/v1/manga/:mangaId/library") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        addMangaToLibrary(mangaId)
+        ctx.status(200)
+    }
+
+    // removes the manga from the library
+    app.delete("api/v1/manga/:mangaId/library") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        removeMangaFromLibrary(mangaId)
+        ctx.status(200)
+    }
+
+    // list manga's categories
+    app.get("api/v1/manga/:mangaId/category/") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        ctx.json(getMangaCategories(mangaId))
+    }
+
+    // adds the manga to category
+    app.get("api/v1/manga/:mangaId/category/:categoryId") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        val categoryId = ctx.pathParam("categoryId").toInt()
+        addMangaToCategory(mangaId, categoryId)
+        ctx.status(200)
+    }
+
+    // removes the manga from the category
+    app.delete("api/v1/manga/:mangaId/category/:categoryId") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        val categoryId = ctx.pathParam("categoryId").toInt()
+        removeMangaFromCategory(mangaId, categoryId)
+        ctx.status(200)
+    }
+
+    app.get("/api/v1/manga/:mangaId/chapters") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        ctx.json(getChapterList(mangaId))
+    }
+
+    app.get("/api/v1/manga/:mangaId/chapter/:chapterIndex") { ctx ->
+        val chapterIndex = ctx.pathParam("chapterIndex").toInt()
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        ctx.json(getChapter(chapterIndex, mangaId))
+    }
+
+    app.get("/api/v1/manga/:mangaId/chapter/:chapterIndex/page/:index") { ctx ->
+        val mangaId = ctx.pathParam("mangaId").toInt()
+        val chapterIndex = ctx.pathParam("chapterIndex").toInt()
+        val index = ctx.pathParam("index").toInt()
+        val result = getPageImage(mangaId, chapterIndex, index)
+
+        ctx.result(result.first)
+        ctx.header("content-type", result.second)
+    }
+
+    // global search
+    app.get("/api/v1/search/:searchTerm") { ctx ->
+        val searchTerm = ctx.pathParam("searchTerm")
+        ctx.json(sourceGlobalSearch(searchTerm))
+    }
+
+    // single source search
+    app.get("/api/v1/source/:sourceId/search/:searchTerm/:pageNum") { ctx ->
+        val sourceId = ctx.pathParam("sourceId").toLong()
+        val searchTerm = ctx.pathParam("searchTerm")
+        val pageNum = ctx.pathParam("pageNum").toInt()
+        ctx.json(sourceSearch(sourceId, searchTerm, pageNum))
+    }
+
+    // source filter list
+    app.get("/api/v1/source/:sourceId/filters/") { ctx ->
+        val sourceId = ctx.pathParam("sourceId").toLong()
+        ctx.json(sourceFilters(sourceId))
+    }
+
+    // lists mangas that have no category assigned
+    app.get("/api/v1/library/") { ctx ->
+        ctx.json(getLibraryMangas())
+    }
+
+    // category list
+    app.get("/api/v1/category/") { ctx ->
+        ctx.json(getCategoryList())
+    }
+
+    // category create
+    app.post("/api/v1/category/") { ctx ->
+        val name = ctx.formParam("name")!!
+        createCategory(name)
+        ctx.status(200)
+    }
+
+    // category modification
+    app.patch("/api/v1/category/:categoryId") { ctx ->
+        val categoryId = ctx.pathParam("categoryId").toInt()
+        val name = ctx.formParam("name")
+        val isLanding = if (ctx.formParam("isLanding") != null) ctx.formParam("isLanding")?.toBoolean() else null
+        updateCategory(categoryId, name, isLanding)
+        ctx.status(200)
+    }
+
+    // category re-ordering
+    app.patch("/api/v1/category/:categoryId/reorder") { ctx ->
+        val categoryId = ctx.pathParam("categoryId").toInt()
+        val from = ctx.formParam("from")!!.toInt()
+        val to = ctx.formParam("to")!!.toInt()
+        reorderCategory(categoryId, from, to)
+        ctx.status(200)
+    }
+
+    // category delete
+    app.delete("/api/v1/category/:categoryId") { ctx ->
+        val categoryId = ctx.pathParam("categoryId").toInt()
+        removeCategory(categoryId)
+        ctx.status(200)
+    }
+
+    // returns the manga list associated with a category
+    app.get("/api/v1/category/:categoryId") { ctx ->
+        val categoryId = ctx.pathParam("categoryId").toInt()
+        ctx.json(getCategoryMangaList(categoryId))
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/server/ServerConfig.kt

@@ -0,0 +1,31 @@
+package ir.armor.tachidesk.server
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import com.typesafe.config.Config
+import io.github.config4k.getValue
+import xyz.nulldev.ts.config.ConfigModule
+
+class ServerConfig(config: Config) : ConfigModule(config) {
+    val ip: String by config
+    val port: Int by config
+
+    // proxy
+    val socksProxy: Boolean by config
+    val socksProxyHost: String by config
+    val socksProxyPort: String by config
+
+    // misc
+    val debugLogsEnabled: Boolean by config
+    val systemTrayEnabled: Boolean by config
+    val initialOpenInBrowserEnabled: Boolean by config
+
+    companion object {
+        fun register(config: Config) = ServerConfig(config.getConfig("server"))
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/server/ServerSetup.kt

@@ -0,0 +1,101 @@
+package ir.armor.tachidesk.server
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ch.qos.logback.classic.Level
+import eu.kanade.tachiyomi.App
+import ir.armor.tachidesk.Main
+import ir.armor.tachidesk.database.makeDataBaseTables
+import ir.armor.tachidesk.server.util.systemTray
+import mu.KotlinLogging
+import net.harawata.appdirs.AppDirsFactory
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import xyz.nulldev.androidcompat.AndroidCompat
+import xyz.nulldev.androidcompat.AndroidCompatInitializer
+import xyz.nulldev.ts.config.ConfigKodeinModule
+import xyz.nulldev.ts.config.GlobalConfigManager
+import java.io.File
+
+private val logger = KotlinLogging.logger {}
+
+object applicationDirs {
+    val dataRoot = AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)!!
+    val extensionsRoot = "$dataRoot/extensions"
+    val thumbnailsRoot = "$dataRoot/thumbnails"
+    val mangaRoot = "$dataRoot/manga"
+}
+
+val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
+
+val systemTray by lazy { systemTray() }
+
+val androidCompat by lazy { AndroidCompat() }
+
+fun applicationSetup() {
+    // register server config
+    GlobalConfigManager.registerModule(
+        ServerConfig.register(GlobalConfigManager.config)
+    )
+
+    // set application wide logging level
+    if (serverConfig.debugLogsEnabled) {
+        (mu.KotlinLogging.logger(org.slf4j.Logger.ROOT_LOGGER_NAME).underlyingLogger as ch.qos.logback.classic.Logger).level = Level.DEBUG
+    }
+
+    // make dirs we need
+    listOf(
+        applicationDirs.dataRoot,
+        applicationDirs.extensionsRoot,
+        "${applicationDirs.extensionsRoot}/icon",
+        applicationDirs.thumbnailsRoot
+    ).forEach {
+        File(it).mkdirs()
+    }
+
+    // create conf file if doesn't exist
+    try {
+        val dataConfFile = File("${applicationDirs.dataRoot}/server.conf")
+        if (!dataConfFile.exists()) {
+            Main::class.java.getResourceAsStream("/server-reference.conf").use { input ->
+                dataConfFile.outputStream().use { output ->
+                    input.copyTo(output)
+                }
+            }
+        }
+    } catch (e: Exception) {
+        logger.error("Exception while creating initial server.conf:\n", e)
+    }
+
+    makeDataBaseTables()
+
+    // create system tray
+    if (serverConfig.systemTrayEnabled)
+        try {
+            systemTray
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+    // Load config API
+    DI.global.addImport(ConfigKodeinModule().create())
+    // Load Android compatibility dependencies
+    AndroidCompatInitializer().init()
+    // start app
+    androidCompat.startApp(App())
+
+    // Disable jetty's logging
+    System.setProperty("org.eclipse.jetty.util.log.announce", "false")
+    System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog")
+    System.setProperty("org.eclipse.jetty.LEVEL", "OFF")
+
+    // socks proxy settings
+    System.getProperties()["proxySet"] = serverConfig.socksProxy.toString()
+    System.getProperties()["socksProxyHost"] = serverConfig.socksProxyHost
+    System.getProperties()["socksProxyPort"] = serverConfig.socksProxyPort
+}

server/src/main/kotlin/ir/armor/tachidesk/server/util/SystemTray.kt

@@ -0,0 +1,71 @@
+package ir.armor.tachidesk.server.util
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import dorkbox.systemTray.MenuItem
+import dorkbox.systemTray.SystemTray
+import dorkbox.systemTray.SystemTray.TrayType
+import dorkbox.util.CacheUtil
+import dorkbox.util.Desktop
+import ir.armor.tachidesk.Main
+import ir.armor.tachidesk.server.serverConfig
+import java.awt.event.ActionListener
+import java.io.IOException
+
+fun openInBrowser() {
+    try {
+        Desktop.browseURL("http://127.0.0.1:4567")
+    } catch (e1: IOException) {
+        e1.printStackTrace()
+    }
+}
+
+fun systemTray(): SystemTray? {
+    try {
+        // ref: https://github.com/dorkbox/SystemTray/blob/master/test/dorkbox/TestTray.java
+        SystemTray.DEBUG = serverConfig.debugLogsEnabled
+        if (System.getProperty("os.name").startsWith("Windows"))
+            SystemTray.FORCE_TRAY_TYPE = TrayType.Swing
+
+        CacheUtil.clear()
+
+        val systemTray = SystemTray.get() ?: return null
+        val mainMenu = systemTray.menu
+
+        mainMenu.add(
+            MenuItem(
+                "Open Tachidesk",
+                ActionListener {
+                    try {
+                        Desktop.browseURL("http://127.0.0.1:4567")
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    }
+                }
+            )
+        )
+
+        val icon = Main::class.java.getResource("/icon/faviconlogo.png")
+
+//    systemTray.setTooltip("Tachidesk")
+        systemTray.setImage(icon)
+//    systemTray.status = "No Mail"
+
+        systemTray.getMenu().add(
+            MenuItem("Quit") {
+                systemTray.shutdown()
+                System.exit(0)
+            }
+        )
+
+        return systemTray
+    } catch (e: Exception) {
+        e.printStackTrace()
+        return null
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/util/APK.kt

@@ -1,131 +0,0 @@
-package ir.armor.tachidesk.util
-
-import com.googlecode.dex2jar.tools.Dex2jarCmd
-import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceFactory
-import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.APKExtractor
-import ir.armor.tachidesk.Config
-import ir.armor.tachidesk.database.table.ExtensionsTable
-import ir.armor.tachidesk.database.table.SourceTable
-import kotlinx.coroutines.runBlocking
-import okhttp3.Request
-import okio.buffer
-import okio.sink
-import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.sql.update
-import uy.kohesive.injekt.injectLazy
-import java.io.File
-import java.net.URL
-import java.net.URLClassLoader
-
-fun installAPK(apkName: String): Int {
-    val extensionRecord = getExtensionList(true).first { it.apkName == apkName }
-    val fileNameWithoutType = apkName.substringBefore(".apk")
-    val dirPathWithoutType = "${Config.extensionsRoot}/$fileNameWithoutType"
-
-    // check if we don't have the dex file already downloaded
-    val dexPath = "${Config.extensionsRoot}/$fileNameWithoutType.jar"
-    if (!File(dexPath).exists()) {
-        runBlocking {
-            val api = ExtensionGithubApi()
-            val apkToDownload = api.getApkUrl(extensionRecord)
-
-            val apkFilePath = "$dirPathWithoutType.apk"
-            val jarFilePath = "$dirPathWithoutType.jar"
-            val dexFilePath = "$dirPathWithoutType.dex"
-
-            // download apk file
-            downloadAPKFile(apkToDownload, apkFilePath)
-
-
-            val className: String = APKExtractor.extract_dex_and_read_className(apkFilePath, dexFilePath)
-            println(className)
-            // dex -> jar
-            Dex2jarCmd.main(dexFilePath, "-o", jarFilePath, "--force")
-
-            // clean up
-            File(apkFilePath).delete()
-            File(dexFilePath).delete()
-
-            // update sources of the extension
-            val child = URLClassLoader(arrayOf<URL>(URL("file:$jarFilePath")), this::class.java.classLoader)
-            val classToLoad = Class.forName(className, true, child)
-            val instance = classToLoad.newInstance()
-
-            val extensionId = transaction {
-                return@transaction ExtensionsTable.select { ExtensionsTable.name eq extensionRecord.name }.first()[ExtensionsTable.id]
-            }
-
-            if (instance is HttpSource) {// single source
-                val httpSource = instance as HttpSource
-                transaction {
-//                            SourceEntity.new  {
-//                                sourceId = httpSource.id
-//                                name = httpSource.name
-//                                this.extension =  ExtensionEntity.find { ExtensionsTable.name eq extension.name }.first().id
-//                            }
-                    if (SourceTable.select { SourceTable.id eq httpSource.id }.count() == 0L) {
-                        SourceTable.insert {
-                            it[this.id] = httpSource.id
-                            it[name] = httpSource.name
-                            it[this.lang] = httpSource.lang
-                            it[extension] = extensionId
-                        }
-                    }
-//                            println(httpSource.id)
-//                            println(httpSource.name)
-//                            println()
-                }
-
-            } else { // multi source
-                val sourceFactory = instance as SourceFactory
-                transaction {
-                    sourceFactory.createSources().forEachIndexed { index, source ->
-                        val httpSource = source as HttpSource
-                        if (SourceTable.select { SourceTable.id eq httpSource.id }.count() == 0L) {
-                            SourceTable.insert {
-                                it[this.id] = httpSource.id
-                                it[name] = httpSource.name
-                                it[this.lang] = httpSource.lang
-                                it[extension] = extensionId
-                                it[partOfFactorySource] = true
-                                it[positionInFactorySource] = index
-                            }
-                        }
-//                                println(httpSource.id)
-//                                println(httpSource.name)
-//                                println()
-                    }
-                }
-            }
-
-            // update extension info
-            transaction {
-                ExtensionsTable.update({ ExtensionsTable.name eq extensionRecord.name }) {
-                    it[installed] = true
-                    it[classFQName] = className
-                }
-            }
-
-        }
-        return 201 // we downloaded successfully
-    } else {
-        return 302
-    }
-}
-
-val networkHelper: NetworkHelper by injectLazy()
-
-private fun downloadAPKFile(url: String, apkPath: String) {
-    val request = Request.Builder().url(url).build()
-    val response =  networkHelper.client.newCall(request).execute()
-
-    val downloadedFile = File(apkPath)
-    val sink = downloadedFile.sink().buffer()
-    sink.writeAll(response.body!!.source())
-    sink.close()
-}

server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt

@@ -1,87 +0,0 @@
-package ir.armor.tachidesk.util
-
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.database.dataclass.ChapterDataClass
-import ir.armor.tachidesk.database.dataclass.PageDataClass
-import ir.armor.tachidesk.database.entity.MangaEntity
-import ir.armor.tachidesk.database.table.ChapterTable
-import ir.armor.tachidesk.database.table.MangaTable
-import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-
-
-fun getChapterList(mangaId: Int): List<ChapterDataClass> {
-    val mangaDetails = getManga(mangaId)
-    val source = getHttpSource(mangaDetails.sourceId)
-
-    val chapterList = source.fetchChapterList(
-            SManga.create().apply {
-                title = mangaDetails.title
-                url = mangaDetails.url
-            }
-    ).toBlocking().first()
-
-    return transaction {
-        chapterList.forEach { fetchedChapter ->
-            val chapterEntry = ChapterTable.select { ChapterTable.url eq fetchedChapter.url }.firstOrNull()
-            if (chapterEntry == null) {
-                ChapterTable.insertAndGetId {
-                    it[url] = fetchedChapter.url
-                    it[name] = fetchedChapter.name
-                    it[date_upload] = fetchedChapter.date_upload
-                    it[chapter_number] = fetchedChapter.chapter_number
-                    it[scanlator] = fetchedChapter.scanlator
-
-                    it[manga] = mangaId
-                }
-            }
-        }
-
-
-        return@transaction chapterList.map {
-            ChapterDataClass(
-                    ChapterTable.select { ChapterTable.url eq it.url }.firstOrNull()!![ChapterTable.id].value,
-                    it.url,
-                    it.name,
-                    it.date_upload,
-                    it.chapter_number,
-                    it.scanlator,
-                    mangaId
-            )
-        }
-    }
-}
-
-fun getPages(chapterId: Int, mangaId: Int): List<PageDataClass> {
-    return transaction {
-        val chapterEntry = ChapterTable.select { ChapterTable.id eq chapterId }.firstOrNull()!!
-        assert(mangaId == chapterEntry[ChapterTable.manga].value) // sanity check
-        val mangaEntry = MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!!
-        val source = getHttpSource(mangaEntry[MangaTable.sourceReference].value)
-
-        val pagesList = source.fetchPageList(
-                SChapter.create().apply {
-                    url = chapterEntry[ChapterTable.url]
-                    name = chapterEntry[ChapterTable.name]
-                }
-        ).toBlocking().first()
-
-        return@transaction pagesList.map {
-            PageDataClass(
-                    it.index,
-                    getTrueImageUrl(it,source)
-            )
-        }
-    }
-
-}
-
-fun getTrueImageUrl(page: Page, source: HttpSource): String {
-    return if ( page.imageUrl == null){
-        source.fetchImageUrl(page).toBlocking().first()!!
-    } else page.imageUrl!!
-}

server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt

@@ -1,78 +0,0 @@
-package ir.armor.tachidesk.util
-
-import eu.kanade.tachiyomi.source.model.SManga
-import ir.armor.tachidesk.database.dataclass.MangaDataClass
-import ir.armor.tachidesk.database.table.MangaStatus
-import ir.armor.tachidesk.database.table.MangaTable
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.sql.update
-
-fun getManga(mangaId: Int): MangaDataClass {
-    return transaction {
-        var mangaEntry = MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!!
-
-        return@transaction if (mangaEntry[MangaTable.initialized]) {
-            MangaDataClass(
-                    mangaId,
-                    mangaEntry[MangaTable.sourceReference].value,
-
-                    mangaEntry[MangaTable.url],
-                    mangaEntry[MangaTable.title],
-                    mangaEntry[MangaTable.thumbnail_url],
-
-                    true,
-
-                    mangaEntry[MangaTable.artist],
-                    mangaEntry[MangaTable.author],
-                    mangaEntry[MangaTable.description],
-                    mangaEntry[MangaTable.genre],
-                    MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
-            )
-        } else { // initialize manga
-            val source = getHttpSource(mangaEntry[MangaTable.sourceReference].value)
-            val fetchedManga = source.fetchMangaDetails(
-                    SManga.create().apply {
-                        url = mangaEntry[MangaTable.url]
-                        title = mangaEntry[MangaTable.title]
-                    }
-            ).toBlocking().first()
-
-            // update database
-            MangaTable.update({ MangaTable.id eq mangaId }) {
-//            it[url] = fetchedManga.url
-//            it[title] = fetchedManga.title
-                it[initialized] = true
-
-                it[artist] = fetchedManga.artist
-                it[author] = fetchedManga.author
-                it[description] = fetchedManga.description
-                it[genre] = fetchedManga.genre
-                it[status] = fetchedManga.status
-                if (fetchedManga.thumbnail_url != null && fetchedManga.thumbnail_url!!.isNotEmpty())
-                    it[thumbnail_url] = fetchedManga.thumbnail_url
-            }
-
-            mangaEntry = MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!!
-
-            MangaDataClass(
-                    mangaId,
-                    mangaEntry[MangaTable.sourceReference].value,
-
-
-                    mangaEntry[MangaTable.url],
-                    mangaEntry[MangaTable.title],
-                    mangaEntry[MangaTable.thumbnail_url],
-
-                    true,
-
-                    mangaEntry[MangaTable.artist],
-                    mangaEntry[MangaTable.author],
-                    mangaEntry[MangaTable.description],
-                    mangaEntry[MangaTable.genre],
-                    MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
-            )
-        }
-    }
-}
-

server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt

@@ -1,61 +0,0 @@
-package ir.armor.tachidesk.util
-
-import ir.armor.tachidesk.database.dataclass.MangaDataClass
-import ir.armor.tachidesk.database.table.MangaStatus
-import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.SourceTable
-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
-
-fun getMangaList(sourceId: Long, pageNum: Int = 1, popular: Boolean): List<MangaDataClass> {
-    val source = getHttpSource(sourceId.toLong())
-    val mangasPage = if (popular) {
-        source.fetchPopularManga(pageNum).toBlocking().first()
-    } else {
-        if (source.supportsLatest)
-            source.fetchLatestUpdates(pageNum).toBlocking().first()
-        else
-            throw Exception("Source $source doesn't support latest")
-    }
-    return transaction {
-        return@transaction mangasPage.mangas.map { manga ->
-            var mangaEntry = MangaTable.select { MangaTable.url eq manga.url }.firstOrNull()
-            var mangaEntityId = if (mangaEntry == null) { // create manga entry
-                MangaTable.insertAndGetId {
-                    it[url] = manga.url
-                    it[title] = manga.title
-
-                    it[artist] = manga.artist
-                    it[author] = manga.author
-                    it[description] = manga.description
-                    it[genre] = manga.genre
-                    it[status] = manga.status
-                    it[thumbnail_url] = manga.genre
-
-                    it[sourceReference] = sourceId
-                }.value
-            } else {
-                mangaEntry[MangaTable.id].value
-            }
-
-            MangaDataClass(
-                    mangaEntityId,
-                    sourceId.toLong(),
-
-                    manga.url,
-                    manga.title,
-                    manga.thumbnail_url,
-
-                    manga.initialized,
-
-                    manga.artist,
-                    manga.author,
-                    manga.description,
-                    manga.genre,
-                    MangaStatus.valueOf(manga.status).name,
-            )
-        }
-    }
-}

server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt

@@ -1,14 +0,0 @@
-package ir.armor.tachidesk.util
-
-import ir.armor.tachidesk.Config
-import ir.armor.tachidesk.database.makeDataBaseTables
-import java.io.File
-
-fun applicationSetup() {
-    // make dirs we need
-    File(Config.dataRoot).mkdirs()
-    File(Config.extensionsRoot).mkdirs()
-
-
-    makeDataBaseTables()
-}

server/src/main/resources/logback.xml

@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="Exposed" level="ERROR"/>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

server/src/main/resources/server-reference.conf

@@ -0,0 +1,13 @@
+# Server ip and port bindings
+server.ip = "0.0.0.0"
+server.port = 4567
+
+# Socks5 proxy
+server.socksProxy = false
+server.socksProxyHost = ""
+server.socksProxyPort = ""
+
+# misc
+server.debugLogsEnabled = false
+server.systemTrayEnabled = true
+server.initialOpenInBrowserEnabled = true

server/src/test/kotlin/ir/armor/tachidesk/AppTest.kt

@@ -1,13 +0,0 @@
-/*
- * This Kotlin source file was generated by the Gradle 'init' task.
- */
-package ir.armor.tachidesk
-
-import kotlin.test.Test
-import kotlin.test.assertTrue
-
-class AppTest {
-    @Test fun testAppHasAGreeting() {
-        assertTrue(true)
-    }
-}

webUI/build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
 
 node {
     workDir = file("${project.projectDir}/react/")
-    nodeModulesDir = file("${project.projectDir}/react/node_modules")
+    nodeModulesDir = file("${project.projectDir}/react/")
 }
 
 tasks.named("yarn_build") {
-    dependsOn("yarn_install")
+    dependsOn("yarn") // install node_moduels
 }
 
 tasks.register<Copy>("copyBuild") {

webUI/node_modules/.yarn-integrity

@@ -1,10 +0,0 @@
-{
-  "systemParams": "linux-x64-88",
-  "modulesFolders": [],
-  "flags": [],
-  "linkedModules": [],
-  "topLevelPatterns": [],
-  "lockfileEntries": {},
-  "files": [],
-  "artifacts": {}
-}

webUI/react/.eslintrc.js

@@ -13,5 +13,7 @@ module.exports = {
 
         // Indent props with 4 spaces
         'react/jsx-indent-props': ['error', 4],
+
+        'no-plusplus': ['error', { 'allowForLoopAfterthoughts': true }]
     },
 };

webUI/react/.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .eslintcache
 .vscode
+.env