Misc cleanup

.github/workflows/build_pull_request.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout pull request
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -34,4 +34,4 @@ jobs:
       - name: Build project
         uses: gradle/gradle-command-action@v2
         with:
-          arguments: :server:shadowJar
+          arguments: :inspector:shadowJar

.github/workflows/build_push.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -34,4 +34,4 @@ jobs:
       - name: Build project
         uses: gradle/gradle-command-action@v2
         with:
-          arguments: :server:shadowJar
+          arguments: :inspector:shadowJar

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout ${{ github.ref }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
 
@@ -36,7 +36,7 @@ jobs:
       - name: Build project
         uses: gradle/gradle-command-action@v2
         with:
-          arguments: :server:shadowJar
+          arguments: :inspector:shadowJar
 
       - name: Upload Release
         uses: xresloader/upload-to-github-release@v1

.gitignore

@@ -7,11 +7,3 @@ local.properties
 # Ignore Gradle build output directory
 build
 
-server/src/main/resources/webUI
-server/tmp/
-server/tachiserver-data/
-
-# bundle asset downlaods
-OpenJDK*.zip
-electron-*.zip
-rcedit-*

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

@@ -5,7 +5,8 @@ package xyz.nulldev.ts.config
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import ch.qos.logback.classic.Level
 import com.typesafe.config.Config

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

@@ -5,7 +5,8 @@ package xyz.nulldev.ts.config
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import com.typesafe.config.Config
 

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

@@ -5,7 +5,8 @@ package xyz.nulldev.ts.config
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import ch.qos.logback.classic.Level
 import mu.KotlinLogging

AndroidCompat/src/main/java/android/widget/EditText.java

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 public class EditText {
     public EditText(android.content.Context context) { throw new RuntimeException("Stub!"); }

AndroidCompat/src/main/java/android/widget/Toast.java

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 public class Toast {
     public static final int LENGTH_LONG = 1;

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 import android.text.TextUtils;

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 import android.content.SharedPreferences;

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 

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

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.Context;
 

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

@@ -5,7 +5,8 @@ package xyz.nulldev.androidcompat.io.sharedprefs
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import android.content.SharedPreferences
 import com.russhwolf.settings.ExperimentalSettingsApi
@@ -23,7 +24,7 @@ import java.util.prefs.Preferences
 
 @OptIn(ExperimentalSettingsImplementation::class, ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
 class JavaSharedPreferences(key: String) : SharedPreferences {
-    private val javaPreferences = Preferences.userRoot().node("suwayomi/tachidesk/$key")
+    private val javaPreferences = Preferences.userRoot().node("inspector/$key")
     private val preferences = JvmPreferencesSettings(javaPreferences)
     private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, PreferenceChangeListener>()
 

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/NumberFormat.java

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import com.ibm.icu.text.DisplayContext;
 import com.ibm.icu.util.Currency;

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import com.ibm.icu.text.DateFormatSymbols;
 import com.ibm.icu.text.DisplayContext;

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/Calendar.java

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.util.ULocale;

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/TimeZone.java

@@ -5,7 +5,8 @@
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. 
+ */
 
 import com.ibm.icu.util.ULocale;
 

build.gradle.kts

@@ -9,8 +9,7 @@ plugins {
 }
 
 allprojects {
-    group = "suwayomi"
-
+    group = "tachiyomi"
     version = "1.0"
 
     repositories {
@@ -24,9 +23,9 @@ allprojects {
 }
 
 val projects = listOf(
-        project(":AndroidCompat"),
-        project(":AndroidCompat:Config"),
-        project(":server")
+    project(":AndroidCompat"),
+    project(":AndroidCompat:Config"),
+    project(":inspector")
 )
 
 configure(projects) {
@@ -47,7 +46,6 @@ configure(projects) {
         // Kotlin
         implementation(kotlin("stdlib-jdk8"))
         implementation(kotlin("reflect"))
-        testImplementation(kotlin("test"))
 
         // coroutines
         val coroutinesVersion = "1.6.4"

server/build.gradle.kts → inspector/build.gradle.kts

@@ -21,7 +21,6 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
     implementation("com.squareup.okio:okio:3.3.0")
 
-
     // 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:$okhttpVersion")
@@ -35,12 +34,9 @@ dependencies {
 
     // uncomment to test extensions directly
 //    implementation(fileTree("lib/"))
-
-    // Testing
-    testImplementation(kotlin("test-junit5"))
 }
 
-val MainClass = "suwayomi.tachidesk.MainKt"
+val MainClass = "inspector.MainKt"
 application {
     mainClass.set(MainClass)
 }
@@ -75,7 +71,7 @@ val String.wrapped get() = """"$this""""
 
 buildConfig {
     className("BuildConfig")
-    packageName("suwayomi.server")
+    packageName("inspector")
 
     useKotlinOutput()
 
@@ -88,13 +84,13 @@ tasks {
     shadowJar {
         manifest {
             attributes(
-                    mapOf(
-                            "Main-Class" to MainClass,
-                            "Implementation-Title" to rootProject.name,
-                            "Implementation-Vendor" to "The Tachiyomi Open Source Project",
-                            "Specification-Version" to inspectorVersion,
-                            "Implementation-Version" to inspectorRevision
-                    )
+                mapOf(
+                    "Main-Class" to MainClass,
+                    "Implementation-Title" to rootProject.name,
+                    "Implementation-Vendor" to "The Tachiyomi Open Source Project",
+                    "Specification-Version" to inspectorVersion,
+                    "Implementation-Version" to inspectorRevision
+                )
             )
         }
         archiveBaseName.set(rootProject.name)

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

@@ -5,7 +5,8 @@ package eu.kanade.tachiyomi
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
 
 import android.app.Application
 import android.content.Context

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

@@ -5,36 +5,26 @@ package eu.kanade.tachiyomi
  *
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
 
 import android.app.Application
 import eu.kanade.tachiyomi.network.JavaScriptEngine
 import eu.kanade.tachiyomi.network.NetworkHelper
 import kotlinx.serialization.json.Json
-import rx.Observable
-import rx.schedulers.Schedulers
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
 import uy.kohesive.injekt.api.addSingleton
 import uy.kohesive.injekt.api.addSingletonFactory
-import uy.kohesive.injekt.api.get
 
 class AppModule(val app: Application) : InjektModule {
 
     override fun InjektRegistrar.registerInjectables() {
-
         addSingleton(app)
 
         addSingletonFactory { NetworkHelper(app) }
         addSingletonFactory { JavaScriptEngine(app) }
 
         addSingletonFactory { Json { ignoreUnknownKeys = true } }
-
-        // Asynchronously init expensive components for a faster cold start
-        rxAsync { get<NetworkHelper>() }
-    }
-
-    private fun rxAsync(block: () -> Unit) {
-        Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe()
     }
 }

inspector/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt

@@ -0,0 +1,8 @@
+package eu.kanade.tachiyomi
+
+class BuildConfig {
+    companion object {
+        const val VERSION_NAME = inspector.BuildConfig.NAME
+        val VERSION_CODE = inspector.BuildConfig.REVISION.trimStart('r').toInt()
+    }
+}