Comick: fix new chapters delay and small refactor (#1354)

* remove chapter pagination

page parameter seems to trigger some cache issue in their api

* update baseUrl

* data class -> class

micro optimization

* small refactor

* remove useless interceptor

* oops

* mutable not needed

.github/workflows/build_push.yml

@@ -25,51 +25,6 @@ jobs:
     steps:
       - name: Clone repo
         uses: actions/checkout@v4
-        
-  build_multisrc:
-    name: Build multisrc modules
-    needs: prepare
-    runs-on: arch
-    steps:
-      - name: Checkout master branch
-        uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Prepare signing key
-        run: |
-          echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
-
-      - name: Generate sources from the multi-source library
-        uses: gradle/gradle-build-action@v2
-        env:
-          CI_MODULE_GEN: "true"
-        with:
-          arguments: :multisrc:generateExtensions
-
-      - name: Build extensions
-        uses: gradle/gradle-build-action@v2
-        env:
-          CI_MULTISRC: "true"
-          ALIAS: ${{ secrets.ALIAS }}
-          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-          KEY_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        with:
-          arguments: assembleRelease
-
-      - name: Upload APKs
-        uses: actions/upload-artifact@v3
-        with:
-          name: "multisrc-apks"
-          path: "**/*.apk"
-          retention-days: 1
-
-      - name: Clean up CI files
-        run: rm signingkey.jks
 
   build_individual:
     name: Build individual modules
@@ -92,12 +47,10 @@ jobs:
       - name: Build extensions
         uses: gradle/gradle-build-action@v2
         env:
-          CI_MULTISRC: "false"
           ALIAS: ${{ secrets.ALIAS }}
           KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
           KEY_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        with:
-          arguments: assembleRelease
+        run: ./gradlew -p src assembleRelease
 
       - name: Upload APKs
         uses: actions/upload-artifact@v3
@@ -112,7 +65,6 @@ jobs:
   publish_repo:
     name: Publish repo
     needs:
-      - build_multisrc
       - build_individual
     runs-on: arch
     steps:

.run/MadaraGenerator.run.xml

@@ -1,11 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MadaraGenerator" type="JetRunConfigurationType" nameIsGenerated="true">
-    <module name="tachiyomi-extensions.multisrc.main" />
-    <option name="MAIN_CLASS_NAME" value="eu.kanade.tachiyomi.multisrc.madara.MadaraGenerator" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktFormat" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="-Ptheme=madara" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktLint" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="-Ptheme=madara" />
-    </method>
-  </configuration>
-</component>

.run/MangaThemesiaGenerator.run.xml

@@ -1,11 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MangaThemesiaGenerator" type="JetRunConfigurationType" nameIsGenerated="true">
-    <module name="tachiyomi-extensions.multisrc.main" />
-    <option name="MAIN_CLASS_NAME" value="eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesiaGenerator" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktFormat" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="-Ptheme=mangathemesia" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktLint" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="-Ptheme=mangathemesia" />
-    </method>
-  </configuration>
-</component>

CONTRIBUTING.md

@@ -423,14 +423,15 @@ will be cached.
 
       ```kotlin
       private fun parseDate(dateStr: String): Long {
-          return runCatching { DATE_FORMATTER.parse(dateStr)?.time }
-              .getOrNull() ?: 0L
+          return try {
+              dateFormat.parse(dateStr)!!.time
+          } catch (_: ParseException) {
+              0L
+          }
       }
 
-      companion object {
-          private val DATE_FORMATTER by lazy {
-              SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
-          }
+      private val dateFormat by lazy {
+          SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
       }
       ```
 

buildSrc/.gitignore

@@ -1,2 +0,0 @@
-.gradle/
-build/

buildSrc/build.gradle.kts

@@ -3,5 +3,14 @@ plugins {
 }
 
 repositories {
+    gradlePluginPortal()
     mavenCentral()
+    google()
+}
+
+dependencies {
+    implementation(libs.gradle.agp)
+    implementation(libs.gradle.kotlin)
+    implementation(libs.gradle.serialization)
+    implementation(libs.gradle.kotlinter)
 }

buildSrc/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/src/main/kotlin/Extensions.kt

@@ -0,0 +1,6 @@
+import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.extra
+
+var ExtensionAware.baseVersionCode: Int
+    get() = extra.get("baseVersionCode") as Int
+    set(value) = extra.set("baseVersionCode", value)

buildSrc/src/main/kotlin/lib-multisrc.gradle.kts

@@ -0,0 +1,64 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    id("kotlinx-serialization")
+    id("org.jmailen.kotlinter")
+}
+
+android {
+    compileSdk = AndroidConfig.compileSdk
+
+    defaultConfig {
+        minSdk = AndroidConfig.minSdk
+    }
+
+    namespace = "eu.kanade.tachiyomi.multisrc.${project.name}"
+
+    sourceSets {
+        named("main") {
+            manifest.srcFile("AndroidManifest.xml")
+            java.setSrcDirs(listOf("src"))
+            res.setSrcDirs(listOf("res"))
+            assets.setSrcDirs(listOf("assets"))
+        }
+    }
+
+    buildFeatures {
+        resValues = false
+        shaders = false
+    }
+
+    kotlinOptions {
+        freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
+    }
+}
+
+kotlinter {
+    experimentalRules = true
+    disabledRules = arrayOf(
+        "experimental:argument-list-wrapping", // Doesn't play well with Android Studio
+        "experimental:comment-wrapping",
+    )
+}
+
+repositories {
+    mavenCentral()
+}
+
+// TODO: use versionCatalogs.named("libs") in Gradle 8.5
+val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
+dependencies {
+    compileOnly(libs.findBundle("common").get())
+}
+
+tasks {
+    preBuild {
+        dependsOn(lintKotlin)
+    }
+
+    if (System.getenv("CI") != "true") {
+        lintKotlin {
+            dependsOn(formatKotlin)
+        }
+    }
+}

common.gradle

@@ -8,6 +8,8 @@ assert !ext.has("libVersion")
 
 assert extName.chars().max().asInt < 0x180 : "Extension name should be romanized"
 
+Project theme = ext.has("themePkg") ? project(":lib-multisrc:$themePkg") : null
+
 android {
     compileSdk AndroidConfig.compileSdk
 
@@ -25,7 +27,7 @@ android {
         minSdk AndroidConfig.minSdk
         targetSdk AndroidConfig.targetSdk
         applicationIdSuffix project.parent.name + "." + project.name
-        versionCode extVersionCode
+        versionCode theme == null ? extVersionCode : theme.baseVersionCode + overrideVersionCode
         versionName "1.4.$versionCode"
         base {
             archivesName = "tachiyomi-$applicationIdSuffix-v$versionName"
@@ -34,8 +36,18 @@ android {
         manifestPlaceholders = [
                 appName : "Tachiyomi: $extName",
                 extClass: extClass,
-                nsfw: project.ext.find("isNsfw") ? 1 : 0,
+                nsfw    : project.ext.find("isNsfw") ? 1 : 0,
         ]
+        String baseUrl = project.ext.find("baseUrl") ?: ""
+        if (theme != null && !baseUrl.isEmpty()) {
+            def split = baseUrl.split("://")
+            assert split.length == 2
+            def path = split[1].split("/")
+            manifestPlaceholders += [
+                    SOURCEHOST  : path[0],
+                    SOURCESCHEME: split[0],
+            ]
+        }
     }
 
     signingConfigs {
@@ -88,6 +100,7 @@ repositories {
 }
 
 dependencies {
+    if (theme != null) implementation(theme) // Overrides core launcher icons
     implementation(project(":core"))
     compileOnly(libs.bundles.common)
 }
@@ -108,4 +121,6 @@ tasks.register("writeManifestFile") {
 }
 
 preBuild.dependsOn(writeManifestFile, lintKotlin)
-lintKotlin.dependsOn(formatKotlin)
+if (System.getenv("CI") != "true") {
+    lintKotlin.dependsOn(formatKotlin)
+}

lib-multisrc/a3manga/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 3

lib-multisrc/bakkin/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 6

lib-multisrc/bilibili/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 9

lib-multisrc/blogtruyen/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 1

lib-multisrc/colamanga/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 3
+
+dependencies {
+    api(project(":lib:synchrony"))
+}

lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt

@@ -126,7 +126,7 @@ abstract class ColaManga(
         }
     }
 
-    override fun searchMangaSelector() = "dl.fed-data-info, ${popularMangaSelector()}"
+    override fun searchMangaSelector() = "dl.fed-deta-info, ${popularMangaSelector()}"
 
     override fun searchMangaFromElement(element: Element): SManga {
         if (element.tagName() == "li") {
@@ -143,7 +143,7 @@ abstract class ColaManga(
         }
     }
 
-    override fun searchMangaNextPageSelector() = popularMangaSelector()
+    override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
 
     protected abstract val statusTitle: String
     protected abstract val authorTitle: String

lib-multisrc/colorlibanime/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 1

lib-multisrc/comicgamma/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 7
+
+dependencies {
+    api(project(":lib:speedbinb"))
+}

lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt

@@ -1,16 +1,20 @@
 package eu.kanade.tachiyomi.multisrc.comicgamma
 
+import eu.kanade.tachiyomi.lib.speedbinb.SpeedBinbInterceptor
+import eu.kanade.tachiyomi.lib.speedbinb.SpeedBinbReader
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import kotlinx.serialization.json.Json
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Evaluator
 import rx.Observable
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.TimeZone
@@ -22,7 +26,11 @@ open class ComicGamma(
 ) : ParsedHttpSource() {
     override val supportsLatest = false
 
-    override val client = network.client.newBuilder().addInterceptor(PtImgInterceptor).build()
+    private val json = Injekt.get<Json>()
+
+    override val client = network.client.newBuilder()
+        .addInterceptor(SpeedBinbInterceptor(json))
+        .build()
 
     override fun popularMangaRequest(page: Int) = GET("$baseUrl/manga/", headers)
     override fun popularMangaNextPageSelector(): String? = null
@@ -54,10 +62,9 @@ open class ComicGamma(
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList) =
         throw UnsupportedOperationException()
 
-    override fun pageListParse(document: Document) =
-        document.select("#content > div[data-ptimg]").mapIndexed { i, e ->
-            Page(i, imageUrl = e.attr("abs:data-ptimg"))
-        }
+    private val reader by lazy { SpeedBinbReader(client, headers, json) }
+
+    override fun pageListParse(document: Document) = reader.pageListParse(document)
 
     override fun mangaDetailsParse(document: Document): SManga {
         val titleElement = document.selectFirst(Evaluator.Class("manga__title"))!!

lib-multisrc/eromuse/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 1

lib-multisrc/fansubscat/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 4

lib-multisrc/flixscans/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 5

lib-multisrc/fmreader/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 9

lib-multisrc/foolslide/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 3

lib-multisrc/gattsu/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 5

lib-multisrc/gigaviewer/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 5

lib-multisrc/gravureblogger/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 1

lib-multisrc/grouple/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("lib-multisrc")
+}
+
+baseVersionCode = 22