fix wrong release name

v0.6.1
fix mentions
2022-02-19 05:38:04 +03:30 · 2022-02-19 05:29:46 +03:30 · 2022-02-19 05:27:34 +03:30 · 2022-02-19 05:17:56 +03:30 · 2022-02-19 05:12:20 +03:30 · 2022-02-19 04:44:17 +03:30
72 changed files with 1293 additions and 364 deletions
@@ -73,6 +73,7 @@ jobs:
          ./windows-bundler.sh win32
          ./windows-bundler.sh win64
          ./unix-bundler.sh linux-x64
+          ./debian-packager.sh
          ./unix-bundler.sh macOS-x64
          ./unix-bundler.sh macOS-arm64

@@ -103,7 +104,7 @@ jobs:
        uses: ncipollo/release-action@v1
        with:
          token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
-          artifacts: "master/server/build/*.jar,master/server/build/*.zip,master/server/build/*.tar.gz"
+          artifacts: "master/server/build/*.jar,master/server/build/*.msi,master/server/build/*.zip,master/server/build/*.tar.gz,master/server/build/*.deb"
          owner: "Suwayomi"
          repo: "Tachidesk-Server-preview"
          tag: ${{ steps.GenTagName.outputs.value }}
@@ -3,7 +3,7 @@ name: CI Publish
 on:
  push:
    tags:
-      - 'v*'
+      - "v*"

 jobs:
  check_wrapper:
@@ -58,12 +58,13 @@ jobs:
          dependencies-cache-enabled: true
          configuration-cache-enabled: true

-      - name: make bundle packages
+      - name: Make bundle packages
        run: |
          cd master/scripts
          ./windows-bundler.sh win32
          ./windows-bundler.sh win64
          ./unix-bundler.sh linux-x64
+          ./debian-packager.sh
          ./unix-bundler.sh macOS-x64
          ./unix-bundler.sh macOS-arm64

@@ -72,7 +73,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          file: "master/server/build/*.jar;master/server/build/*.zip;master/server/build/*.tar.gz"
+          file: "master/server/build/*.jar;master/server/build/*.msi;master/server/build/*.zip;master/server/build/*.tar.gz;master/server/build/*.deb"
          tags: true
          draft: true
          verbose: true
@@ -9,20 +9,20 @@ dependencies {
    implementation(project(":AndroidCompat:Config"))

    // APK sig verifier
-    compileOnly("com.android.tools.build:apksig:7.1.0-alpha12")
+    compileOnly("com.android.tools.build:apksig:7.1.0-beta05")

    // AndroidX annotations
-    compileOnly("androidx.annotation:annotation:1.2.0")
+    compileOnly("androidx.annotation:annotation:1.3.0")

    // substitute for duktape-android
-    implementation("org.mozilla:rhino-runtime:1.7.13") // slimmer version of 'org.mozilla:rhino'
-    implementation("org.mozilla:rhino-engine:1.7.13") // provides the same interface as 'javax.script' a.k.a Nashorn
+    implementation("org.mozilla:rhino-runtime:1.7.14") // slimmer version of 'org.mozilla:rhino'
+    implementation("org.mozilla:rhino-engine:1.7.14") // provides the same interface as 'javax.script' a.k.a Nashorn

    // Kotlin wrapper around Java Preferences, makes certain things easier
-    val multiplatformSettingsVersion = "0.8"
+    val multiplatformSettingsVersion = "0.8.1"
    implementation("com.russhwolf:multiplatform-settings-jvm:$multiplatformSettingsVersion")
    implementation("com.russhwolf:multiplatform-settings-serialization-jvm:$multiplatformSettingsVersion")

    // Android version of SimpleDateFormat
-    implementation("com.ibm.icu:icu4j:69.1")
+    implementation("com.ibm.icu:icu4j:70.1")
 }
@@ -14,9 +14,10 @@
 * limitations under the License.
 */
 package com.android.internal.util;
+
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Bitmap.CompressFormat;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -25,19 +26,14 @@ import android.util.Xml;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ProtocolException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 /** {@hide} */
 public class XmlUtils {
    private static final String STRING_ARRAY_SEPARATOR = ":";
@@ -1396,9 +1392,9 @@ public class XmlUtils {
            } else if (tagName.equals("long")) {
                return Long.valueOf(parser.getAttributeValue(null, "value"));
            } else if (tagName.equals("float")) {
-                return new Float(parser.getAttributeValue(null, "value"));
+                return Float.valueOf(parser.getAttributeValue(null, "value"));
            } else if (tagName.equals("double")) {
-                return new Double(parser.getAttributeValue(null, "value"));
+                return Double.valueOf(parser.getAttributeValue(null, "value"));
            } else if (tagName.equals("boolean")) {
                return Boolean.valueOf(parser.getAttributeValue(null, "value"));
            } else {
@@ -1,3 +1,54 @@
+# Server: v0.6.1 + WebUI: r911
+## TL;DR
+- msi and deb packages thanks to @mahor1221
+- [Tachidesk-Flutter](https://github.com/Suwayomi/Tachidesk-Flutter) exists now!
+
+## Tachidesk-Server Changelog
+- (r1047) update (by @AriaMoradi)
+- (r1048) bump version (by @AriaMoradi)
+- (r1049) Update README.md (by @AriaMoradi)
+- (r1050) Update README.md (by @AriaMoradi)
+- (r1051) refactor getChapter ([#268](https://github.com/Suwayomi/Tachidesk-Server/pull/268) by @AriaMoradi)
+- (r1052) Improve documentation with Http codes ([#261](https://github.com/Suwayomi/Tachidesk-Server/pull/261) by @Syer10)
+- (r1053) Add Route to stop and reset the updater ([#260](https://github.com/Suwayomi/Tachidesk-Server/pull/260) by @ntbm)
+- (r1054) ignore non image files ([#269](https://github.com/Suwayomi/Tachidesk-Server/pull/269) by @AriaMoradi)
+- (r1055) fix compile erorr (by @AriaMoradi)
+- (r1056) update dex2jar (by @AriaMoradi)
+- (r1057) Update Gradle and Dependencies ([#281](https://github.com/Suwayomi/Tachidesk-Server/pull/281) by @Syer10)
+- (r1058) Handlers must return a result ([#282](https://github.com/Suwayomi/Tachidesk-Server/pull/282) by @Syer10)
+- (r1059) Allow app compilation on Java 18+ ([#286](https://github.com/Suwayomi/Tachidesk-Server/pull/286) by @Syer10)
+- (r1060) Automated MSI package building ([#277](https://github.com/Suwayomi/Tachidesk-Server/pull/277) by @mahor1221)
+- (r1061) Automated debian package building ([#287](https://github.com/Suwayomi/Tachidesk-Server/pull/287) by @mahor1221)
+- (r1062) fix Debian package errors ([#288](https://github.com/Suwayomi/Tachidesk-Server/pull/288) by @mahor1221)
+- (r1063) Fix build_push.yml Hopefully ([#289](https://github.com/Suwayomi/Tachidesk-Server/pull/289) by @mahor1221)
+- (r1064) Improve windows-bundler.sh ([#290](https://github.com/Suwayomi/Tachidesk-Server/pull/290) by @mahor1221)
+- (r1065) add Tachidesk-Flutter to readme ([#292](https://github.com/Suwayomi/Tachidesk-Server/pull/292)) @DattatreyaReddy)
+- (r1066) no online fetch on backup ([#293](https://github.com/Suwayomi/Tachidesk-Server/pull/293) by @AriaMoradi)
+- (r1067) auto-remove duplicate chapters ([#294](https://github.com/Suwayomi/Tachidesk-Server/pull/294) by @AriaMoradi)
+- (r1068) remove gson ([#295](https://github.com/Suwayomi/Tachidesk-Server/pull/295) by @AriaMoradi)
+
+## Tachidesk-WebUI Changelog
+- (r894) migrate ReaderNavbar to Mui 5 ([#84](https://github.com/Suwayomi/Tachidesk-WebUI/pull/84) by @AriaMoradi)
+- (r895) migrate SpinnerImage to Mui 5 ([#97](https://github.com/Suwayomi/Tachidesk-WebUI/pull/97) by @AriaMoradi)
+- (r896) migrate VerticalPager to Mui 5 ([#94](https://github.com/Suwayomi/Tachidesk-WebUI/pull/94) by @AriaMoradi)
+- (r897) migrate PagedPager to Mui 5 ([#93](https://github.com/Suwayomi/Tachidesk-WebUI/pull/93) by @AriaMoradi)
+- (r898) MangaCard imges don't stretch now ([#110](https://github.com/Suwayomi/Tachidesk-WebUI/pull/110) by @abhijeetChawla)
+- (r899) show correct title ([#111](https://github.com/Suwayomi/Tachidesk-WebUI/pull/111) by @AriaMoradi)
+- (r900) migrate DoublePage to Mui 5 ([#88](https://github.com/Suwayomi/Tachidesk-WebUI/pull/88) by @AriaMoradi)
+- (r901) migrate DoublePagedPager to Mui 5 ([#91](https://github.com/Suwayomi/Tachidesk-WebUI/pull/91) by @AriaMoradi)
+- (r902) migrate Reader to Mui 5 ([#100](https://github.com/Suwayomi/Tachidesk-WebUI/pull/100) by @AriaMoradi)
+- (r903) migrate HorizantalPager to Mui 5 ([#92](https://github.com/Suwayomi/Tachidesk-WebUI/pull/92) by @AriaMoradi)
+- (r904) migrate PageNumber to Mui 5 ([#90](https://github.com/Suwayomi/Tachidesk-WebUI/pull/90) by @AriaMoradi)
+- (r905) Chapter filter is woking ([#114](https://github.com/Suwayomi/Tachidesk-WebUI/pull/114) by @abhijeetChawla)
+- (r906) added extension search ([#115](https://github.com/Suwayomi/Tachidesk-WebUI/pull/115) by @abhijeetChawla)
+- (r907) cleanup ([#117](https://github.com/Suwayomi/Tachidesk-WebUI/pull/117) by @AriaMoradi)
+- (r908) handle search shortcuts ([#116](https://github.com/Suwayomi/Tachidesk-WebUI/pull/116) by @AriaMoradi)
+- (r909) Refactor for Removing unnecesary UseEffect ([#118](https://github.com/Suwayomi/Tachidesk-WebUI/pull/118) by @abhijeetChawla)
+- (r910) refactor ChapterList ([#125](https://github.com/Suwayomi/Tachidesk-WebUI/pull/125) by @abhijeetChawla)
+- (r911) refactor ChapterOptions ([#126](https://github.com/Suwayomi/Tachidesk-WebUI/pull/126) by @abhijeetChawla)
+
+
+
 # Server: v0.6.0 + WebUI: r893
 ## TL;DR
 - WebUI design went through a whole lot of changes, including
@@ -125,6 +176,8 @@
 - (r892) add support for emptySearch ([#109](https://github.com/Suwayomi/Tachidesk-WebUI/pull/109) by @AriaMoradi)
 - (r893) add support for MultiSelectListPreference ([#108](https://github.com/Suwayomi/Tachidesk-WebUI/pull/108) by @AriaMoradi)

+
+
 # Server: v0.5.4 + WebUI: r820
 ## TL;DR
 - Fixed ReadComicOnline, Toonily and possibly other sources not working
@@ -45,11 +45,14 @@ Ability to sync with Tachiyomi is a planned feature.
 **You need a client/user interface app as a front-end for Tachidesk-Server, if you Directly Download Tachidesk-Server you'll get a bundled version of [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI) with it.**

 Here's a list of known clients/user interfaces for Tachidesk-Server:
+##### Actively Developed Cients
 - [Tachidesk-WebUI](https://github.com/Suwayomi/Tachidesk-WebUI): The web/ElectronJS front-end that Tachidesk-Server is traditionally shipped with. Usually gets new features faster.
- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Tachidesk-Server. Currently the most advanced. Downlading Tachidesk-JUI is not recommened for now, the current release is getting obsolete, a new version is to be released soon(TM).
- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), in super early stage of development.
+- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Tachidesk-Server. Currently the most advanced.
+- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), in super early stage of development. 
+- [Tachidesk-Flutter](https://github.com/Suwayomi/Tachidesk-Flutter): A Flutter front-end for Desktop(Linux, windows, etc.), in early stage of development. 
+##### Inctive/Abandoned Cients
+- [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stage of development.
 - [Tachidesk-GTK](https://github.com/mahor1221/Tachidesk-GTK): A native Rust/GTK desktop client, in super early stage of development.
- [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js, in super early stage of development. Seemingly abandoned.

 ## Is this application usable? Should I test it?
 Here is a list of current features:
@@ -5,7 +5,7 @@ import org.jmailen.gradle.kotlinter.tasks.LintTask
 plugins {
    kotlin("jvm") version kotlinVersion
    kotlin("plugin.serialization") version kotlinVersion
-    id("org.jmailen.kotlinter") version "3.6.0"
+    id("org.jmailen.kotlinter") version "3.8.0"
    id("com.github.gmazzo.buildconfig") version "3.0.3" apply false
 }

@@ -69,22 +69,22 @@ configure(projects) {
        testImplementation(kotlin("test-junit5"))

        // coroutines
-        val coroutinesVersion = "1.5.2"
+        val coroutinesVersion = "1.6.0"
        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")

-        val kotlinSerializationVersion = "1.3.0-RC"
+        val kotlinSerializationVersion = "1.3.2"
        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion")
        implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion")

        // Dependency Injection
-        implementation("org.kodein.di:kodein-di-conf-jvm:7.8.0")
+        implementation("org.kodein.di:kodein-di-conf-jvm:7.10.0")

        // Logging
        implementation("org.slf4j:slf4j-api:1.7.32")
        implementation("ch.qos.logback:logback-classic:1.2.6")
-        implementation("io.github.microutils:kotlin-logging:2.0.11")
+        implementation("io.github.microutils:kotlin-logging:2.1.21")

        // ReactiveX
        implementation("io.reactivex:rxjava:1.3.8")
@@ -92,7 +92,7 @@ configure(projects) {
        implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")

        // dependency both in AndroidCompat and extensions, version locked by Tachiyomi app/extensions
-        implementation("org.jsoup:jsoup:1.14.2")
+        implementation("org.jsoup:jsoup:1.14.3")

        // dependency of :AndroidCompat:Config
        implementation("com.typesafe:config:1.4.1")
@@ -102,7 +102,7 @@ configure(projects) {
        implementation("net.harawata:appdirs:1.2.1")

        // dex2jar
-        val dex2jarVersion = "v26"
+        val dex2jarVersion = "v35"
        implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion")
        implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion")

@@ -7,14 +7,14 @@ import java.io.BufferedReader
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

-const val kotlinVersion = "1.5.30"
+const val kotlinVersion = "1.6.10"

 const val MainClass = "suwayomi.tachidesk.MainKt"

 // should be bumped with each stable release
-val tachideskVersion = System.getenv("ProductVersion") ?: "v0.6.0"
+val tachideskVersion = System.getenv("ProductVersion") ?: "v0.6.1"

-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r893"
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r911"

 // counts commits on the master branch
 val tachideskRevision = runCatching {
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Copyright (C) Contributors to the Suwayomi project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+echo "creating debian package"
+jar=$(ls ../server/build/*.jar | tail -n1)
+release_ver=$(tmp="${jar%-*}" && echo "${tmp##*-}" | tr -d v)
+orig_dir="tachidesk-$release_ver"                # dir uses hyphen "-"
+orig_tar_gz="tachidesk_$release_ver.orig.tar.gz" # orig file uses underscore "_"
+package_name="tachidesk_$release_ver-1_all.deb"
+
+# copy artifacts
+mkdir "$orig_dir"
+cp "$jar" "$orig_dir/Tachidesk.jar"
+cp -r "resources/debian" "$orig_dir"
+cp "resources/tachidesk-browser-launcher-standalone.sh" "$orig_dir/debian"
+cp "resources/tachidesk-debug-launcher-standalone.sh" "$orig_dir/debian"
+cp "resources/tachidesk-electron-launcher-standalone.sh" "$orig_dir/debian"
+cp "resources/tachidesk.desktop" "$orig_dir/debian"
+cp "../server/src/main/resources/icon/faviconlogo.png" "$orig_dir/debian/tachidesk.png"
+
+# prepare
+tar cvzf "$orig_tar_gz" "$orig_dir/Tachidesk.jar"
+sed -i "s/\${version}/$release_ver/" "$orig_dir/debian/changelog"
+
+# build
+mkdir "build"
+mv $orig_dir $orig_tar_gz "build/"
+cd "build/$orig_dir/debian"
+sudo apt install devscripts build-essential dh-exec
+# --lintian-opts --profile debian: build Debian packages on Ubuntu
+debuild -uc -us --lintian-opts --profile debian
+cd -
+
+# clean build directory
+mv "build/$package_name" "./"
+rm -rf "build"
+
+# clean up from possible previous runs
+if [ -f "../server/build/$package_name" ]; then
+  rm "../server/build/$package_name"
+fi
+
+mv "$package_name" "../server/build/"
@@ -0,0 +1,5 @@
+tachidesk (${version}-1) unstable; urgency=medium
+
+  * See CHANGELOG.md on https://github.com/Suwayomi/Tachidesk-Server
+
+ -- Mahor Foruzesh <mahorforuzesh@pm.me>  Fri, 14 Jan 2022 00:00:00 +0000
@@ -0,0 +1,14 @@
+Source: tachidesk
+Section: web
+Priority: optional
+Maintainer: Mahor Foruzesh <mahorforuzesh@pm.me>
+Build-Depends: debhelper-compat (= 12), dh-exec
+Standards-Version: 4.5.1
+Homepage: https://github.com/Suwayomi/Tachidesk-Server
+
+Package: tachidesk
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless (>= 8)
+Description: Manga Reader
+ A free and open source manga reader server that runs extensions built for Tachiyomi.
+ Tachidesk is an independent Tachiyomi compatible software and is not a Fork of Tachiyomi.
@@ -0,0 +1,381 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: tachidesk
+Upstream-Contact: https://discord.gg/DDZdqZWaHA
+Source: https://github.com/Suwayomi/Tachidesk-Server
+
+Files: *
+Copyright: Contributors to the Suwayomi project
+License: MPL-2.0
+ Mozilla Public License Version 2.0
+ ==================================
+ .
+ 1. Definitions
+ --------------
+ .
+ 1.1. "Contributor"
+     means each individual or legal entity that creates, contributes to
+     the creation of, or owns Covered Software.
+ .
+ 1.2. "Contributor Version"
+     means the combination of the Contributions of others (if any) used
+     by a Contributor and that particular Contributor's Contribution.
+ .
+ 1.3. "Contribution"
+     means Covered Software of a particular Contributor.
+ .
+ 1.4. "Covered Software"
+     means Source Code Form to which the initial Contributor has attached
+     the notice in Exhibit A, the Executable Form of such Source Code
+     Form, and Modifications of such Source Code Form, in each case
+     including portions thereof.
+ .
+ 1.5. "Incompatible With Secondary Licenses"
+     means
+ .
+     (a) that the initial Contributor has attached the notice described
+         in Exhibit B to the Covered Software; or
+ .
+     (b) that the Covered Software was made available under the terms of
+         version 1.1 or earlier of the License, but not also under the
+         terms of a Secondary License.
+ .
+ 1.6. "Executable Form"
+     means any form of the work other than Source Code Form.
+ .
+ 1.7. "Larger Work"
+     means a work that combines Covered Software with other material, in
+     a separate file or files, that is not Covered Software.
+ .
+ 1.8. "License"
+     means this document.
+ .
+ 1.9. "Licensable"
+     means having the right to grant, to the maximum extent possible,
+     whether at the time of the initial grant or subsequently, any and
+     all of the rights conveyed by this License.
+ .
+ 1.10. "Modifications"
+     means any of the following:
+ .
+     (a) any file in Source Code Form that results from an addition to,
+         deletion from, or modification of the contents of Covered
+         Software; or
+ .
+     (b) any new file in Source Code Form that contains any Covered
+         Software.
+ .
+ 1.11. "Patent Claims" of a Contributor
+     means any patent claim(s), including without limitation, method,
+     process, and apparatus claims, in any patent Licensable by such
+     Contributor that would be infringed, but for the grant of the
+     License, by the making, using, selling, offering for sale, having
+     made, import, or transfer of either its Contributions or its
+     Contributor Version.
+ .
+ 1.12. "Secondary License"
+     means either the GNU General Public License, Version 2.0, the GNU
+     Lesser General Public License, Version 2.1, the GNU Affero General
+     Public License, Version 3.0, or any later versions of those
+     licenses.
+ .
+ 1.13. "Source Code Form"
+     means the form of the work preferred for making modifications.
+ .
+ 1.14. "You" (or "Your")
+     means an individual or a legal entity exercising rights under this
+     License. For legal entities, "You" includes any entity that
+     controls, is controlled by, or is under common control with You. For
+     purposes of this definition, "control" means (a) the power, direct
+     or indirect, to cause the direction or management of such entity,
+     whether by contract or otherwise, or (b) ownership of more than
+     fifty percent (50%) of the outstanding shares or beneficial
+     ownership of such entity.
+ .
+ 2. License Grants and Conditions
+ --------------------------------
+ .
+ 2.1. Grants
+ .
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+ .
+ (a) under intellectual property rights (other than patent or trademark)
+     Licensable by such Contributor to use, reproduce, make available,
+     modify, display, perform, distribute, and otherwise exploit its
+     Contributions, either on an unmodified basis, with Modifications, or
+     as part of a Larger Work; and
+ .
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+     for sale, have made, import, and otherwise transfer either its
+     Contributions or its Contributor Version.
+ .
+ 2.2. Effective Date
+ .
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+ .
+ 2.3. Limitations on Grant Scope
+ .
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+ .
+ (a) for any code that a Contributor has removed from Covered Software;
+     or
+ .
+ (b) for infringements caused by: (i) Your and any other third party's
+     modifications of Covered Software, or (ii) the combination of its
+     Contributions with other software (except as part of its Contributor
+     Version); or
+ .
+ (c) under Patent Claims infringed by Covered Software in the absence of
+     its Contributions.
+ .
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+ .
+ 2.4. Subsequent Licenses
+ .
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+ .
+ 2.5. Representation
+ .
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+ .
+ 2.6. Fair Use
+ .
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+ .
+ 2.7. Conditions
+ .
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+ .
+ 3. Responsibilities
+ -------------------
+ .
+ 3.1. Distribution of Source Form
+ .
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+ .
+ 3.2. Distribution of Executable Form
+ .
+ If You distribute Covered Software in Executable Form then:
+ .
+ (a) such Covered Software must also be made available in Source Code
+     Form, as described in Section 3.1, and You must inform recipients of
+     the Executable Form how they can obtain a copy of such Source Code
+     Form by reasonable means in a timely manner, at a charge no more
+     than the cost of distribution to the recipient; and
+ .
+ (b) You may distribute such Executable Form under the terms of this
+     License, or sublicense it under different terms, provided that the
+     license for the Executable Form does not attempt to limit or alter
+     the recipients' rights in the Source Code Form under this License.
+ .
+ 3.3. Distribution of a Larger Work
+ .
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+ .
+ 3.4. Notices
+ .
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+ .
+ 3.5. Application of Additional Terms
+ .
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+ .
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+ .
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+ .
+ 5. Termination
+ --------------
+ .
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+ .
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+ .
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+ .
+ ************************************************************************
+ *                                                                      *
+ *  6. Disclaimer of Warranty                                           *
+ *  -------------------------                                           *
+ *                                                                      *
+ *  Covered Software is provided under this License on an "as is"       *
+ *  basis, without warranty of any kind, either expressed, implied, or  *
+ *  statutory, including, without limitation, warranties that the       *
+ *  Covered Software is free of defects, merchantable, fit for a        *
+ *  particular purpose or non-infringing. The entire risk as to the     *
+ *  quality and performance of the Covered Software is with You.        *
+ *  Should any Covered Software prove defective in any respect, You     *
+ *  (not any Contributor) assume the cost of any necessary servicing,   *
+ *  repair, or correction. This disclaimer of warranty constitutes an   *
+ *  essential part of this License. No use of any Covered Software is   *
+ *  authorized under this License except under this disclaimer.         *
+ *                                                                      *
+ ************************************************************************
+ .
+ ************************************************************************
+ *                                                                      *
+ *  7. Limitation of Liability                                          *
+ *  --------------------------                                          *
+ *                                                                      *
+ *  Under no circumstances and under no legal theory, whether tort      *
+ *  (including negligence), contract, or otherwise, shall any           *
+ *  Contributor, or anyone who distributes Covered Software as          *
+ *  permitted above, be liable to You for any direct, indirect,         *
+ *  special, incidental, or consequential damages of any character      *
+ *  including, without limitation, damages for lost profits, loss of    *
+ *  goodwill, work stoppage, computer failure or malfunction, or any    *
+ *  and all other commercial damages or losses, even if such party      *
+ *  shall have been informed of the possibility of such damages. This   *
+ *  limitation of liability shall not apply to liability for death or   *
+ *  personal injury resulting from such party's negligence to the       *
+ *  extent applicable law prohibits such limitation. Some               *
+ *  jurisdictions do not allow the exclusion or limitation of           *
+ *  incidental or consequential damages, so this exclusion and          *
+ *  limitation may not apply to You.                                    *
+ *                                                                      *
+ ************************************************************************
+ .
+ 8. Litigation
+ -------------
+ .
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+ .
+ 9. Miscellaneous
+ ----------------
+ .
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+ .
+ 10. Versions of the License
+ ---------------------------
+ .
+ 10.1. New Versions
+ .
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+ .
+ 10.2. Effect of New Versions
+ .
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+ .
+ 10.3. Modified Versions
+ .
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+ .
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+ .
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+ .
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+ .
+   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/.
+ .
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+ .
+ You may add additional accurate notices of copyright ownership.
+ .
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+ .
+   This Source Code Form is "Incompatible With Secondary Licenses", as
+   defined by the Mozilla Public License, v. 2.0.
@@ -0,0 +1,9 @@
+#!/usr/bin/dh-exec
+
+debian/tachidesk-browser-launcher-standalone.sh  => usr/bin/tachidesk
+debian/tachidesk-browser-launcher-standalone.sh  => usr/bin/tachidesk-browser
+debian/tachidesk-debug-launcher-standalone.sh    => usr/bin/tachidesk-debug
+debian/tachidesk-electron-launcher-standalone.sh => usr/bin/tachidesk-electron
+Tachidesk.jar => usr/share/java/tachidesk/tachidesk.jar
+debian/tachidesk.png     usr/share/pixmaps/
+debian/tachidesk.desktop usr/share/applications/
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+%:
+	dh $@
+
+override_dh_strip_nondeterminism:
+	true
+
@@ -0,0 +1 @@
+3.0 (quilt)
@@ -0,0 +1 @@
+debian/tachidesk.png
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*" UpgradeCode="*"
+    Version="$(var.ProductVersion)" Language="1033" Name="Tachidesk Server" Manufacturer="Suwayomi">
+    <Package InstallerVersion="300" Compressed="yes" />
+    <Media Id="1" Cabinet="Tachidesk_Server.cab" EmbedCab="yes" />
+
+    <Condition Message="This version of Windows does not support deploying 64-bit packages.">
+      VersionNT64
+    </Condition>
+
+    <!-- Directory -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFiles64Folder">
+        <Directory Id="INSTALLDIR" Name="Tachidesk-Server" >
+          <Directory Id="jre"/>
+          <Directory Id="electron"/>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ProgramMenuDir" Name="Tachidesk-Server">
+          <Component Id="ProgramMenuDir" Guid="*">
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
+            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
+          </Component>
+        </Directory>
+      </Directory>
+      <Directory Id="DesktopFolder" />
+    </Directory>
+
+    <!-- Component -->
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="TachideskJAR" Guid="*" Win64="yes">
+          <File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
+      </Component>
+
+      <Component Id="TachideskBrowserBAT" Guid="*" Win64="yes">
+        <File Id="TachideskBrowser.bat" Source="$(var.SourceDir)/Tachidesk Browser Launcher.bat" KeyPath="yes" >
+          <Shortcut Id="TachideskBrowser.lnk" Name="Tachidesk Browser" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskDebugBAT" Guid="*" Win64="yes">
+        <File Id="TachideskDebug.bat" Source="$(var.SourceDir)/Tachidesk Debug Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskDebug.lnk" Name="Tachidesk Debug" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskDebug.lnk" Name="Tachidesk Debug" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskElectronBAT" Guid="*" Win64="yes">
+        <File Id="TachideskElectron.bat" Source="$(var.SourceDir)/Tachidesk Electron Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskElectron.lnk" Name="Tachidesk Electron" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskElectron.lnk" Name="Tachidesk Electron" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskElectron.lnk" Name="Tachidesk Electron" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk inside Electron as a desktop applicaton." />
+        </File>
+      </Component>
+    </DirectoryRef>
+
+    <!-- Feature -->
+    <Feature Id="Tachidesk_Server" Title="Tachidesk-Server" Level="1">
+      <ComponentGroupRef Id="jre" />
+      <ComponentRef Id="TachideskJAR" />
+      <ComponentRef Id="TachideskBrowserBAT" />
+      <ComponentRef Id="TachideskDebugBAT" />
+      <ComponentRef Id="ProgramMenuDir" />
+      <ComponentGroupRef Id="electron" />
+      <ComponentRef Id="TachideskElectronBAT" />
+    </Feature>
+
+    <Icon Id="Tachidesk.ico" SourceFile="$(var.Icon)" />
+    <Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
+  </Product>
+</Wix>
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*" UpgradeCode="*"
+    Version="$(var.ProductVersion)" Language="1033" Name="Tachidesk Server" Manufacturer="Suwayomi">
+    <Package InstallerVersion="300" Compressed="yes" />
+    <Media Id="1" Cabinet="Tachidesk_Server.cab" EmbedCab="yes" />
+
+    <!-- Directory -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLDIR" Name="Tachidesk-Server" >
+          <Directory Id="jre"/>
+          <Directory Id="electron"/>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ProgramMenuDir" Name="Tachidesk-Server">
+          <Component Id="ProgramMenuDir" Guid="*">
+            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
+            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
+          </Component>
+        </Directory>
+      </Directory>
+      <Directory Id="DesktopFolder" />
+    </Directory>
+
+    <!-- Component -->
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="TachideskJAR" Guid="*">
+          <File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
+      </Component>
+
+      <Component Id="TachideskBrowserBAT" Guid="*">
+        <File Id="TachideskBrowser.bat" Source="$(var.SourceDir)/Tachidesk Browser Launcher.bat" KeyPath="yes" >
+          <Shortcut Id="TachideskBrowser.lnk" Name="Tachidesk Browser" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskDebugBAT" Guid="*">
+        <File Id="TachideskDebug.bat" Source="$(var.SourceDir)/Tachidesk Debug Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskDebug.lnk" Name="Tachidesk Debug" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskDebug.lnk" Name="Tachidesk Debug" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why." />
+        </File>
+      </Component>
+
+      <Component Id="TachideskElectronBAT" Guid="*">
+        <File Id="TachideskElectron.bat" Source="$(var.SourceDir)/Tachidesk Electron Launcher.bat" KeyPath="yes">
+          <Shortcut Id="TachideskElectron.lnk" Name="Tachidesk Electron" Directory="INSTALLDIR"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="DesktopTachideskElectron.lnk" Name="Tachidesk Electron" Directory="DesktopFolder"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ProgramMenuTachideskElectron.lnk" Name="Tachidesk Electron" Directory="ProgramMenuDir"
+            WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
+            Description="Launches Tachidesk inside Electron as a desktop applicaton." />
+        </File>
+      </Component>
+    </DirectoryRef>
+
+    <!-- Feature -->
+    <Feature Id="Tachidesk_Server" Title="Tachidesk-Server" Level="1">
+      <ComponentGroupRef Id="jre" />
+      <ComponentRef Id="TachideskJAR" />
+      <ComponentRef Id="TachideskBrowserBAT" />
+      <ComponentRef Id="TachideskDebugBAT" />
+      <ComponentRef Id="ProgramMenuDir" />
+      <ComponentGroupRef Id="electron" />
+      <ComponentRef Id="TachideskElectronBAT" />
+    </Feature>
+
+    <Icon Id="Tachidesk.ico" SourceFile="$(var.Icon)" />
+    <Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
+  </Product>
+</Wix>
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -jar /usr/share/java/tachidesk/tachidesk.jar
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.debugLogsEnabled=true -jar /usr/share/java/tachidesk/tachidesk.jar
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ ! -f /usr/bin/electron ]; then
+    echo "Electron executable was not found!
+In order to run this launcher, you need Electron installed.
+
+You can install it with these commands:
+sudo apt install npm
+sudo npm install electron -g
+"
+    exit 1
+fi
+
+exec /usr/bin/java -Dsuwayomi.tachidesk.config.server.webUIInterface=electron -Dsuwayomi.tachidesk.config.server.electronPath=/usr/bin/electron -jar /usr/share/java/tachidesk/tachidesk.jar
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tachidesk
+Comment=Manga Reader
+Exec=/usr/bin/java -jar /usr/share/java/tachidesk/tachidesk.jar "\\$@"
+Icon=tachidesk
+Terminal=false
+Categories=Network;
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash

 # Copyright (C) Contributors to the Suwayomi project
 #
@@ -40,11 +40,9 @@ jar=$(ls ../server/build/*.jar | tail -n1)
 jar_name=$(echo $jar | cut -d'/' -f4)
 release_name=$(echo $jar_name | sed 's/.jar//')-$arch

-
 # make release dir
 mkdir $release_name

-
 echo "Dealing with jre..."
 if [ ! -f $jre ]; then
  curl -L $jre_url -o $jre
@@ -7,8 +7,8 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.

 electron_version="v14.0.0"
-
-if [ $1 = "win32" ]; then
+arch=$1
+if [ $arch = "win32" ]; then
  jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
  jre_release="jdk8u292-b10"
  jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$jre_release/$jre"
@@ -30,11 +30,9 @@ jar=$(ls ../server/build/*.jar | tail -n1)
 jar_name=$(echo $jar | cut -d'/' -f4)
 release_name=$(echo $jar_name | sed 's/.jar//')-$arch

-
 # make release dir
 mkdir $release_name

-
 echo "Dealing with jre..."
 if [ ! -f $jre ]; then
  curl -L $jre_url -o $jre
@@ -62,6 +60,7 @@ if [ $CI = true ]; then
  sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
  sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
  sudo apt install --install-recommends winehq-stable
+  sudo apt install -y wixl
 fi
 # this script assumes that wine is installed here on out

@@ -76,11 +75,30 @@ cp "resources/Tachidesk Electron Launcher.bat" $release_name
 zip_name=$release_name.zip
 zip -9 -r $zip_name $release_name

+# create msi package
+msi_name=$release_name.msi
+release_ver=$(tmp=${jar%-*} && echo ${tmp##*-} | tr -d v)
+icon="../server/src/main/resources/icon/faviconlogo.ico"
+
+find $release_name/jre | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref jre --component-group jre >jre.wxs
+find $release_name/electron | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref electron --component-group electron >electron.wxs
+if [ $arch = "win32" ]; then
+  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name -D Icon=$icon \
+    --arch x86 resources/msi/tachidesk-server-x86.wxs jre.wxs electron.wxs -o $msi_name
+else
+  wixl -D ProductVersion=$release_ver -D SourceDir=$release_name -D Icon=$icon \
+    --arch x64 resources/msi/tachidesk-server-x64.wxs jre.wxs electron.wxs -o $msi_name
+fi
+
 rm -rf $release_name

 # clean up from possible previous runs
 if [ -f ../server/build/$zip_name ]; then
  rm ../server/build/$zip_name
 fi
+if [ -f ../server/build/$msi_name ]; then
+  rm ../server/build/$msi_name
+fi

 mv $zip_name ../server/build/
+mv $msi_name ../server/build/
@@ -3,21 +3,21 @@ import java.time.Instant

 plugins {
    application
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
    id("com.github.gmazzo.buildconfig")
 }

 dependencies {
    // okhttp
-    val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions
+    val okhttpVersion = "4.9.3" // Major version is locked by Tachiyomi extensions
    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
    implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
-    implementation("com.squareup.okio:okio:2.10.0")
+    implementation("com.squareup.okio:okio:3.0.0")

    // Javalin api
-    implementation("io.javalin:javalin:4.1.1")
-    implementation("io.javalin:javalin-openapi:4.1.1")
+    implementation("io.javalin:javalin:4.2.0")
+    implementation("io.javalin:javalin-openapi:4.2.0")
    // jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
    val jacksonVersion = "2.12.4"
    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
@@ -41,11 +41,9 @@ dependencies {

    // dependencies of Tachiyomi extensions, some are duplicate, keeping it here for reference
    implementation("com.github.inorichi.injekt:injekt-core:65b0440")
-    implementation("com.squareup.okhttp3:okhttp:4.9.1")
+    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
    implementation("io.reactivex:rxjava:1.3.8")
-    implementation("org.jsoup:jsoup:1.14.2")
-    implementation("com.google.code.gson:gson:2.8.8")
-    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
+    implementation("org.jsoup:jsoup:1.14.3")

    // Sort
    implementation("com.github.gpanther:java-nat-sort:natural-comparator-1.1")
@@ -54,11 +52,11 @@ dependencies {
    implementation("org.ow2.asm:asm:9.2")

    // Disk & File
-    implementation("net.lingala.zip4j:zip4j:2.9.0")
+    implementation("net.lingala.zip4j:zip4j:2.9.1")
    implementation("com.github.junrar:junrar:7.4.0")

    // CloudflareInterceptor
-    implementation("net.sourceforge.htmlunit:htmlunit:2.52.0")
+    implementation("net.sourceforge.htmlunit:htmlunit:2.56.0")

    // Source models and interfaces from Tachiyomi 1.x
    // using source class from tachiyomi commit 9493577de27c40ce8b2b6122cc447d025e34c477 to not depend on tachiyomi.sourceapi
@@ -72,7 +70,7 @@ dependencies {
 //    implementation(fileTree("lib/"))
    implementation(kotlin("script-runtime"))

-    testImplementation("io.mockk:mockk:1.9.3")
+    testImplementation("io.mockk:mockk:1.12.2")
 }

 application {
@@ -106,7 +104,7 @@ buildConfig {
    buildConfigField("String", "WEBUI_TAG", quoteWrap(webUIRevisionTag))


-    buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Tachidesk"))
+    buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Tachidesk-Server"))
    buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA"))
 }

@@ -7,8 +7,6 @@ package eu.kanade.tachiyomi
 * 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.CoverCache
 // import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -17,6 +15,7 @@ import com.google.gson.Gson
 // import eu.kanade.tachiyomi.data.sync.LibrarySyncManager
 // import eu.kanade.tachiyomi.data.track.TrackManager
 // import eu.kanade.tachiyomi.extension.ExtensionManager
+import android.app.Application
 import eu.kanade.tachiyomi.network.NetworkHelper
 import kotlinx.serialization.json.Json
 import rx.Observable
@@ -53,8 +52,6 @@ class AppModule(val app: Application) : InjektModule {
 //
 //        addSingletonFactory { LibrarySyncManager(app) }

-        addSingletonFactory { Gson() }
-
        addSingletonFactory { Json { ignoreUnknownKeys = true } }

        // Asynchronously init expensive components for a faster cold start
@@ -1,7 +1,8 @@
 package eu.kanade.tachiyomi.network

-// import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
@@ -11,6 +12,8 @@ import okhttp3.internal.closeQuietly
 import rx.Observable
 import rx.Producer
 import rx.Subscription
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.fullType
 import java.io.IOException
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.coroutines.resumeWithException
@@ -124,3 +127,12 @@ fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListene

    return progressClient.newCall(request)
 }
+
+inline fun <reified T> Response.parseAs(): T {
+    // Avoiding Injekt.get<Json>() due to compiler issues
+    val json = Injekt.getInstance<Json>(fullType<Json>().type)
+    this.use {
+        val responseBody = it.body?.string().orEmpty()
+        return json.decodeFromString(responseBody)
+    }
+}
@@ -293,12 +293,15 @@ class LocalSource : CatalogueSource {
        return when (getFormat(chapterFile)) {
            is Directory -> {
                Observable.just(
-                    chapterFile.listFiles().orEmpty().sortedBy { it.name }.mapIndexed { index, page ->
-                        Page(
-                            index,
-                            imageUrl = applicationDirs.localMangaRoot + "/" + chapter.url + "/" + page.name
-                        )
-                    }
+                    chapterFile.listFiles().orEmpty()
+                        .sortedBy { it.name }
+                        .filter { !it.isDirectory && ImageUtil.isImage(it.name, it::inputStream) }
+                        .mapIndexed { index, page ->
+                            Page(
+                                index,
+                                imageUrl = applicationDirs.localMangaRoot + "/" + chapter.url + "/" + page.name
+                            )
+                        }
                )
            }
            is Zip -> {
@@ -2,7 +2,7 @@ package suwayomi.tachidesk

 /*
 * 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/. */
@@ -10,7 +10,7 @@ import uy.kohesive.injekt.injectLazy

 /*
 * 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/. */
@@ -78,7 +78,7 @@ object MangaAPI {
            get("", CategoryController::categoryList)
            post("", CategoryController::categoryCreate)

-            // The order here is important {categoryId} needs to be applied last 
+            // The order here is important {categoryId} needs to be applied last
            // or throws a NumberFormatException
            patch("reorder", CategoryController::categoryReorder)

@@ -114,6 +114,7 @@ object MangaAPI {
        path("update") {
            get("recentChapters/{pageNum}", UpdateController::recentChapters)
            post("fetch", UpdateController::categoryUpdate)
+            post("reset", UpdateController.reset)
            get("summary", UpdateController::updateSummary)
            ws("", UpdateController::categoryUpdateWS)
        }
@@ -11,7 +11,7 @@ import java.util.Date

 /*
 * 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/. */
@@ -8,11 +8,13 @@ package suwayomi.tachidesk.manga.controller
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

 import io.javalin.http.Context
+import io.javalin.http.HttpCode
 import suwayomi.tachidesk.manga.impl.CategoryManga
 import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.Library
 import suwayomi.tachidesk.manga.impl.Manga
 import suwayomi.tachidesk.manga.impl.Page
+import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReady
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
 import suwayomi.tachidesk.server.JavalinSetup.future
 import suwayomi.tachidesk.server.util.handler
@@ -39,7 +41,8 @@ object MangaController {
            )
        },
        withResults = {
-            json<MangaDataClass>("OK")
+            json<MangaDataClass>(HttpCode.OK)
+            httpCode(HttpCode.NOT_FOUND)
        }
    )

@@ -124,7 +127,7 @@ object MangaController {
    fun chapterRetrieve(ctx: Context) {
        val chapterIndex = ctx.pathParam("chapterIndex").toInt()
        val mangaId = ctx.pathParam("mangaId").toInt()
-        ctx.future(future { Chapter.getChapter(chapterIndex, mangaId) })
+        ctx.future(future { getChapterDownloadReady(chapterIndex, mangaId) })
    }

    /** used to modify a chapter's parameters */
@@ -15,10 +15,12 @@ import suwayomi.tachidesk.manga.impl.update.IUpdater
 import suwayomi.tachidesk.manga.impl.update.UpdaterSocket
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.server.JavalinSetup.future
+import suwayomi.tachidesk.server.util.handler
+import suwayomi.tachidesk.server.util.withOperation

 /*
 * 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/. */
@@ -86,4 +88,26 @@ object UpdateController {
        val updater by DI.global.instance<IUpdater>()
        ctx.json(updater.getStatus().value.getJsonSummary())
    }
+
+    val reset = handler(
+        documentWith = {
+            withOperation {
+                summary("Stops and resets the Updater")
+            }
+        },
+        behaviorOf = { ctx ->
+            val updater by DI.global.instance<IUpdater>()
+            logger.info { "Resetting Updater" }
+            ctx.future(
+                future {
+                    updater.reset()
+                }.thenApply {
+                    ctx.status(HttpCode.OK)
+                }
+            )
+        },
+        withResults = {
+            httpCode(HttpCode.OK)
+        }
+    )
 }
@@ -2,17 +2,17 @@ package suwayomi.tachidesk.manga.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 eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.sql.SortOrder
+import org.jetbrains.exposed.sql.SortOrder.ASC
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.insert
@@ -20,11 +20,9 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
 import suwayomi.tachidesk.manga.impl.Manga.getManga
-import suwayomi.tachidesk.manga.impl.Page.getPageName
 import suwayomi.tachidesk.manga.impl.util.getChapterDir
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
-import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.dataclass.MangaChapterDataClass
 import suwayomi.tachidesk.manga.model.dataclass.PaginatedList
@@ -104,14 +102,19 @@ object Chapter {
            }
        }

-        // clear any orphaned chapters that are in the db but not in `chapterList`
+        // clear any orphaned/duplicate chapters that are in the db but not in `chapterList`
        val dbChapterCount = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.count() }
        if (dbChapterCount > chapterCount) { // we got some clean up due
-            val dbChapterList = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.toList() }
+            val dbChapterList = transaction {
+                ChapterTable.select { ChapterTable.manga eq mangaId }.orderBy(ChapterTable.url to ASC).toList()
+            }
            val chapterUrls = chapterList.map { it.url }.toSet()

-            dbChapterList.forEach { dbChapter ->
-                if (!chapterUrls.contains(dbChapter[ChapterTable.url])) {
+            dbChapterList.forEachIndexed { index, dbChapter ->
+                if (
+                    !chapterUrls.contains(dbChapter[ChapterTable.url]) || // is orphaned
+                    (index < dbChapterList.lastIndex && dbChapter[ChapterTable.url] == dbChapterList[index + 1][ChapterTable.url]) // is duplicate
+                ) {
                    transaction {
                        PageTable.deleteWhere { PageTable.chapter eq dbChapter[ChapterTable.id] }
                        ChapterTable.deleteWhere { ChapterTable.id eq dbChapter[ChapterTable.id] }
@@ -154,102 +157,6 @@ object Chapter {
        }
    }

-    /** used to display a chapter, get a chapter in order to show it's pages */
-    suspend fun getChapter(chapterIndex: Int, mangaId: Int): ChapterDataClass {
-        val chapterEntry = transaction {
-            ChapterTable.select {
-                (ChapterTable.sourceOrder eq chapterIndex) and (ChapterTable.manga eq mangaId)
-            }.first()
-        }
-
-        val isPartiallyDownloaded =
-            !(chapterEntry[ChapterTable.isDownloaded] && firstPageExists(mangaId, chapterEntry[ChapterTable.id].value))
-
-        return if (isPartiallyDownloaded) {
-
-            // chapter files may have been deleted
-            transaction {
-                ChapterTable.update({ (ChapterTable.sourceOrder eq chapterIndex) and (ChapterTable.manga eq mangaId) }) {
-                    it[isDownloaded] = false
-                }
-            }
-
-            val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.first() }
-            val source = getCatalogueSourceOrStub(mangaEntry[MangaTable.sourceReference])
-
-            val pageList = source.fetchPageList(
-                SChapter.create().apply {
-                    url = chapterEntry[ChapterTable.url]
-                    name = chapterEntry[ChapterTable.name]
-                }
-            ).awaitSingle()
-
-            val chapterId = chapterEntry[ChapterTable.id].value
-            val chapterCount = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.count() }
-
-            // update page list for this chapter
-            transaction {
-                pageList.forEach { page ->
-                    val pageEntry = transaction {
-                        PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }
-                            .firstOrNull()
-                    }
-                    if (pageEntry == null) {
-                        PageTable.insert {
-                            it[index] = page.index
-                            it[url] = page.url
-                            it[imageUrl] = page.imageUrl
-                            it[chapter] = chapterId
-                        }
-                    } else {
-                        PageTable.update({ (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }) {
-                            it[url] = page.url
-                            it[imageUrl] = page.imageUrl
-                        }
-                    }
-                }
-            }
-
-            val pageCount = pageList.count()
-
-            transaction {
-                ChapterTable.update({ (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder eq chapterIndex) }) {
-                    it[ChapterTable.pageCount] = pageCount
-                }
-            }
-            return ChapterDataClass(
-                chapterEntry[ChapterTable.url],
-                chapterEntry[ChapterTable.name],
-                chapterEntry[ChapterTable.date_upload],
-                chapterEntry[ChapterTable.chapter_number],
-                chapterEntry[ChapterTable.scanlator],
-                mangaId,
-                chapterEntry[ChapterTable.isRead],
-                chapterEntry[ChapterTable.isBookmarked],
-                chapterEntry[ChapterTable.lastPageRead],
-                chapterEntry[ChapterTable.lastReadAt],
-
-                chapterEntry[ChapterTable.sourceOrder],
-                chapterEntry[ChapterTable.fetchedAt],
-                chapterEntry[ChapterTable.isDownloaded],
-                pageCount,
-                chapterCount.toInt(),
-                getChapterMetaMap(chapterEntry[ChapterTable.id])
-            )
-        } else {
-            ChapterTable.toDataClass(chapterEntry)
-        }
-    }
-
-    private fun firstPageExists(mangaId: Int, chapterId: Int): Boolean {
-        val chapterDir = getChapterDir(mangaId, chapterId)
-
-        return ImageResponse.findFileNameStartingWith(
-            chapterDir,
-            getPageName(1)
-        ) != null
-    }
-
    fun modifyChapter(
        mangaId: Int,
        chapterIndex: Int,
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.impl.backup

 /*
 * 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/. */
@@ -2,12 +2,11 @@ package suwayomi.tachidesk.manga.impl.backup.proto

 /*
 * 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 kotlinx.coroutines.runBlocking
 import okio.buffer
 import okio.gzip
 import okio.sink
@@ -17,7 +16,6 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.manga.impl.CategoryManga
-import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
 import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
 import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupCategory
@@ -26,6 +24,7 @@ import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
 import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSerializer
 import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSource
 import suwayomi.tachidesk.manga.model.table.CategoryTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaStatus
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
@@ -76,7 +75,14 @@ object ProtoBackupExport : ProtoBackupBase() {
            val mangaId = mangaRow[MangaTable.id].value

            if (flags.includeChapters) {
-                val chapters = runBlocking { Chapter.getChapterList(mangaId) }
+                val chapters = transaction {
+                    ChapterTable.select { ChapterTable.manga eq mangaId }
+                        .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
+                        .map {
+                            ChapterTable.toDataClass(it)
+                        }
+                }
+
                backupManga.chapters = chapters.map {
                    BackupChapter(
                        it.url,
@@ -0,0 +1,147 @@
+package suwayomi.tachidesk.manga.impl.chapter
+
+/*
+ * 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.model.SChapter
+import org.jetbrains.exposed.sql.ResultRow
+import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.insert
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.manga.impl.Page.getPageName
+import suwayomi.tachidesk.manga.impl.util.getChapterDir
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
+import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse
+import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
+import suwayomi.tachidesk.manga.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.PageTable
+import suwayomi.tachidesk.manga.model.table.toDataClass
+
+suspend fun getChapterDownloadReady(chapterIndex: Int, mangaId: Int): ChapterDataClass {
+    val chapter = ChapterForDownload(chapterIndex, mangaId)
+
+    return chapter.asDownloadReady()
+}
+
+private class ChapterForDownload(
+    private val chapterIndex: Int,
+    private val mangaId: Int
+) {
+    suspend fun asDownloadReady(): ChapterDataClass {
+
+        if (isNotCompletelyDownloaded()) {
+            markAsNotDownloaded()
+
+            val pageList = fetchPageList()
+
+            updateDatabasePages(pageList)
+        }
+
+        return asDataClass()
+    }
+
+    private fun asDataClass() = ChapterTable.toDataClass(chapterEntry)
+
+    var chapterEntry: ResultRow = freshChapterEntry()
+
+    private fun freshChapterEntry() = transaction {
+        ChapterTable.select {
+            (ChapterTable.sourceOrder eq chapterIndex) and (ChapterTable.manga eq mangaId)
+        }.first()
+    }
+
+    private suspend fun fetchPageList(): List<Page> {
+        val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.first() }
+        val source = getCatalogueSourceOrStub(mangaEntry[MangaTable.sourceReference])
+
+        return source.fetchPageList(
+            SChapter.create().apply {
+                url = chapterEntry[ChapterTable.url]
+                name = chapterEntry[ChapterTable.name]
+            }
+        ).awaitSingle()
+    }
+
+    private fun markAsNotDownloaded() {
+        // chapter may be downloaded but if we are here, then images might be deleted and database data be false
+        transaction {
+            ChapterTable.update({ (ChapterTable.sourceOrder eq chapterIndex) and (ChapterTable.manga eq mangaId) }) {
+                it[isDownloaded] = false
+            }
+        }
+    }
+
+    private fun updateDatabasePages(pageList: List<Page>) {
+        val chapterId = chapterEntry[ChapterTable.id].value
+        val chapterIndex = chapterEntry[ChapterTable.sourceOrder]
+        val mangaId = chapterEntry[ChapterTable.manga].value
+
+        transaction {
+            pageList.forEach { page ->
+                val pageEntry = transaction {
+                    PageTable.select { (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }
+                        .firstOrNull()
+                }
+                if (pageEntry == null) {
+                    PageTable.insert {
+                        it[index] = page.index
+                        it[url] = page.url
+                        it[imageUrl] = page.imageUrl
+                        it[chapter] = chapterId
+                    }
+                } else {
+                    PageTable.update({ (PageTable.chapter eq chapterId) and (PageTable.index eq page.index) }) {
+                        it[url] = page.url
+                        it[imageUrl] = page.imageUrl
+                    }
+                }
+            }
+        }
+
+        updatePageCount(pageList, mangaId, chapterIndex)
+
+        // chapter was updated
+        chapterEntry = freshChapterEntry()
+    }
+
+    private fun updatePageCount(
+        pageList: List<Page>,
+        mangaId: Int,
+        chapterIndex: Int
+    ) {
+        val pageCount = pageList.count()
+
+        transaction {
+            ChapterTable.update({ (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder eq chapterIndex) }) {
+                it[ChapterTable.pageCount] = pageCount
+            }
+        }
+    }
+
+    private fun isNotCompletelyDownloaded(): Boolean {
+        return !(chapterEntry[ChapterTable.isDownloaded] && firstPageExists())
+    }
+
+    private fun firstPageExists(): Boolean {
+        val chapterId = chapterEntry[ChapterTable.id].value
+
+        val chapterDir = getChapterDir(mangaId, chapterId)
+
+        println(chapterDir)
+        println(getPageName(0))
+
+        return ImageResponse.findFileNameStartingWith(
+            chapterDir,
+            getPageName(0)
+        ) != null
+    }
+}
@@ -12,8 +12,8 @@ import mu.KotlinLogging
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.manga.impl.Chapter.getChapter
 import suwayomi.tachidesk.manga.impl.Page.getPageImage
+import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReady
 import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
 import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Downloading
 import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Error
@@ -47,7 +47,7 @@ class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter
                download.state = Downloading
                step()

-                download.chapter = runBlocking { getChapter(download.chapterIndex, download.mangaId) }
+                download.chapter = runBlocking { getChapterDownloadReady(download.chapterIndex, download.mangaId) }
                step()

                val pageCount = download.chapter.pageCount
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.impl.download.model

 /*
 * 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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.impl.download.model

 /*
 * 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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.impl.extension

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.impl.extension

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -7,11 +7,10 @@ package suwayomi.tachidesk.manga.impl.extension.github
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */

-import com.github.salomonbrys.kotson.int
-import com.github.salomonbrys.kotson.string
-import com.google.gson.JsonArray
-import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.parseAs
+import kotlinx.serialization.Serializable
 import okhttp3.Request
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
@@ -19,34 +18,39 @@ import suwayomi.tachidesk.manga.model.dataclass.ExtensionDataClass
 import uy.kohesive.injekt.injectLazy

 object ExtensionGithubApi {
-    private const val BASE_URL = "https://raw.githubusercontent.com"
-    private const val REPO_URL_PREFIX = "$BASE_URL/tachiyomiorg/tachiyomi-extensions/repo"
+    private const val REPO_URL_PREFIX = "https://raw.githubusercontent.com/tachiyomiorg/tachiyomi-extensions/repo/"

-    private fun parseResponse(json: JsonArray): List<OnlineExtension> {
-        return json
-            .map { it.asJsonObject }
-            .filter { element ->
-                val versionName = element["version"].string
-                val libVersion = versionName.substringBeforeLast('.').toDouble()
-                libVersion in LIB_VERSION_MIN..LIB_VERSION_MAX
-            }
-            .map { element ->
-                val name = element["name"].string.substringAfter("Tachiyomi: ")
-                val pkgName = element["pkg"].string
-                val apkName = element["apk"].string
-                val versionName = element["version"].string
-                val versionCode = element["code"].int
-                val lang = element["lang"].string
-                val nsfw = element["nsfw"].int == 1
-                val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
+    @Serializable
+    private data class ExtensionJsonObject(
+        val name: String,
+        val pkg: String,
+        val apk: String,
+        val lang: String,
+        val code: Int,
+        val version: String,
+        val nsfw: Int,
+        val hasReadme: Int = 0,
+        val hasChangelog: Int = 0,
+        val sources: List<ExtensionSourceJsonObject>?,
+    )

-                OnlineExtension(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
-            }
-    }
+    @Serializable
+    private data class ExtensionSourceJsonObject(
+        val name: String,
+        val lang: String,
+        val id: Long,
+        val baseUrl: String
+    )

    suspend fun findExtensions(): List<OnlineExtension> {
-        val response = getRepo()
-        return parseResponse(response)
+        val request = Request.Builder()
+            .url("$REPO_URL_PREFIX/index.min.json")
+            .build()
+
+        return client.newCall(request)
+            .await()
+            .parseAs<List<ExtensionJsonObject>>()
+            .toExtensions()
    }

    fun getApkUrl(extension: ExtensionDataClass): String {
@@ -65,12 +69,37 @@ object ExtensionGithubApi {
            .build()
    }

-    private fun getRepo(): JsonArray {
-        val request = Request.Builder()
-            .url("$REPO_URL_PREFIX/index.min.json")
-            .build()
+    private fun List<ExtensionJsonObject>.toExtensions(): List<OnlineExtension> {
+        return this
+            .filter {
+                val libVersion = it.version.substringBeforeLast('.').toDouble()
+                libVersion in LIB_VERSION_MIN..LIB_VERSION_MAX
+            }
+            .map {
+                OnlineExtension(
+                    name = it.name.substringAfter("Tachiyomi: "),
+                    pkgName = it.pkg,
+                    versionName = it.version,
+                    versionCode = it.code,
+                    lang = it.lang,
+                    isNsfw = it.nsfw == 1,
+                    hasReadme = it.hasReadme == 1,
+                    hasChangelog = it.hasChangelog == 1,
+                    sources = it.sources?.toExtensionSources() ?: emptyList(),
+                    apkName = it.apk,
+                    iconUrl = "${REPO_URL_PREFIX}icon/${it.apk.replace(".apk", ".png")}"
+                )
+            }
+    }

-        val response = client.newCall(request).execute().use { response -> response.body!!.string() }
-        return JsonParser.parseString(response).asJsonArray
+    private fun List<ExtensionSourceJsonObject>.toExtensionSources(): List<OnlineExtensionSource> {
+        return this.map {
+            OnlineExtensionSource(
+                name = it.name,
+                lang = it.lang,
+                id = it.id,
+                baseUrl = it.baseUrl
+            )
+        }
    }
 }
@@ -7,13 +7,23 @@ package suwayomi.tachidesk.manga.impl.extension.github
 * 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 OnlineExtensionSource(
+    val name: String,
+    val lang: String,
+    val id: Long,
+    val baseUrl: String
+)
+
 data class OnlineExtension(
    val name: String,
    val pkgName: String,
-    val versionName: String,
-    val versionCode: Int,
-    val lang: String,
-    val isNsfw: Boolean,
    val apkName: String,
+    val lang: String,
+    val versionCode: Int,
+    val versionName: String,
+    val isNsfw: Boolean,
+    val hasReadme: Boolean,
+    val hasChangelog: Boolean,
+    val sources: List<OnlineExtensionSource>,
    val iconUrl: String
 )
@@ -4,7 +4,7 @@ import java.io.File

 /*
 * 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/. */
@@ -11,7 +11,7 @@ import java.io.IOException

 /*
 * 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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.impl.util.storage

 /*
 * 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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.dataclass

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.dataclass

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.dataclass

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.dataclass

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.dataclass

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.dataclass

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.source.ConfigurableSource

 /*
 * 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/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.table

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.table

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.table

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.table

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.table

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.manga.model.table

 /*
 * Copyright (C) Contributors to the Suwayomi project
- * 
+ *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -2,7 +2,7 @@ package suwayomi.tachidesk.server.database

 /*
 * 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/. */
@@ -1,6 +1,7 @@
 package suwayomi.tachidesk.server.util

 import io.javalin.http.Context
+import io.javalin.http.HttpCode
 import io.javalin.plugin.openapi.dsl.DocumentedHandler
 import io.javalin.plugin.openapi.dsl.OpenApiDocumentation
 import io.javalin.plugin.openapi.dsl.documented
@@ -114,19 +115,27 @@ sealed class Param<T> {
 class ResultsBuilder {
    val results = mutableListOf<ResultType<*>>()

-    inline fun <reified T> json(status: String) {
-        results += ResultType.MimeType(status, "application/json", T::class.java)
+    inline fun <reified T> json(code: HttpCode) {
+        results += ResultType.MimeType(code, "application/json", T::class.java)
    }
-    inline fun <reified T> plainText(status: String) {
-        results += ResultType.MimeType(status, "text/plain", String::class.java)
+    fun plainText(code: HttpCode) {
+        results += ResultType.MimeType(code, "text/plain", String::class.java)
+    }
+    fun httpCode(code: HttpCode) {
+        results += ResultType.StatusCode(code)
    }
 }

 sealed class ResultType <T> {
    abstract fun applyTo(documentation: OpenApiDocumentation)
-    data class MimeType<T>(val status: String, val mime: String, private val clazz: Class<T>) : ResultType<T>() {
+    data class MimeType<T>(val code: HttpCode, val mime: String, private val clazz: Class<T>) : ResultType<T>() {
        override fun applyTo(documentation: OpenApiDocumentation) {
-            documentation.result(status, clazz)
+            documentation.result(code.status.toString(), clazz)
+        }
+    }
+    data class StatusCode(val code: HttpCode) : ResultType<Unit>() {
+        override fun applyTo(documentation: OpenApiDocumentation) {
+            documentation.result<Unit>(code.status.toString())
        }
    }
 }
@@ -2,7 +2,7 @@ package suwayomi.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/. */
Author	SHA1	Message	Date
Aria Moradi	454de23844	fix wrong release name CI Publish / Validate Gradle Wrapper (push) Successful in 12s Details CI Publish / Build artifacts and release (push) Failing after 15s Details	2022-02-19 05:38:04 +03:30
Aria Moradi	1176092fc6	v0.6.1	2022-02-19 05:29:46 +03:30
Aria Moradi	0fc2c57395	fix mentions	2022-02-19 05:27:34 +03:30
Aria Moradi	0b292f8d74	update WebUI and CHANGELOG	2022-02-19 05:17:56 +03:30
Aria Moradi	4bbe51331f	remove gson (#295 ) * remove gson * also remove kotson * fix build	2022-02-19 05:12:20 +03:30
Aria Moradi	c289786dfa	auto-remove duplicate chapters (#294 ) * auto-remove duplicate chapters * Apply suggestions from code review Co-authored-by: Mitchell Syer <Mitchellptbo@gmail.com> * Update Chapter.kt Co-authored-by: Mitchell Syer <Mitchellptbo@gmail.com>	2022-02-19 04:44:17 +03:30
Aria Moradi	9a9752a6a1	no online fetch on backup (#293 ) * no online fetch on backup * Revert "no online fetch on backup" This reverts commit 09af582b1a3ef77ca62167bc01f7dcc9643329c9. * alternative solution	2022-02-19 02:57:03 +03:30
DattatreyaReddy Panta	c43b688f8e	add Tachidesk-Flutter to readme (#292 )	2022-02-01 21:52:58 +03:30
Mahor	a6272d5221	Improve windows-bundler.sh (#290 )	2022-01-22 14:10:10 +03:30
Mahor	b440a58d95	Fix build_push.yml Hopefully (#289 )	2022-01-18 11:01:39 +03:30
Mahor	ec1589aa2d	fix Debian package errors (#288 ) * Fix lintian errors Fix lintian errors Short description in debian/changelog to hide lintian changelog warnings Use launcher scripts that run java and electron from /usr/bin * Update changelog version * Rename laucnher scripts. Put electron installaion guide in electron-launcher-standalone.sh * Seperate debian packager codes from unix-bundler.sh * chmod +x debian-packager.sh * Fix mistakes * Fix mistakes * Add missing '!' to shebang * Change faviconlogo.png to tachidesk.png * Change faviconlogo.png to tachidesk.png	2022-01-17 18:41:58 +03:30
Mahor	8d48e56fa0	Automated debian package building (#287 ) * Automate debian package building Move wxs files to scripts/resources/msi/ Define icon's path inside script instead of hardcoding it in wxs * Revert back Windows script improvments * Remove copyright year. Use uppercase for first letter of foruzesh * Seperate deb from tar code with defining new debian-x64 arch * Add ./unix-bundler.sh debian-x64 * Fix mistake * Remove unneeded change of license	2022-01-16 08:27:59 +03:30
Mahor	df7938037e	Automated MSI package building (#277 ) * Create msi package instead of zipping stuff * Keep the zip release, Install wixl inside windows-bundler.sh * Fix mistakes * Seprate mv command * Automate versioning * Fix syntax mistake * Fix mistake	2022-01-12 23:48:43 +03:30
Mitchell Syer	c908ee2d49	Allow app compilation on Java 18+ (#286 )	2022-01-09 22:30:10 +03:30
Mitchell Syer	b714abddae	Handlers must return a result (#282 )	2022-01-07 17:03:35 +03:30
Mitchell Syer	63ca189907	Update Gradle and Dependencies (#281 )	2022-01-07 17:03:01 +03:30
Aria Moradi	6130fb9ba2	update dex2jar	2021-12-13 17:16:19 +03:30
Aria Moradi	f0edc676fc	fix compile erorr	2021-12-13 17:16:03 +03:30
Aria Moradi	b68fdb0772	ignore non image files (#269 ) * ignore non image files * Update server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt Co-authored-by: Mitchell Syer <Mitchellptbo@gmail.com> Co-authored-by: Mitchell Syer <Mitchellptbo@gmail.com>	2021-12-03 20:53:18 +03:30
Sascha Hahne	76c7bdd604	Add Route to stop and reset the updater (#260 )	2021-12-01 23:18:32 +03:30
Mitchell Syer	205101568e	Improve documentation with Http codes (#261 ) * Improve documentation dsl with Http codes * Fix plaintext requiring T	2021-12-01 23:17:41 +03:30
Aria Moradi	efff68c49b	refactor getChapter (#268 ) * refactor * better naming * fix copytight notice	2021-12-01 22:39:19 +03:30
Aria Moradi	f74f60bb1d	Update README.md	2021-11-30 11:18:44 +03:30
Aria Moradi	63ea28a620	Update README.md	2021-11-29 20:22:43 +03:30