From b220571647b0cfb5a9159fc0b998989c4130f400 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 7 Feb 2023 09:31:25 -0500 Subject: [PATCH 01/19] Update workflows (#8) --- .github/runner-files/ci-gradle.properties | 7 ------- .github/workflows/build_pull_request.yml | 19 +++++++------------ .github/workflows/build_push.yml | 21 ++++++++------------- .github/workflows/publish.yml | 19 +++++++------------ 4 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 .github/runner-files/ci-gradle.properties diff --git a/.github/runner-files/ci-gradle.properties b/.github/runner-files/ci-gradle.properties deleted file mode 100644 index 753351b1..00000000 --- a/.github/runner-files/ci-gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -org.gradle.daemon=false -org.gradle.jvmargs=-Xmx5120m -org.gradle.workers.max=5 -org.gradle.parallel=true - -kotlin.incremental=false -kotlin.compiler.execution.strategy=in-process diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 5967f4f9..1a5317f7 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -3,19 +3,18 @@ name: CI Pull Request on: pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number }} + cancel-in-progress: true + jobs: build: name: Build pull request runs-on: ubuntu-latest steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.0 - with: - access_token: ${{ github.token }} - - name: Checkout pull request - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} @@ -23,14 +22,10 @@ jobs: uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 - - - name: Copy CI gradle.properties - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties + distribution: adopt - name: Generate android.jar run: | diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 9b83be93..6e06c110 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -3,7 +3,11 @@ name: CI build on: push: branches: - - master + - main + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: build: @@ -11,26 +15,17 @@ jobs: runs-on: ubuntu-latest steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.0 - with: - access_token: ${{ github.token }} - - name: Clone repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 - - - name: Copy CI gradle.properties - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties + distribution: adopt - name: Generate android.jar run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 406205c1..5e70135b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,19 +5,18 @@ on: tags: - 'v*' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build artifacts and create draft release runs-on: ubuntu-latest steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.0 - with: - access_token: ${{ github.token }} - - name: Checkout ${{ github.ref }} - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.ref }} @@ -25,14 +24,10 @@ jobs: uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 - - - name: Copy CI gradle.properties - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties + distribution: adopt - name: Generate android.jar run: | From 2314d3e432863479a815eceb0bc8afb28636098a Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 7 Feb 2023 17:56:49 -0500 Subject: [PATCH 02/19] Add extensions-lib 1.4 bits (#9) --- .../src/main/java/android/text/Html.java | 6 ++-- build.gradle.kts | 11 ++++--- server/build.gradle.kts | 6 ++-- .../kotlin/eu/kanade/tachiyomi/AppModule.kt | 2 ++ .../tachiyomi/network/JavaScriptEngine.kt | 26 +++++++++++++++++ .../eu/kanade/tachiyomi/network/Requests.kt | 15 ++++++++++ .../kanade/tachiyomi/source/model/SManga.kt | 2 ++ .../tachiyomi/source/model/SMangaImpl.kt | 2 ++ .../tachiyomi/source/model/UpdateStrategy.kt | 6 ++++ .../tachiyomi/source/online/HttpSource.kt | 29 ++++++++++++++++--- .../kanade/tachiyomi/util/JsoupExtensions.kt | 2 +- .../util/lang/CoroutinesExtensions.kt | 7 +++++ 12 files changed, 97 insertions(+), 17 deletions(-) create mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt create mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt create mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt diff --git a/AndroidCompat/src/main/java/android/text/Html.java b/AndroidCompat/src/main/java/android/text/Html.java index 052afed0..03555608 100644 --- a/AndroidCompat/src/main/java/android/text/Html.java +++ b/AndroidCompat/src/main/java/android/text/Html.java @@ -1,10 +1,10 @@ package android.text; - import android.graphics.drawable.Drawable; + import org.jetbrains.annotations.NotNull; import org.jsoup.Jsoup; -import org.jsoup.safety.Whitelist; +import org.jsoup.safety.Safelist; import org.xml.sax.XMLReader; /** @@ -18,7 +18,7 @@ public class Html { public static Spanned fromHtml(String source) { - return new FakeSpanned(Jsoup.clean(source, Whitelist.none())); + return new FakeSpanned(Jsoup.clean(source, Safelist.none())); } public static Spanned fromHtml(String source, Html.ImageGetter imageGetter, Html.TagHandler tagHandler) { diff --git a/build.gradle.kts b/build.gradle.kts index 7a546228..e2d8d6cd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.6.10" - kotlin("plugin.serialization") version "1.6.10" apply false + kotlin("jvm") version "1.8.0" + kotlin("plugin.serialization") version "1.8.0" apply false id("org.jmailen.kotlinter") version "3.9.0" apply false id("com.github.gmazzo.buildconfig") version "3.0.3" apply false id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("com.github.ben-manes.versions") version "0.39.0" } allprojects { @@ -51,12 +50,12 @@ configure(projects) { testImplementation(kotlin("test")) // coroutines - val coroutinesVersion = "1.6.0" + val coroutinesVersion = "1.6.4" 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.2" + val kotlinSerializationVersion = "1.4.0" implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion") implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion") @@ -75,7 +74,7 @@ configure(projects) { implementation("com.jakewharton.rxrelay:rxrelay:1.2.0") // JSoup - implementation("org.jsoup:jsoup:1.14.3") + implementation("org.jsoup:jsoup:1.15.3") // dependency of :AndroidCompat:Config implementation("com.typesafe:config:1.4.2") diff --git a/server/build.gradle.kts b/server/build.gradle.kts index f529d177..85ede409 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -15,18 +15,18 @@ plugins { dependencies { // okhttp - val okhttpVersion = "4.9.3" // version is locked by Tachiyomi extensions + val okhttpVersion = "5.0.0-alpha.11" // 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:3.0.0") + 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") implementation("io.reactivex:rxjava:1.3.8") - implementation("org.jsoup:jsoup:1.14.3") + implementation("org.jsoup:jsoup:1.15.3") implementation("app.cash.quickjs:quickjs-jvm:0.9.2") diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt index 55c45af4..a8551724 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt @@ -8,6 +8,7 @@ package eu.kanade.tachiyomi * 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 @@ -25,6 +26,7 @@ class AppModule(val app: Application) : InjektModule { addSingleton(app) addSingletonFactory { NetworkHelper(app) } + addSingletonFactory { JavaScriptEngine(app) } addSingletonFactory { Json { ignoreUnknownKeys = true } } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt new file mode 100644 index 00000000..e3e3577c --- /dev/null +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt @@ -0,0 +1,26 @@ +package eu.kanade.tachiyomi.network + +import android.content.Context +import app.cash.quickjs.QuickJs +import eu.kanade.tachiyomi.util.lang.withIOContext + +/** + * Util for evaluating JavaScript in sources. + */ +class JavaScriptEngine(context: Context) { + + /** + * Evaluate arbitrary JavaScript code and get the result as a primtive type + * (e.g., String, Int). + * + * @since extensions-lib 1.4 + * @param script JavaScript to execute. + * @return Result of JavaScript code as a primitive type. + */ + @Suppress("UNUSED", "UNCHECKED_CAST") + suspend fun evaluate(script: String): T = withIOContext { + QuickJs.create().use { + it.evaluate(script) as T + } + } +} diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt index 3d3b88b5..9a5dee98 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.network import okhttp3.CacheControl import okhttp3.FormBody import okhttp3.Headers +import okhttp3.HttpUrl import okhttp3.Request import okhttp3.RequestBody import java.util.concurrent.TimeUnit.MINUTES @@ -23,6 +24,20 @@ fun GET( .build() } +/** + * @since extensions-lib 1.4 + */ +fun GET( + url: HttpUrl, + headers: Headers = DEFAULT_HEADERS, + cache: CacheControl = DEFAULT_CACHE_CONTROL, +): Request { + return Request.Builder() + .url(url) + .headers(headers) + .cacheControl(cache) + .build() +} fun POST( url: String, headers: Headers = DEFAULT_HEADERS, diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt index 19980ef1..3c167077 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt @@ -20,6 +20,8 @@ interface SManga : Serializable { var thumbnail_url: String? + var update_strategy: UpdateStrategy + var initialized: Boolean fun copyFrom(other: SManga) { diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt index c944474a..91a7711c 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt @@ -18,5 +18,7 @@ class SMangaImpl : SManga { override var thumbnail_url: String? = null + override var update_strategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE + override var initialized: Boolean = false } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt new file mode 100644 index 00000000..aa1d7018 --- /dev/null +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt @@ -0,0 +1,6 @@ +package eu.kanade.tachiyomi.source.model + +enum class UpdateStrategy { + ALWAYS_UPDATE, + ONLY_FETCH_ONCE +} diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt index d9a583c8..213b7171 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -54,7 +54,7 @@ abstract class HttpSource : CatalogueSource { * Note the generated id sets the sign bit to 0. */ override val id by lazy { - val key = "${name.toLowerCase()}/$lang/$versionId" + val key = "${name.lowercase()}/$lang/$versionId" val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray()) (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE } @@ -80,7 +80,7 @@ abstract class HttpSource : CatalogueSource { /** * Visible name of the source. */ - override fun toString() = "$name (${lang.toUpperCase()})" + override fun toString() = "$name (${lang.uppercase()})" /** * Returns an observable containing a page with a list of manga. Normally it's not needed to @@ -355,6 +355,28 @@ abstract class HttpSource : CatalogueSource { } } + /** + * Returns the url of the provided manga + * + * @since extensions-lib 1.4 + * @param manga the manga + * @return url of the manga + */ + open fun getMangaUrl(manga: SManga): String { + return mangaDetailsRequest(manga).url.toString() + } + + /** + * Returns the url of the provided chapter + * + * @since extensions-lib 1.4 + * @param chapter the chapter + * @return url of the chapter + */ + open fun getChapterUrl(chapter: SChapter): String { + return pageListRequest(chapter).url.toString() + } + /** * Called before inserting a new chapter into database. Use it if you need to override chapter * fields, like the title or the chapter number. Do not change anything to [manga]. @@ -362,8 +384,7 @@ abstract class HttpSource : CatalogueSource { * @param chapter the chapter to be added. * @param manga the manga of the chapter. */ - open fun prepareNewChapter(chapter: SChapter, manga: SManga) { - } + open fun prepareNewChapter(chapter: SChapter, manga: SManga) {} /** * Returns the list of filters for the source. diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt index 2dc39e10..6c166448 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt @@ -22,5 +22,5 @@ fun Element.attrOrText(css: String): String { * @param html the body of the response. Use only if the body was read before calling this method. */ fun Response.asJsoup(html: String? = null): Document { - return Jsoup.parse(html ?: body!!.string(), request.url.toString()) + return Jsoup.parse(html ?: body.string(), request.url.toString()) } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt new file mode 100644 index 00000000..f0827e33 --- /dev/null +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt @@ -0,0 +1,7 @@ +package eu.kanade.tachiyomi.util.lang + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +suspend fun withIOContext(block: suspend CoroutineScope.() -> T) = withContext(Dispatchers.IO, block) From 42a23ee871fc2e2c2cd2e81548ff32da65d8dc03 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 8 Feb 2023 21:18:07 -0500 Subject: [PATCH 03/19] Release v1.4.0 Changing versioning to match the extensions-lib (so this is rev0 for extensions-lib 1.4). --- server/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 85ede409..51dc8d45 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -59,7 +59,7 @@ sourceSets { } // should be bumped with each stable release -val inspectorVersion = "v0.7.2" +val inspectorVersion = "v1.4.0" // counts commit count on master val inspectorRevision = runCatching { From ad84ee88573db9f38c483ebe56e5170adce90fb6 Mon Sep 17 00:00:00 2001 From: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com> Date: Sat, 11 Feb 2023 11:36:36 -0300 Subject: [PATCH 04/19] Update extensions-lib version check to match the app ones. (#10) --- .../kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt index ffa88cc7..1c366513 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt @@ -32,8 +32,8 @@ object PackageTools { const val EXTENSION_FEATURE = "tachiyomi.extension" const val METADATA_SOURCE_CLASS = "tachiyomi.extension.class" - const val LIB_VERSION_MIN = 1.2 - const val LIB_VERSION_MAX = 1.3 + const val LIB_VERSION_MIN = 1.3 + const val LIB_VERSION_MAX = 1.4 /** * Convert dex to jar, a wrapper for the dex2jar library From b0e09fe721889c4cae12ac29e1f3c42a8d0c5bc1 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 11 Feb 2023 09:37:39 -0500 Subject: [PATCH 05/19] Release v1.4.1 --- server/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 51dc8d45..3799256a 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -59,7 +59,7 @@ sourceSets { } // should be bumped with each stable release -val inspectorVersion = "v1.4.0" +val inspectorVersion = "v1.4.1" // counts commit count on master val inspectorRevision = runCatching { From e301768a5df9e3be13fb06faeb33abbe932c9ca1 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 11 Feb 2023 14:52:54 -0500 Subject: [PATCH 06/19] Bump dex2jar --- build.gradle.kts | 2 +- server/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e2d8d6cd..380f7e11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,7 +81,7 @@ configure(projects) { implementation("io.github.config4k:config4k:0.4.2") // dex2jar - val dex2jarVersion = "v35" + val dex2jarVersion = "v59" implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion") implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion") diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 3799256a..1fd15b84 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -59,7 +59,7 @@ sourceSets { } // should be bumped with each stable release -val inspectorVersion = "v1.4.1" +val inspectorVersion = "v1.4.2" // counts commit count on master val inspectorRevision = runCatching { From 58ad7891184409f886966382d723f5cf8f76aac7 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Fri, 17 Feb 2023 23:20:59 -0300 Subject: [PATCH 07/19] Release v1.4.3 --- server/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 2b82e477..2b331368 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -55,7 +55,7 @@ sourceSets { } // should be bumped with each stable release -val inspectorVersion = "v1.4.2" +val inspectorVersion = "v1.4.3" // counts commit count on master val inspectorRevision = runCatching { From 1f03ebad2b37bc60ec320c4463aaa2e019b12e7b Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 2 Sep 2023 23:22:37 -0400 Subject: [PATCH 08/19] Update Source interface --- .github/workflows/build_pull_request.yml | 2 +- .github/workflows/build_push.yml | 2 +- .github/workflows/publish.yml | 2 +- build.gradle.kts | 10 ++- gradle/wrapper/gradle-wrapper.properties | 4 +- server/build.gradle.kts | 15 ++-- .../tachiyomi/source/CatalogueSource.kt | 2 +- .../eu/kanade/tachiyomi/source/Source.kt | 70 +++++++++++++++++-- .../source/online/ResolvableSource.kt | 26 +++++++ .../eu/kanade/tachiyomi/util/RxExtension.kt | 54 ++++++++++++++ settings.gradle.kts | 1 - 11 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt create mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 1a5317f7..781efa83 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -24,7 +24,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: adopt - name: Generate android.jar diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 6e06c110..02fd9e37 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -24,7 +24,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: adopt - name: Generate android.jar diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5e70135b..ca0b0c22 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,7 +26,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: adopt - name: Generate android.jar diff --git a/build.gradle.kts b/build.gradle.kts index 380f7e11..c67e30ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,13 +33,13 @@ configure(projects) { apply(plugin = "org.jetbrains.kotlin.jvm") java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } } @@ -59,7 +59,6 @@ configure(projects) { 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.11.0") @@ -71,7 +70,6 @@ configure(projects) { // ReactiveX implementation("io.reactivex:rxjava:1.3.8") implementation("io.reactivex:rxkotlin:1.0.0") - implementation("com.jakewharton.rxrelay:rxrelay:1.2.0") // JSoup implementation("org.jsoup:jsoup:1.15.3") @@ -81,7 +79,7 @@ configure(projects) { implementation("io.github.config4k:config4k:0.4.2") // dex2jar - val dex2jarVersion = "v59" + val dex2jarVersion = "v71" implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion") implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..ac72c34e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 1fd15b84..1b0a77d4 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -29,11 +29,6 @@ dependencies { implementation("org.jsoup:jsoup:1.15.3") implementation("app.cash.quickjs:quickjs-jvm:0.9.2") - - // Source models and interfaces from Tachiyomi 1.x - // using source class from tachiyomi commit 9493577de27c40ce8b2b6122cc447d025e34c477 to not depend on tachiyomi.sourceapi -// implementation("tachiyomi.sourceapi:source-api:1.1") - // AndroidCompat implementation(project(":AndroidCompat")) implementation(project(":AndroidCompat:Config")) @@ -59,7 +54,7 @@ sourceSets { } // should be bumped with each stable release -val inspectorVersion = "v1.4.2" +val inspectorVersion = "v1.4.3" // counts commit count on master val inspectorRevision = runCatching { @@ -110,10 +105,10 @@ tasks { withType { kotlinOptions { freeCompilerArgs = listOf( - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi", - "-Xopt-in=kotlin.io.path.ExperimentalPathApi", + "-Xopt-in=kotlin.RequiresOptIn", + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi", + "-Xopt-in=kotlin.io.path.ExperimentalPathApi", ) } } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt index c78033ea..f9e416de 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt @@ -9,7 +9,7 @@ interface CatalogueSource : Source { /** * An ISO 639-1 compliant language code (two letters in lower case). */ - val lang: String + override val lang: String /** * Whether the source has support for latest updates. diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt index 93a8a809..f140eda7 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt @@ -3,15 +3,16 @@ package eu.kanade.tachiyomi.source import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga +import eu.kanade.tachiyomi.util.awaitSingle import rx.Observable /** - * A basic interface for creating a source. It could be an online source, a local source, etc... + * A basic interface for creating a source. It could be an online source, a local source, etc. */ interface Source { /** - * Id for the source. Must be unique. + * ID for the source. Must be unique. */ val id: Long @@ -20,24 +21,81 @@ interface Source { */ val name: String + val lang: String + get() = "" + + /** + * Get the updated details for a manga. + * + * @since extensions-lib 1.4 + * @param manga the manga to update. + * @return the updated manga. + */ + @Suppress("DEPRECATION") + suspend fun getMangaDetails(manga: SManga): SManga { + return fetchMangaDetails(manga).awaitSingle() + } + + /** + * Get all the available chapters for a manga. + * + * @since extensions-lib 1.4 + * @param manga the manga to update. + * @return the chapters for the manga. + */ + @Suppress("DEPRECATION") + suspend fun getChapterList(manga: SManga): List { + return fetchChapterList(manga).awaitSingle() + } + + /** + * Get the list of pages a chapter has. Pages should be returned + * in the expected order; the index is ignored. + * + * @since extensions-lib 1.4 + * @param chapter the chapter. + * @return the pages for the chapter. + */ + @Suppress("DEPRECATION") + suspend fun getPageList(chapter: SChapter): List { + return fetchPageList(chapter).awaitSingle() + } + /** * Returns an observable with the updated details for a manga. * * @param manga the manga to update. */ - fun fetchMangaDetails(manga: SManga): Observable + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getMangaDetails"), + ) + fun fetchMangaDetails(manga: SManga): Observable = throw IllegalStateException( + "Not used", + ) /** * Returns an observable with all the available chapters for a manga. * * @param manga the manga to update. */ - fun fetchChapterList(manga: SManga): Observable> + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getChapterList"), + ) + fun fetchChapterList(manga: SManga): Observable> = throw IllegalStateException( + "Not used", + ) /** - * Returns an observable with the list of pages a chapter has. + * Returns an observable with the list of pages a chapter has. Pages should be returned + * in the expected order; the index is ignored. * * @param chapter the chapter. */ - fun fetchPageList(chapter: SChapter): Observable> + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getPageList"), + ) + fun fetchPageList(chapter: SChapter): Observable> = Observable.empty() } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt new file mode 100644 index 00000000..6a00c2e5 --- /dev/null +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt @@ -0,0 +1,26 @@ +package eu.kanade.tachiyomi.source.online + +import eu.kanade.tachiyomi.source.Source +import eu.kanade.tachiyomi.source.model.SManga + +/** + * A source that may handle opening an SManga for a given URI. + * + * @since extensions-lib 1.5 + */ +interface ResolvableSource : Source { + + /** + * Whether this source may potentially handle the given URI. + * + * @since extensions-lib 1.5 + */ + fun canResolveUri(uri: String): Boolean + + /** + * Called if canHandleUri is true. Returns the corresponding SManga, if possible. + * + * @since extensions-lib 1.5 + */ + suspend fun getManga(uri: String): SManga? +} diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt new file mode 100644 index 00000000..d82e9e82 --- /dev/null +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt @@ -0,0 +1,54 @@ +package eu.kanade.tachiyomi.util + +import kotlinx.coroutines.CancellableContinuation +import kotlinx.coroutines.InternalCoroutinesApi +import kotlinx.coroutines.suspendCancellableCoroutine +import rx.Observable +import rx.Subscriber +import rx.Subscription +import kotlin.coroutines.resume +import kotlin.coroutines.resumeWithException + +suspend fun Observable.awaitSingle(): T = single().awaitOne() + +@OptIn(InternalCoroutinesApi::class) +private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutine { cont -> + cont.unsubscribeOnCancellation( + subscribe( + object : Subscriber() { + override fun onStart() { + request(1) + } + + override fun onNext(t: T) { + cont.resume(t) + } + + override fun onCompleted() { + if (cont.isActive) { + cont.resumeWithException( + IllegalStateException( + "Should have invoked onNext", + ), + ) + } + } + + override fun onError(e: Throwable) { + /* + * Rx1 observable throws NoSuchElementException if cancellation happened before + * element emission. To mitigate this we try to atomically resume continuation with exception: + * if resume failed, then we know that continuation successfully cancelled itself + */ + val token = cont.tryResumeWithException(e) + if (token != null) { + cont.completeResume(token) + } + } + }, + ), + ) +} + +private fun CancellableContinuation.unsubscribeOnCancellation(sub: Subscription) = + invokeOnCancellation { sub.unsubscribe() } diff --git a/settings.gradle.kts b/settings.gradle.kts index 041d99a3..b63917db 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,5 @@ rootProject.name = "Tachiyomi Extensions Inspector" include("server") - include("AndroidCompat") include("AndroidCompat:Config") \ No newline at end of file From 1aa6775836e4b1c0d1a45b6c79af4101288fe80a Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 14 Sep 2023 22:05:47 -0400 Subject: [PATCH 09/19] Revert RxJava API changes for 1.4 These will return for 1.5 --- .../eu/kanade/tachiyomi/source/Source.kt | 70 ++----------------- .../source/online/ResolvableSource.kt | 26 ------- .../eu/kanade/tachiyomi/util/RxExtension.kt | 54 -------------- 3 files changed, 6 insertions(+), 144 deletions(-) diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt index f140eda7..93a8a809 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt @@ -3,16 +3,15 @@ package eu.kanade.tachiyomi.source import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.util.awaitSingle import rx.Observable /** - * A basic interface for creating a source. It could be an online source, a local source, etc. + * A basic interface for creating a source. It could be an online source, a local source, etc... */ interface Source { /** - * ID for the source. Must be unique. + * Id for the source. Must be unique. */ val id: Long @@ -21,81 +20,24 @@ interface Source { */ val name: String - val lang: String - get() = "" - - /** - * Get the updated details for a manga. - * - * @since extensions-lib 1.4 - * @param manga the manga to update. - * @return the updated manga. - */ - @Suppress("DEPRECATION") - suspend fun getMangaDetails(manga: SManga): SManga { - return fetchMangaDetails(manga).awaitSingle() - } - - /** - * Get all the available chapters for a manga. - * - * @since extensions-lib 1.4 - * @param manga the manga to update. - * @return the chapters for the manga. - */ - @Suppress("DEPRECATION") - suspend fun getChapterList(manga: SManga): List { - return fetchChapterList(manga).awaitSingle() - } - - /** - * Get the list of pages a chapter has. Pages should be returned - * in the expected order; the index is ignored. - * - * @since extensions-lib 1.4 - * @param chapter the chapter. - * @return the pages for the chapter. - */ - @Suppress("DEPRECATION") - suspend fun getPageList(chapter: SChapter): List { - return fetchPageList(chapter).awaitSingle() - } - /** * Returns an observable with the updated details for a manga. * * @param manga the manga to update. */ - @Deprecated( - "Use the non-RxJava API instead", - ReplaceWith("getMangaDetails"), - ) - fun fetchMangaDetails(manga: SManga): Observable = throw IllegalStateException( - "Not used", - ) + fun fetchMangaDetails(manga: SManga): Observable /** * Returns an observable with all the available chapters for a manga. * * @param manga the manga to update. */ - @Deprecated( - "Use the non-RxJava API instead", - ReplaceWith("getChapterList"), - ) - fun fetchChapterList(manga: SManga): Observable> = throw IllegalStateException( - "Not used", - ) + fun fetchChapterList(manga: SManga): Observable> /** - * Returns an observable with the list of pages a chapter has. Pages should be returned - * in the expected order; the index is ignored. + * Returns an observable with the list of pages a chapter has. * * @param chapter the chapter. */ - @Deprecated( - "Use the non-RxJava API instead", - ReplaceWith("getPageList"), - ) - fun fetchPageList(chapter: SChapter): Observable> = Observable.empty() + fun fetchPageList(chapter: SChapter): Observable> } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt index 6a00c2e5..e69de29b 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt @@ -1,26 +0,0 @@ -package eu.kanade.tachiyomi.source.online - -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.model.SManga - -/** - * A source that may handle opening an SManga for a given URI. - * - * @since extensions-lib 1.5 - */ -interface ResolvableSource : Source { - - /** - * Whether this source may potentially handle the given URI. - * - * @since extensions-lib 1.5 - */ - fun canResolveUri(uri: String): Boolean - - /** - * Called if canHandleUri is true. Returns the corresponding SManga, if possible. - * - * @since extensions-lib 1.5 - */ - suspend fun getManga(uri: String): SManga? -} diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt index d82e9e82..e69de29b 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt @@ -1,54 +0,0 @@ -package eu.kanade.tachiyomi.util - -import kotlinx.coroutines.CancellableContinuation -import kotlinx.coroutines.InternalCoroutinesApi -import kotlinx.coroutines.suspendCancellableCoroutine -import rx.Observable -import rx.Subscriber -import rx.Subscription -import kotlin.coroutines.resume -import kotlin.coroutines.resumeWithException - -suspend fun Observable.awaitSingle(): T = single().awaitOne() - -@OptIn(InternalCoroutinesApi::class) -private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutine { cont -> - cont.unsubscribeOnCancellation( - subscribe( - object : Subscriber() { - override fun onStart() { - request(1) - } - - override fun onNext(t: T) { - cont.resume(t) - } - - override fun onCompleted() { - if (cont.isActive) { - cont.resumeWithException( - IllegalStateException( - "Should have invoked onNext", - ), - ) - } - } - - override fun onError(e: Throwable) { - /* - * Rx1 observable throws NoSuchElementException if cancellation happened before - * element emission. To mitigate this we try to atomically resume continuation with exception: - * if resume failed, then we know that continuation successfully cancelled itself - */ - val token = cont.tryResumeWithException(e) - if (token != null) { - cont.completeResume(token) - } - } - }, - ), - ) -} - -private fun CancellableContinuation.unsubscribeOnCancellation(sub: Subscription) = - invokeOnCancellation { sub.unsubscribe() } From 29e358953ec1da224a57243c0ae2d7780ad0e631 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 14 Sep 2023 22:24:21 -0400 Subject: [PATCH 10/19] Misc cleanup --- .github/workflows/build_pull_request.yml | 4 +- .github/workflows/build_push.yml | 4 +- .github/workflows/publish.yml | 4 +- .gitignore | 8 ---- .../xyz/nulldev/ts/config/ConfigManager.kt | 3 +- .../xyz/nulldev/ts/config/ConfigModule.kt | 3 +- .../java/xyz/nulldev/ts/config/Logging.kt | 3 +- .../main/java/android/widget/EditText.java | 3 +- .../src/main/java/android/widget/Toast.java | 3 +- .../preference/CheckBoxPreference.java | 3 +- .../androidx/preference/DialogPreference.java | 3 +- .../preference/EditTextPreference.java | 3 +- .../androidx/preference/ListPreference.java | 3 +- .../preference/MultiSelectListPreference.java | 3 +- .../java/androidx/preference/Preference.java | 3 +- .../androidx/preference/PreferenceScreen.java | 3 +- .../preference/SwitchPreferenceCompat.java | 3 +- .../preference/TwoStatePreference.java | 3 +- .../io/sharedprefs/JavaSharedPreferences.kt | 5 +- .../replace/java/text/NumberFormat.java | 3 +- .../replace/java/text/SimpleDateFormat.java | 3 +- .../replace/java/util/Calendar.java | 3 +- .../replace/java/util/TimeZone.java | 3 +- build.gradle.kts | 10 ++-- {server => inspector}/build.gradle.kts | 22 ++++----- .../main/kotlin/eu/kanade/tachiyomi/App.kt | 3 +- .../kotlin/eu/kanade/tachiyomi/AppInfo.kt | 0 .../kotlin/eu/kanade/tachiyomi/AppModule.kt | 14 +----- .../kotlin/eu/kanade/tachiyomi/BuildConfig.kt | 8 ++++ .../tachiyomi/network/JavaScriptEngine.kt | 0 .../tachiyomi/network/MemoryCookieJar.kt | 3 +- .../kanade/tachiyomi/network/NetworkHelper.kt | 3 +- .../tachiyomi/network/OkHttpExtensions.kt | 0 .../tachiyomi/network/ProgressListener.kt | 0 .../eu/kanade/tachiyomi/network/Requests.kt | 1 + .../interceptor/CloudflareInterceptor.kt | 3 +- .../interceptor/RateLimitInterceptor.kt | 0 .../SpecificHostRateLimitInterceptor.kt | 0 .../tachiyomi/source/CatalogueSource.kt | 0 .../tachiyomi/source/ConfigurableSource.kt | 0 .../eu/kanade/tachiyomi/source/LocalSource.kt | 7 ++- .../eu/kanade/tachiyomi/source/Source.kt | 3 ++ .../kanade/tachiyomi/source/SourceFactory.kt | 0 .../kanade/tachiyomi/source/SourceManager.kt | 0 .../tachiyomi/source/UnmeteredSource.kt | 0 .../kanade/tachiyomi/source/model/Filter.kt | 4 +- .../tachiyomi/source/model/FilterList.kt | 0 .../tachiyomi/source/model/MangasPage.kt | 0 .../eu/kanade/tachiyomi/source/model/Page.kt | 0 .../kanade/tachiyomi/source/model/SChapter.kt | 0 .../tachiyomi/source/model/SChapterImpl.kt | 0 .../kanade/tachiyomi/source/model/SManga.kt | 0 .../tachiyomi/source/model/SMangaImpl.kt | 0 .../tachiyomi/source/model/UpdateStrategy.kt | 0 .../tachiyomi/source/online/HttpSource.kt | 15 ++++-- .../source/online/HttpSourceFetcher.kt | 0 .../source/online/ParsedHttpSource.kt | 0 .../source/online/ResolvableSource.kt | 0 .../kanade/tachiyomi/util/JsoupExtensions.kt | 0 .../util/lang/CoroutinesExtensions.kt | 3 +- .../src/main/kotlin/inspector}/Main.kt | 47 ++++++++++++------- .../main/kotlin/inspector/util}/Extension.kt | 33 ++++++++----- .../kotlin/inspector}/util/PackageTools.kt | 8 ++-- .../src/main/resources/logback.xml | 2 +- .../src/main/resources/server-reference.conf | 0 .../kotlin/eu/kanade/tachiyomi/BuildConfig.kt | 8 ---- .../eu/kanade/tachiyomi/util/RxExtension.kt | 0 .../eu/kanade/tachiyomi/util/lang/Hash.kt | 44 ----------------- .../suwayomi/tachidesk/server/ServerSetup.kt | 33 ------------- .../src/test/resources/server-reference.conf | 13 ----- settings.gradle.kts | 4 +- 71 files changed, 161 insertions(+), 209 deletions(-) rename {server => inspector}/build.gradle.kts (86%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/App.kt (91%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/AppInfo.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt (68%) create mode 100644 inspector/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt (97%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt (93%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt (99%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt (89%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt (90%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt (96%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt (96%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt (97%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt (100%) rename {server => inspector}/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt (82%) rename {server/src/main/kotlin/suwayomi/tachidesk => inspector/src/main/kotlin/inspector}/Main.kt (61%) rename {server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension => inspector/src/main/kotlin/inspector/util}/Extension.kt (65%) rename {server/src/main/kotlin/suwayomi/tachidesk/manga/impl => inspector/src/main/kotlin/inspector}/util/PackageTools.kt (95%) rename {server => inspector}/src/main/resources/logback.xml (91%) rename {server => inspector}/src/main/resources/server-reference.conf (100%) delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/Hash.kt delete mode 100644 server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt delete mode 100644 server/src/test/resources/server-reference.conf diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 781efa83..70883a96 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.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 diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 02fd9e37..8d1180b2 100644 --- a/.github/workflows/build_push.yml +++ b/.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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ca0b0c22..4d2fbb1b 100644 --- a/.github/workflows/publish.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 80c6a2b2..4e6ce4d6 100644 --- a/.gitignore +++ b/.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-* diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt index 13cba2a2..250358fe 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt +++ b/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 diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt index c893c84e..bf0223d8 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt +++ b/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 diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt index 14925001..9cdf675c 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt +++ b/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 diff --git a/AndroidCompat/src/main/java/android/widget/EditText.java b/AndroidCompat/src/main/java/android/widget/EditText.java index 58080ac1..3825a539 100644 --- a/AndroidCompat/src/main/java/android/widget/EditText.java +++ b/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!"); } diff --git a/AndroidCompat/src/main/java/android/widget/Toast.java b/AndroidCompat/src/main/java/android/widget/Toast.java index 603efb9b..111edf86 100644 --- a/AndroidCompat/src/main/java/android/widget/Toast.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/CheckBoxPreference.java b/AndroidCompat/src/main/java/androidx/preference/CheckBoxPreference.java index 7a6af1e0..87f82839 100644 --- a/AndroidCompat/src/main/java/androidx/preference/CheckBoxPreference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/DialogPreference.java b/AndroidCompat/src/main/java/androidx/preference/DialogPreference.java index 70b4509b..3938ab1e 100644 --- a/AndroidCompat/src/main/java/androidx/preference/DialogPreference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java b/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java index fa3f2aea..33cb46e2 100644 --- a/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/ListPreference.java b/AndroidCompat/src/main/java/androidx/preference/ListPreference.java index d71f191b..4adbfc29 100644 --- a/AndroidCompat/src/main/java/androidx/preference/ListPreference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java b/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java index 70835a0b..0b12289e 100644 --- a/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/Preference.java b/AndroidCompat/src/main/java/androidx/preference/Preference.java index 3eae6c7b..938a0b85 100644 --- a/AndroidCompat/src/main/java/androidx/preference/Preference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/PreferenceScreen.java b/AndroidCompat/src/main/java/androidx/preference/PreferenceScreen.java index 91032b3e..a7dc824d 100644 --- a/AndroidCompat/src/main/java/androidx/preference/PreferenceScreen.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/SwitchPreferenceCompat.java b/AndroidCompat/src/main/java/androidx/preference/SwitchPreferenceCompat.java index d536bd0f..9f0ab4c6 100644 --- a/AndroidCompat/src/main/java/androidx/preference/SwitchPreferenceCompat.java +++ b/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; diff --git a/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java b/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java index fc302966..f42cd7f1 100644 --- a/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java +++ b/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; diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt index 97a5f475..cce98268 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt +++ b/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() diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/NumberFormat.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/NumberFormat.java index d1c79eb5..5144b95a 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/NumberFormat.java +++ b/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; diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java index a129d877..e9120b64 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java +++ b/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; diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/Calendar.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/Calendar.java index b8384bc4..b2394149 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/Calendar.java +++ b/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; diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/TimeZone.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/TimeZone.java index 0c46d865..54e51c59 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/util/TimeZone.java +++ b/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; diff --git a/build.gradle.kts b/build.gradle.kts index c67e30ee..339824ec 100644 --- a/build.gradle.kts +++ b/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" diff --git a/server/build.gradle.kts b/inspector/build.gradle.kts similarity index 86% rename from server/build.gradle.kts rename to inspector/build.gradle.kts index 1b0a77d4..11ffa168 100644 --- a/server/build.gradle.kts +++ b/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) diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/App.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/App.kt similarity index 91% rename from server/src/main/kotlin/eu/kanade/tachiyomi/App.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/App.kt index 882fcc2c..1e0579d4 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/App.kt +++ b/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 diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppInfo.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/AppInfo.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/AppInfo.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/AppInfo.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt similarity index 68% rename from server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt index a8551724..a5b0787b 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt +++ b/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() } - } - - private fun rxAsync(block: () -> Unit) { - Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe() } } diff --git a/inspector/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt new file mode 100644 index 00000000..0555c558 --- /dev/null +++ b/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() + } +} diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt similarity index 97% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt index 89c402ff..ef57e755 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt @@ -5,7 +5,8 @@ package eu.kanade.tachiyomi.network * * 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 okhttp3.Cookie import okhttp3.CookieJar diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt similarity index 93% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt index 3a0b5b94..2a9e7539 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -5,7 +5,8 @@ package eu.kanade.tachiyomi.network * * 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 eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/ProgressListener.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt similarity index 99% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt index 9a5dee98..6a6e3125 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt @@ -38,6 +38,7 @@ fun GET( .cacheControl(cache) .build() } + fun POST( url: String, headers: Headers = DEFAULT_HEADERS, diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt similarity index 89% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt index 76963585..4d1f205c 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt @@ -5,7 +5,8 @@ package eu.kanade.tachiyomi.network.interceptor * * 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 okhttp3.Interceptor import okhttp3.Response diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/CatalogueSource.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt similarity index 90% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt index 153b26e0..bf47b2ff 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt @@ -29,11 +29,16 @@ class LocalSource(private val context: Context) : CatalogueSource { override fun fetchPageList(chapter: SChapter): Observable> { TODO("Not yet implemented") } + override fun fetchPopularManga(page: Int): Observable { TODO("Not yet implemented") } - override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { + override fun fetchSearchManga( + page: Int, + query: String, + filters: FilterList + ): Observable { TODO("Not yet implemented") } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt similarity index 96% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt index 93a8a809..b735632c 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt @@ -20,6 +20,9 @@ interface Source { */ val name: String + val lang: String + get() = "" + /** * Returns an observable with the updated details for a manga. * diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/SourceFactory.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/UnmeteredSource.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt similarity index 96% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt index f30b2f52..14955db2 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/Filter.kt @@ -3,7 +3,9 @@ package eu.kanade.tachiyomi.source.model sealed class Filter(val name: String, var state: T) { open class Header(name: String) : Filter(name, 0) open class Separator(name: String = "") : Filter(name, 0) - abstract class Select(name: String, val values: Array, state: Int = 0) : Filter(name, state) + abstract class Select(name: String, val values: Array, state: Int = 0) : + Filter(name, state) + abstract class Text(name: String, state: String = "") : Filter(name, state) abstract class CheckBox(name: String, state: Boolean = false) : Filter(name, state) abstract class TriState(name: String, state: Int = STATE_IGNORE) : Filter(name, state) { diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapterImpl.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/SMangaImpl.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/model/UpdateStrategy.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt similarity index 97% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt index 213b7171..a6aa55eb 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -56,7 +56,8 @@ abstract class HttpSource : CatalogueSource { override val id by lazy { val key = "${name.lowercase()}/$lang/$versionId" val bytes = MessageDigest.getInstance("MD5").digest(key.toByteArray()) - (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) }.reduce(Long::or) and Long.MAX_VALUE + (0..7).map { bytes[it].toLong() and 0xff shl 8 * (7 - it) } + .reduce(Long::or) and Long.MAX_VALUE } /** @@ -118,7 +119,11 @@ abstract class HttpSource : CatalogueSource { * @param query the search query. * @param filters the list of filters to apply. */ - override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { + override fun fetchSearchManga( + page: Int, + query: String, + filters: FilterList + ): Observable { return client.newCall(searchMangaRequest(page, query, filters)) .asObservableSuccess() .map { response -> @@ -133,7 +138,11 @@ abstract class HttpSource : CatalogueSource { * @param query the search query. * @param filters the list of filters to apply. */ - protected abstract fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request + protected abstract fun searchMangaRequest( + page: Int, + query: String, + filters: FilterList + ): Request /** * Parses the response from the site and returns a [MangasPage] object. diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/source/online/ResolvableSource.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt similarity index 100% rename from server/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/util/JsoupExtensions.kt diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt b/inspector/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt similarity index 82% rename from server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt rename to inspector/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt index f0827e33..79c9f3f5 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt +++ b/inspector/src/main/kotlin/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt @@ -4,4 +4,5 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -suspend fun withIOContext(block: suspend CoroutineScope.() -> T) = withContext(Dispatchers.IO, block) +suspend fun withIOContext(block: suspend CoroutineScope.() -> T) = + withContext(Dispatchers.IO, block) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/Main.kt b/inspector/src/main/kotlin/inspector/Main.kt similarity index 61% rename from server/src/main/kotlin/suwayomi/tachidesk/Main.kt rename to inspector/src/main/kotlin/inspector/Main.kt index 9a459696..0dff6442 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/Main.kt +++ b/inspector/src/main/kotlin/inspector/Main.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk +package inspector /* * Copyright (C) Contributors to the Suwayomi project @@ -8,14 +8,18 @@ package suwayomi.tachidesk * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor +import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.source.online.HttpSource +import inspector.util.Extension import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import mu.KotlinLogging -import suwayomi.tachidesk.manga.impl.extension.Extension -import suwayomi.tachidesk.server.applicationSetup +import org.kodein.di.DI +import org.kodein.di.conf.global +import xyz.nulldev.androidcompat.AndroidCompat +import xyz.nulldev.androidcompat.AndroidCompatInitializer +import xyz.nulldev.ts.config.ConfigKodeinModule import java.io.File import java.nio.file.Files import java.nio.file.Paths @@ -23,41 +27,53 @@ import kotlin.io.path.extension import kotlin.streams.asSequence private val logger = KotlinLogging.logger {} +private val androidCompat by lazy { AndroidCompat() } suspend fun main(args: Array) { if (args.size < 3) { throw RuntimeException("Inspector must be given the path of apks directory, output json, and a tmp dir") } - applicationSetup() - val (apksPath, outputPath, tmpDirPath) = args + initApplication() + val tmpDir = File(tmpDirPath, "tmp").also { it.mkdir() } - val extensions = Files.find(Paths.get(apksPath), 2, { _, fileAttributes -> fileAttributes.isRegularFile }) - .asSequence() - .filter { it.extension == "apk" } - .toList() + val extensions = + Files.find(Paths.get(apksPath), 2, { _, fileAttributes -> fileAttributes.isRegularFile }) + .asSequence() + .filter { it.extension == "apk" } + .toList() logger.info("Found ${extensions.size} extensions") val extensionsInfo = extensions.associate { logger.debug("Installing $it") - val (pkgName, sources) = Extension.installAPK(tmpDir) { it.toFile() } + val (pkgName, sources) = Extension.installApk(tmpDir) { it.toFile() } pkgName to sources.map { source -> SourceJson(source) } } File(outputPath).writeText(Json.encodeToString(extensionsInfo)) } +private fun initApplication() { + logger.info("Running Inspector ${BuildConfig.VERSION} revision ${BuildConfig.REVISION}") + + // Load config API + DI.global.addImport(ConfigKodeinModule().create()) + // Load Android compatibility dependencies + AndroidCompatInitializer().init() + // start app + androidCompat.startApp(App()) +} + @Serializable -data class SourceJson( +private data class SourceJson( val name: String, val lang: String, val id: String, val baseUrl: String, val versionId: Int, - val hasCloudflare: Short ) { constructor(source: HttpSource) : this( @@ -66,10 +82,5 @@ data class SourceJson( source.id.toString(), source.baseUrl, source.versionId, - source.client.interceptors - .any { it is CloudflareInterceptor } - .toShort() ) } - -private fun Boolean.toShort(): Short = if (this) 1 else 0 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt b/inspector/src/main/kotlin/inspector/util/Extension.kt similarity index 65% rename from server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt rename to inspector/src/main/kotlin/inspector/util/Extension.kt index 106a62dd..7b8cdd3b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt +++ b/inspector/src/main/kotlin/inspector/util/Extension.kt @@ -1,29 +1,33 @@ -package suwayomi.tachidesk.manga.impl.extension +package inspector.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/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.online.HttpSource +import inspector.util.PackageTools.EXTENSION_FEATURE +import inspector.util.PackageTools.LIB_VERSION_MAX +import inspector.util.PackageTools.LIB_VERSION_MIN +import inspector.util.PackageTools.METADATA_SOURCE_CLASS +import inspector.util.PackageTools.dex2jar +import inspector.util.PackageTools.getPackageInfo +import inspector.util.PackageTools.loadExtensionSources import mu.KotlinLogging -import suwayomi.tachidesk.manga.impl.util.PackageTools.EXTENSION_FEATURE -import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX -import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN -import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_SOURCE_CLASS -import suwayomi.tachidesk.manga.impl.util.PackageTools.dex2jar -import suwayomi.tachidesk.manga.impl.util.PackageTools.getPackageInfo -import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources import java.io.File object Extension { private val logger = KotlinLogging.logger {} - suspend fun installAPK(tmpDir: File, fetcher: suspend () -> File): Pair> { + suspend fun installApk( + tmpDir: File, + fetcher: suspend () -> File + ): Pair> { val apkFile = fetcher() val jarFile = File(tmpDir, "${apkFile.nameWithoutExtension}.jar") @@ -43,14 +47,19 @@ object Extension { ) } - val className = packageInfo.packageName + packageInfo.applicationInfo.metaData.getString(METADATA_SOURCE_CLASS) + val className = packageInfo.packageName + packageInfo.applicationInfo.metaData.getString( + METADATA_SOURCE_CLASS + ) logger.trace("Main class for extension is $className") dex2jar(apkFile, jarFile) // collect sources from the extension - return packageInfo.packageName to when (val instance = loadExtensionSources(jarFile.absolutePath, className)) { + return packageInfo.packageName to when ( + val instance = + loadExtensionSources(jarFile.absolutePath, className) + ) { is Source -> listOf(instance).filterIsInstance() is SourceFactory -> instance.createSources().filterIsInstance() else -> throw RuntimeException("Unknown source class type! ${instance.javaClass}") diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt b/inspector/src/main/kotlin/inspector/util/PackageTools.kt similarity index 95% rename from server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt rename to inspector/src/main/kotlin/inspector/util/PackageTools.kt index 1c366513..57f3f76d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt +++ b/inspector/src/main/kotlin/inspector/util/PackageTools.kt @@ -1,11 +1,12 @@ -package suwayomi.tachidesk.manga.impl.util +package inspector.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/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ import android.content.pm.PackageInfo import android.content.pm.Signature @@ -57,7 +58,8 @@ object PackageTools { .skipExceptions(false) .to(jarFilePath) if (handler.hasException()) { - val errorFile: Path = jarFilePath.parent.resolve("${dexFile.nameWithoutExtension}-error.txt") + val errorFile: Path = + jarFilePath.parent.resolve("${dexFile.nameWithoutExtension}-error.txt") logger.error( """ Detail Error Information in File $errorFile diff --git a/server/src/main/resources/logback.xml b/inspector/src/main/resources/logback.xml similarity index 91% rename from server/src/main/resources/logback.xml rename to inspector/src/main/resources/logback.xml index 1d27933d..5bb220cd 100644 --- a/server/src/main/resources/logback.xml +++ b/inspector/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - + diff --git a/server/src/main/resources/server-reference.conf b/inspector/src/main/resources/server-reference.conf similarity index 100% rename from server/src/main/resources/server-reference.conf rename to inspector/src/main/resources/server-reference.conf diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt deleted file mode 100644 index c8da3570..00000000 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.kanade.tachiyomi - -class BuildConfig { - companion object { - const val VERSION_NAME = suwayomi.server.BuildConfig.NAME - val VERSION_CODE = suwayomi.server.BuildConfig.REVISION.trimStart('r').toInt() - } -} diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/util/RxExtension.kt deleted file mode 100644 index e69de29b..00000000 diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/Hash.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/Hash.kt deleted file mode 100644 index a8906320..00000000 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/Hash.kt +++ /dev/null @@ -1,44 +0,0 @@ -package eu.kanade.tachiyomi.util.lang - -import java.security.MessageDigest - -object Hash { - - private val chars = charArrayOf( - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - 'a', 'b', 'c', 'd', 'e', 'f' - ) - - private val MD5 get() = MessageDigest.getInstance("MD5") - - private val SHA256 get() = MessageDigest.getInstance("SHA-256") - - fun sha256(bytes: ByteArray): String { - return encodeHex(SHA256.digest(bytes)) - } - - fun sha256(string: String): String { - return sha256(string.toByteArray()) - } - - fun md5(bytes: ByteArray): String { - return encodeHex(MD5.digest(bytes)) - } - - fun md5(string: String): String { - return md5(string.toByteArray()) - } - - private fun encodeHex(data: ByteArray): String { - val l = data.size - val out = CharArray(l shl 1) - var i = 0 - var j = 0 - while (i < l) { - out[j++] = chars[(240 and data[i].toInt()).ushr(4)] - out[j++] = chars[15 and data[i].toInt()] - i++ - } - return String(out) - } -} diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt deleted file mode 100644 index 12a05c49..00000000 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt +++ /dev/null @@ -1,33 +0,0 @@ -package suwayomi.tachidesk.server - -/* - * Copyright (C) Contributors to the Suwayomi project - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -import eu.kanade.tachiyomi.App -import mu.KotlinLogging -import org.kodein.di.DI -import org.kodein.di.conf.global -import suwayomi.server.BuildConfig -import xyz.nulldev.androidcompat.AndroidCompat -import xyz.nulldev.androidcompat.AndroidCompatInitializer -import xyz.nulldev.ts.config.ConfigKodeinModule - -private val logger = KotlinLogging.logger {} - -val androidCompat by lazy { AndroidCompat() } - -fun applicationSetup() { - logger.info("Running Inspector ${BuildConfig.VERSION} revision ${BuildConfig.REVISION}") - - // Load config API - DI.global.addImport(ConfigKodeinModule().create()) - // Load Android compatibility dependencies - AndroidCompatInitializer().init() - // start app - androidCompat.startApp(App()) -} diff --git a/server/src/test/resources/server-reference.conf b/server/src/test/resources/server-reference.conf deleted file mode 100644 index 9e49ccd8..00000000 --- a/server/src/test/resources/server-reference.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Server ip and port bindings -server.ip = "0.0.0.0" -server.port = 4567 - -# Socks5 proxy -server.socksProxy = false -server.socksProxyHost = "" -server.socksProxyPort = "" - -# misc -server.debugLogsEnabled = true -server.systemTrayEnabled = false -server.initialOpenInBrowserEnabled = true diff --git a/settings.gradle.kts b/settings.gradle.kts index b63917db..c0fce379 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ rootProject.name = "Tachiyomi Extensions Inspector" -include("server") include("AndroidCompat") -include("AndroidCompat:Config") \ No newline at end of file +include("AndroidCompat:Config") +include("inspector") From 8b309a49a703cd89e8adc5a80615fc0047bc0a50 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Thu, 21 Dec 2023 20:22:46 -0300 Subject: [PATCH 11/19] chore: Update gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++- gradlew | 41 ++++++++++++++++------- gradlew.bat | 15 +++++---- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..d64cd4917707c1f8861d8cb53dd15194d4248596 100644 GIT binary patch literal 43462 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 literal 59821 zcma&NV|1p`(k7gaZQHhOJ9%QKV?D8LCmq{1JGRYE(y=?XJw0>InKkE~^UnAEs2gk5 zUVGPCwX3dOb!}xiFmPB95NK!+5D<~S0s;d1zn&lrfAn7 zC?Nb-LFlib|DTEqB8oDS5&$(u1<5;wsY!V`2F7^=IR@I9so5q~=3i_(hqqG<9SbL8Q(LqDrz+aNtGYWGJ2;p*{a-^;C>BfGzkz_@fPsK8{pTT~_VzB$E`P@> z7+V1WF2+tSW=`ZRj3&0m&d#x_lfXq`bb-Y-SC-O{dkN2EVM7@!n|{s+2=xSEMtW7( zz~A!cBpDMpQu{FP=y;sO4Le}Z)I$wuFwpugEY3vEGfVAHGqZ-<{vaMv-5_^uO%a{n zE_Zw46^M|0*dZ`;t%^3C19hr=8FvVdDp1>SY>KvG!UfD`O_@weQH~;~W=fXK_!Yc> z`EY^PDJ&C&7LC;CgQJeXH2 zjfM}2(1i5Syj)Jj4EaRyiIl#@&lC5xD{8hS4Wko7>J)6AYPC-(ROpVE-;|Z&u(o=X z2j!*>XJ|>Lo+8T?PQm;SH_St1wxQPz)b)Z^C(KDEN$|-6{A>P7r4J1R-=R7|FX*@! zmA{Ja?XE;AvisJy6;cr9Q5ovphdXR{gE_7EF`ji;n|RokAJ30Zo5;|v!xtJr+}qbW zY!NI6_Wk#6pWFX~t$rAUWi?bAOv-oL6N#1>C~S|7_e4 zF}b9(&a*gHk+4@J26&xpiWYf2HN>P;4p|TD4f586umA2t@cO1=Fx+qd@1Ae#Le>{-?m!PnbuF->g3u)7(n^llJfVI%Q2rMvetfV5 z6g|sGf}pV)3_`$QiKQnqQ<&ghOWz4_{`rA1+7*M0X{y(+?$|{n zs;FEW>YzUWg{sO*+D2l6&qd+$JJP_1Tm;To<@ZE%5iug8vCN3yH{!6u5Hm=#3HJ6J zmS(4nG@PI^7l6AW+cWAo9sFmE`VRcM`sP7X$^vQY(NBqBYU8B|n-PrZdNv8?K?kUTT3|IE`-A8V*eEM2=u*kDhhKsmVPWGns z8QvBk=BPjvu!QLtlF0qW(k+4i+?H&L*qf262G#fks9}D5-L{yiaD10~a;-j!p!>5K zl@Lh+(9D{ePo_S4F&QXv|q_yT`GIPEWNHDD8KEcF*2DdZD;=J6u z|8ICSoT~5Wd!>g%2ovFh`!lTZhAwpIbtchDc{$N%<~e$E<7GWsD42UdJh1fD($89f2on`W`9XZJmr*7lRjAA8K0!(t8-u>2H*xn5cy1EG{J;w;Q-H8Yyx+WW(qoZZM7p(KQx^2-yI6Sw?k<=lVOVwYn zY*eDm%~=|`c{tUupZ^oNwIr!o9T;H3Fr|>NE#By8SvHb&#;cyBmY1LwdXqZwi;qn8 zK+&z{{95(SOPXAl%EdJ3jC5yV^|^}nOT@M0)|$iOcq8G{#*OH7=DlfOb; z#tRO#tcrc*yQB5!{l5AF3(U4>e}nEvkoE_XCX=a3&A6Atwnr&`r&f2d%lDr8f?hBB zr1dKNypE$CFbT9I?n){q<1zHmY>C=5>9_phi79pLJG)f=#dKdQ7We8emMjwR*qIMF zE_P-T*$hX#FUa%bjv4Vm=;oxxv`B*`weqUn}K=^TXjJG=UxdFMSj-QV6fu~;- z|IsUq`#|73M%Yn;VHJUbt<0UHRzbaF{X@76=8*-IRx~bYgSf*H(t?KH=?D@wk*E{| z2@U%jKlmf~C^YxD=|&H?(g~R9-jzEb^y|N5d`p#2-@?BUcHys({pUz4Zto7XwKq2X zSB~|KQGgv_Mh@M!*{nl~2~VV_te&E7K39|WYH zCxfd|v_4!h$Ps2@atm+gj14Ru)DhivY&(e_`eA)!O1>nkGq|F-#-6oo5|XKEfF4hR z%{U%ar7Z8~B!foCd_VRHr;Z1c0Et~y8>ZyVVo9>LLi(qb^bxVkbq-Jq9IF7!FT`(- zTMrf6I*|SIznJLRtlP)_7tQ>J`Um>@pP=TSfaPB(bto$G1C zx#z0$=zNpP-~R);kM4O)9Mqn@5Myv5MmmXOJln312kq#_94)bpSd%fcEo7cD#&|<` zrcal$(1Xv(nDEquG#`{&9Ci~W)-zd_HbH-@2F6+|a4v}P!w!Q*h$#Zu+EcZeY>u&?hn#DCfC zVuye5@Ygr+T)0O2R1*Hvlt>%rez)P2wS}N-i{~IQItGZkp&aeY^;>^m7JT|O^{`78 z$KaK0quwcajja;LU%N|{`2o&QH@u%jtH+j!haGj;*ZCR*`UgOXWE>qpXqHc?g&vA& zt-?_g8k%ZS|D;()0Lf!>7KzTSo-8hUh%OA~i76HKRLudaNiwo*E9HxmzN4y>YpZNO zUE%Q|H_R_UmX=*f=2g=xyP)l-DP}kB@PX|(Ye$NOGN{h+fI6HVw`~Cd0cKqO;s6aiYLy7sl~%gs`~XaL z^KrZ9QeRA{O*#iNmB7_P!=*^pZiJ5O@iE&X2UmUCPz!)`2G3)5;H?d~3#P|)O(OQ_ zua+ZzwWGkWflk4j^Lb=x56M75_p9M*Q50#(+!aT01y80x#rs9##!;b-BH?2Fu&vx} za%4!~GAEDsB54X9wCF~juV@aU}fp_(a<`Ig0Pip8IjpRe#BR?-niYcz@jI+QY zBU9!8dAfq@%p;FX)X=E7?B=qJJNXlJ&7FBsz;4&|*z{^kEE!XbA)(G_O6I9GVzMAF z8)+Un(6od`W7O!!M=0Z)AJuNyN8q>jNaOdC-zAZ31$Iq%{c_SYZe+(~_R`a@ zOFiE*&*o5XG;~UjsuW*ja-0}}rJdd@^VnQD!z2O~+k-OSF%?hqcFPa4e{mV1UOY#J zTf!PM=KMNAzbf(+|AL%K~$ahX0Ol zbAxKu3;v#P{Qia{_WzHl`!@!8c#62XSegM{tW1nu?Ee{sQq(t{0TSq67YfG;KrZ$n z*$S-+R2G?aa*6kRiTvVxqgUhJ{ASSgtepG3hb<3hlM|r>Hr~v_DQ>|Nc%&)r0A9go z&F3Ao!PWKVq~aWOzLQIy&R*xo>}{UTr}?`)KS&2$3NR@a+>+hqK*6r6Uu-H};ZG^| zfq_Vl%YE1*uGwtJ>H*Y(Q9E6kOfLJRlrDNv`N;jnag&f<4#UErM0ECf$8DASxMFF& zK=mZgu)xBz6lXJ~WZR7OYw;4&?v3Kk-QTs;v1r%XhgzSWVf|`Sre2XGdJb}l1!a~z zP92YjnfI7OnF@4~g*LF>G9IZ5c+tifpcm6#m)+BmnZ1kz+pM8iUhwag`_gqr(bnpy zl-noA2L@2+?*7`ZO{P7&UL~ahldjl`r3=HIdo~Hq#d+&Q;)LHZ4&5zuDNug@9-uk; z<2&m#0Um`s=B}_}9s&70Tv_~Va@WJ$n~s`7tVxi^s&_nPI0`QX=JnItlOu*Tn;T@> zXsVNAHd&K?*u~a@u8MWX17VaWuE0=6B93P2IQ{S$-WmT+Yp!9eA>@n~=s>?uDQ4*X zC(SxlKap@0R^z1p9C(VKM>nX8-|84nvIQJ-;9ei0qs{}X>?f%&E#%-)Bpv_p;s4R+ z;PMpG5*rvN&l;i{^~&wKnEhT!S!LQ>udPzta#Hc9)S8EUHK=%x+z@iq!O{)*XM}aI zBJE)vokFFXTeG<2Pq}5Na+kKnu?Ch|YoxdPb&Z{07nq!yzj0=xjzZj@3XvwLF0}Pa zn;x^HW504NNfLY~w!}5>`z=e{nzGB>t4ntE>R}r7*hJF3OoEx}&6LvZz4``m{AZxC zz6V+^73YbuY>6i9ulu)2`ozP(XBY5n$!kiAE_Vf4}Ih)tlOjgF3HW|DF+q-jI_0p%6Voc^e;g28* z;Sr4X{n(X7eEnACWRGNsHqQ_OfWhAHwnSQ87@PvPcpa!xr9`9+{QRn;bh^jgO8q@v zLekO@-cdc&eOKsvXs-eMCH8Y{*~3Iy!+CANy+(WXYS&6XB$&1+tB?!qcL@@) zS7XQ|5=o1fr8yM7r1AyAD~c@Mo`^i~hjx{N17%pDX?j@2bdBEbxY}YZxz!h#)q^1x zpc_RnoC3`V?L|G2R1QbR6pI{Am?yW?4Gy`G-xBYfebXvZ=(nTD7u?OEw>;vQICdPJBmi~;xhVV zisVvnE!bxI5|@IIlDRolo_^tc1{m)XTbIX^<{TQfsUA1Wv(KjJED^nj`r!JjEA%MaEGqPB z9YVt~ol3%e`PaqjZt&-)Fl^NeGmZ)nbL;92cOeLM2H*r-zA@d->H5T_8_;Jut0Q_G zBM2((-VHy2&eNkztIpHk&1H3M3@&wvvU9+$RO%fSEa_d5-qZ!<`-5?L9lQ1@AEpo* z3}Zz~R6&^i9KfRM8WGc6fTFD%PGdruE}`X$tP_*A)_7(uI5{k|LYc-WY*%GJ6JMmw zNBT%^E#IhekpA(i zcB$!EB}#>{^=G%rQ~2;gbObT9PQ{~aVx_W6?(j@)S$&Ja1s}aLT%A*mP}NiG5G93- z_DaRGP77PzLv0s32{UFm##C2LsU!w{vHdKTM1X)}W%OyZ&{3d^2Zu-zw?fT=+zi*q z^fu6CXQ!i?=ljsqSUzw>g#PMk>(^#ejrYp(C)7+@Z1=Mw$Rw!l8c9}+$Uz;9NUO(kCd#A1DX4Lbis0k; z?~pO(;@I6Ajp}PL;&`3+;OVkr3A^dQ(j?`by@A!qQam@_5(w6fG>PvhO`#P(y~2ue zW1BH_GqUY&>PggMhhi@8kAY;XWmj>y1M@c`0v+l~l0&~Kd8ZSg5#46wTLPo*Aom-5 z>qRXyWl}Yda=e@hJ%`x=?I42(B0lRiR~w>n6p8SHN~B6Y>W(MOxLpv>aB)E<1oEcw z%X;#DJpeDaD;CJRLX%u!t23F|cv0ZaE183LXxMq*uWn)cD_ zp!@i5zsmcxb!5uhp^@>U;K>$B|8U@3$65CmhuLlZ2(lF#hHq-<<+7ZN9m3-hFAPgA zKi;jMBa*59ficc#TRbH_l`2r>z(Bm_XEY}rAwyp~c8L>{A<0@Q)j*uXns^q5z~>KI z)43=nMhcU1ZaF;CaBo>hl6;@(2#9yXZ7_BwS4u>gN%SBS<;j{{+p}tbD8y_DFu1#0 zx)h&?`_`=ti_6L>VDH3>PPAc@?wg=Omdoip5j-2{$T;E9m)o2noyFW$5dXb{9CZ?c z);zf3U526r3Fl+{82!z)aHkZV6GM@%OKJB5mS~JcDjieFaVn}}M5rtPnHQVw0Stn- zEHs_gqfT8(0b-5ZCk1%1{QQaY3%b>wU z7lyE?lYGuPmB6jnMI6s$1uxN{Tf_n7H~nKu+h7=%60WK-C&kEIq_d4`wU(*~rJsW< zo^D$-(b0~uNVgC+$J3MUK)(>6*k?92mLgpod{Pd?{os+yHr&t+9ZgM*9;dCQBzE!V zk6e6)9U6Bq$^_`E1xd}d;5O8^6?@bK>QB&7l{vAy^P6FOEO^l7wK4K=lLA45gQ3$X z=$N{GR1{cxO)j;ZxKI*1kZIT9p>%FhoFbRK;M(m&bL?SaN zzkZS9xMf={o@gpG%wE857u@9dq>UKvbaM1SNtMA9EFOp7$BjJQVkIm$wU?-yOOs{i z1^(E(WwZZG{_#aIzfpGc@g5-AtK^?Q&vY#CtVpfLbW?g0{BEX4Vlk(`AO1{-D@31J zce}#=$?Gq+FZG-SD^z)-;wQg9`qEO}Dvo+S9*PUB*JcU)@S;UVIpN7rOqXmEIerWo zP_lk!@RQvyds&zF$Rt>N#_=!?5{XI`Dbo0<@>fIVgcU*9Y+ z)}K(Y&fdgve3ruT{WCNs$XtParmvV;rjr&R(V&_#?ob1LzO0RW3?8_kSw)bjom#0; zeNllfz(HlOJw012B}rgCUF5o|Xp#HLC~of%lg+!pr(g^n;wCX@Yk~SQOss!j9f(KL zDiI1h#k{po=Irl)8N*KU*6*n)A8&i9Wf#7;HUR^5*6+Bzh;I*1cICa|`&`e{pgrdc zs}ita0AXb$c6{tu&hxmT0faMG0GFc)unG8tssRJd%&?^62!_h_kn^HU_kBgp$bSew zqu)M3jTn;)tipv9Wt4Ll#1bmO2n?^)t^ZPxjveoOuK89$oy4(8Ujw{nd*Rs*<+xFi z{k*9v%sl?wS{aBSMMWdazhs0#gX9Has=pi?DhG&_0|cIyRG7c`OBiVG6W#JjYf7-n zIQU*Jc+SYnI8oG^Q8So9SP_-w;Y00$p5+LZ{l+81>v7|qa#Cn->312n=YQd$PaVz8 zL*s?ZU*t-RxoR~4I7e^c!8TA4g>w@R5F4JnEWJpy>|m5la2b#F4d*uoz!m=i1;`L` zB(f>1fAd~;*wf%GEbE8`EA>IO9o6TdgbIC%+en!}(C5PGYqS0{pa?PD)5?ds=j9{w za9^@WBXMZ|D&(yfc~)tnrDd#*;u;0?8=lh4%b-lFPR3ItwVJp};HMdEw#SXg>f-zU zEiaj5H=jzRSy(sWVd%hnLZE{SUj~$xk&TfheSch#23)YTcjrB+IVe0jJqsdz__n{- zC~7L`DG}-Dgrinzf7Jr)e&^tdQ}8v7F+~eF*<`~Vph=MIB|YxNEtLo1jXt#9#UG5` zQ$OSk`u!US+Z!=>dGL>%i#uV<5*F?pivBH@@1idFrzVAzttp5~>Y?D0LV;8Yv`wAa{hewVjlhhBM z_mJhU9yWz9Jexg@G~dq6EW5^nDXe(sU^5{}qbd0*yW2Xq6G37f8{{X&Z>G~dUGDFu zgmsDDZZ5ZmtiBw58CERFPrEG>*)*`_B75!MDsOoK`T1aJ4GZ1avI?Z3OX|Hg?P(xy zSPgO$alKZuXd=pHP6UZy0G>#BFm(np+dekv0l6gd=36FijlT8^kI5; zw?Z*FPsibF2d9T$_L@uX9iw*>y_w9HSh8c=Rm}f>%W+8OS=Hj_wsH-^actull3c@!z@R4NQ4qpytnwMaY z)>!;FUeY?h2N9tD(othc7Q=(dF zZAX&Y1ac1~0n(z}!9{J2kPPnru1?qteJPvA2m!@3Zh%+f1VQt~@leK^$&ZudOpS!+ zw#L0usf!?Df1tB?9=zPZ@q2sG!A#9 zKZL`2cs%|Jf}wG=_rJkwh|5Idb;&}z)JQuMVCZSH9kkG%zvQO01wBN)c4Q`*xnto3 zi7TscilQ>t_SLij{@Fepen*a(`upw#RJAx|JYYXvP1v8f)dTHv9pc3ZUwx!0tOH?c z^Hn=gfjUyo!;+3vZhxNE?LJgP`qYJ`J)umMXT@b z{nU(a^xFfofcxfHN-!Jn*{Dp5NZ&i9#9r{)s^lUFCzs5LQL9~HgxvmU#W|iNs0<3O z%Y2FEgvts4t({%lfX1uJ$w{JwfpV|HsO{ZDl2|Q$-Q?UJd`@SLBsMKGjFFrJ(s?t^ z2Llf`deAe@YaGJf)k2e&ryg*m8R|pcjct@rOXa=64#V9!sp=6tC#~QvYh&M~zmJ;% zr*A}V)Ka^3JE!1pcF5G}b&jdrt;bM^+J;G^#R08x@{|ZWy|547&L|k6)HLG|sN<~o z?y`%kbfRN_vc}pwS!Zr}*q6DG7;be0qmxn)eOcD%s3Wk`=@GM>U3ojhAW&WRppi0e zudTj{ufwO~H7izZJmLJD3uPHtjAJvo6H=)&SJ_2%qRRECN#HEU_RGa(Pefk*HIvOH zW7{=Tt(Q(LZ6&WX_Z9vpen}jqge|wCCaLYpiw@f_%9+-!l{kYi&gT@Cj#D*&rz1%e z@*b1W13bN8^j7IpAi$>`_0c!aVzLe*01DY-AcvwE;kW}=Z{3RJLR|O~^iOS(dNEnL zJJ?Dv^ab++s2v!4Oa_WFDLc4fMspglkh;+vzg)4;LS{%CR*>VwyP4>1Tly+!fA-k? z6$bg!*>wKtg!qGO6GQ=cAmM_RC&hKg$~(m2LdP{{*M+*OVf07P$OHp*4SSj9H;)1p z^b1_4p4@C;8G7cBCB6XC{i@vTB3#55iRBZiml^jc4sYnepCKUD+~k}TiuA;HWC6V3 zV{L5uUAU9CdoU+qsFszEwp;@d^!6XnX~KI|!o|=r?qhs`(-Y{GfO4^d6?8BC0xonf zKtZc1C@dNu$~+p#m%JW*J7alfz^$x`U~)1{c7svkIgQ3~RK2LZ5;2TAx=H<4AjC8{ z;)}8OfkZy7pSzVsdX|wzLe=SLg$W1+`Isf=o&}npxWdVR(i8Rr{uzE516a@28VhVr zVgZ3L&X(Q}J0R2{V(}bbNwCDD5K)<5h9CLM*~!xmGTl{Mq$@;~+|U*O#nc^oHnFOy z9Kz%AS*=iTBY_bSZAAY6wXCI?EaE>8^}WF@|}O@I#i69ljjWQPBJVk zQ_rt#J56_wGXiyItvAShJpLEMtW_)V5JZAuK#BAp6bV3K;IkS zK0AL(3ia99!vUPL#j>?<>mA~Q!mC@F-9I$9Z!96ZCSJO8FDz1SP3gF~m`1c#y!efq8QN}eHd+BHwtm%M5586jlU8&e!CmOC z^N_{YV$1`II$~cTxt*dV{-yp61nUuX5z?N8GNBuZZR}Uy_Y3_~@Y3db#~-&0TX644OuG^D3w_`?Yci{gTaPWST8`LdE)HK5OYv>a=6B%R zw|}>ngvSTE1rh`#1Rey0?LXTq;bCIy>TKm^CTV4BCSqdpx1pzC3^ca*S3fUBbKMzF z6X%OSdtt50)yJw*V_HE`hnBA)1yVN3Ruq3l@lY;%Bu+Q&hYLf_Z@fCUVQY-h4M3)- zE_G|moU)Ne0TMjhg?tscN7#ME6!Rb+y#Kd&-`!9gZ06o3I-VX1d4b1O=bpRG-tDK0 zSEa9y46s7QI%LmhbU3P`RO?w#FDM(}k8T`&>OCU3xD=s5N7}w$GntXF;?jdVfg5w9OR8VPxp5{uw zD+_;Gb}@7Vo_d3UV7PS65%_pBUeEwX_Hwfe2e6Qmyq$%0i8Ewn%F7i%=CNEV)Qg`r|&+$ zP6^Vl(MmgvFq`Zb715wYD>a#si;o+b4j^VuhuN>+sNOq6Qc~Y;Y=T&!Q4>(&^>Z6* zwliz!_16EDLTT;v$@W(s7s0s zi*%p>q#t)`S4j=Ox_IcjcllyT38C4hr&mlr6qX-c;qVa~k$MG;UqdnzKX0wo0Xe-_)b zrHu1&21O$y5828UIHI@N;}J@-9cpxob}zqO#!U%Q*ybZ?BH#~^fOT_|8&xAs_rX24 z^nqn{UWqR?MlY~klh)#Rz-*%&e~9agOg*fIN`P&v!@gcO25Mec23}PhzImkdwVT|@ zFR9dYYmf&HiUF4xO9@t#u=uTBS@k*97Z!&hu@|xQnQDkLd!*N`!0JN7{EUoH%OD85 z@aQ2(w-N)1_M{;FV)C#(a4p!ofIA3XG(XZ2E#%j_(=`IWlJAHWkYM2&(+yY|^2TB0 z>wfC-+I}`)LFOJ%KeBb1?eNxGKeq?AI_eBE!M~$wYR~bB)J3=WvVlT8ZlF2EzIFZt zkaeyj#vmBTGkIL9mM3cEz@Yf>j=82+KgvJ-u_{bBOxE5zoRNQW3+Ahx+eMGem|8xo zL3ORKxY_R{k=f~M5oi-Z>5fgqjEtzC&xJEDQ@`<)*Gh3UsftBJno-y5Je^!D?Im{j za*I>RQ=IvU@5WKsIr?kC$DT+2bgR>8rOf3mtXeMVB~sm%X7W5`s=Tp>FR544tuQ>9qLt|aUSv^io&z93luW$_OYE^sf8DB?gx z4&k;dHMWph>Z{iuhhFJr+PCZ#SiZ9e5xM$A#0yPtVC>yk&_b9I676n|oAH?VeTe*1 z@tDK}QM-%J^3Ns6=_vh*I8hE?+=6n9nUU`}EX|;Mkr?6@NXy8&B0i6h?7%D=%M*Er zivG61Wk7e=v;<%t*G+HKBqz{;0Biv7F+WxGirONRxJij zon5~(a`UR%uUzfEma99QGbIxD(d}~oa|exU5Y27#4k@N|=hE%Y?Y3H%rcT zHmNO#ZJ7nPHRG#y-(-FSzaZ2S{`itkdYY^ZUvyw<7yMBkNG+>$Rfm{iN!gz7eASN9-B3g%LIEyRev|3)kSl;JL zX7MaUL_@~4ot3$woD0UA49)wUeu7#lj77M4ar8+myvO$B5LZS$!-ZXw3w;l#0anYz zDc_RQ0Ome}_i+o~H=CkzEa&r~M$1GC!-~WBiHiDq9Sdg{m|G?o7g`R%f(Zvby5q4; z=cvn`M>RFO%i_S@h3^#3wImmWI4}2x4skPNL9Am{c!WxR_spQX3+;fo!y(&~Palyjt~Xo0uy6d%sX&I`e>zv6CRSm)rc^w!;Y6iVBb3x@Y=`hl9jft zXm5vilB4IhImY5b->x{!MIdCermpyLbsalx8;hIUia%*+WEo4<2yZ6`OyG1Wp%1s$ zh<|KrHMv~XJ9dC8&EXJ`t3ETz>a|zLMx|MyJE54RU(@?K&p2d#x?eJC*WKO9^d17# zdTTKx-Os3k%^=58Sz|J28aCJ}X2-?YV3T7ee?*FoDLOC214J4|^*EX`?cy%+7Kb3(@0@!Q?p zk>>6dWjF~y(eyRPqjXqDOT`4^Qv-%G#Zb2G?&LS-EmO|ixxt79JZlMgd^~j)7XYQ; z62rGGXA=gLfgy{M-%1gR87hbhxq-fL)GSfEAm{yLQP!~m-{4i_jG*JsvUdqAkoc#q6Yd&>=;4udAh#?xa2L z7mFvCjz(hN7eV&cyFb%(U*30H@bQ8-b7mkm!=wh2|;+_4vo=tyHPQ0hL=NR`jbsSiBWtG ztMPPBgHj(JTK#0VcP36Z`?P|AN~ybm=jNbU=^3dK=|rLE+40>w+MWQW%4gJ`>K!^- zx4kM*XZLd(E4WsolMCRsdvTGC=37FofIyCZCj{v3{wqy4OXX-dZl@g`Dv>p2`l|H^ zS_@(8)7gA62{Qfft>vx71stILMuyV4uKb7BbCstG@|e*KWl{P1$=1xg(7E8MRRCWQ1g)>|QPAZot~|FYz_J0T+r zTWTB3AatKyUsTXR7{Uu) z$1J5SSqoJWt(@@L5a)#Q6bj$KvuC->J-q1!nYS6K5&e7vNdtj- zj9;qwbODLgIcObqNRGs1l{8>&7W?BbDd!87=@YD75B2ep?IY|gE~t)$`?XJ45MG@2 zz|H}f?qtEb_p^Xs$4{?nA=Qko3Lc~WrAS`M%9N60FKqL7XI+v_5H-UDiCbRm`fEmv z$pMVH*#@wQqml~MZe+)e4Ts3Gl^!Z0W3y$;|9hI?9(iw29b7en0>Kt2pjFXk@!@-g zTb4}Kw!@u|V!wzk0|qM*zj$*-*}e*ZXs#Y<6E_!BR}3^YtjI_byo{F+w9H9?f%mnBh(uE~!Um7)tgp2Ye;XYdVD95qt1I-fc@X zXHM)BfJ?^g(s3K|{N8B^hamrWAW|zis$`6|iA>M-`0f+vq(FLWgC&KnBDsM)_ez1# zPCTfN8{s^K`_bum2i5SWOn)B7JB0tzH5blC?|x;N{|@ch(8Uy-O{B2)OsfB$q0@FR z27m3YkcVi$KL;;4I*S;Z#6VfZcZFn!D2Npv5pio)sz-`_H*#}ROd7*y4i(y(YlH<4 zh4MmqBe^QV_$)VvzWgMXFy`M(vzyR2u!xx&%&{^*AcVLrGa8J9ycbynjKR~G6zC0e zlEU>zt7yQtMhz>XMnz>ewXS#{Bulz$6HETn?qD5v3td>`qGD;Y8&RmkvN=24=^6Q@DYY zxMt}uh2cSToMkkIWo1_Lp^FOn$+47JXJ*#q=JaeiIBUHEw#IiXz8cStEsw{UYCA5v_%cF@#m^Y!=+qttuH4u}r6gMvO4EAvjBURtLf& z6k!C|OU@hv_!*qear3KJ?VzVXDKqvKRtugefa7^^MSWl0fXXZR$Xb!b6`eY4A1#pk zAVoZvb_4dZ{f~M8fk3o?{xno^znH1t;;E6K#9?erW~7cs%EV|h^K>@&3Im}c7nm%Y zbLozFrwM&tSNp|46)OhP%MJ(5PydzR>8)X%i3!^L%3HCoCF#Y0#9vPI5l&MK*_ z6G8Y>$`~c)VvQle_4L_AewDGh@!bKkJeEs_NTz(yilnM!t}7jz>fmJb89jQo6~)%% z@GNIJ@AShd&K%UdQ5vR#yT<-goR+D@Tg;PuvcZ*2AzSWN&wW$Xc+~vW)pww~O|6hL zBxX?hOyA~S;3rAEfI&jmMT4f!-eVm%n^KF_QT=>!A<5tgXgi~VNBXqsFI(iI$Tu3x0L{<_-%|HMG4Cn?Xs zq~fvBhu;SDOCD7K5(l&i7Py-;Czx5byV*3y%#-Of9rtz?M_owXc2}$OIY~)EZ&2?r zLQ(onz~I7U!w?B%LtfDz)*X=CscqH!UE=mO?d&oYvtj|(u)^yomS;Cd>Men|#2yuD zg&tf(*iSHyo;^A03p&_j*QXay9d}qZ0CgU@rnFNDIT5xLhC5_tlugv()+w%`7;ICf z>;<#L4m@{1}Og76*e zHWFm~;n@B1GqO8s%=qu)+^MR|jp(ULUOi~v;wE8SB6^mK@adSb=o+A_>Itjn13AF& zDZe+wUF9G!JFv|dpj1#d+}BO~s*QTe3381TxA%Q>P*J#z%( z5*8N^QWxgF73^cTKkkvgvIzf*cLEyyKw)Wf{#$n{uS#(rAA~>TS#!asqQ2m_izXe3 z7$Oh=rR;sdmVx3G)s}eImsb<@r2~5?vcw*Q4LU~FFh!y4r*>~S7slAE6)W3Up2OHr z2R)+O<0kKo<3+5vB}v!lB*`%}gFldc+79iahqEx#&Im@NCQU$@PyCZbcTt?K{;o@4 z312O9GB)?X&wAB}*-NEU zn@6`)G`FhT8O^=Cz3y+XtbwO{5+{4-&?z!esFts-C zypwgI^4#tZ74KC+_IW|E@kMI=1pSJkvg$9G3Va(!reMnJ$kcMiZ=30dTJ%(Ws>eUf z;|l--TFDqL!PZbLc_O(XP0QornpP;!)hdT#Ts7tZ9fcQeH&rhP_1L|Z_ha#JOroe^qcsLi`+AoBWHPM7}gD z+mHuPXd14M?nkp|nu9G8hPk;3=JXE-a204Fg!BK|$MX`k-qPeD$2OOqvF;C(l8wm13?>i(pz7kRyYm zM$IEzf`$}B%ezr!$(UO#uWExn%nTCTIZzq&8@i8sP#6r8 z*QMUzZV(LEWZb)wbmf|Li;UpiP;PlTQ(X4zreD`|`RG!7_wc6J^MFD!A=#K*ze>Jg z?9v?p(M=fg_VB0+c?!M$L>5FIfD(KD5ku*djwCp+5GVIs9^=}kM2RFsxx0_5DE%BF zykxwjWvs=rbi4xKIt!z$&v(`msFrl4n>a%NO_4`iSyb!UiAE&mDa+apc zPe)#!ToRW~rqi2e1bdO1RLN5*uUM@{S`KLJhhY-@TvC&5D(c?a(2$mW-&N%h5IfEM zdFI6`6KJiJQIHvFiG-34^BtO3%*$(-Ht_JU*(KddiUYoM{coadlG&LVvke&*p>Cac z^BPy2Zteiq1@ulw0e)e*ot7@A$RJui0$l^{lsCt%R;$){>zuRv9#w@;m=#d%%TJmm zC#%eFOoy$V)|3*d<OC1iP+4R7D z8FE$E8l2Y?(o-i6wG=BKBh0-I?i3WF%hqdD7VCd;vpk|LFP!Et8$@voH>l>U8BY`Q zC*G;&y6|!p=7`G$*+hxCv!@^#+QD3m>^azyZoLS^;o_|plQaj-wx^ zRV&$HcY~p)2|Zqp0SYU?W3zV87s6JP-@D~$t0 zvd;-YL~JWc*8mtHz_s(cXus#XYJc5zdC=&!4MeZ;N3TQ>^I|Pd=HPjVP*j^45rs(n zzB{U4-44=oQ4rNN6@>qYVMH4|GmMIz#z@3UW-1_y#eNa+Q%(41oJ5i(DzvMO^%|?L z^r_+MZtw0DZ0=BT-@?hUtA)Ijk~Kh-N8?~X5%KnRH7cb!?Yrd8gtiEo!v{sGrQk{X zvV>h{8-DqTyuAxIE(hb}jMVtga$;FIrrKm>ye5t%M;p!jcH1(Bbux>4D#MVhgZGd> z=c=nVb%^9T?iDgM&9G(mV5xShc-lBLi*6RShenDqB%`-2;I*;IHg6>#ovKQ$M}dDb z<$USN%LMqa5_5DR7g7@(oAoQ%!~<1KSQr$rmS{UFQJs5&qBhgTEM_Y7|0Wv?fbP`z z)`8~=v;B)+>Jh`V*|$dTxKe`HTBkho^-!!K#@i{9FLn-XqX&fQcGsEAXp)BV7(`Lk zC{4&+Pe-0&<)C0kAa(MTnb|L;ZB5i|b#L1o;J)+?SV8T*U9$Vxhy}dm3%!A}SK9l_6(#5(e*>8|;4gNKk7o_%m_ zEaS=Z(ewk}hBJ>v`jtR=$pm_Wq3d&DU+6`BACU4%qdhH1o^m8hT2&j<4Z8!v=rMCk z-I*?48{2H*&+r<{2?wp$kh@L@=rj8c`EaS~J>W?)trc?zP&4bsNagS4yafuDoXpi5`!{BVqJ1$ZC3`pf$`LIZ(`0&Ik+!_Xa=NJW`R2 zd#Ntgwz`JVwC4A61$FZ&kP)-{T|rGO59`h#1enAa`cWxRR8bKVvvN6jBzAYePrc&5 z+*zr3en|LYB2>qJp479rEALk5d*X-dfKn6|kuNm;2-U2+P3_rma!nWjZQ-y*q3JS? zBE}zE-!1ZBR~G%v!$l#dZ*$UV4$7q}xct}=on+Ba8{b>Y9h*f-GW0D0o#vJ0%ALg( ztG2+AjWlG#d;myA(i&dh8Gp?y9HD@`CTaDAy?c&0unZ%*LbLIg4;m{Kc?)ws3^>M+ zt5>R)%KIJV*MRUg{0$#nW=Lj{#8?dD$yhjBOrAeR#4$H_Dc(eyA4dNjZEz1Xk+Bqt zB&pPl+?R{w8GPv%VI`x`IFOj320F1=cV4aq0(*()Tx!VVxCjua;)t}gTr=b?zY+U! zkb}xjXZ?hMJN{Hjw?w&?gz8Ow`htX z@}WG*_4<%ff8(!S6bf3)p+8h2!Rory>@aob$gY#fYJ=LiW0`+~l7GI%EX_=8 z{(;0&lJ%9)M9{;wty=XvHbIx|-$g4HFij`J$-z~`mW)*IK^MWVN+*>uTNqaDmi!M8 zurj6DGd)g1g(f`A-K^v)3KSOEoZXImXT06apJum-dO_%oR)z6Bam-QC&CNWh7kLOE zcxLdVjYLNO2V?IXWa-ys30Jbxw(Xm?U1{4kDs9`gZQHh8X{*w9=H&Zz&-6RL?uq#R zxN+k~JaL|gdsdvY_u6}}MHC?a@ElFeipA1Lud#M~)pp2SnG#K{a@tSpvXM;A8gz9> zRVDV5T1%%!LsNRDOw~LIuiAiKcj<%7WpgjP7G6mMU1#pFo6a-1>0I5ZdhxnkMX&#L z=Vm}?SDlb_LArobqpnU!WLQE*yVGWgs^4RRy4rrJwoUUWoA~ZJUx$mK>J6}7{CyC4 zv=8W)kKl7TmAnM%m;anEDPv5tzT{A{ON9#FPYF6c=QIc*OrPp96tiY&^Qs+#A1H>Y z<{XtWt2eDwuqM zQ_BI#UIP;2-olOL4LsZ`vTPv-eILtuB7oWosoSefWdM}BcP>iH^HmimR`G`|+9waCO z&M375o@;_My(qYvPNz;N8FBZaoaw3$b#x`yTBJLc8iIP z--la{bzK>YPP|@Mke!{Km{vT8Z4|#An*f=EmL34?!GJfHaDS#41j~8c5KGKmj!GTh&QIH+DjEI*BdbSS2~6VTt}t zhAwNQNT6%c{G`If3?|~Fp7iwee(LaUS)X9@I29cIb61} z$@YBq4hSplr&liE@ye!y&7+7n$fb+8nS~co#^n@oCjCwuKD61x$5|0ShDxhQES5MP z(gH|FO-s6#$++AxnkQR!3YMgKcF)!&aqr^a3^{gAVT`(tY9@tqgY7@ z>>ul3LYy`R({OY7*^Mf}UgJl(N7yyo$ag;RIpYHa_^HKx?DD`%Vf1D0s^ zjk#OCM5oSzuEz(7X`5u~C-Y~n4B}_3*`5B&8tEdND@&h;H{R`o%IFpIJ4~Kw!kUjehGT8W!CD7?d8sg_$KKp%@*dW)#fI1#R<}kvzBVpaog_2&W%c_jJfP` z6)wE+$3+Hdn^4G}(ymPyasc1<*a7s2yL%=3LgtZLXGuA^jdM^{`KDb%%}lr|ONDsl zy~~jEuK|XJ2y<`R{^F)Gx7DJVMvpT>gF<4O%$cbsJqK1;v@GKXm*9l3*~8^_xj*Gs z=Z#2VQ6`H@^~#5Pv##@CddHfm;lbxiQnqy7AYEH(35pTg^;u&J2xs-F#jGLuDw2%z z`a>=0sVMM+oKx4%OnC9zWdbpq*#5^yM;og*EQKpv`^n~-mO_vj=EgFxYnga(7jO?G z`^C87B4-jfB_RgN2FP|IrjOi;W9AM1qS}9W@&1a9Us>PKFQ9~YE!I~wTbl!m3$Th? z)~GjFxmhyyGxN}t*G#1^KGVXm#o(K0xJyverPe}mS=QgJ$#D}emQDw+dHyPu^&Uv> z4O=3gK*HLFZPBY|!VGq60Of6QrAdj`nj1h!$?&a;Hgaj{oo{l0P3TzpJK_q_eW8Ng zP6QF}1{V;xlolCs?pGegPoCSxx@bshb#3ng4Fkp4!7B0=&+1%187izf@}tvsjZ6{m z4;K>sR5rm97HJrJ`w}Y`-MZN$Wv2N%X4KW(N$v2@R1RkRJH2q1Ozs0H`@ zd5)X-{!{<+4Nyd=hQ8Wm3CCd}ujm*a?L79ztfT7@&(?B|!pU5&%9Rl!`i;suAg0+A zxb&UYpo-z}u6CLIndtH~C|yz&!OV_I*L;H#C7ie_5uB1fNRyH*<^d=ww=gxvE%P$p zRHKI{^{nQlB9nLhp9yj-so1is{4^`{Xd>Jl&;dX;J)#- z=fmE5GiV?-&3kcjM1+XG7&tSq;q9Oi4NUuRrIpoyp*Fn&nVNFdUuGQ_g)g>VzXGdneB7`;!aTUE$t* z5iH+8XPxrYl)vFo~+vmcU-2) zq!6R(T0SsoDnB>Mmvr^k*{34_BAK+I=DAGu){p)(ndZqOFT%%^_y;X(w3q-L``N<6 zw9=M zoQ8Lyp>L_j$T20UUUCzYn2-xdN}{e@$8-3vLDN?GbfJ>7*qky{n!wC#1NcYQr~d51 zy;H!am=EI#*S&TCuP{FA3CO)b0AAiN*tLnDbvKwxtMw-l;G2T@EGH)YU?-B`+Y=!$ zypvDn@5V1Tr~y~U0s$ee2+CL3xm_BmxD3w}d_Pd@S%ft#v~_j;6sC6cy%E|dJy@wj z`+(YSh2CrXMxI;yVy*=O@DE2~i5$>nuzZ$wYHs$y`TAtB-ck4fQ!B8a;M=CxY^Nf{ z+UQhn0jopOzvbl(uZZ1R-(IFaprC$9hYK~b=57@ zAJ8*pH%|Tjotzu5(oxZyCQ{5MAw+6L4)NI!9H&XM$Eui-DIoDa@GpNI=I4}m>Hr^r zZjT?xDOea}7cq+TP#wK1p3}sbMK{BV%(h`?R#zNGIP+7u@dV5#zyMau+w}VC1uQ@p zrFUjrJAx6+9%pMhv(IOT52}Dq{B9njh_R`>&j&5Sbub&r*hf4es)_^FTYdDX$8NRk zMi=%I`)hN@N9>X&Gu2RmjKVsUbU>TRUM`gwd?CrL*0zxu-g#uNNnnicYw=kZ{7Vz3 zULaFQ)H=7%Lm5|Z#k?<{ux{o4T{v-e zTLj?F(_qp{FXUzOfJxEyKO15Nr!LQYHF&^jMMBs z`P-}WCyUYIv>K`~)oP$Z85zZr4gw>%aug1V1A)1H(r!8l&5J?ia1x_}Wh)FXTxZUE zs=kI}Ix2cK%Bi_Hc4?mF^m`sr6m8M(n?E+k7Tm^Gn}Kf= zfnqoyVU^*yLypz?s+-XV5(*oOBwn-uhwco5b(@B(hD|vtT8y7#W{>RomA_KchB&Cd zcFNAD9mmqR<341sq+j+2Ra}N5-3wx5IZqg6Wmi6CNO#pLvYPGNER}Q8+PjvIJ42|n zc5r@T*p)R^U=d{cT2AszQcC6SkWiE|hdK)m{7ul^mU+ED1R8G#)#X}A9JSP_ubF5p z8Xxcl;jlGjPwow^p+-f_-a~S;$lztguPE6SceeUCfmRo=Qg zKHTY*O_ z;pXl@z&7hniVYVbGgp+Nj#XP^Aln2T!D*{(Td8h{8Dc?C)KFfjPybiC`Va?Rf)X>y z;5?B{bAhPtbmOMUsAy2Y0RNDQ3K`v`gq)#ns_C&ec-)6cq)d^{5938T`Sr@|7nLl; zcyewuiSUh7Z}q8iIJ@$)L3)m)(D|MbJm_h&tj^;iNk%7K-YR}+J|S?KR|29K?z-$c z<+C4uA43yfSWBv*%z=-0lI{ev`C6JxJ};A5N;lmoR(g{4cjCEn33 z-ef#x^uc%cM-f^_+*dzE?U;5EtEe;&8EOK^K}xITa?GH`tz2F9N$O5;)`Uof4~l+t z#n_M(KkcVP*yMYlk_~5h89o zlf#^qjYG8Wovx+f%x7M7_>@r7xaXa2uXb?_*=QOEe_>ErS(v5-i)mrT3&^`Oqr4c9 zDjP_6T&NQMD`{l#K&sHTm@;}ed_sQ88X3y`ON<=$<8Qq{dOPA&WAc2>EQ+U8%>yWR zK%(whl8tB;{C)yRw|@Gn4%RhT=bbpgMZ6erACc>l5^p)9tR`(2W-D*?Ph6;2=Fr|G- zdF^R&aCqyxqWy#P7#G8>+aUG`pP*ow93N=A?pA=aW0^^+?~#zRWcf_zlKL8q8-80n zqGUm=S8+%4_LA7qrV4Eq{FHm9#9X15%ld`@UKyR7uc1X*>Ebr0+2yCye6b?i=r{MPoqnTnYnq z^?HWgl+G&@OcVx4$(y;{m^TkB5Tnhx2O%yPI=r*4H2f_6Gfyasq&PN^W{#)_Gu7e= zVHBQ8R5W6j;N6P3O(jsRU;hkmLG(Xs_8=F&xh@`*|l{~0OjUVlgm z7opltSHg7Mb%mYamGs*v1-#iW^QMT**f+Nq*AzIvFT~Ur3KTD26OhIw1WQsL(6nGg znHUo-4e15cXBIiyqN};5ydNYJ6zznECVVR44%(P0oW!yQ!YH)FPY?^k{IrtrLo7Zo`?sg%%oMP9E^+H@JLXicr zi?eoI?LODRPcMLl90MH32rf8btf69)ZE~&4d%(&D{C45egC6bF-XQ;6QKkbmqW>_H z{86XDZvjiN2wr&ZPfi;^SM6W+IP0);50m>qBhzx+docpBkkiY@2bSvtPVj~E`CfEu zhQG5G>~J@dni5M5Jmv7GD&@%UR`k3ru-W$$onI259jM&nZ)*d3QFF?Mu?{`+nVzkx z=R*_VH=;yeU?9TzQ3dP)q;P)4sAo&k;{*Eky1+Z!10J<(cJC3zY9>bP=znA=<-0RR zMnt#<9^X7BQ0wKVBV{}oaV=?JA=>R0$az^XE%4WZcA^Em>`m_obQyKbmf-GA;!S-z zK5+y5{xbkdA?2NgZ0MQYF-cfOwV0?3Tzh8tcBE{u%Uy?Ky4^tn^>X}p>4&S(L7amF zpWEio8VBNeZ=l!%RY>oVGOtZh7<>v3?`NcHlYDPUBRzgg z0OXEivCkw<>F(>1x@Zk=IbSOn+frQ^+jI*&qdtf4bbydk-jgVmLAd?5ImK+Sigh?X zgaGUlbf^b-MH2@QbqCawa$H1Vb+uhu{zUG9268pa{5>O&Vq8__Xk5LXDaR1z$g;s~;+Ae82wq#l;wo08tX(9uUX6NJWq1vZLh3QbP$# zL`udY|Qp*4ER`_;$%)2 zmcJLj|FD`(;ts0bD{}Ghq6UAVpEm#>j`S$wHi0-D_|)bEZ}#6) zIiqH7Co;TB`<6KrZi1SF9=lO+>-_3=Hm%Rr7|Zu-EzWLSF{9d(H1v*|UZDWiiqX3} zmx~oQ6%9~$=KjPV_ejzz7aPSvTo+3@-a(OCCoF_u#2dHY&I?`nk zQ@t8#epxAv@t=RUM09u?qnPr6=Y5Pj;^4=7GJ`2)Oq~H)2V)M1sC^S;w?hOB|0zXT zQdf8$)jslO>Q}(4RQ$DPUF#QUJm-k9ysZFEGi9xN*_KqCs9Ng(&<;XONBDe1Joku? z*W!lx(i&gvfXZ4U(AE@)c0FI2UqrFLOO$&Yic|`L;Vyy-kcm49hJ^Mj^H9uY8Fdm2 z?=U1U_5GE_JT;Tx$2#I3rAAs(q@oebIK=19a$N?HNQ4jw0ljtyGJ#D}z3^^Y=hf^Bb--297h6LQxi0-`TB|QY2QPg92TAq$cEQdWE ze)ltSTVMYe0K4wte6;^tE+^>|a>Hit_3QDlFo!3Jd`GQYTwlR#{<^MzG zK!vW&))~RTKq4u29bc<+VOcg7fdorq-kwHaaCQe6tLB{|gW1_W_KtgOD0^$^|`V4C# z*D_S9Dt_DIxpjk3my5cBFdiYaq||#0&0&%_LEN}BOxkb3v*d$4L|S|z z!cZZmfe~_Y`46v=zul=aixZTQCOzb(jx>8&a%S%!(;x{M2!*$od2!Pwfs>RZ-a%GOZdO88rS)ZW~{$656GgW)$Q=@!x;&Nn~!K)lr4gF*%qVO=hlodHA@2)keS2 zC}7O=_64#g&=zY?(zhzFO3)f5=+`dpuyM!Q)zS&otpYB@hhn$lm*iK2DRt+#1n|L%zjM}nB*$uAY^2JIw zV_P)*HCVq%F))^)iaZD#R9n^{sAxBZ?Yvi1SVc*`;8|F2X%bz^+s=yS&AXjysDny)YaU5RMotF-tt~FndTK ziRve_5b!``^ZRLG_ks}y_ye0PKyKQSsQCJuK5()b2ThnKPFU?An4;dK>)T^4J+XjD zEUsW~H?Q&l%K4<1f5^?|?lyCQe(O3?!~OU{_Wxs#|Ff8?a_WPQUKvP7?>1()Cy6oLeA zjEF^d#$6Wb${opCc^%%DjOjll%N2=GeS6D-w=Ap$Ux2+0v#s#Z&s6K*)_h{KFfgKjzO17@p1nKcC4NIgt+3t}&}F z@cV; zZ1r#~?R@ZdSwbFNV(fFl2lWI(Zf#nxa<6f!nBZD>*K)nI&Fun@ngq@Ge!N$O< zySt*mY&0moUXNPe~Fg=%gIu)tJ;asscQ!-AujR@VJBRoNZNk;z4hs4T>Ud!y=1NwGs-k zlTNeBOe}=)Epw=}+dfX;kZ32h$t&7q%Xqdt-&tlYEWc>>c3(hVylsG{Ybh_M8>Cz0ZT_6B|3!_(RwEJus9{;u-mq zW|!`{BCtnao4;kCT8cr@yeV~#rf76=%QQs(J{>Mj?>aISwp3{^BjBO zLV>XSRK+o=oVDBnbv?Y@iK)MiFSl{5HLN@k%SQZ}yhPiu_2jrnI?Kk?HtCv>wN$OM zSe#}2@He9bDZ27hX_fZey=64#SNU#1~=icK`D>a;V-&Km>V6ZdVNj7d2 z-NmAoOQm_aIZ2lXpJhlUeJ95eZt~4_S zIfrDs)S$4UjyxKSaTi#9KGs2P zfSD>(y~r+bU4*#|r`q+be_dopJzKK5JNJ#rR978ikHyJKD>SD@^Bk$~D0*U38Y*IpYcH>aaMdZq|YzQ-Ixd(_KZK!+VL@MWGl zG!k=<%Y-KeqK%``uhx}0#X^@wS+mX@6Ul@90#nmYaKh}?uw>U;GS4fn3|X%AcV@iY z8v+ePk)HxSQ7ZYDtlYj#zJ?5uJ8CeCg3efmc#|a%2=u>+vrGGRg$S@^mk~0f;mIu! zWMA13H1<@hSOVE*o0S5D8y=}RiL#jQpUq42D}vW$z*)VB*FB%C?wl%(3>ANaY)bO@ zW$VFutemwy5Q*&*9HJ603;mJJkB$qp6yxNOY0o_4*y?2`qbN{m&*l{)YMG_QHXXa2 z+hTmlA;=mYwg{Bfusl zyF&}ib2J;#q5tN^e)D62fWW*Lv;Rnb3GO-JVtYG0CgR4jGujFo$Waw zSNLhc{>P~>{KVZE1Vl1!z)|HFuN@J7{`xIp_)6>*5Z27BHg6QIgqLqDJTmKDM+ON* zK0Fh=EG`q13l z+m--9UH0{ZGQ%j=OLO8G2WM*tgfY}bV~>3Grcrpehjj z6Xe<$gNJyD8td3EhkHjpKk}7?k55Tu7?#;5`Qcm~ki;BeOlNr+#PK{kjV>qfE?1No zMA07}b>}Dv!uaS8Hym0TgzxBxh$*RX+Fab6Gm02!mr6u}f$_G4C|^GSXJMniy^b`G z74OC=83m0G7L_dS99qv3a0BU({t$zHQsB-RI_jn1^uK9ka_%aQuE2+~J2o!7`735Z zb?+sTe}Gd??VEkz|KAPMfj(1b{om89p5GIJ^#Aics_6DD%WnNGWAW`I<7jT|Af|8g zZA0^)`p8i#oBvX2|I&`HC8Pn&0>jRuMF4i0s=}2NYLmgkZb=0w9tvpnGiU-gTUQhJ zR6o4W6ZWONuBZAiN77#7;TR1^RKE(>>OL>YU`Yy_;5oj<*}ac99DI(qGCtn6`949f ziMpY4k>$aVfffm{dNH=-=rMg|u?&GIToq-u;@1-W&B2(UOhC-O2N5_px&cF-C^tWp zXvChm9@GXEcxd;+Q6}u;TKy}$JF$B`Ty?|Y3tP$N@Rtoy(*05Wj-Ks32|2y2ZM>bM zi8v8E1os!yorR!FSeP)QxtjIKh=F1ElfR8U7StE#Ika;h{q?b?Q+>%78z^>gTU5+> zxQ$a^rECmETF@Jl8fg>MApu>btHGJ*Q99(tMqsZcG+dZ6Yikx7@V09jWCiQH&nnAv zY)4iR$Ro223F+c3Q%KPyP9^iyzZsP%R%-i^MKxmXQHnW6#6n7%VD{gG$E;7*g86G< zu$h=RN_L2(YHO3@`B<^L(q@^W_0#U%mLC9Q^XEo3LTp*~(I%?P_klu-c~WJxY1zTI z^PqntLIEmdtK~E-v8yc&%U+jVxW5VuA{VMA4Ru1sk#*Srj0Pk#tZuXxkS=5H9?8eb z)t38?JNdP@#xb*yn=<*_pK9^lx%;&yH6XkD6-JXgdddZty8@Mfr9UpGE!I<37ZHUe z_Rd+LKsNH^O)+NW8Ni-V%`@J_QGKA9ZCAMSnsN>Ych9VW zCE7R_1FVy}r@MlkbxZ*TRIGXu`ema##OkqCM9{wkWQJg^%3H${!vUT&vv2250jAWN zw=h)C!b2s`QbWhBMSIYmWqZ_~ReRW;)U#@C&ThctSd_V!=HA=kdGO-Hl57an|M1XC?~3f0{7pyjWY}0mChU z2Fj2(B*r(UpCKm-#(2(ZJD#Y|Or*Vc5VyLpJ8gO1;fCm@EM~{DqpJS5FaZ5%|ALw) zyumBl!i@T57I4ITCFmdbxhaOYud}i!0YkdiNRaQ%5$T5>*HRBhyB~<%-5nj*b8=i= z(8g(LA50%0Zi_eQe}Xypk|bt5e6X{aI^jU2*c?!p*$bGk=?t z+17R){lx~Z{!B34Zip~|A;8l@%*Gc}kT|kC0*Ny$&fI3@%M! zqk_zvN}7bM`x@jqFOtaxI?*^Im5ix@=`QEv;__i;Tek-&7kGm6yP17QANVL>*d0B=4>i^;HKb$k8?DYFMr38IX4azK zBbwjF%$>PqXhJh=*7{zH5=+gi$!nc%SqFZlwRm zmpctOjZh3bwt!Oc>qVJhWQf>`HTwMH2ibK^eE*j!&Z`-bs8=A`Yvnb^?p;5+U=Fb8 z@h>j_3hhazd$y^Z-bt%3%E3vica%nYnLxW+4+?w{%|M_=w^04U{a6^22>M_?{@mXP zS|Qjcn4&F%WN7Z?u&I3fU(UQVw4msFehxR*80dSb=a&UG4zDQp&?r2UGPy@G?0FbY zVUQ?uU9-c;f9z06$O5FO1TOn|P{pLcDGP?rfdt`&uw|(Pm@$n+A?)8 zP$nG(VG&aRU*(_5z#{+yVnntu`6tEq>%9~n^*ao}`F6ph_@6_8|AfAXtFfWee_14` zKKURYV}4}=UJmxv7{RSz5QlwZtzbYQs0;t3?kx*7S%nf-aY&lJ@h?-BAn%~0&&@j) zQd_6TUOLXErJ`A3vE?DJIbLE;s~s%eVt(%fMzUq^UfZV9c?YuhO&6pwKt>j(=2CkgTNEq7&c zfeGN+%5DS@b9HO>zsoRXv@}(EiA|t5LPi}*R3?(-=iASADny<{D0WiQG>*-BSROk4vI6%$R>q64J&v-T+(D<_(b!LD z9GL;DV;;N3!pZYg23mcg81tx>7)=e%f|i{6Mx0GczVpc}{}Mg(W_^=Wh0Rp+xXgX` z@hw|5=Je&nz^Xa>>vclstYt;8c2PY)87Ap;z&S&`yRN>yQVV#K{4&diVR7Rm;S{6m z6<+;jwbm`==`JuC6--u6W7A@o4&ZpJV%5+H)}toy0afF*!)AaG5=pz_i9}@OG%?$O z2cec6#@=%xE3K8;^ps<2{t4SnqH+#607gAHP-G4^+PBiC1s>MXf&bQ|Pa;WBIiErV z?3VFpR9JFl9(W$7p3#xe(Bd?Z93Uu~jHJFo7U3K_x4Ej-=N#=a@f;kPV$>;hiN9i9 z<6elJl?bLI$o=|d6jlihA4~bG;Fm2eEnlGxZL`#H%Cdes>uJfMJ4>@1SGGeQ81DwxGxy7L5 zm05Ik*WpSgZvHh@Wpv|2i|Y#FG?Y$hbRM5ZF0Z7FB3cY0+ei#km9mDSPI}^!<<`vr zuv$SPg2vU{wa)6&QMY)h1hbbxvR2cc_6WcWR`SH& z&KuUQcgu}!iW2Wqvp~|&&LSec9>t(UR_|f$;f-fC&tSO-^-eE0B~Frttnf+XN(#T) z^PsuFV#(pE#6ztaI8(;ywN%CtZh?w&;_)w_s@{JiA-SMjf&pQk+Bw<}f@Q8-xCQMwfaf zMgHsAPU=>>Kw~uDFS(IVRN{$ak(SV(hrO!UqhJ?l{lNnA1>U24!=>|q_p404Xd>M# z7?lh^C&-IfeIr`Dri9If+bc%oU0?|Rh8)%BND5;_9@9tuM)h5Kcw6}$Ca7H_n)nOf0pd`boCXItb`o11 zb`)@}l6I_h>n+;`g+b^RkYs7;voBz&Gv6FLmyvY|2pS)z#P;t8k;lS>49a$XeVDc4 z(tx2Pe3N%Gd(!wM`E7WRBZy)~vh_vRGt&esDa0NCua)rH#_39*H0!gIXpd>~{rGx+ zJKAeXAZ-z5n=mMVqlM5Km;b;B&KSJlScD8n?2t}kS4Wf9@MjIZSJ2R?&=zQn zs_`=+5J$47&mP4s{Y{TU=~O_LzSrXvEP6W?^pz<#Y*6Fxg@$yUGp31d(h+4x>xpb< zH+R639oDST6F*0iH<9NHC^Ep*8D4-%p2^n-kD6YEI<6GYta6-I;V^ZH3n5}syTD=P z3b6z=jBsdP=FlXcUe@I|%=tY4J_2j!EVNEzph_42iO3yfir|Dh>nFl&Lu9!;`!zJB zCis9?_(%DI?$CA(00pkzw^Up`O;>AnPc(uE$C^a9868t$m?5Q)CR%!crI$YZpiYK6m= z!jv}82He`QKF;10{9@roL2Q7CF)OeY{~dBp>J~X#c-Z~{YLAxNmn~kWQW|2u!Yq00 zl5LKbzl39sVCTpm9eDW_T>Z{x@s6#RH|P zA~_lYas7B@SqI`N=>x50Vj@S)QxouKC(f6Aj zz}7e5e*5n?j@GO;mCYEo^Jp_*BmLt3!N)(T>f#L$XHQWzZEVlJo(>qH@7;c%fy zS-jm^Adju9Sm8rOKTxfTU^!&bg2R!7C_-t+#mKb_K?0R72%26ASF;JWA_prJ8_SVW zOSC7C&CpSrgfXRp8r)QK34g<~!1|poTS7F;)NseFsbwO$YfzEeG3oo!qe#iSxQ2S# z1=Fxc9J;2)pCab-9o-m8%BLjf(*mk#JJX3k9}S7Oq)dV0jG)SOMbw7V^Z<5Q0Cy$< z^U0QUVd4(96W03OA1j|x%{sd&BRqIERDb6W{u1p1{J(a;fd6lnWzjeS`d?L3-0#o7 z{Qv&L7!Tm`9|}u=|IbwS_jgH(_V@o`S*R(-XC$O)DVwF~B&5c~m!zl14ydT6sK+Ly zn+}2hQ4RTC^8YvrQ~vk$f9u=pTN{5H_yTOcza9SVE&nt_{`ZC8zkmFji=UyD`G4~f zUfSTR=Kju>6u+y&|Bylb*W&^P|8fvEbQH3+w*DrKq|9xMzq2OiZyM=;(?>~4+O|jn zC_Et05oc>e%}w4ye2Fm%RIR??VvofwZS-}BL@X=_4jdHp}FlMhW_IW?Zh`4$z*Wr!IzQHa3^?1|);~VaWmsIcmc6 zJs{k0YW}OpkfdoTtr4?9F6IX6$!>hhA+^y_y@vvA_Gr7u8T+i-< zDX(~W5W{8mfbbM-en&U%{mINU#Q8GA`byo)iLF7rMVU#wXXY`a3ji3m{4;x53216i z`zA8ap?>_}`tQj7-%$K78uR}R$|@C2)qgop$}o=g(jOv0ishl!E(R73N=i0~%S)6+ z1xFP7|H0yt3Z_Re*_#C2m3_X{=zi1C&3CM7e?9-Y5lCtAlA%RFG9PDD=Quw1dfYnZ zdUL)#+m`hKx@PT`r;mIx_RQ6Txbti+&;xQorP;$H=R2r)gPMO9>l+!p*Mt04VH$$M zSLwJ81IFjQ5N!S#;MyBD^IS`2n04kuYbZ2~4%3%tp0jn^**BZQ05ELp zY%yntZ=52s6U5Y93Aao)v~M3y?6h7mZcVGp63pK*d&!TRjW99rUU;@s#3kYB76Bs$|LRwkH>L!0Xe zE=dz1o}phhnOVYZFsajQsRA^}IYZnk9Wehvo>gHPA=TPI?2A`plIm8=F1%QiHx*Zn zi)*Y@)$aXW0v1J|#+R2=$ysooHZ&NoA|Wa}htd`=Eud!(HD7JlT8ug|yeBZmpry(W z)pS>^1$N#nuo3PnK*>Thmaxz4pLcY?PP2r3AlhJ7jw(TI8V#c}>Ym;$iPaw+83L+* z!_QWpYs{UWYcl0u z(&(bT0Q*S_uUX9$jC;Vk%oUXw=A-1I+!c18ij1CiUlP@pfP9}CHAVm{!P6AEJ(7Dn z?}u#}g`Q?`*|*_0Rrnu8{l4PP?yCI28qC~&zlwgLH2AkfQt1?B#3AOQjW&10%@@)Q zDG?`6$8?Nz(-sChL8mRs#3z^uOA>~G=ZIG*mgUibWmgd{a|Tn4nkRK9O^37E(()Q% zPR0#M4e2Q-)>}RSt1^UOCGuv?dn|IT3#oW_$S(YR+jxAzxCD_L25p_dt|^>g+6Kgj zJhC8n)@wY;Y7JI6?wjU$MQU|_Gw*FIC)x~^Eq1k41BjLmr}U>6#_wxP0-2Ka?uK14u5M-lAFSX$K1K{WH!M1&q}((MWWUp#Uhl#n_yT5dFs4X`>vmM& z*1!p0lACUVqp&sZG1GWATvZEENs^0_7Ymwem~PlFN3hTHVBv(sDuP;+8iH07a)s(# z%a7+p1QM)YkS7>kbo${k2N1&*%jFP*7UABJ2d||c!eSXWM*<4(_uD7;1XFDod@cT$ zP>IC%^fbC${^QrUXy$f)yBwY^g@}}kngZKa1US!lAa+D=G4wklukaY8AEW%GL zh40pnuv*6D>9`_e14@wWD^o#JvxYVG-~P)+<)0fW zP()DuJN?O*3+Ab!CP-tGr8S4;JN-Ye^9D%(%8d{vb_pK#S1z)nZzE^ezD&%L6nYbZ z*62>?u)xQe(Akd=e?vZbyb5)MMNS?RheZDHU?HK<9;PBHdC~r{MvF__%T)-9ifM#cR#2~BjVJYbA>xbPyl9yNX zX)iFVvv-lfm`d?tbfh^j*A|nw)RszyD<#e>llO8X zou=q3$1|M@Ob;F|o4H0554`&y9T&QTa3{yn=w0BLN~l;XhoslF-$4KGNUdRe?-lcV zS4_WmftU*XpP}*wFM^oKT!D%_$HMT#V*j;9weoOq0mjbl1271$F)`Q(C z76*PAw3_TE{vntIkd=|(zw)j^!@j ^tV@s0U~V+mu)vv`xgL$Z9NQLnuRdZ;95D|1)!0Aybwv}XCE#xz1k?ZC zxAU)v@!$Sm*?)t2mWrkevNFbILU9&znoek=d7jn*k+~ptQ)6z`h6e4B&g?Q;IK+aH z)X(BH`n2DOS1#{AJD-a?uL)@Vl+`B=6X3gF(BCm>Q(9+?IMX%?CqgpsvK+b_de%Q> zj-GtHKf!t@p2;Gu*~#}kF@Q2HMevg~?0{^cPxCRh!gdg7MXsS}BLtG_a0IY0G1DVm z2F&O-$Dzzc#M~iN`!j38gAn`6*~h~AP=s_gy2-#LMFoNZ0<3q+=q)a|4}ur7F#><%j1lnr=F42Mbti zi-LYs85K{%NP8wE1*r4Mm+ZuZ8qjovmB;f##!E*M{*A(4^~vg!bblYi1M@7tq^L8- zH7tf_70iWXqcSQgENGdEjvLiSLicUi3l0H*sx=K!!HLxDg^K|s1G}6Tam|KBV>%YeU)Q>zxQe;ddnDTWJZ~^g-kNeycQ?u242mZs`i8cP)9qW`cwqk)Jf?Re0=SD=2z;Gafh(^X-=WJ$i7Z9$Pao56bTwb+?p>L3bi9 zP|qi@;H^1iT+qnNHBp~X>dd=Us6v#FPDTQLb9KTk%z{&OWmkx3uY(c6JYyK3w|z#Q zMY%FPv%ZNg#w^NaW6lZBU+}Znwc|KF(+X0RO~Q6*O{T-P*fi@5cPGLnzWMSyoOPe3 z(J;R#q}3?z5Ve%crTPZQFLTW81cNY-finw!LH9wr$(C)p_@v?(y#b-R^Pv!}_#7t+A?pHEUMY zoQZIwSETTKeS!W{H$lyB1^!jn4gTD{_mgG?#l1Hx2h^HrpCXo95f3utP-b&%w80F} zXFs@Jp$lbIL64@gc?k*gJ;OForPaapOH7zNMB60FdNP<*9<@hEXJk9Rt=XhHR-5_$Ck-R?+1py&J3Y9^sBBZuj?GwSzua;C@9)@JZpaI zE?x6{H8@j9P06%K_m%9#nnp0Li;QAt{jf-7X%Pd2jHoI4As-9!UR=h6Rjc z!3{UPWiSeLG&>1V5RlM@;5HhQW_&-wL2?%k@dvRS<+@B6Yaj*NG>qE5L*w~1ATP$D zmWu6(OE=*EHqy{($~U4zjxAwpPn42_%bdH9dMphiUU|) z*+V@lHaf%*GcXP079>vy5na3h^>X=n;xc;VFx)`AJEk zYZFlS#Nc-GIHc}j06;cOU@ zAD7Egkw<2a8TOcfO9jCp4U4oI*`|jpbqMWo(={gG3BjuM3QTGDG`%y|xithFck}0J zG}N#LyhCr$IYP`#;}tdm-7^9=72+CBfBsOZ0lI=LC_a%U@(t3J_I1t(UdiJ^@NubM zvvA0mGvTC%{fj53M^|Ywv$KbW;n8B-x{9}Z!K6v-tw&Xe_D2{7tX?eVk$sA*0826( zuGz!K7$O#;K;1w<38Tjegl)PmRso`fc&>fAT5s z7hzQe-_`lx`}2=c)jz6;yn(~F6#M@z_7@Z(@GWbIAo6A2&;aFf&>CVHpqoPh5#~=G zav`rZ3mSL2qwNL+Pg>aQv;%V&41e|YU$!fQ9Ksle!XZERpjAowHtX zi#0lnw{(zmk&}t`iFEMmx-y7FWaE*vA{Hh&>ieZg{5u0-3@a8BY)Z47E`j-H$dadu zIP|PXw1gjO@%aSz*O{GqZs_{ke|&S6hV{-dPkl*V|3U4LpqhG0eVdqfeNX28hrafI zE13WOsRE|o?24#`gQJs@v*EwL{@3>Ffa;knvI4@VEG2I>t-L(KRS0ShZ9N!bwXa}e zI0}@2#PwFA&Y9o}>6(ZaSaz>kw{U=@;d{|dYJ~lyjh~@bBL>n}#@KjvXUOhrZ`DbnAtf5bz3LD@0RpmAyC-4cgu<7rZo&C3~A_jA*0)v|Ctcdu} zt@c7nQ6hSDC@76c4hI&*v|5A0Mj4eQ4kVb0$5j^*$@psB zdouR@B?l6E%a-9%i(*YWUAhxTQ(b@z&Z#jmIb9`8bZ3Um3UW!@w4%t0#nxsc;*YrG z@x$D9Yj3EiA(-@|IIzi@!E$N)j?gedGJpW!7wr*7zKZwIFa>j|cy<(1`VV_GzWN=1 zc%OO)o*RRobvTZE<9n1s$#V+~5u8ZwmDaysD^&^cxynksn!_ypmx)Mg^8$jXu5lMo zK3K_8GJh#+7HA1rO2AM8cK(#sXd2e?%3h2D9GD7!hxOEKJZK&T`ZS0e*c9c36Y-6yz2D0>Kvqy(EuiQtUQH^~M*HY!$e z20PGLb2Xq{3Ceg^sn+99K6w)TkprP)YyNU(+^PGU8}4&Vdw*u;(`Bw!Um76gL_aMT z>*82nmA8Tp;~hwi0d3S{vCwD};P(%AVaBr=yJ zqB?DktZ#)_VFh_X69lAHQw(ZNE~ZRo2fZOIP;N6fD)J*3u^YGdgwO(HnI4pb$H#9) zizJ<>qI*a6{+z=j+SibowDLKYI*Je2Y>~=*fL@i*f&8**s~4l&B&}$~nwhtbOTr=G zFx>{y6)dpJPqv={_@*!q0=jgw3^j`qi@!wiWiT_$1`SPUgaG&9z9u9=m5C8`GpMaM zyMRSv2llS4F}L?233!)f?mvcYIZ~U z7mPng^=p)@Z*Fp9owSYA`Fe4OjLiJ`rdM`-U(&z1B1`S`ufK_#T@_BvenxDQU`deH$X5eMVO=;I4EJjh6?kkG2oc6AYF6|(t)L0$ukG}Zn=c+R`Oq;nC)W^ z{ek!A?!nCsfd_5>d&ozG%OJmhmnCOtARwOq&p!FzWl7M))YjqK8|;6sOAc$w2%k|E z`^~kpT!j+Y1lvE0B)mc$Ez_4Rq~df#vC-FmW;n#7E)>@kMA6K30!MdiC19qYFnxQ* z?BKegU_6T37%s`~Gi2^ewVbciy-m5%1P3$88r^`xN-+VdhhyUj4Kzg2 zlKZ|FLUHiJCZL8&<=e=F2A!j@3D@_VN%z?J;uw9MquL`V*f^kYTrpoWZ6iFq00uO+ zD~Zwrs!e4cqGedAtYxZ76Bq3Ur>-h(m1~@{x@^*YExmS*vw9!Suxjlaxyk9P#xaZK z)|opA2v#h=O*T42z>Mub2O3Okd3GL86KZM2zlfbS z{Vps`OO&3efvt->OOSpMx~i7J@GsRtoOfQ%vo&jZ6^?7VhBMbPUo-V^Znt%-4k{I# z8&X)=KY{3lXlQg4^FH^{jw0%t#2%skLNMJ}hvvyd>?_AO#MtdvH;M^Y?OUWU6BdMX zJ(h;PM9mlo@i)lWX&#E@d4h zj4Z0Czj{+ipPeW$Qtz_A52HA<4$F9Qe4CiNQSNE2Q-d1OPObk4?7-&`={{yod5Iy3kB=PK3%0oYSr`Gca120>CHbC#SqE*ivL2R(YmI1A|nAT?JmK*2qj_3p#?0h)$#ixdmP?UejCg9%AS2 z8I(=_QP(a(s)re5bu-kcNQc-&2{QZ%KE*`NBx|v%K2?bK@Ihz_e<5Y(o(gQ-h+s&+ zjpV>uj~?rfJ!UW5Mop~ro^|FP3Z`@B6A=@f{Wn78cm`)3&VJ!QE+P9&$;3SDNH>hI z_88;?|LHr%1kTX0t*xzG-6BU=LRpJFZucRBQ<^zy?O5iH$t>o}C}Fc+kM1EZu$hm% zTTFKrJkXmCylFgrA;QAA(fX5Sia5TNo z?=Ujz7$Q?P%kM$RKqRQisOexvV&L+bolR%`u`k;~!o(HqgzV9I6w9|g*5SVZN6+kT9H$-3@%h%k7BBnB zPn+wmPYNG)V2Jv`&$LoI*6d0EO^&Nh`E* z&1V^!!Szd`8_uf%OK?fuj~! z%p9QLJ?V*T^)72<6p1ONqpmD?Wm((40>W?rhjCDOz?#Ei^sXRt|GM3ULLnoa8cABQ zA)gCqJ%Q5J%D&nJqypG-OX1`JLT+d`R^|0KtfGQU+jw79la&$GHTjKF>*8BI z0}l6TC@XB6`>7<&{6WX2kX4k+0SaI`$I8{{mMHB}tVo*(&H2SmZLmW* z+P8N>(r}tR?f!O)?)df>HIu>$U~e~tflVmwk*+B1;TuqJ+q_^`jwGwCbCgSevBqj$ z<`Fj*izeO)_~fq%wZ0Jfvi6<3v{Afz;l5C^C7!i^(W>%5!R=Ic7nm(0gJ~9NOvHyA zqWH2-6w^YmOy(DY{VrN6ErvZREuUMko@lVbdLDq*{A+_%F>!@6Z)X9kR1VI1+Ler+ zLUPtth=u~23=CqZoAbQ`uGE_91kR(8Ie$mq1p`q|ilkJ`Y-ob_=Nl(RF=o7k{47*I)F%_XMBz9uwRH8q1o$TkV@8Pwl zzi`^7i;K6Ak7o58a_D-V0AWp;H8pSjbEs$4BxoJkkC6UF@QNL)0$NU;Wv0*5 z0Ld;6tm7eR%u=`hnUb)gjHbE2cP?qpo3f4w%5qM0J*W_Kl6&z4YKX?iD@=McR!gTyhpGGYj!ljQm@2GL^J70`q~4CzPv@sz`s80FgiuxjAZ zLq61rHv1O>>w1qOEbVBwGu4%LGS!!muKHJ#JjfT>g`aSn>83Af<9gM3XBdY)Yql|{ zUds}u*;5wuus)D>HmexkC?;R&*Z`yB4;k;4T*(823M&52{pOd1yXvPJ3PPK{Zs>6w zztXy*HSH0scZHn7qIsZ8y-zftJ*uIW;%&-Ka0ExdpijI&xInDg-Bv-Q#Islcbz+R! zq|xz?3}G5W@*7jSd`Hv9q^5N*yN=4?Lh=LXS^5KJC=j|AJ5Y(f_fC-c4YQNtvAvn|(uP9@5Co{dL z?7|=jqTzD8>(6Wr&(XYUEzT~-VVErf@|KeFpKjh=v51iDYN_`Kg&XLOIG;ZI8*U$@ zKig{dy?1H}UbW%3jp@7EVSD>6c%#abQ^YfcO(`)*HuvNc|j( zyUbYozBR15$nNU$0ZAE%ivo4viW?@EprUZr6oX=4Sc!-WvrpJdF`3SwopKPyX~F>L zJ>N>v=_plttTSUq6bYu({&rkq)d94m5n~Sk_MO*gY*tlkPFd2m=Pi>MK)ObVV@Sgs zmXMNMvvcAuz+<$GLR2!j4w&;{)HEkxl{$B^*)lUKIn&p5_huD6+%WDoH4`p}9mkw$ zXCPw6Y7tc%rn$o_vy>%UNBC`0@+Ih-#T05AT)ooKt?94^ROI5;6m2pIM@@tdT=&WP z{u09xEVdD}{(3v}8AYUyT82;LV%P%TaJa%f)c36?=90z>Dzk5mF2}Gs0jYCmufihid8(VFcZWs8#59;JCn{!tHu5kSBbm zL`F{COgE01gg-qcP2Lt~M9}mALg@i?TZp&i9ZM^G<3`WSDh}+Ceb3Q!QecJ|N;Xrs z{wH{D8wQ2+mEfBX#M8)-32+~q4MRVr1UaSPtw}`iwx@x=1Xv-?UT{t}w}W(J&WKAC zrZ%hssvf*T!rs}}#atryn?LB=>0U%PLwA9IQZt$$UYrSw`7++}WR7tfE~*Qg)vRrM zT;(1>Zzka?wIIz8vfrG86oc^rjM@P7^i8D~b(S23AoKYj9HBC(6kq9g`1gN@|9^xO z{~h zbxGMHqGZ@eJ17bgES?HQnwp|G#7I>@p~o2zxWkgZUYSUeB*KT{1Q z*J3xZdWt`eBsA}7(bAHNcMPZf_BZC(WUR5B8wUQa=UV^e21>|yp+uop;$+#JwXD!> zunhJVCIKgaol0AM_AwJNl}_k&q|uD?aTE@{Q*&hxZ=k_>jcwp}KwG6mb5J*pV@K+- zj*`r0WuEU_8O=m&1!|rj9FG7ad<2px63;Gl z9lJrXx$~mPnuiqIH&n$jSt*ReG}1_?r4x&iV#3e_z+B4QbhHwdjiGu^J3vcazPi`| zaty}NFSWe=TDry*a*4XB)F;KDI$5i9!!(5p@5ra4*iW;FlGFV0P;OZXF!HCQ!oLm1 zsK+rY-FnJ?+yTBd0}{*Y6su|hul)wJ>RNQ{eau*;wWM{vWM`d0dTC-}Vwx6@cd#P? zx$Qyk^2*+_ZnMC}q0)+hE-q)PKoox#;pc%DNJ&D5+if6X4j~p$A7-s&AjDkSEV)aM z(<3UOw*&f)+^5F0Mpzw3zB1ZHl*B?C~Cx) zuNg*>5RM9F5{EpU@a2E7hAE`m<89wbQ2Lz&?Egu-^sglNXG5Q;{9n(%&*kEb0vApd zRHrY@22=pkFN81%x)~acZeu`yvK zovAVJNykgxqkEr^hZksHkpxm>2I8FTu2%+XLs@?ym0n;;A~X>i32{g6NOB@o4lk8{ zB}7Z2MNAJi>9u=y%s4QUXaNdt@SlAZr54!S6^ETWoik6gw=k-itu_}Yl_M9!l+Rbv z(S&WD`{_|SE@@(|Wp7bq1Zq}mc4JAG?mr2WN~6}~u`7M_F@J9`sr0frzxfuqSF~mA z$m$(TWAuCIE99yLSwi%R)8geQhs;6VBlRhJb(4Cx zu)QIF%_W9+21xI45U>JknBRaZ9nYkgAcK6~E|Zxo!B&z9zQhjsi^fgwZI%K@rYbMq znWBXg1uCZ+ljGJrsW7@x3h2 z;kn!J!bwCeOrBx;oPkZ}FeP%wExyf4=XMp)N8*lct~SyfK~4^-75EZFpHYO5AnuRM z!>u?>Vj3+j=uiHc<=cD~JWRphDSwxFaINB42-{@ZJTWe85>-RcQ&U%?wK)vjz z5u5fJYkck##j(bP7W0*RdW#BmAIK`D3=(U~?b`cJ&U2jHj}?w6 z_4BM)#EoJ6)2?pcR4AqBd)qAUn@RtNQq})FIQoBK4ie+GB(Vih2D|Ds>RJo2zE~C- z7mI)7p)5(-O6JRh6a@VZ5~piVC+Xv=O-)=0eTMSJsRE^c1@bPQWlr}E31VqO-%739 zdcmE{`1m;5LH8w|7euK>>>U#Iod8l1yivC>;YWsg=z#07E%cU9x1yw#3l6AcIm%79 zGi^zH6rM#CZMow(S(8dcOq#5$kbHnQV6s?MRsU3et!!YK5H?OV9vf2qy-UHCn>}2d zTwI(A_fzmmCtE@10yAGgU7R&|Fl$unZJ_^0BgCEDE6(B*SzfkapE9#0N6adc>}dtH zJ#nt^F~@JMJg4=Pv}OdUHyPt-<<9Z&c0@H@^4U?KwZM&6q0XjXc$>K3c&3iXLD9_%(?)?2kmZ=Ykb;)M`Tw=%_d=e@9eheGG zk0<`4so}r={C{zr|6+_1mA_=a56(XyJq||g6Es1E6%fPg#l{r+vk9;)r6VB7D84nu zE0Z1EIxH{Y@}hT+|#$0xn+CdMy6Uhh80eK~nfMEIpM z`|G1v!USmx81nY8XkhEOSWto}pc#{Ut#`Pqb}9j$FpzkQ7`0<-@5D_!mrLah98Mpr zz(R7;ZcaR-$aKqUaO!j z=7QT;Bu0cvYBi+LDfE_WZ`e@YaE_8CCxoRc?Y_!Xjnz~Gl|aYjN2&NtT5v4#q3od2 zkCQZHe#bn(5P#J**Fj4Py%SaaAKJsmV6}F_6Z7V&n6QAu8UQ#9{gkq+tB=VF_Q6~^ zf(hXvhJ#tC(eYm6g|I>;55Lq-;yY*COpTp4?J}hGQ42MIVI9CgEC{3hYw#CZfFKVG zgD(steIg8veyqX%pYMoulq zMUmbj8I`t>mC`!kZ@A>@PYXy*@NprM@e}W2Q+s?XIRM-U1FHVLM~c60(yz1<46-*j zW*FjTnBh$EzI|B|MRU11^McTPIGVJrzozlv$1nah_|t4~u}Ht^S1@V8r@IXAkN;lH z_s|WHlN90k4X}*#neR5bX%}?;G`X!1#U~@X6bbhgDYKJK17~oFF0&-UB#()c$&V<0 z7o~Pfye$P@$)Lj%T;axz+G1L_YQ*#(qO zQND$QTz(~8EF1c3<%;>dAiD$>8j@7WS$G_+ktE|Z?Cx<}HJb=!aChR&4z ziD&FwsiZ)wxS4k6KTLn>d~!DJ^78yb>?Trmx;GLHrbCBy|Bip<@sWdAfP0I~;(Ybr zoc-@j?wA!$ zIP0m3;LZy+>dl#&Ymws@7|{i1+OFLYf@+8+)w}n?mHUBCqg2=-Hb_sBb?=q))N7Ej zDIL9%@xQFOA!(EQmchHiDN%Omrr;WvlPIN5gW;u#ByV)x2aiOd2smy&;vA2+V!u|D zc~K(OVI8} z0t|e0OQ7h23e01O;%SJ}Q#yeDh`|jZR7j-mL(T4E;{w^}2hzmf_6PF|`gWVj{I?^2T3MBK>{?nMXed4kgNox2DP!jvP9v`;pa6AV)OD zDt*Vd-x7s{-;E?E5}3p-V;Y#dB-@c5vTWfS7<=>E+tN$ME`Z7K$px@!%{5{uV`cH80|IzU! zDs9=$%75P^QKCRQ`mW7$q9U?mU@vrFMvx)NNDrI(uk>xwO;^($EUvqVev#{W&GdtR z0ew;Iwa}(-5D28zABlC{WnN{heSY5Eq5Fc=TN^9X#R}0z53!xP85#@;2E=&oNYHyo z46~#Sf!1M1X!rh}ioe`>G2SkPH{5nCoP`GT@}rH;-LP1Q7U_ypw4+lwsqiBql80aA zJE<(88yw$`xzNiSnU(hsyJqHGac<}{Av)x9lQ=&py9djsh0uc}6QkmKN3{P!TEy;P zzLDVQj4>+0r<9B0owxBt5Uz`!M_VSS|{(?`_e+qD9b=vZHoo6>?u;!IP zM7sqoyP>kWY|=v06gkhaGRUrO8n@zE?Yh8$om@8%=1}*!2wdIWsbrCg@;6HfF?TEN z+B_xtSvT6H3in#8e~jvD7eE|LTQhO_>3b823&O_l$R$CFvP@3~)L7;_A}JpgN@ax{ z2d9Ra)~Yh%75wsmHK8e87yAn-ZMiLo6#=<&PgdFsJw1bby-j&3%&4=9dQFltFR(VB z@=6XmyNN4yr^^o$ON8d{PQ=!OX17^CrdM~7D-;ZrC!||<+FEOxI_WI3 zCA<35va%4v>gcEX-@h8esj=a4szW7x z{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1*nV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q z8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI##W$P9M{B3c3Si9gw^jlPU-JqD~Cye z;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP>rp)BWKA9<}^R9g!0q7yWlh;gr_TEOD|#BmGq<@IV;ue zg+D2}cjpp+dPf&Q(36sFU&K8}hA85U61faW&{lB`9HUl-WWCG|<1XANN3JVAkRYvr5U z4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvxK%p23>M&=KTCgR!Ee8c?DAO2_R?Bkaqr6^BSP!8dHXxj%N1l+V$_%vzHjq zvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rUHfcog>kv3UZAEB*g7Er@t6CF8kHDmK zTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B6~YD=gjJ!043F+&#_;D*mz%Q60=L9O zve|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw-19qI#oB(RSNydn0t~;tAmK!P-d{b-@ z@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^82zk8VXx|3mR^JCcWdA|t{0nPmYFOxN z55#^-rlqobcr==<)bi?E?SPymF*a5oDDeSdO0gx?#KMoOd&G(2O@*W)HgX6y_aa6i zMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H`oa=g0SyiLd~BxAj2~l$zRSDHxvDs; zI4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*(e-417=bO2q{492SWrqDK+L3#ChUHtz z*@MP)e^%@>_&#Yk^1|tv@j4%3T)diEXATx4K*hcO`sY$jk#jN5WD<=C3nvuVs zRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_l3F^#f_rDu8l}l8qcAz0FFa)EAt32I zUy_JLIhU_J^l~FRH&6-iv zSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPmZi-noqS!^Ft zb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@fFGJtW3r>qV>1Z0r|L>7I3un^gcep$ zAAWfZHRvB|E*kktY$qQP_$YG60C z@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn`EgAp!h|r03h7B!$#OZW#ACD+M;-5J!W+{h z|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czPg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-& zSFp;!k?uFayytV$8HPwuyELSXOs^27XvK-DOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2 zS43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@K^kpH8=yFuP+vI^+59|3%Zqnb5lTDAykf9S#X`3N(X^SpdMyWQGOQRjhiwlj!0W-yD<3aEj^ z&X%=?`6lCy~?`&WSWt?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6Vj zA#>1f@EYiS8MRHZphpMA_5`znM=pzUpBPO)pXGYpQ6gkine{ z6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ<1SE2Edkfk9C!0t%}8Yio09^F`YGzp zaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8pT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk z7v1W)5H9wkorE0ZZjL0Q1=NRGY>zwgfm81DdoaVwNH;or{{e zSyybt)m<=zXoA^RALYG-2touH|L*BLvmm9cdMmn+KGopyR@4*=&0 z&4g|FLoreZOhRmh=)R0bg~T2(8V_q7~42-zvb)+y959OAv!V$u(O z3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+MWQoJI_r$HxL5km1#6(e@{lK3Udc~n z0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai<6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY z>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF#Mnbr-f55)vXj=^j+#)=s+ThMaV~E`B z8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg%bOg8>mbRN%7^Um-7oj4=6`$|(K7!+t^90a{$1 z8Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9SquGh<9<=AO&g6BZte6hn>Qmvv;Rt)*c zJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapiPbLg_pxm`+HZurtFZ;wZ=`Vk*do~$wBxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5 zo}_(P;=!y z-AjFrERh%8la!z6Fn@lR?^E~H12D? z8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2wG1|5ikb^qHv&9hT8w83+yv&BQXOQy zMVJSBL(Ky~p)gU3#%|blG?I zR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-}9?*x{y(`509qhCV*B47f2hLrGl^<@S zuRGR!KwHei?!CM10pBKpDIoBNyRuO*>3FU?HjipIE#B~y3FSfOsMfj~F9PNr*H?0o zHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R%rq|ic4fzJ#USpTm;X7K+E%xsT_3VHK ze?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>JmiU#?2^`>arnsl#)*R&nf_%>A+qwl%o z{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVDM8AI6MM2V*^_M^sQ0dmHu11fy^kOqX zqzps-c5efIKWG`=Es(9&S@K@)ZjA{lj3ea7_MBPk(|hBFRjHVMN!sNUkrB;(cTP)T97M$ z0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5I7{`Z=z_X*no8s>mY;>BvEXK%b`a6(DTS6t&b!vf_z#HM{Uoy z_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIoIZSVls9kFGsTwvr4{T_LidcWtt$u{k zJlW7moRaH6+A5hW&;;2O#$oKyEN8kx z`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41UwxzRFXt^E2B$domKT@|nNW`EHwyj>&< zJatrLQ=_3X%vd%nHh^z@vIk(<5%IRAa&Hjzw`TSyVMLV^L$N5Kk_i3ey6byDt)F^U zuM+Ub4*8+XZpnnPUSBgu^ijLtQD>}K;eDpe1bNOh=fvIfk`&B61+S8ND<(KC%>y&? z>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xoaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$ zitm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H?n6^}l{D``Me90`^o|q!olsF?UX3YS zq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfwR!gX_%AR=L3BFsf8LxI|K^J}deh0Zd zV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z-G6kzA01M?rba+G_mwNMQD1mbVbNTW zmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bAv!b;%yo{g*9l2)>tsZJOOp}U~8VUH`}$8p_}t*XIOehezolNa-a2x0BS})Y9}& z*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWKDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~ zVCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjM zsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$) zWL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>Igy8p#i4GN{>#v=pFYUQT(g&b$OeTy- zX_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6NIHrC0H+Qpam1bNa=(`SRKjixBTtm&e z`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_%7SUeH6=TrXt3J@js`4iDD0=I zoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bXa_A{oZ9eG$he;_xYvTbTD#moBy zY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOxXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+p zmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L*&?(77!-=zvnCVW&kUcZMb6;2!83si z518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j(iTaS4HhQ)ldR=r)_7vYFUr%THE}cPF z{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVAdDZRybv?H|>`9f$AKVjFWJ=wegO7hO zOIYCtd?Vj{EYLT*^gl35|HbMX|NAEUf2ra9dy1=O;figB>La=~eA^#>O6n4?EMugV zbbt{Dbfef5l^(;}5kZ@!XaWwF8z0vUr6r|+QN*|WpF z^*osUHzOnE$lHuWYO$G7>}Y)bY0^9UY4eDV`E{s+{}Z$O$2*lMEYl zTA`ki(<0(Yrm~}15V-E^e2W6`*`%ydED-3G@$UFm6$ZtLx z+av`BhsHcAWqdxPWfu2*%{}|Sptax4_=NpDMeWy$* zZM6__s`enB$~0aT1BU^2k`J9F%+n+lL_|8JklWOCVYt*0%o*j4w1CsB_H^tVpYT_LLyKuyk=CV6~1M<7~^FylL*+AIFf3h>J=x$ygY-BG}4LJ z8XxYPY!v7dO3PVwEoY=`)6krokmR^|Mg5ztX_^#QR}ibr^X-|_St#rtv3gukh0(#A=};NPlNz57ZDFJ9hf#NP50zS)+Fo=StX)i@ zWS?W}i6LjB>kAB~lupAPyIjFb)izFgRq*iS*(Jt509jNr3r72{Gj`5DGoj;J&k5G@Rm!dJ($ox>SbxR)fc zz|Phug;~A7!p@?|mMva@rWuf2fSDK_ZxN3vVmlYz>rrf?LpiNs)^z!y{As@`55JC~ zS*GD3#N-ptY!2<613UelAJ;M4EEI$dm)`8#n$|o{ce^dlyoUY3bsy2hgnj-;ovubb zg2h1rZA6Ot}K_cpYBpIuF&CyK~5R0Wv;kG|3A^8K3nk{rw$Be8u@aos#qvKQKJyVU$cX6biw&Ep#+q7upFX z%qo&`WZ){<%zh@BTl{MO@v9#;t+cb7so0Uz49Fmo1e4>y!vUyIHadguZS0T7-x#_drMXz*16*c zymR0u^`ZQpXN}2ofegbpSedL%F9aypdQcrzjzPlBW0j zMlPzC&ePZ@Cq!?d%9oQNEg0`rHALm8l#lUdXMVEqDvb(AID~H(?H9z!e9G98fG@IzhajKr)3{L_Clu1(Bwg`RM!-(MOuZi zbeDsj9I3(~EITsE=3Z)a|l_rn8W92U0DB70gF7YYfO0j!)h?QobY1lSR>0 z_TVw@$eP~3k8r9;%g%RlZzCJ2%f}DvY`rsZ$;ak&^~-`i%B%+O!pnADeVyV!dHj|} zzOj#q4eRx9Q8c2Z7vy9L&fGLj+3_?fp}+8o`Xpwyi(81H|7P8#65%FIS*lOi={o&v z4NV$xu7az4Nb50dRGZv<tdZCx4Ek<_o3!mAT} zL5l*|K3Qr-)W8paaG z&R6{ped_4e2cy}ejD0!dt{*PaC*^L@eB%(1Fmc%Y#4)~!jF#lCGfj#E??4LG-T;!M z>Uha}f;W>ib_ZL-I7-v9KZQls^G!-JmL^w;=^}?!RXK;m4$#MwI2AH-l7M2-0 zVMK8k^+4+>2S0k^N_40EDa#`7c;2!&3-o6MHsnBfRnq@>E@)=hDulVq-g5SQWDWbt zj6H5?QS2gRZ^Zvbs~cW|8jagJV|;^zqC0e=D1oUsQPJ3MCb+eRGw(XgIY9y8v_tXq z9$(xWntWpx_Uronmvho{JfyYdV{L1N$^s^|-Nj`Ll`lUsiWTjm&8fadUGMXreJGw$ zQ**m+Tj|(XG}DyUKY~2?&9&n6SJ@9VKa9Hcayv{ar^pNr0WHy zP$bQv&8O!vd;GoT!pLwod-42qB^`m!b7nP@YTX}^+1hzA$}LSLh}Ln|?`%8xGMazw z8WT!LoYJ-Aq3=2p6ZSP~uMgSSWv3f`&-I06tU}WhZsA^6nr&r17hjQIZE>^pk=yZ% z06}dfR$85MjWJPq)T?OO(RxoaF+E#4{Z7)i9}Xsb;Nf+dzig61HO;@JX1Lf9)R5j9)Oi6vPL{H z&UQ9ln=$Q8jnh6-t;`hKM6pHftdd?$=1Aq16jty4-TF~`Gx=C&R242uxP{Y@Q~%O3 z*(16@x+vJsbW@^3tzY=-5MHi#(kB};CU%Ep`mVY1j$MAPpYJBB3x$ue`%t}wZ-@CG z(lBv36{2HMjxT)2$n%(UtHo{iW9>4HX4>)%k8QNnzIQYXrm-^M%#Qk%9odbUrZDz1YPdY`2Z4w~p!5tb^m(mUfk}kZ9+EsmenQ)5iwiaulcy zCJ#2o4Dz?@%)aAKfVXYMF;3t@aqNh2tBBlBkCdj`F31b=h93y(46zQ-YK@+zX5qM9 z&=KkN&3@Ptp*>UD$^q-WpG|9O)HBXz{D>p!`a36aPKkgz7uxEo0J>-o+4HHVD9!Hn z${LD0d{tuGsW*wvZoHc8mJroAs(3!FK@~<}Pz1+vY|Gw}Lwfxp{4DhgiQ_SSlV)E| zZWZxYZLu2EB1=g_y@(ieCQC_1?WNA0J0*}eMZfxCCs>oL;?kHdfMcKB+A)Qull$v( z2x6(38utR^-(?DG>d1GyU()8>ih3ud0@r&I$`ZSS<*1n6(76=OmP>r_JuNCdS|-8U zxGKXL1)Lc2kWY@`_kVBt^%7t9FyLVYX(g%a6>j=yURS1!V<9ieT$$5R+yT!I>}jI5 z?fem|T=Jq;BfZmsvqz_Ud*m5;&xE66*o*S22vf-L+MosmUPPA}~wy`kntf8rIeP-m;;{`xe}9E~G7J!PYoVH_$q~NzQab?F8vWUja5BJ!T5%5IpyqI#Dkps0B;gQ*z?c#N>spFw|wRE$gY?y4wQbJ zku2sVLh({KQz6e0yo+X!rV#8n8<;bHWd{ZLL_(*9Oi)&*`LBdGWz>h zx+p`Wi00u#V$f=CcMmEmgFjw+KnbK3`mbaKfoCsB{;Q^oJgj*LWnd_(dk9Kcssbj` z?*g8l`%{*LuY!Ls*|Tm`1Gv-tRparW8q4AK(5pfJFY5>@qO( zcY>pt*na>LlB^&O@YBDnWLE$x7>pMdSmb-?qMh79eB+Wa{)$%}^kX@Z3g>fytppz! zl%>pMD(Yw+5=!UgYHLD69JiJ;YhiGeEyZM$Au{ff;i zCBbNQfO{d!b7z^F732XX&qhEsJA1UZtJjJEIPyDq+F`LeAUU_4`%2aTX#3NG3%W8u zC!7OvlB?QJ4s2#Ok^_8SKcu&pBd}L?vLRT8Kow#xARt`5&Cg=ygYuz>>c z4)+Vv$;<$l=is&E{k&4Lf-Lzq#BHuWc;wDfm4Fbd5Sr!40s{UpKT$kzmUi{V0t1yp zPOf%H8ynE$x@dQ_!+ISaI}#%72UcYm7~|D*(Fp8xiFAj$CmQ4oH3C+Q8W=Y_9Sp|B z+k<%5=y{eW=YvTivV(*KvC?qxo)xqcEU9(Te=?ITts~;xA0Jph-vpd4@Zw#?r2!`? zB3#XtIY^wxrpjJv&(7Xjvm>$TIg2ZC&+^j(gT0R|&4cb)=92-2Hti1`& z=+M;*O%_j3>9zW|3h{0Tfh5i)Fa;clGNJpPRcUmgErzC{B+zACiPHbff3SmsCZ&X; zp=tgI=zW-t(5sXFL8;ITHw0?5FL3+*z5F-KcLN130l=jAU6%F=DClRPrzO|zY+HD`zlZ-)JT}X?2g!o zxg4Ld-mx6&*-N0-MQ(z+zJo8c`B39gf{-h2vqH<=^T&o1Dgd>4BnVht+JwLcrjJl1 zsP!8`>3-rSls07q2i1hScM&x0lQyBbk(U=#3hI7Bkh*kj6H*&^p+J?OMiT_3*vw5R zEl&p|QQHZq6f~TlAeDGy(^BC0vUK?V&#ezC0*#R-h}_8Cw8-*${mVfHssathC8%VA zUE^Qd!;Rvym%|f@?-!sEj|73Vg8!$$zj_QBZAOraF5HCFKl=(Ac|_p%-P;6z<2WSf zz(9jF2x7ZR{w+p)ETCW06PVt0YnZ>gW9^sr&~`%a_7j-Ful~*4=o|&TM@k@Px2z>^ t{*Ed16F~3V5p+(suF-++X8+nHtT~NSfJ>UC3v)>lEpV}<+rIR_{{yMcG_L>v diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..1af9e093 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else 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. + if ! command -v java >/dev/null 2>&1 + then + 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 location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then 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. + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From b5556843cb8c24ec5eebd8f383d1905b0b5edbb0 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Thu, 21 Dec 2023 20:23:02 -0300 Subject: [PATCH 12/19] chore(CI): Update actions --- .github/workflows/build_pull_request.yml | 10 +++++----- .github/workflows/build_push.yml | 10 +++++----- .github/workflows/publish.yml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 1a5317f7..4bcfce0d 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.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 }} @@ -22,16 +22,16 @@ jobs: uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 11 - distribution: adopt + java-version: 17 + distribution: zulu - name: Generate android.jar run: | ./AndroidCompat/getAndroid.sh - name: Build project - uses: gradle/gradle-command-action@v2 + uses: gradle/gradle-build-action@v2 with: arguments: :server:shadowJar diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 6e06c110..50c63a26 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -16,22 +16,22 @@ jobs: steps: - name: Clone repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 11 - distribution: adopt + java-version: 17 + distribution: zulu - name: Generate android.jar run: | ./AndroidCompat/getAndroid.sh - name: Build project - uses: gradle/gradle-command-action@v2 + uses: gradle/gradle-build-action@v2 with: arguments: :server:shadowJar diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5e70135b..fe500170 100644 --- a/.github/workflows/publish.yml +++ b/.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 }} @@ -24,17 +24,17 @@ jobs: uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 11 - distribution: adopt + java-version: 17 + distribution: zulu - name: Generate android.jar run: | ./AndroidCompat/getAndroid.sh - name: Build project - uses: gradle/gradle-command-action@v2 + uses: gradle/gradle-build-action@v2 with: arguments: :server:shadowJar From 587e3e866a20080002e0ccb16c77dab19411dae1 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Thu, 21 Dec 2023 21:27:55 -0300 Subject: [PATCH 13/19] refactor: Move repositories block to settings.gradle.kts --- build.gradle.kts | 15 +++------------ settings.gradle.kts | 16 +++++++++++----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 380f7e11..16c13eaa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,21 +12,12 @@ allprojects { group = "suwayomi" version = "1.0" - - repositories { - mavenCentral() - maven("https://maven.google.com/") - maven("https://jitpack.io") - maven("https://dl.google.com/dl/android/maven2/") - maven("https://repo1.maven.org/maven2/") - maven("https://oss.sonatype.org/content/repositories/snapshots/") - } } val projects = listOf( - project(":AndroidCompat"), - project(":AndroidCompat:Config"), - project(":server") + project(":AndroidCompat"), + project(":AndroidCompat:Config"), + project(":server") ) configure(projects) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 5ba0b93e..4e92d289 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,12 @@ -rootProject.name = "Aniyomi Extensions Inspector" - -include("server") +dependencyResolutionManagement { + repositories { + mavenCentral() + google() + maven("https://jitpack.io") + } +} -include("AndroidCompat") -include("AndroidCompat:Config") +rootProject.name = "Aniyomi Extensions Inspector" +include(":server") +include(":AndroidCompat") +include(":AndroidCompat:Config") From fcceb06b5edd6da60b558b559b6b464ba14f2768 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Thu, 21 Dec 2023 21:46:48 -0300 Subject: [PATCH 14/19] feat: Backport changes from Aniyomi extensions tester --- .../nulldev/ts/config/ConfigKodeinModule.kt | 4 +- .../xyz/nulldev/ts/config/ConfigManager.kt | 20 +-- .../xyz/nulldev/ts/config/ConfigModule.kt | 3 +- .../java/xyz/nulldev/ts/config/Logging.kt | 10 +- .../ts/config/util/ConfigExtensions.kt | 2 +- AndroidCompat/build.gradle.kts | 41 ++--- AndroidCompat/getAndroid.ps1 | 4 + AndroidCompat/getAndroid.sh | 4 + AndroidCompat/lib/.gitignore | 1 - .../src/main/java/android/content/Intent.java | 3 +- .../android/content/pm/PackageManager.java | 3 +- .../java/android/net/ConnectivityManager.java | 2 + .../main/java/android/net/NetworkInfo.java | 3 +- .../src/main/java/android/os/Handler.kt | 23 +++ .../src/main/java/android/os/Looper.kt | 12 ++ .../android/preference/PreferenceManager.kt | 10 +- .../src/main/java/android/text/Html.java | 2 +- .../src/main/java/android/webkit/WebView.kt | 34 ++++ .../preference/EditTextPreference.java | 2 + .../androidx/preference/ListPreference.java | 4 + .../preference/MultiSelectListPreference.java | 41 ++++- .../java/androidx/preference/Preference.java | 12 ++ .../preference/TwoStatePreference.java | 14 +- .../src/main/java/app/cash/quickjs/QuickJs.kt | 46 +++++ .../java/app/cash/quickjs/QuickJsException.kt | 3 + .../com/android/internal/util/XmlUtils.java | 16 +- .../java/com/squareup/duktape/Duktape.java | 95 ---------- .../squareup/duktape/DuktapeException.java | 41 ----- .../com/squareup/duktape/DuktapeStub.java | 30 ---- .../sqlite/RequerySQLiteOpenHelperFactory.kt | 5 +- .../android/schedulers}/AndroidSchedulers.kt | 1 + .../nulldev/androidcompat/AndroidCompat.kt | 2 +- .../androidcompat/AndroidCompatInitializer.kt | 7 +- .../androidcompat/AndroidCompatModule.kt | 2 +- .../androidimpl/CustomContext.java | 5 +- .../config/ApplicationInfoConfigModule.kt | 9 +- .../androidcompat/config/FilesConfigModule.kt | 37 ++-- .../config/SystemConfigModule.kt | 17 +- .../androidcompat/db/ScrollableResultSet.kt | 117 ++++++------ .../nulldev/androidcompat/io/AndroidFiles.kt | 8 +- .../io/sharedprefs/JavaSharedPreferences.kt | 33 ++-- .../androidcompat/pm/InstalledPackage.kt | 62 ++----- .../androidcompat/pm/PackageController.kt | 16 +- .../nulldev/androidcompat/pm/PackageUtil.kt | 2 +- .../replace/java/text/SimpleDateFormat.java | 5 +- .../androidcompat/res/BuildConfigCompat.java | 27 --- .../xyz/nulldev/androidcompat/res/Resource.kt | 2 +- .../androidcompat/service/ServiceSupport.kt | 10 +- .../androidcompat/util/KodeinGlobalHelper.kt | 43 ++--- .../src/main/resources/compat-reference.conf | 65 ++----- build.gradle.kts | 78 ++++---- gradle/androidcompat.versions.toml | 30 ++++ gradle/libs.versions.toml | 55 ++++++ server/build.gradle.kts | 70 +++----- .../kotlin/eu/kanade/tachiyomi/AppModule.kt | 9 +- .../kotlin/eu/kanade/tachiyomi/BuildConfig.kt | 8 +- .../animesource/AnimeCatalogueSource.kt | 46 ++++- .../tachiyomi/animesource/AnimeSource.kt | 58 ++++-- .../animesource/AnimeSourceManager.kt | 76 -------- .../animesource/ConfigurableAnimeSource.kt | 15 ++ .../tachiyomi/animesource/LocalAnimeSource.kt | 47 ----- .../animesource/model/AnimeFilter.kt | 1 + .../animesource/model/UpdateStrategy.kt | 2 +- .../animesource/online/AnimeHttpSource.kt | 167 +++++++++++++----- .../online/AnimeHttpSourceFetcher.kt | 25 --- .../online/ParsedAnimeHttpSource.kt | 34 ++-- .../online/ResolvableAnimeSource.kt | 43 +++++ .../tachiyomi/network/JavaScriptEngine.kt | 2 + .../kanade/tachiyomi/network/NetworkHelper.kt | 29 +-- .../tachiyomi/network/OkHttpExtensions.kt | 68 ++++--- .../eu/kanade/tachiyomi/network/Requests.kt | 9 +- .../interceptor/CloudflareInterceptor.kt | 20 --- .../interceptor/RateLimitInterceptor.kt | 121 +++++++++---- .../SpecificHostRateLimitInterceptor.kt | 109 ++++++------ .../eu/kanade/tachiyomi/util/lang/Hash.kt | 44 ----- .../main/kotlin/suwayomi/tachidesk/Main.kt | 17 +- .../anime/impl/extension/AnimeExtension.kt | 7 +- .../tachidesk/anime/impl/util/PackageTools.kt | 42 ++--- .../suwayomi/tachidesk/server/ServerSetup.kt | 4 +- .../core/util/lang/RxCoroutinesBridge.kt | 58 ++++++ settings.gradle.kts | 7 + 81 files changed, 1182 insertions(+), 1079 deletions(-) delete mode 100644 AndroidCompat/lib/.gitignore create mode 100644 AndroidCompat/src/main/java/android/os/Handler.kt create mode 100644 AndroidCompat/src/main/java/android/os/Looper.kt create mode 100644 AndroidCompat/src/main/java/android/webkit/WebView.kt create mode 100644 AndroidCompat/src/main/java/app/cash/quickjs/QuickJs.kt create mode 100644 AndroidCompat/src/main/java/app/cash/quickjs/QuickJsException.kt delete mode 100644 AndroidCompat/src/main/java/com/squareup/duktape/Duktape.java delete mode 100644 AndroidCompat/src/main/java/com/squareup/duktape/DuktapeException.java delete mode 100644 AndroidCompat/src/main/java/com/squareup/duktape/DuktapeStub.java rename AndroidCompat/src/main/java/{rx.android.schedulers => rx/android/schedulers}/AndroidSchedulers.kt (89%) delete mode 100644 AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/BuildConfigCompat.java create mode 100644 gradle/androidcompat.versions.toml create mode 100644 gradle/libs.versions.toml delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSourceManager.kt delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/animesource/LocalAnimeSource.kt delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt create mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/animesource/online/ResolvableAnimeSource.kt delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt delete mode 100644 server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/Hash.kt create mode 100644 server/src/main/kotlin/tachiyomi/core/util/lang/RxCoroutinesBridge.kt diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigKodeinModule.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigKodeinModule.kt index cf1b9867..c509e5f0 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigKodeinModule.kt +++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigKodeinModule.kt @@ -6,7 +6,7 @@ import org.kodein.di.singleton class ConfigKodeinModule { fun create() = DI.Module("ConfigManager") { - //Config module + // Config module bind() with singleton { GlobalConfigManager } } -} \ No newline at end of file +} diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt index 13cba2a2..de8dab0c 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt +++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt @@ -10,8 +10,7 @@ package xyz.nulldev.ts.config import ch.qos.logback.classic.Level import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import com.typesafe.config.ConfigRenderOptions -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging /** * Manages app config. @@ -20,7 +19,7 @@ open class ConfigManager { private val generatedModules = mutableMapOf, ConfigModule>() val config by lazy { loadConfigs() } - //Public read-only view of modules + // Public read-only view of modules val loadedModules: Map, ConfigModule> get() = generatedModules @@ -41,21 +40,16 @@ open class ConfigManager { * Load configs */ fun loadConfigs(): Config { - //Load reference configs + // Load reference configs val compatConfig = ConfigFactory.parseResources("compat-reference.conf") val config = ConfigFactory.empty() - .withFallback(compatConfig) - .resolve() + .withFallback(compatConfig) + .resolve() // set log level early setLogLevel(Level.DEBUG) - - logger.debug { - "Loaded config:\n" + config.root().render(ConfigRenderOptions.concise().setFormatted(true)) - } - return config } @@ -64,9 +58,7 @@ open class ConfigManager { } fun registerModules(vararg modules: ConfigModule) { - modules.forEach { - registerModule(it) - } + modules.forEach(::registerModule) } } diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt index c893c84e..ac01ab86 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt +++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt @@ -12,4 +12,5 @@ import com.typesafe.config.Config /** * Abstract config module. */ -abstract class ConfigModule(config: Config, moduleName: String = "") \ No newline at end of file +@Suppress("UNUSED_PARAMETER") +abstract class ConfigModule(config: Config, moduleName: String = "") diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt index 14925001..e20452f5 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt +++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt @@ -8,9 +8,15 @@ package xyz.nulldev.ts.config * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import ch.qos.logback.classic.Level -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.DelegatingKLogger +import io.github.oshai.kotlinlogging.KotlinLogging import org.slf4j.Logger +import ch.qos.logback.classic.Logger as LogbackLogger fun setLogLevel(level: Level) { - (KotlinLogging.logger(Logger.ROOT_LOGGER_NAME).underlyingLogger as ch.qos.logback.classic.Logger).level = level + val ktlogger = KotlinLogging.logger(Logger.ROOT_LOGGER_NAME) + + @Suppress("UNCHECKED_CAST") + val slf4jLogger = (ktlogger as DelegatingKLogger).underlyingLogger + (slf4jLogger as LogbackLogger).level = level } diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/util/ConfigExtensions.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/util/ConfigExtensions.kt index 2f36be41..292eefc5 100644 --- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/util/ConfigExtensions.kt +++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/util/ConfigExtensions.kt @@ -3,4 +3,4 @@ package xyz.nulldev.ts.config.util import com.typesafe.config.Config operator fun Config.get(key: String) = getString(key) - ?: throw IllegalStateException("Could not find value for config entry: $key!") + ?: throw IllegalStateException("Could not find value for config entry: $key!") diff --git a/AndroidCompat/build.gradle.kts b/AndroidCompat/build.gradle.kts index c7c1cb6b..a6083386 100644 --- a/AndroidCompat/build.gradle.kts +++ b/AndroidCompat/build.gradle.kts @@ -1,39 +1,26 @@ -plugins { - application - kotlin("plugin.serialization") -} - dependencies { // Android stub library - implementation(fileTree("lib/")) + // implementation(fileTree("lib/")) + implementation(androidcompat.android.jar) - // XML - compileOnly("xmlpull:xmlpull:1.1.3.4a") + // Android version of SimpleDateFormat + implementation(androidcompat.icu4j) + + // AndroidX annotations + compileOnly(androidcompat.android.annotations) // Config API implementation(project(":AndroidCompat:Config")) - // APK sig verifier - compileOnly("com.android.tools.build:apksig:7.1.2") - - // AndroidX annotations - compileOnly("androidx.annotation:annotation:1.3.0") - - // substitute for duktape-android - 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 + // Jackson annotations + implementation(androidcompat.jackson.annotations) // Kotlin wrapper around Java Preferences, makes certain things easier - val multiplatformSettingsVersion = "0.8.1" - implementation("com.russhwolf:multiplatform-settings-jvm:$multiplatformSettingsVersion") - implementation("com.russhwolf:multiplatform-settings-serialization-jvm:$multiplatformSettingsVersion") + implementation(androidcompat.bundles.settings) - // Android version of SimpleDateFormat - implementation("com.ibm.icu:icu4j:70.1") -} + // Rhino, an pure-java alternative to duktape-android / QuickJS + implementation(androidcompat.bundles.rhino) -tasks { - withType { - kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn") - } + // XML + compileOnly(androidcompat.xmlpull) } diff --git a/AndroidCompat/getAndroid.ps1 b/AndroidCompat/getAndroid.ps1 index a36453c2..8e81ad9e 100644 --- a/AndroidCompat/getAndroid.ps1 +++ b/AndroidCompat/getAndroid.ps1 @@ -50,6 +50,10 @@ function Remove-Files-Zip($zipfile, $paths) $stream.Dispose() } +Write-Output "Removing useless resources..." +Remove-Files-Zip $android_jar 'res/*' +Remove-Files-Zip $android_jar 'resources.arsc' + Write-Output "Removing org.json..." Remove-Files-Zip $android_jar 'org/json/*' diff --git a/AndroidCompat/getAndroid.sh b/AndroidCompat/getAndroid.sh index d77e4bf3..f0f74240 100755 --- a/AndroidCompat/getAndroid.sh +++ b/AndroidCompat/getAndroid.sh @@ -35,6 +35,10 @@ curl "https://android.googlesource.com/platform/prebuilts/sdk/+/6cd31be5e4e25901 # We need to remove any stub classes that we have implementations for echo "Patching JAR..." +echo "Removing useless resources..." +zip --delete android.jar res/* +zip --delete android.jar resources.arsc + echo "Removing org.json..." zip --delete android.jar org/json/* diff --git a/AndroidCompat/lib/.gitignore b/AndroidCompat/lib/.gitignore deleted file mode 100644 index 545576c5..00000000 --- a/AndroidCompat/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -android.jar \ No newline at end of file diff --git a/AndroidCompat/src/main/java/android/content/Intent.java b/AndroidCompat/src/main/java/android/content/Intent.java index 5f4074dd..e97de2c0 100644 --- a/AndroidCompat/src/main/java/android/content/Intent.java +++ b/AndroidCompat/src/main/java/android/content/Intent.java @@ -4190,6 +4190,7 @@ public static boolean isAccessUriMode(int modeFlags) { * @deprecated As of API 21 this performs identically to * {@link #FLAG_ACTIVITY_NEW_DOCUMENT} which should be used instead of this. */ + @Deprecated public static final int FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET = 0x00080000; /** * This flag is used to open a document into a new task rooted at the activity launched @@ -7622,4 +7623,4 @@ private static ClipData.Item makeClipItem(ArrayList streams, ArrayList getInstalledApplicationsAsUser( * @deprecated * @hide */ + @Deprecated public abstract int getInstantAppCookieMaxSize(); /** * Gets the instant application cookie for this app. Non @@ -5315,4 +5316,4 @@ public abstract void onDexModuleRegistered(String dexModulePath, boolean success @SystemApi public abstract void registerDexModule(String dexModulePath, @Nullable DexModuleRegisterCallback callback); -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/android/net/ConnectivityManager.java b/AndroidCompat/src/main/java/android/net/ConnectivityManager.java index dbc69b8f..92c776c0 100644 --- a/AndroidCompat/src/main/java/android/net/ConnectivityManager.java +++ b/AndroidCompat/src/main/java/android/net/ConnectivityManager.java @@ -1220,6 +1220,7 @@ private boolean removeRequestForFeature(NetworkCapabilities netCap) { * to find the network instead. * @hide */ + @Deprecated public static NetworkCapabilities networkCapabilitiesForType(int type) { throw new RuntimeException("Stub!"); } @@ -1845,6 +1846,7 @@ public int getLastTetherError(String iface) { * @deprecated Types are deprecated. Use {@link #reportNetworkConnectivity} instead. * {@hide} */ + @Deprecated public void reportInetCondition(int networkType, int percentage) { throw new RuntimeException("Stub!"); } diff --git a/AndroidCompat/src/main/java/android/net/NetworkInfo.java b/AndroidCompat/src/main/java/android/net/NetworkInfo.java index 91bac1fd..e3898adb 100644 --- a/AndroidCompat/src/main/java/android/net/NetworkInfo.java +++ b/AndroidCompat/src/main/java/android/net/NetworkInfo.java @@ -421,6 +421,7 @@ public void setExtraInfo(String extraInfo) { * @deprecated This method does not have a consistent contract that could make it useful * to callers. */ + @Deprecated public String getReason() { synchronized (this) { return mReason; @@ -493,4 +494,4 @@ public NetworkInfo[] newArray(int size) { return new NetworkInfo[size]; } }; -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/android/os/Handler.kt b/AndroidCompat/src/main/java/android/os/Handler.kt new file mode 100644 index 00000000..9138ac0c --- /dev/null +++ b/AndroidCompat/src/main/java/android/os/Handler.kt @@ -0,0 +1,23 @@ +package android.os + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +open class Handler(val looper: Looper) { + constructor(handler: Handler) : this(handler.looper) + constructor() : this(Looper()) + + interface Callback { + fun handleMessage(message: Message): Boolean = true + } + + fun post(runnable: Runnable): Boolean { + CoroutineScope(Dispatchers.IO).launch { + runnable.run() + } + return true + } + + open fun handleMessage(message: Message) {} +} diff --git a/AndroidCompat/src/main/java/android/os/Looper.kt b/AndroidCompat/src/main/java/android/os/Looper.kt new file mode 100644 index 00000000..aa3e8036 --- /dev/null +++ b/AndroidCompat/src/main/java/android/os/Looper.kt @@ -0,0 +1,12 @@ +package android.os + +@Suppress("UtilityClassWithPublicConstructor") +class Looper { + companion object { + @JvmStatic + fun getMainLooper(): Looper = Looper() + + @JvmStatic + fun myLooper(): Looper = Looper() + } +} diff --git a/AndroidCompat/src/main/java/android/preference/PreferenceManager.kt b/AndroidCompat/src/main/java/android/preference/PreferenceManager.kt index 6d539dbb..134712c6 100644 --- a/AndroidCompat/src/main/java/android/preference/PreferenceManager.kt +++ b/AndroidCompat/src/main/java/android/preference/PreferenceManager.kt @@ -5,12 +5,14 @@ import android.content.Context /** * Created by nulldev on 3/26/17. */ - +@Suppress("UtilityClassWithPublicConstructor") class PreferenceManager { companion object { @JvmStatic - fun getDefaultSharedPreferences(context: Context) - = context.getSharedPreferences(context.applicationInfo.packageName, - Context.MODE_PRIVATE)!! + fun getDefaultSharedPreferences(context: Context) = + context.getSharedPreferences( + context.applicationInfo.packageName, + Context.MODE_PRIVATE, + )!! } } diff --git a/AndroidCompat/src/main/java/android/text/Html.java b/AndroidCompat/src/main/java/android/text/Html.java index 03555608..443c8b27 100644 --- a/AndroidCompat/src/main/java/android/text/Html.java +++ b/AndroidCompat/src/main/java/android/text/Html.java @@ -1,7 +1,7 @@ package android.text; -import android.graphics.drawable.Drawable; +import android.graphics.drawable.Drawable; import org.jetbrains.annotations.NotNull; import org.jsoup.Jsoup; import org.jsoup.safety.Safelist; diff --git a/AndroidCompat/src/main/java/android/webkit/WebView.kt b/AndroidCompat/src/main/java/android/webkit/WebView.kt new file mode 100644 index 00000000..854bcafc --- /dev/null +++ b/AndroidCompat/src/main/java/android/webkit/WebView.kt @@ -0,0 +1,34 @@ +@file:Suppress("UNUSED_PARAMETER") +package android.webkit + +import android.content.Context + +@Suppress("EmptyFunctionBlock", "UnusedPrivateProperty") +class WebView(private val context: Context) { + fun clearCache(includeDiskFiles: Boolean) {} + + fun clearFormData() {} + fun clearHistory() {} + + fun stopLoading() {} + + fun destroy() {} + + fun loadUrl(url: String, additionalHeaders: Map) {} + + fun loadUrl(url: String) {} + + fun loadData(data: String, mimeType: String?, encoding: String?) {} + + fun loadDataWithBaseURL( + baseUrl: String?, + data: String, + mimeType: String?, + encoding: String?, + historyUrl: String?, + ) {} + + fun addJavascriptInterface(obj: Any, name: String) {} + + fun evaluateJavascript(script: String, resultCallback: ValueCallback?) {} +} diff --git a/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java b/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java index fa3f2aea..12d4b67d 100644 --- a/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java +++ b/AndroidCompat/src/main/java/androidx/preference/EditTextPreference.java @@ -11,12 +11,14 @@ import android.annotation.Nullable; import android.content.Context; import android.widget.EditText; +import com.fasterxml.jackson.annotation.JsonIgnore; public class EditTextPreference extends DialogPreference { // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/EditTextPreference.java private String text; + @JsonIgnore private OnBindEditTextListener onBindEditTextListener; public EditTextPreference(Context context) { diff --git a/AndroidCompat/src/main/java/androidx/preference/ListPreference.java b/AndroidCompat/src/main/java/androidx/preference/ListPreference.java index d71f191b..94517b16 100644 --- a/AndroidCompat/src/main/java/androidx/preference/ListPreference.java +++ b/AndroidCompat/src/main/java/androidx/preference/ListPreference.java @@ -9,6 +9,7 @@ import android.content.Context; import android.text.TextUtils; +import com.fasterxml.jackson.annotation.JsonIgnore; public class ListPreference extends Preference { // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/ListPreference.java @@ -48,10 +49,13 @@ public void setEntryValues(CharSequence[] entryValues) { this.entryValues = entryValues; } + @JsonIgnore public void setValueIndex(int index) { throw new RuntimeException("Stub!"); } + @JsonIgnore public String getValue() { throw new RuntimeException("Stub!"); } + @JsonIgnore public void setValue(String value) { throw new RuntimeException("Stub!"); } /** Tachidesk specific API */ diff --git a/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java b/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java index 70835a0b..0ca3a3cd 100644 --- a/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java +++ b/AndroidCompat/src/main/java/androidx/preference/MultiSelectListPreference.java @@ -8,31 +8,54 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import android.content.Context; +import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.Set; public class MultiSelectListPreference extends DialogPreference { + // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/MultiSelectListPreference.java // Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them - public MultiSelectListPreference(Context context) { super(context); } + private CharSequence[] entries; + private CharSequence[] entryValues; - public void setEntries(CharSequence[] entries) { throw new RuntimeException("Stub!"); } + public MultiSelectListPreference(Context context) { + super(context); + } - public CharSequence[] getEntries() { throw new RuntimeException("Stub!"); } + public void setEntries(CharSequence[] entries) { + this.entries = entries; + } - public void setEntryValues(CharSequence[] entryValues) { throw new RuntimeException("Stub!"); } + public CharSequence[] getEntries() { + return entries; + } - public CharSequence[] getEntryValues() { throw new RuntimeException("Stub!"); } + public void setEntryValues(CharSequence[] entryValues) { + this.entryValues = entryValues; + } - public void setValues(Set values) { throw new RuntimeException("Stub!"); } + public CharSequence[] getEntryValues() { + return entryValues; + } - public Set getValues() { throw new RuntimeException("Stub!"); } + @JsonIgnore + public void setValues(Set values) { + throw new RuntimeException("Stub!"); + } + + @JsonIgnore + public Set getValues() { + throw new RuntimeException("Stub!"); + } - public int findIndexOfValue(String value) { throw new RuntimeException("Stub!"); } + public int findIndexOfValue(String value) { + throw new RuntimeException("Stub!"); + } /** Tachidesk specific API */ @Override public String getDefaultValueType() { - return "Set"; + return "Set"; } } \ No newline at end of file diff --git a/AndroidCompat/src/main/java/androidx/preference/Preference.java b/AndroidCompat/src/main/java/androidx/preference/Preference.java index 3eae6c7b..2fb71b2c 100644 --- a/AndroidCompat/src/main/java/androidx/preference/Preference.java +++ b/AndroidCompat/src/main/java/androidx/preference/Preference.java @@ -9,6 +9,8 @@ import android.content.Context; import android.content.SharedPreferences; +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.util.Set; /** * A minimal implementation of androidx.preference.Preference @@ -17,6 +19,7 @@ public class Preference { // reference: https://android.googlesource.com/platform/frameworks/support/+/996971f962fcd554339a7cb2859cef9ca89dbcb7/preference/preference/src/main/java/androidx/preference/Preference.java // Note: `Preference` doesn't actually hold or persist the value, `OnPreferenceChangeListener` is called and it's up to the extension to persist it. + @JsonIgnore protected Context context; private String key; @@ -25,8 +28,10 @@ public class Preference { private Object defaultValue; /** Tachidesk specific API */ + @JsonIgnore private SharedPreferences sharedPreferences; + @JsonIgnore public OnPreferenceChangeListener onChangeListener; public Preference(Context context) { @@ -109,18 +114,22 @@ public interface OnPreferenceClickListener { } /** Tachidesk specific API */ + @SuppressWarnings("unchecked") public Object getCurrentValue() { switch (getDefaultValueType()) { case "String": return sharedPreferences.getString(key, (String)defaultValue); case "Boolean": return sharedPreferences.getBoolean(key, (Boolean)defaultValue); + case "Set": + return sharedPreferences.getStringSet(key, (Set)defaultValue); default: throw new RuntimeException("Unsupported type"); } } /** Tachidesk specific API */ + @SuppressWarnings("unchecked") public void saveNewValue(Object value) { switch (getDefaultValueType()) { case "String": @@ -129,6 +138,9 @@ public void saveNewValue(Object value) { case "Boolean": sharedPreferences.edit().putBoolean(key, (Boolean)value).apply(); break; + case "Set": + sharedPreferences.edit().putStringSet(key, (Set)value).apply(); + break; default: throw new RuntimeException("Unsupported type"); } diff --git a/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java b/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java index fc302966..a8da574a 100644 --- a/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java +++ b/AndroidCompat/src/main/java/androidx/preference/TwoStatePreference.java @@ -8,26 +8,38 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import android.content.Context; +import com.fasterxml.jackson.annotation.JsonIgnore; public class TwoStatePreference extends Preference { // Note: remove @JsonIgnore and implement methods if any extension ever uses these methods or the variables behind them - public TwoStatePreference(Context context) { super(context); } + public TwoStatePreference(Context context) { + super(context); + setDefaultValue(false); + } + @JsonIgnore public boolean isChecked() { throw new RuntimeException("Stub!"); } + @JsonIgnore public void setChecked(boolean checked) { throw new RuntimeException("Stub!"); } + @JsonIgnore public CharSequence getSummaryOn() { throw new RuntimeException("Stub!"); } + @JsonIgnore public void setSummaryOn(CharSequence summary) { throw new RuntimeException("Stub!"); } + @JsonIgnore public CharSequence getSummaryOff() { throw new RuntimeException("Stub!"); } + @JsonIgnore public void setSummaryOff(CharSequence summary) { throw new RuntimeException("Stub!"); } + @JsonIgnore public boolean getDisableDependentsState() { throw new RuntimeException("Stub!"); } + @JsonIgnore public void setDisableDependentsState(boolean disableDependentsState) { throw new RuntimeException("Stub!"); } /** Tachidesk specific API */ diff --git a/AndroidCompat/src/main/java/app/cash/quickjs/QuickJs.kt b/AndroidCompat/src/main/java/app/cash/quickjs/QuickJs.kt new file mode 100644 index 00000000..0f42566f --- /dev/null +++ b/AndroidCompat/src/main/java/app/cash/quickjs/QuickJs.kt @@ -0,0 +1,46 @@ +package app.cash.quickjs + +import org.mozilla.javascript.ConsString +import org.mozilla.javascript.NativeArray +import java.io.Closeable +import javax.script.ScriptEngine +import javax.script.ScriptEngineManager + +class QuickJs private constructor(private var engine: ScriptEngine?) : Closeable { + companion object { + @JvmStatic + fun create() = QuickJs(ScriptEngineManager()) + } + + constructor(manager: ScriptEngineManager) : this(manager.getEngineByName("rhino")) + + @Suppress("UNUSED_PARAMETER") + fun evaluate(script: String, fileName: String) = evaluate(script) + + fun evaluate(script: String): Any? { + try { + val value = engine?.eval(script) + return translateType(value) + } catch (exception: Exception) { + throw QuickJsException(exception.message, exception) + } + } + + private fun translateType(obj: Any?): Any? { + return when (obj) { + is NativeArray -> obj.map(::translateType) + is ConsString -> obj.toString() + is Long -> obj.toInt() + else -> obj + } + } + + @Suppress("UNUSED_PARAMETER") + fun compile(sourceCode: String, fileName: String) = sourceCode.toByteArray() + + fun execute(bytecode: ByteArray) = evaluate(String(bytecode)) + + override fun close() { + engine = null + } +} diff --git a/AndroidCompat/src/main/java/app/cash/quickjs/QuickJsException.kt b/AndroidCompat/src/main/java/app/cash/quickjs/QuickJsException.kt new file mode 100644 index 00000000..370802a7 --- /dev/null +++ b/AndroidCompat/src/main/java/app/cash/quickjs/QuickJsException.kt @@ -0,0 +1,3 @@ +package app.cash.quickjs + +class QuickJsException(message: String?, cause: Throwable) : RuntimeException(message, cause) diff --git a/AndroidCompat/src/main/java/com/android/internal/util/XmlUtils.java b/AndroidCompat/src/main/java/com/android/internal/util/XmlUtils.java index 54a44eaf..e97195fd 100644 --- a/AndroidCompat/src/main/java/com/android/internal/util/XmlUtils.java +++ b/AndroidCompat/src/main/java/com/android/internal/util/XmlUtils.java @@ -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 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 @@ private static final Object readThisPrimitiveValueXml(XmlPullParser parser, Stri } 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 { diff --git a/AndroidCompat/src/main/java/com/squareup/duktape/Duktape.java b/AndroidCompat/src/main/java/com/squareup/duktape/Duktape.java deleted file mode 100644 index 08e0ff46..00000000 --- a/AndroidCompat/src/main/java/com/squareup/duktape/Duktape.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2015 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.squareup.duktape; - -import kotlin.NotImplementedError; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; -import java.io.Closeable; - -/* Note (March 2021): - * The old implementation for duktape-android used the nashorn engine which is deprecated. - * This new implementation uses Mozilla's Rhino: https://github.com/mozilla/rhino - */ - -/** - * A simple EMCAScript (Javascript) interpreter. - */ -public final class Duktape implements Closeable, AutoCloseable { - - private ScriptEngineManager factory = new ScriptEngineManager(); - private ScriptEngine engine = factory.getEngineByName("rhino"); - - /** - * Create a new interpreter instance. Calls to this method must matched with - * calls to {@link #close()} on the returned instance to avoid leaking native memory. - */ - public static Duktape create() { - return new Duktape(); - } - - private Duktape() {} - - /** - * Evaluate {@code script} and return a result. Note that the result must be one of the - * supported Java types or the call will return null. - * - * @throws DuktapeException if there is an error evaluating the script. - */ - public synchronized Object evaluate(String script) { - try { - return engine.eval(script); - } catch (ScriptException e) { - throw new DuktapeException(e.getMessage()); - } - } - - /** - * Provides {@code object} to JavaScript as a global object called {@code name}. {@code type} - * defines the interface implemented by {@code object} that will be accessible to JavaScript. - * {@code type} must be an interface that does not extend any other interfaces, and cannot define - * any overloaded methods. - *

Methods of the interface may return {@code void} or any of the following supported argument - * types: {@code boolean}, {@link Boolean}, {@code int}, {@link Integer}, {@code double}, - * {@link Double}, {@link String}. - */ - public synchronized void set(String name, Class type, T object) { - throw new NotImplementedError("Not implemented!"); - } - - /** - * Attaches to a global JavaScript object called {@code name} that implements {@code type}. - * {@code type} defines the interface implemented in JavaScript that will be accessible to Java. - * {@code type} must be an interface that does not extend any other interfaces, and cannot define - * any overloaded methods. - *

Methods of the interface may return {@code void} or any of the following supported argument - * types: {@code boolean}, {@link Boolean}, {@code int}, {@link Integer}, {@code double}, - * {@link Double}, {@link String}. - */ - public synchronized T get(final String name, final Class type) { - throw new NotImplementedError("Not implemented!"); - } - - /** - * Release the native resources associated with this object. You must call this - * method for each instance to avoid leaking native memory. - */ - @Override - public synchronized void close() {} -} \ No newline at end of file diff --git a/AndroidCompat/src/main/java/com/squareup/duktape/DuktapeException.java b/AndroidCompat/src/main/java/com/squareup/duktape/DuktapeException.java deleted file mode 100644 index 1639ddbe..00000000 --- a/AndroidCompat/src/main/java/com/squareup/duktape/DuktapeException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2015 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.squareup.duktape; - -import android.support.annotation.Keep; - -import java.util.regex.Pattern; - -// Called from native code. -@SuppressWarnings("unused") -// Instruct ProGuard not to strip this type. -@Keep -public final class DuktapeException extends RuntimeException { - - /** - * Duktape stack trace strings have multiple lines of the format " at func (file.ext:line)". - * "func" is optional, but we'll omit frames without a function, since it means the frame is in - * native code. - */ - private static final Pattern STACK_TRACE_PATTERN = null; - - /** Java StackTraceElements require a class name. We don't have one in JS, so use this. */ - private static final String STACK_TRACE_CLASS_NAME = "JavaScript"; - - public DuktapeException(String detailMessage) { - super(detailMessage); - } -} \ No newline at end of file diff --git a/AndroidCompat/src/main/java/com/squareup/duktape/DuktapeStub.java b/AndroidCompat/src/main/java/com/squareup/duktape/DuktapeStub.java deleted file mode 100644 index 4454a487..00000000 --- a/AndroidCompat/src/main/java/com/squareup/duktape/DuktapeStub.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.squareup.duktape; - -/* part of tachiyomi-extensions which is licensed under Apache License Version 2.0 */ - -import java.io.Closeable; -import java.io.IOException; - -/** This is the reference Duktape stub that tachiyomi's extensions depend on. - * Intended to be used as a reference. - */ -public class DuktapeStub implements Closeable { - - public static Duktape create() { - throw new RuntimeException("Stub!"); - } - - @Override - public synchronized void close() throws IOException { - throw new RuntimeException("Stub!"); - } - - public synchronized Object evaluate(String script) { - throw new RuntimeException("Stub!"); - } - - public synchronized void set(String name, Class type, T object) { - throw new RuntimeException("Stub!"); - } - -} \ No newline at end of file diff --git a/AndroidCompat/src/main/java/io/requery/android/database/sqlite/RequerySQLiteOpenHelperFactory.kt b/AndroidCompat/src/main/java/io/requery/android/database/sqlite/RequerySQLiteOpenHelperFactory.kt index 4ca6d194..cce4b73e 100644 --- a/AndroidCompat/src/main/java/io/requery/android/database/sqlite/RequerySQLiteOpenHelperFactory.kt +++ b/AndroidCompat/src/main/java/io/requery/android/database/sqlite/RequerySQLiteOpenHelperFactory.kt @@ -4,5 +4,6 @@ import android.arch.persistence.db.SupportSQLiteOpenHelper import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory class RequerySQLiteOpenHelperFactory { - fun create(configuration: SupportSQLiteOpenHelper.Configuration) = FrameworkSQLiteOpenHelperFactory().create(configuration) -} \ No newline at end of file + fun create(configuration: SupportSQLiteOpenHelper.Configuration) = + FrameworkSQLiteOpenHelperFactory().create(configuration) +} diff --git a/AndroidCompat/src/main/java/rx.android.schedulers/AndroidSchedulers.kt b/AndroidCompat/src/main/java/rx/android/schedulers/AndroidSchedulers.kt similarity index 89% rename from AndroidCompat/src/main/java/rx.android.schedulers/AndroidSchedulers.kt rename to AndroidCompat/src/main/java/rx/android/schedulers/AndroidSchedulers.kt index ebe717c0..da1ab880 100644 --- a/AndroidCompat/src/main/java/rx.android.schedulers/AndroidSchedulers.kt +++ b/AndroidCompat/src/main/java/rx/android/schedulers/AndroidSchedulers.kt @@ -3,6 +3,7 @@ package rx.android.schedulers import rx.Scheduler import rx.internal.schedulers.ImmediateScheduler +@Suppress("UtilityClassWithPublicConstructor") class AndroidSchedulers { companion object { val mainThreadScheduler by lazy { diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompat.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompat.kt index 35c1c038..0e47b754 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompat.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompat.kt @@ -14,4 +14,4 @@ class AndroidCompat { application.attach(context) application.onCreate() } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt index 5a52b1ff..cc10024c 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt @@ -14,14 +14,11 @@ class AndroidCompatInitializer { fun init() { DI.global.addImport(AndroidCompatModule().create()) - //Register config modules + // Register config modules GlobalConfigManager.registerModules( FilesConfigModule.register(GlobalConfigManager.config), ApplicationInfoConfigModule.register(GlobalConfigManager.config), - SystemConfigModule.register(GlobalConfigManager.config) + SystemConfigModule.register(GlobalConfigManager.config), ) - - // Set some properties extensions use - System.setProperty("http.agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36") } } diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatModule.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatModule.kt index 7283a9de..5d00237b 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatModule.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatModule.kt @@ -29,7 +29,7 @@ class AndroidCompatModule { bind() with singleton { PackageController() } - //Context + // Context bind() with singleton { CustomContext() } bind() with singleton { val context: Context by DI.global.instance() diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java index c25750d7..8c136d21 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/androidimpl/CustomContext.java @@ -33,10 +33,7 @@ import android.view.DisplayAdjustments; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.kodein.di.DI; -import org.kodein.di.DIAware; -import org.kodein.di.DIContext; -import org.kodein.di.DITrigger; +import org.kodein.di.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import xyz.nulldev.androidcompat.info.ApplicationInfoImpl; diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt index 932b2b9a..145d3650 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt @@ -1,6 +1,7 @@ package xyz.nulldev.androidcompat.config import com.typesafe.config.Config +import io.github.config4k.getValue import xyz.nulldev.ts.config.ConfigModule /** @@ -8,11 +9,11 @@ import xyz.nulldev.ts.config.ConfigModule */ class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) { - val packageName = config.getString("packageName")!! - val debug = config.getBoolean("debug") + val packageName: String by config + val debug: Boolean by config companion object { - fun register(config: Config) - = ApplicationInfoConfigModule(config.getConfig("android.app")) + fun register(config: Config) = + ApplicationInfoConfigModule(config.getConfig("android.app")) } } diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt index c2ee7b71..ff8bc9c0 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt @@ -1,6 +1,7 @@ package xyz.nulldev.androidcompat.config import com.typesafe.config.Config +import io.github.config4k.getValue import xyz.nulldev.ts.config.ConfigModule /** @@ -8,26 +9,26 @@ import xyz.nulldev.ts.config.ConfigModule */ class FilesConfigModule(config: Config) : ConfigModule(config) { - val dataDir = config.getString("dataDir")!! - val filesDir = config.getString("filesDir")!! - val noBackupFilesDir = config.getString("noBackupFilesDir")!! - val externalFilesDirs: MutableList = config.getStringList("externalFilesDirs")!! - val obbDirs: MutableList = config.getStringList("obbDirs")!! - val cacheDir = config.getString("cacheDir")!! - val codeCacheDir = config.getString("codeCacheDir")!! - val externalCacheDirs: MutableList = config.getStringList("externalCacheDirs")!! - val externalMediaDirs: MutableList = config.getStringList("externalMediaDirs")!! - val rootDir = config.getString("rootDir")!! - val externalStorageDir = config.getString("externalStorageDir")!! - val downloadCacheDir = config.getString("downloadCacheDir")!! - val databasesDir = config.getString("databasesDir")!! + val dataDir: String by config + val filesDir: String by config + val noBackupFilesDir: String by config + val externalFilesDirs: MutableList by config + val obbDirs: MutableList by config + val cacheDir: String by config + val codeCacheDir: String by config + val externalCacheDirs: MutableList by config + val externalMediaDirs: MutableList by config + val rootDir: String by config + val externalStorageDir: String by config + val downloadCacheDir: String by config + val databasesDir: String by config - val prefsDir = config.getString("prefsDir")!! + val prefsDir: String by config - val packageDir = config.getString("packageDir")!! + val packageDir: String by config companion object { - fun register(config: Config) - = FilesConfigModule(config.getConfig("android.files")) + fun register(config: Config) = + FilesConfigModule(config.getConfig("android.files")) } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt index a8373050..d1449454 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt @@ -1,21 +1,22 @@ package xyz.nulldev.androidcompat.config import com.typesafe.config.Config +import io.github.config4k.getValue import xyz.nulldev.ts.config.ConfigModule class SystemConfigModule(val config: Config) : ConfigModule(config) { - val isDebuggable = config.getBoolean("isDebuggable") + val isDebuggable: Boolean by config val propertyPrefix = "properties." - fun getStringProperty(property: String) = config.getString("$propertyPrefix$property")!! - fun getIntProperty(property: String) = config.getInt("$propertyPrefix$property") - fun getLongProperty(property: String) = config.getLong("$propertyPrefix$property") - fun getBooleanProperty(property: String) = config.getBoolean("$propertyPrefix$property") - fun hasProperty(property: String) = config.hasPath("$propertyPrefix$property") + fun getStringProperty(property: String) = config.getString(propertyPrefix + property)!! + fun getIntProperty(property: String) = config.getInt(propertyPrefix + property) + fun getLongProperty(property: String) = config.getLong(propertyPrefix + property) + fun getBooleanProperty(property: String) = config.getBoolean(propertyPrefix + property) + fun hasProperty(property: String) = config.hasPath(propertyPrefix + property) companion object { - fun register(config: Config) - = SystemConfigModule(config.getConfig("android.system")) + fun register(config: Config) = + SystemConfigModule(config.getConfig("android.system")) } } diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt index 07fedc99..20a89246 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt @@ -29,9 +29,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { val parentMetadata = parent.metaData val columnCount = parentMetadata.columnCount - val columnLabels = (1 .. columnCount).map { - parentMetadata.getColumnLabel(it) - }.toTypedArray() + val columnLabels = (1..columnCount) + .map(parentMetadata::getColumnLabel) + .toTypedArray() init { val columnCount = columnCount @@ -41,10 +41,10 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { // How can we optimize this? // We need to fill the cache as the set is loaded - //Fill cache - while(parent.next()) { + // Fill cache + while (parent.next()) { cachedContent += ResultSetEntry().apply { - for(i in 1 .. columnCount) + for (i in 1..columnCount) data += parent.getObject(i) } resultSetLength++ @@ -60,9 +60,13 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } private fun internalMove(row: Int) { - if(cursor < 0) cursor = 0 - else if(cursor > resultSetLength + 1) cursor = resultSetLength + 1 - else cursor = row + if (cursor < 0) { + cursor = 0 + } else if (cursor > resultSetLength + 1) { + cursor = resultSetLength + 1 + } else { + cursor = row + } } private fun obj(column: Int): Any? { @@ -75,10 +79,11 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { return obj(cachedFindColumn(column)) } - private fun cachedFindColumn(column: String?) - = columnCache.getOrPut(column!!, { - findColumn(column) - }) + @Suppress("UnsafeCallOnNullableType") + private fun cachedFindColumn(column: String?) = + columnCache.getOrPut(column!!, { + findColumn(column) + }) override fun getNClob(columnIndex: Int): NClob { return obj(columnIndex) as NClob @@ -157,27 +162,27 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getDate(columnIndex: Int): Date { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getDate(columnLabel: String?): Date { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getDate(columnIndex: Int, cal: Calendar?): Date { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getDate(columnLabel: String?, cal: Calendar?): Date { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun beforeFirst() { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -201,13 +206,15 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { return cursor - 1 < resultSetLength } + @Deprecated("Deprecated in java") override fun getBigDecimal(columnIndex: Int, scale: Int): BigDecimal { - //TODO Maybe? + // TODO Maybe? notImplemented() } + @Deprecated("Deprecated in java") override fun getBigDecimal(columnLabel: String?, scale: Int): BigDecimal { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -236,22 +243,22 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getTime(columnIndex: Int): Time { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getTime(columnLabel: String?): Time { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getTime(columnIndex: Int, cal: Calendar?): Time { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getTime(columnLabel: String?, cal: Calendar?): Time { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -272,31 +279,32 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun absolute(row: Int): Boolean { - if(row > 0) { + if (row > 0) { internalMove(row) } else { last() - for(i in 1 .. row) + for (i in 1..row) previous() } return cursorValid() } override fun getSQLXML(columnIndex: Int): SQLXML? { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getSQLXML(columnLabel: String?): SQLXML? { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun unwrap(iface: Class?): T { - if(thisIsWrapperFor(iface)) + if (thisIsWrapperFor(iface)) { return this as T - else + } else { return parent.unwrap(iface) + } } override fun next(): Boolean { @@ -426,12 +434,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getBlob(columnIndex: Int): Blob { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getBlob(columnLabel: String?): Blob { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -500,12 +508,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getObject(columnIndex: Int, map: MutableMap>?): Any { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getObject(columnLabel: String?, map: MutableMap>?): Any { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -531,10 +539,15 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } private fun castToLong(obj: Any?): Long { - if(obj == null) return 0 - else if(obj is Long) return obj - else if(obj is Number) return obj.toLong() - else throw IllegalStateException("Object is not a long!") + if (obj == null) { + return 0 + } else if (obj is Long) { + return obj + } else if (obj is Number) { + return obj.toLong() + } else { + throw IllegalStateException("Object is not a long!") + } } override fun getLong(columnIndex: Int): Long { @@ -546,12 +559,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getClob(columnIndex: Int): Clob { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getClob(columnLabel: String?): Clob { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -604,12 +617,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getArray(columnIndex: Int): Array { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getArray(columnLabel: String?): Array { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -688,32 +701,32 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getTimestamp(columnIndex: Int): Timestamp { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getTimestamp(columnLabel: String?): Timestamp { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getTimestamp(columnIndex: Int, cal: Calendar?): Timestamp { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getTimestamp(columnLabel: String?, cal: Calendar?): Timestamp { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getRef(columnIndex: Int): Ref { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getRef(columnLabel: String?): Ref { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -759,10 +772,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { return obj(columnLabel) as Double } + @Deprecated("Deprecated in java") override fun getUnicodeStream(columnIndex: Int): InputStream { return getBinaryStream(columnIndex) } + @Deprecated("Deprecated in java") override fun getUnicodeStream(columnLabel: String?): InputStream { return getBinaryStream(columnLabel) } @@ -792,12 +807,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun getRowId(columnIndex: Int): RowId { - //TODO Maybe? + // TODO Maybe? notImplemented() } override fun getRowId(columnLabel: String?): RowId { - //TODO Maybe? + // TODO Maybe? notImplemented() } @@ -848,4 +863,4 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { class ResultSetEntry { val data = mutableListOf() } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt index ea55b497..1e23f99d 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt @@ -15,12 +15,12 @@ class AndroidFiles(val configManager: ConfigManager = GlobalConfigManager) { val dataDir: File get() = registerFile(filesConfig.dataDir) val filesDir: File get() = registerFile(filesConfig.filesDir) val noBackupFilesDir: File get() = registerFile(filesConfig.noBackupFilesDir) - val externalFilesDirs: List get() = filesConfig.externalFilesDirs.map { registerFile(it) } - val obbDirs: List get() = filesConfig.obbDirs.map { registerFile(it) } + val externalFilesDirs: List get() = filesConfig.externalFilesDirs.map(::registerFile) + val obbDirs: List get() = filesConfig.obbDirs.map(::registerFile) val cacheDir: File get() = registerFile(filesConfig.cacheDir) val codeCacheDir: File get() = registerFile(filesConfig.codeCacheDir) - val externalCacheDirs: List get() = filesConfig.externalCacheDirs.map { registerFile(it) } - val externalMediaDirs: List get() = filesConfig.externalMediaDirs.map { registerFile(it) } + val externalCacheDirs: List get() = filesConfig.externalCacheDirs.map(::registerFile) + val externalMediaDirs: List get() = filesConfig.externalMediaDirs.map(::registerFile) val rootDir: File get() = registerFile(filesConfig.rootDir) val externalStorageDir: File get() = registerFile(filesConfig.externalStorageDir) val downloadCacheDir: File get() = registerFile(filesConfig.downloadCacheDir) diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt index 97a5f475..07d44dce 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt @@ -10,13 +10,13 @@ package xyz.nulldev.androidcompat.io.sharedprefs import android.content.SharedPreferences import com.russhwolf.settings.ExperimentalSettingsApi import com.russhwolf.settings.ExperimentalSettingsImplementation -import com.russhwolf.settings.JvmPreferencesSettings +import com.russhwolf.settings.PreferencesSettings import com.russhwolf.settings.serialization.decodeValue +import com.russhwolf.settings.serialization.decodeValueOrNull import com.russhwolf.settings.serialization.encodeValue import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerializationException import kotlinx.serialization.builtins.SetSerializer -import kotlinx.serialization.builtins.nullable import kotlinx.serialization.builtins.serializer import java.util.prefs.PreferenceChangeListener import java.util.prefs.Preferences @@ -24,12 +24,11 @@ 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 preferences = JvmPreferencesSettings(javaPreferences) + private val preferences = PreferencesSettings(javaPreferences) private val listeners = mutableMapOf() - // TODO: 2021-05-29 Need to find a way to get this working with all pref types override fun getAll(): MutableMap { - return preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap() + return preferences.keys.associateWith(preferences::getStringOrNull).toMutableMap() } override fun getString(key: String, defValue: String?): String? { @@ -40,13 +39,13 @@ class JavaSharedPreferences(key: String) : SharedPreferences { } } - override fun getStringSet(key: String, defValues: MutableSet?): MutableSet? { + override fun getStringSet(key: String, defValues: Set?): Set? { try { return if (defValues != null) { - preferences.decodeValue(SetSerializer(String.serializer()).nullable, key, defValues) + preferences.decodeValue(SetSerializer(String.serializer()), key, defValues) } else { - preferences.decodeValue(SetSerializer(String.serializer()).nullable, key, null) - }?.toMutableSet() + preferences.decodeValueOrNull(SetSerializer(String.serializer()), key) + } } catch (e: SerializationException) { throw ClassCastException("$key was not a StringSet") } @@ -76,7 +75,7 @@ class JavaSharedPreferences(key: String) : SharedPreferences { return Editor(preferences) } - class Editor(private val preferences: JvmPreferencesSettings) : SharedPreferences.Editor { + class Editor(private val preferences: PreferencesSettings) : SharedPreferences.Editor { val itemsToAdd = mutableMapOf() override fun putString(key: String, value: String?): SharedPreferences.Editor { @@ -90,7 +89,7 @@ class JavaSharedPreferences(key: String) : SharedPreferences { override fun putStringSet( key: String, - values: MutableSet? + values: MutableSet?, ): SharedPreferences.Editor { if (values != null) { itemsToAdd[key] = values @@ -122,11 +121,13 @@ class JavaSharedPreferences(key: String) : SharedPreferences { override fun remove(key: String): SharedPreferences.Editor { itemsToAdd.remove(key) + preferences.remove(key) return this } override fun clear(): SharedPreferences.Editor { itemsToAdd.clear() + preferences.clear() return this } @@ -155,7 +156,9 @@ class JavaSharedPreferences(key: String) : SharedPreferences { } } - override fun registerOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) { + override fun registerOnSharedPreferenceChangeListener( + listener: SharedPreferences.OnSharedPreferenceChangeListener, + ) { val javaListener = PreferenceChangeListener { listener.onSharedPreferenceChanged(this, it.key) } @@ -163,7 +166,9 @@ class JavaSharedPreferences(key: String) : SharedPreferences { javaPreferences.addPreferenceChangeListener(javaListener) } - override fun unregisterOnSharedPreferenceChangeListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) { + override fun unregisterOnSharedPreferenceChangeListener( + listener: SharedPreferences.OnSharedPreferenceChangeListener, + ) { val registeredListener = listeners.remove(listener) if (registeredListener != null) { javaPreferences.removePreferenceChangeListener(registeredListener) @@ -174,4 +179,4 @@ class JavaSharedPreferences(key: String) : SharedPreferences { javaPreferences.removeNode() return true } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt index bcabfe3c..6a4d1ee3 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt @@ -1,9 +1,7 @@ package xyz.nulldev.androidcompat.pm import android.content.pm.PackageInfo -import android.content.pm.Signature import android.os.Bundle -import com.android.apksig.ApkVerifier import com.googlecode.d2j.dex.Dex2jar import net.dongliu.apk.parser.ApkFile import net.dongliu.apk.parser.ApkParsers @@ -11,73 +9,41 @@ import org.w3c.dom.Element import org.w3c.dom.Node import org.w3c.dom.NodeList import java.io.File -import javax.imageio.ImageIO import javax.xml.parsers.DocumentBuilderFactory - - data class InstalledPackage(val root: File) { val apk = File(root, "package.apk") val jar = File(root, "translated.jar") - val icon = File(root, "icon.png") val info: PackageInfo get() = ApkParsers.getMetaInfo(apk).toPackageInfo(apk).also { val parsed = ApkFile(apk) val dbFactory = DocumentBuilderFactory.newInstance() val dBuilder = dbFactory.newDocumentBuilder() - val doc = parsed.manifestXml.byteInputStream().use { - dBuilder.parse(it) - } + val doc = parsed.manifestXml.byteInputStream().use(dBuilder::parse) it.applicationInfo.metaData = Bundle().apply { val appTag = doc.getElementsByTagName("application").item(0) - appTag?.childNodes?.toList()?.filter { - it.nodeType == Node.ELEMENT_NODE - }?.map { - it as Element - }?.filter { - it.tagName == "meta-data" - }?.map { - putString(it.attributes.getNamedItem("android:name").nodeValue, - it.attributes.getNamedItem("android:value").nodeValue) + appTag?.childNodes?.run { + toList().asSequence() + .filter { it.nodeType == Node.ELEMENT_NODE } + .map { it as Element } + .filter { it.tagName == "meta-data" } + .forEach { + putString( + it.attributes.getNamedItem("android:name").nodeValue, + it.attributes.getNamedItem("android:value").nodeValue, + ) + } } } - - it.signatures = (parsed.apkSingers.flatMap { it.certificateMetas } - /*+ parsed.apkV2Singers.flatMap { it.certificateMetas }*/) // Blocked by: https://github.com/hsiafan/apk-parser/issues/72 - .map { Signature(it.data) }.toTypedArray() - } - - fun verify(): Boolean { - val res = ApkVerifier.Builder(apk) - .build() - .verify() - - return res.isVerified - } - - fun writeIcon() { - try { - val icons = ApkFile(apk).allIcons - - val read = icons.filter { it.isFile }.map { - it.data.inputStream().use { - ImageIO.read(it) - } - }.sortedByDescending { it.width * it.height }.firstOrNull() ?: return - - ImageIO.write(read, "png", icon) - } catch(e: Exception) { - icon.delete() } - } fun writeJar() { try { Dex2jar.from(apk).to(jar.toPath()) - } catch(e: Exception) { + } catch (e: Exception) { jar.delete() } } @@ -92,4 +58,4 @@ data class InstalledPackage(val root: File) { return out } } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt index 560dc6e2..bf8af23a 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt @@ -42,13 +42,12 @@ class PackageController { val installed = InstalledPackage(root) apk.copyTo(installed.apk) - installed.writeIcon() installed.writeJar() if (!installed.jar.exists()) { throw IllegalStateException("Failed to translate APK dex!") } - } catch(t: Throwable) { + } catch (t: Throwable) { root.deleteRecursively() throw t } @@ -57,13 +56,11 @@ class PackageController { fun listInstalled(): List { return androidFiles.packagesDir.listFiles().orEmpty().filter { it.isDirectory - }.map { - InstalledPackage(it) - } + }.map(::InstalledPackage) } fun deletePackage(pack: InstalledPackage) { - if(!pack.root.exists()) error("Package was never installed!") + if (!pack.root.exists()) error("Package was never installed!") val packageName = pack.info.packageName pack.root.deleteRecursively() @@ -74,14 +71,15 @@ class PackageController { fun findPackage(packageName: String): InstalledPackage? { val file = File(androidFiles.packagesDir, packageName) - return if(file.exists()) + return if (file.exists()) { InstalledPackage(file) - else + } else { null + } } fun findJarFromApk(apkFile: File): File? { val pkgName = ApkParsers.getMetaInfo(apkFile).packageName return findPackage(pkgName)?.jar } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt index 2294cb65..ce3afc17 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt @@ -24,4 +24,4 @@ fun ApkMeta.toPackageInfo(apk: File): PackageInfo { sourceDir = apk.absolutePath } } -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java index a129d877..3b12e05f 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/replace/java/text/SimpleDateFormat.java @@ -14,10 +14,7 @@ import xyz.nulldev.androidcompat.replace.java.util.Calendar; import xyz.nulldev.androidcompat.replace.java.util.TimeZone; -import java.text.AttributedCharacterIterator; -import java.text.FieldPosition; -import java.text.ParseException; -import java.text.ParsePosition; +import java.text.*; import java.util.Date; import java.util.Locale; diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/BuildConfigCompat.java b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/BuildConfigCompat.java deleted file mode 100644 index 78e5122b..00000000 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/BuildConfigCompat.java +++ /dev/null @@ -1,27 +0,0 @@ -package xyz.nulldev.androidcompat.res; - -import xyz.nulldev.androidcompat.info.ApplicationInfoImpl; -import xyz.nulldev.androidcompat.util.KodeinGlobalHelper; - -import java.text.SimpleDateFormat; -import java.util.Calendar; - -/** - * BuildConfig compat class. - */ -public class BuildConfigCompat { - private static ApplicationInfoImpl applicationInfo = KodeinGlobalHelper.instance(ApplicationInfoImpl.class); - - public static final boolean DEBUG = applicationInfo.getDebug(); - - //We assume application ID = package name - public static final String APPLICATION_ID = applicationInfo.packageName; - - //TODO Build time is hardcoded currently - public static final String BUILD_TIME; - static { - Calendar cal = Calendar.getInstance(); - cal.set(2000, Calendar.JANUARY, 1); - BUILD_TIME = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'").format(cal.getTime()); - } -} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/Resource.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/Resource.kt index 043fc9f3..abf92c01 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/Resource.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/Resource.kt @@ -24,4 +24,4 @@ interface Resource { fun getType(): Class fun getValue(): Any? -} \ No newline at end of file +} diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/service/ServiceSupport.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/service/ServiceSupport.kt index 0e84339a..c397520b 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/service/ServiceSupport.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/service/ServiceSupport.kt @@ -3,7 +3,7 @@ package xyz.nulldev.androidcompat.service import android.app.Service import android.content.Context import android.content.Intent -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.ConcurrentHashMap import kotlin.concurrent.thread @@ -27,10 +27,10 @@ class ServiceSupport { runningServices[name] = service - //Setup service + // Setup service thread { callOnCreate(service) - //TODO Handle more complex cases + // TODO Handle more complex cases service.onStartCommand(intent, 0, 0) } } @@ -43,7 +43,7 @@ class ServiceSupport { fun stopService(name: String) { logger.debug { "Stopping service: $name" } val service = runningServices.remove(name) - if(service == null) { + if (service == null) { logger.warn { "An attempt was made to stop a service that is not running: $name" } } else { thread { @@ -63,6 +63,6 @@ class ServiceSupport { fun serviceInstanceFromClass(className: String): Service { val clazzObj = Class.forName(className) return clazzObj.getDeclaredConstructor().newInstance() as? Service - ?: throw IllegalArgumentException("$className is not a Service!") + ?: throw IllegalArgumentException("$className is not a Service!") } } diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt index 353dfb42..c53f2be7 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt @@ -27,42 +27,25 @@ object KodeinGlobalHelper { @JvmStatic @Suppress("UNCHECKED_CAST") fun instance(type: Class, kodein: DI? = null): T { - return when(type) { - AndroidFiles::class.java -> { - val instance: AndroidFiles by (kodein ?: kodein()).instance() - instance as T - } - ApplicationInfoImpl::class.java -> { - val instance: ApplicationInfoImpl by (kodein ?: kodein()).instance() - instance as T - } - ServiceSupport::class.java -> { - val instance: ServiceSupport by (kodein ?: kodein()).instance() - instance as T - } - FakePackageManager::class.java -> { - val instance: FakePackageManager by (kodein ?: kodein()).instance() - instance as T - } - PackageController::class.java -> { - val instance: PackageController by (kodein ?: kodein()).instance() - instance as T - } - CustomContext::class.java -> { - val instance: CustomContext by (kodein ?: kodein()).instance() - instance as T - } - Context::class.java -> { - val instance: Context by (kodein ?: kodein()).instance() - instance as T - } + return when (type) { + AndroidFiles::class.java -> getInjectedInstance(kodein) as T + ApplicationInfoImpl::class.java -> getInjectedInstance(kodein) as T + ServiceSupport::class.java -> getInjectedInstance(kodein) as T + FakePackageManager::class.java -> getInjectedInstance(kodein) as T + PackageController::class.java -> getInjectedInstance(kodein) as T + CustomContext::class.java -> getInjectedInstance(kodein) as T + Context::class.java -> getInjectedInstance(kodein) as T else -> throw IllegalArgumentException("Kodein instance not found") } } + private inline fun getInjectedInstance(kodein: DI? = null): A { + val instance: A by (kodein ?: kodein()).instance() + return instance + } + @JvmStatic fun instance(type: Class): T { return instance(type, null) } - } diff --git a/AndroidCompat/src/main/resources/compat-reference.conf b/AndroidCompat/src/main/resources/compat-reference.conf index 556463a3..b89f008b 100644 --- a/AndroidCompat/src/main/resources/compat-reference.conf +++ b/AndroidCompat/src/main/resources/compat-reference.conf @@ -1,36 +1,12 @@ +# AndroidComapt Root dir +androidcompat.rootDir = androidcompat-root -# Allow/disallow preference changes (useful for demos) -ts.server.allowConfigChanges = true - -# Enable the WebUI? Note: The API and multi-user sync server ui will remain available even if the WebUI is disabled -ts.server.enableWebUi = true - -# 'true' to use the old, buggy/memory-leaking WebUI -ts.server.useOldWebUi = false - -# 'true' to pretty print all JSON API responses -ts.server.prettyPrintApi = false - -# List of blacklisted/whitelisted API endpoints/operation IDs -ts.server.disabledApiEndpoints = [] -ts.server.enabledApiEndpoints = [] - -# Message to print in the console when the API has finished booting -ts.server.httpInitializedPrintMessage = "" - -# Use external folder for static files -ts.server.useExternalStaticFiles = false -ts.server.externalStaticFilesFolder = "" - -# Root storage dir -ts.server.rootDir = tachiserver-data -# Dir to store JVM patches -ts.server.patchesDir = ${ts.server.rootDir}/patches +####################### `android.files` (FilesConfigModule) ####################### # Storage dir for the emulated Android app -android.files.rootDir = ${ts.server.rootDir}/android-compat/appdata +android.files.rootDir = ${androidcompat.rootDir}/appdata # External storage dir for the emulated Android app's -android.files.externalStorageDir = ${ts.server.rootDir}/android-compat/extappdata +android.files.externalStorageDir = ${androidcompat.rootDir}/extappdata # Internal Android directories android.files.dataDir = ${android.files.rootDir}/data @@ -48,37 +24,16 @@ android.files.externalCacheDirs = [${android.files.externalStorageDir}/cache] android.files.externalMediaDirs = [${android.files.externalStorageDir}/media] android.files.downloadCacheDir = ${android.files.externalStorageDir}/downloadCache -android.files.packageDir = ${ts.server.rootDir}/android-compat/packages +android.files.packageDir = ${androidcompat.rootDir}/android-compat/packages + +####################### `android.app` (ApplicationInfoConfigModule) ####################### # Emulated Android app package name android.app.packageName = eu.kanade.tachiyomi # Debug mode for the emulated Android app android.app.debug = true +####################### `android.system` (SystemConfigModule) ####################### + # Whether or not the emulated Android system is debuggable android.system.isDebuggable = true - -# Is the multi-user sync server enabled? Does not affect the single-user sync server included in the API. -ts.syncd.enable = false - -# The URL of this server (displayed in the sync server web ui) -ts.syncd.baseUrl = "http://example.com" - -# 'true' to disable the API and only enable the multi-user sync server -ts.syncd.syncOnlyMode = false - -# The root directory to store synchronized data -ts.syncd.rootDir = ${ts.server.rootDir}/sync/accounts - -# Location to store config files for the sandbox -ts.syncd.sandboxedConfig = ${ts.server.rootDir}/sync/sandboxed_config.config - -# Recaptcha stuff for signup/login -ts.syncd.recaptcha.siteKey = "" -ts.syncd.recaptcha.secret = "" - -# Sync server display name -ts.syncd.name = "Tachiyomi sync server" - -# Header used to forward the IP to the multi-user sync server if the server is behind a reverse proxy -ts.syncd.ipHeader = "" diff --git a/build.gradle.kts b/build.gradle.kts index 16c13eaa..e7c73010 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,82 +1,80 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.8.0" - kotlin("plugin.serialization") version "1.8.0" apply false - id("org.jmailen.kotlinter") version "3.9.0" apply false - id("com.github.gmazzo.buildconfig") version "3.0.3" apply false - id("com.github.johnrengelman.shadow") version "7.1.2" apply false + alias(libs.plugins.buildconfig) apply false + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.kotlinter) apply false + alias(libs.plugins.shadow) apply false } allprojects { group = "suwayomi" - version = "1.0" } val projects = listOf( project(":AndroidCompat"), project(":AndroidCompat:Config"), - project(":server") + project(":server"), ) configure(projects) { apply(plugin = "org.jetbrains.kotlin.jvm") + val javaVersion = JavaVersion.VERSION_17 + java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = javaVersion + targetCompatibility = javaVersion } tasks.withType { kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = javaVersion.toString() } } dependencies { + val libs = rootProject.libs + val androidcompat = rootProject.androidcompat + // Kotlin - implementation(kotlin("stdlib-jdk8")) + implementation(kotlin("stdlib")) implementation(kotlin("reflect")) - testImplementation(kotlin("test")) - // coroutines - val coroutinesVersion = "1.6.4" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion") + // :AndroidCompat:Config dependency + implementation(androidcompat.bundles.config) - val kotlinSerializationVersion = "1.4.0" - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion") + // :AndroidCompat dependency to get application content root + implementation(androidcompat.appdirs) + // APK parser + implementation(libs.apkparser) - // Dependency Injection - implementation("org.kodein.di:kodein-di-conf-jvm:7.11.0") + // Coroutines + implementation(libs.bundles.coroutines) - // Logging - implementation("org.slf4j:slf4j-api:1.7.36") - implementation("ch.qos.logback:logback-classic:1.2.11") - implementation("io.github.microutils:kotlin-logging:2.1.21") + // Dependency Injection + implementation(libs.kodein.di) + implementation(libs.injekt.core) - // ReactiveX - implementation("io.reactivex:rxjava:1.3.8") - implementation("io.reactivex:rxkotlin:1.0.0") - implementation("com.jakewharton.rxrelay:rxrelay:1.2.0") + // Dex2Jar + implementation(libs.bundles.dex2jar) // JSoup - implementation("org.jsoup:jsoup:1.15.3") + implementation(libs.jsoup) + + // Logging + implementation(libs.bundles.logging) - // dependency of :AndroidCompat:Config - implementation("com.typesafe:config:1.4.2") - implementation("io.github.config4k:config4k:0.4.2") + // OkHttp3 + implementation(libs.bundles.okhttp) - // dex2jar - val dex2jarVersion = "v59" - implementation("com.github.ThexXTURBOXx.dex2jar:dex-translator:$dex2jarVersion") - implementation("com.github.ThexXTURBOXx.dex2jar:dex-tools:$dex2jarVersion") + // ReactiveX + implementation(libs.rxjava) - // APK parser - implementation("net.dongliu:apk-parser:2.6.10") + // Serialization + implementation(libs.bundles.serialization) } } diff --git a/gradle/androidcompat.versions.toml b/gradle/androidcompat.versions.toml new file mode 100644 index 00000000..564269d6 --- /dev/null +++ b/gradle/androidcompat.versions.toml @@ -0,0 +1,30 @@ +[versions] +multiplatform_settings_version = "1.1.0" +rhino_version = "1.7.14" + +[libraries] +typesafe-config = "com.typesafe:config:1.4.3" +config4k = "io.github.config4k:config4k:0.6.0" + +android-annotations = "androidx.annotation:annotation:1.7.0" +android-jar = "com.github.Claudemirovsky:android-jar:2.0.0" + +appdirs = "net.harawata:appdirs:1.2.2" + +icu4j = "com.ibm.icu:icu4j:74.1" + +jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.15.2" + +rhino-engine = { module = "org.mozilla:rhino-engine", version.ref = "rhino_version" } +rhino-runtime = { module = "org.mozilla:rhino-runtime", version.ref = "rhino_version" } + +settings-jvm = { module = "com.russhwolf:multiplatform-settings-jvm", version.ref = "multiplatform-settings-version" } +settings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization-jvm", version.ref = "multiplatform-settings-version" } + +xmlpull = "xmlpull:xmlpull:1.1.3.4a" + +[bundles] +config = ["config4k", "typesafe-config"] +rhino = ["rhino-engine", "rhino-runtime"] +settings = ["settings-jvm", "settings-serialization"] + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..4fbcc031 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,55 @@ +[versions] +coroutines_version = "1.7.3" +dex2jar_version = "2.4.10" +kotlin_version = "1.9.21" +okhttp_version = "5.0.0-alpha.11" +serialization_version = "1.6.2" + +[libraries] +coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines_version" } +coroutines-jdk = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines_version" } + +injekt-core = "com.github.inorichi.injekt:injekt-core:65b0440" +jsoup = "org.jsoup:jsoup:1.16.2" +rxjava = "io.reactivex:rxjava:1.3.8" + +kodein-di = "org.kodein.di:kodein-di-conf-jvm:7.21.1" + +gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" } + +# OkHttp +okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp_version" } +okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp_version" } +okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp_version" } +okio = "com.squareup.okio:okio:3.6.0" + +# Serialization +serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" } +serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization_version" } +serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization_version" } + +# Logging +sfl4j-api = "org.slf4j:slf4j-api:2.0.9" +logback = "ch.qos.logback:logback-classic:1.4.14" +ktlogging = "io.github.oshai:kotlin-logging-jvm:5.1.1" + +d2j-translator = { module = "com.github.ThexXTURBOXx.dex2jar:dex-translator", version.ref = "dex2jar_version" } +d2j-tools = { module = "com.github.ThexXTURBOXx.dex2jar:dex-tools", version.ref = "dex2jar_version" } + +apkparser = "net.dongliu:apk-parser:2.6.10" + +[bundles] +coroutines = ["coroutines-core", "coroutines-jdk"] +dex2jar = ["d2j-translator", "d2j-tools"] +extensions_deps = ["jsoup", "injekt-core", "rxjava"] +logging = ["ktlogging", "logback", "sfl4j-api"] +okhttp = ["okhttp-core", "okhttp-dnsoverhttps", "okhttp-logging", "okio"] +serialization = ["serialization-json", "serialization-json-okio", "serialization-protobuf"] + +[plugins] +buildconfig = { id = "com.github.gmazzo.buildconfig", version = "4.2.0" } +detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.4" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin_version" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin_version" } +kotlinter = { id = "org.jmailen.kotlinter", version = "3.16.0" } +shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 2b331368..407ecd96 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -6,39 +6,24 @@ import java.io.BufferedReader plugins { application - kotlin("jvm") - kotlin("plugin.serialization") - id("org.jmailen.kotlinter") - id("com.github.johnrengelman.shadow") - id("com.github.gmazzo.buildconfig") + alias(libs.plugins.buildconfig) + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.kotlinter) + alias(libs.plugins.shadow) } dependencies { - // okhttp - val okhttpVersion = "5.0.0-alpha.11" // version is locked by Aniyomi 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:3.3.0") - - - // dependencies of Aniyomi extensions, some are duplicate, keeping it here for reference - implementation("com.github.inorichi.injekt:injekt-core:65b0440") - implementation("com.squareup.okhttp3:okhttp:$okhttpVersion") - implementation("io.reactivex:rxjava:1.3.8") - implementation("org.jsoup:jsoup:1.15.3") - implementation("app.cash.quickjs:quickjs-jvm:0.9.2") - + // Dependencies of Aniyomi, some are duplicate from root build.gradle.kts + // keeping it here for reference + implementation(libs.injekt.core) + implementation(libs.jsoup) + implementation(libs.rxjava) + implementation(libs.bundles.okhttp) // AndroidCompat implementation(project(":AndroidCompat")) implementation(project(":AndroidCompat:Config")) - - // uncomment to test extensions directly -// implementation(fileTree("lib/")) - - // Testing - testImplementation(kotlin("test-junit5")) } val MainClass = "suwayomi.tachidesk.MainKt" @@ -87,15 +72,19 @@ buildConfig { tasks { shadowJar { + dependencies { + // Useless icu-related files + exclude("com/ibm/icu/impl/data/icudt*/*/*") + } 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 - ) + "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) @@ -106,18 +95,15 @@ tasks { withType { kotlinOptions { freeCompilerArgs = listOf( - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-Xopt-in=kotlinx.coroutines.InternalCoroutinesApi", - "-Xopt-in=kotlin.io.path.ExperimentalPathApi", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-opt-in=kotlinx.coroutines.InternalCoroutinesApi", + "-opt-in=kotlinx.serialization.ExperimentalSerializationApi", + "-opt-in=kotlin.io.path.ExperimentalPathApi", ) } } - test { - useJUnit() - } - withType { destinationDirectory.set(File("$rootDir/server/build")) dependsOn("formatKotlin", "lintKotlin") @@ -128,14 +114,16 @@ tasks { } withType { + exclude("**/BuildConfig.kt") source(files("src/kotlin")) } withType { + exclude("**/BuildConfig.kt") source(files("src/kotlin")) } withType { - duplicatesStrategy = DuplicatesStrategy.WARN + duplicatesStrategy = DuplicatesStrategy.INCLUDE } } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt index a8551724..fca09855 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt @@ -19,16 +19,21 @@ import uy.kohesive.injekt.api.addSingleton import uy.kohesive.injekt.api.addSingletonFactory import uy.kohesive.injekt.api.get +@kotlinx.serialization.ExperimentalSerializationApi class AppModule(val app: Application) : InjektModule { override fun InjektRegistrar.registerInjectables() { - addSingleton(app) addSingletonFactory { NetworkHelper(app) } addSingletonFactory { JavaScriptEngine(app) } - addSingletonFactory { Json { ignoreUnknownKeys = true } } + addSingletonFactory { + Json { + ignoreUnknownKeys = true + explicitNulls = false + } + } // Asynchronously init expensive components for a faster cold start rxAsync { get() } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt index c8da3570..abe4eb55 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/BuildConfig.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi -class BuildConfig { - companion object { - const val VERSION_NAME = suwayomi.server.BuildConfig.NAME - val VERSION_CODE = suwayomi.server.BuildConfig.REVISION.trimStart('r').toInt() - } +object BuildConfig { + const val VERSION_NAME = suwayomi.server.BuildConfig.NAME + val VERSION_CODE = suwayomi.server.BuildConfig.REVISION.trimStart('r').toInt() } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt index 67d99256..171072dc 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.animesource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.model.AnimesPage import rx.Observable +import tachiyomi.core.util.lang.awaitSingle interface AnimeCatalogueSource : AnimeSource { @@ -17,30 +18,63 @@ interface AnimeCatalogueSource : AnimeSource { val supportsLatest: Boolean /** - * Returns an observable containing a page with a list of anime. + * Get a page with a list of anime. * + * @since extensions-lib 1.5 * @param page the page number to retrieve. */ - fun fetchPopularAnime(page: Int): Observable + @Suppress("DEPRECATION") + suspend fun getPopularAnime(page: Int): AnimesPage { + return fetchPopularAnime(page).awaitSingle() + } /** - * Returns an observable containing a page with a list of anime. + * Get a page with a list of anime. * + * @since extensions-lib 1.5 * @param page the page number to retrieve. * @param query the search query. * @param filters the list of filters to apply. */ - fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable + @Suppress("DEPRECATION") + suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage { + return fetchSearchAnime(page, query, filters).awaitSingle() + } /** - * Returns an observable containing a page with a list of latest anime updates. + * Get a page with a list of latest anime updates. * + * @since extensions-lib 1.5 * @param page the page number to retrieve. */ - fun fetchLatestUpdates(page: Int): Observable + @Suppress("DEPRECATION") + suspend fun getLatestUpdates(page: Int): AnimesPage { + return fetchLatestUpdates(page).awaitSingle() + } /** * Returns the list of filters for the source. */ fun getFilterList(): AnimeFilterList + + // Should be replaced as soon as Anime Extension reach 1.5 + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getPopularAnime"), + ) + fun fetchPopularAnime(page: Int): Observable + + // Should be replaced as soon as Anime Extension reach 1.5 + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getSearchAnime"), + ) + fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable + + // Should be replaced as soon as Anime Extension reach 1.5 + @Deprecated( + "Use the non-RxJava API instead", + ReplaceWith("getLatestUpdates"), + ) + fun fetchLatestUpdates(page: Int): Observable } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSource.kt index 3318919e..4603a202 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/animesource/AnimeSource.kt @@ -4,15 +4,15 @@ import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import rx.Observable -import uy.kohesive.injekt.api.get +import tachiyomi.core.util.lang.awaitSingle /** - * A basic interface for creating a source. It could be an online source, a local source, etc... + * A basic interface for creating a source. It could be an online source, a local source, etc. */ interface AnimeSource { /** - * Id for the source. Must be unique. + * ID for the source. Must be unique. */ val id: Long @@ -25,26 +25,60 @@ interface AnimeSource { get() = "" /** - * Returns an observable with the updated details for a anime. + * Get the updated details for a anime. * + * @since extensions-lib 1.5 * @param anime the anime to update. + * @return the updated anime. */ - fun fetchAnimeDetails(anime: SAnime): Observable = - throw IllegalStateException("Not used") + @Suppress("DEPRECATION") + suspend fun getAnimeDetails(anime: SAnime): SAnime { + return fetchAnimeDetails(anime).awaitSingle() + } /** - * Returns an observable with all the available episodes for an anime. + * Get all the available episodes for a anime. * + * @since extensions-lib 1.5 * @param anime the anime to update. + * @return the episodes for the anime. */ - fun fetchEpisodeList(anime: SAnime): Observable> = - throw IllegalStateException("Not used") + @Suppress("DEPRECATION") + suspend fun getEpisodeList(anime: SAnime): List { + return fetchEpisodeList(anime).awaitSingle() + } /** - * Returns an observable with a list of video for the episode of an anime. + * Get the list of videos a episode has. Pages should be returned + * in the expected order; the index is ignored. * - * @param episode the episode to get the link for. + * @since extensions-lib 1.5 + * @param episode the episode. + * @return the videos for the episode. */ + @Suppress("DEPRECATION") + suspend fun getVideoList(episode: SEpisode): List