Netcomics: update for extensions-lib 1.4 (#15363)

src/all/netcomics/build.gradle

@@ -6,7 +6,7 @@ ext {
     extName = 'NETCOMICS'
     pkgNameSuffix = 'all.netcomics'
     extClass = '.NetcomicsFactory'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = true
 }
 

src/all/netcomics/src/eu/kanade/tachiyomi/extension/all/netcomics/Netcomics.kt

@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.extension.all.netcomics
 
 import android.app.Application
-import android.net.Uri
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
@@ -19,6 +18,8 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -56,7 +57,7 @@ class Netcomics(
         System.currentTimeMillis().toString()
     }
 
-    private val apiUri by lazy { Uri.parse(API_URL) }
+    private val apiUrl by lazy { API_URL.toHttpUrl() }
 
     private val apiHeaders by lazy {
         headers.newBuilder()
@@ -80,10 +81,6 @@ class Netcomics(
         }
     }
 
-    // Request the real URL for the webview
-    override fun mangaDetailsRequest(manga: SManga) =
-        GET("$baseUrl/$site/comic/${manga.slug}", headers)
-
     override fun searchMangaParse(response: Response) =
         response.data<List<Title>>().ifEmpty {
             error("No more pages")
@@ -119,50 +116,56 @@ class Netcomics(
         }
 
     override fun fetchLatestUpdates(page: Int) =
-        apiUri.fetch("title", ::searchMangaParse) {
+        apiUrl.fetch("title", ::searchMangaParse) {
-            appendEncodedPath("new")
+            addEncodedPathSegment("new")
-            appendQueryParameter("no", page.toString())
+            addEncodedQueryParameter("no", page.toString())
-            appendQueryParameter("size", "20")
+            addEncodedQueryParameter("size", "20")
-            appendQueryParameter("day", day)
+            addEncodedQueryParameter("day", day)
         }
 
     override fun fetchPopularManga(page: Int) =
-        apiUri.fetch("title", ::searchMangaParse) {
+        apiUrl.fetch("title", ::searchMangaParse) {
-            appendEncodedPath("free")
+            addEncodedPathSegment("free")
-            appendQueryParameter("no", page.toString())
+            addEncodedQueryParameter("no", page.toString())
-            appendQueryParameter("size", "20")
+            addEncodedQueryParameter("size", "20")
         }
 
     override fun fetchSearchManga(page: Int, query: String, filters: FilterList) =
-        apiUri.fetch("title", ::searchMangaParse) {
+        apiUrl.fetch("title", ::searchMangaParse) {
             if (query.isNotBlank()) {
-                appendEncodedPath("search/text")
+                addEncodedPathSegments("search/text")
-                appendQueryParameter("text", query)
+                addQueryParameter("text", query)
             } else {
-                appendEncodedPath("genre")
+                addEncodedPathSegment("genre")
-                appendQueryParameter("genre", filters.genre)
+                addQueryParameter("genre", filters.genre)
             }
-            appendQueryParameter("no", page.toString())
+            addEncodedQueryParameter("no", page.toString())
-            appendQueryParameter("size", "20")
+            addEncodedQueryParameter("size", "20")
         }
 
     override fun fetchMangaDetails(manga: SManga) =
         rx.Observable.just(manga.apply { initialized = true })!!
 
     override fun fetchChapterList(manga: SManga) =
-        apiUri.fetch("chapter", ::chapterListParse) {
+        apiUrl.fetch("chapter", ::chapterListParse) {
-            appendEncodedPath("list")
+            addEncodedPathSegment("list")
-            appendEncodedPath(manga.id)
+            addEncodedPathSegment(manga.id)
-            appendEncodedPath("rent")
+            addEncodedPathSegment("rent")
         }
 
     override fun fetchPageList(chapter: SChapter) =
-        apiUri.fetch("chapter", ::pageListParse) {
+        apiUrl.fetch("chapter", ::pageListParse) {
-            appendEncodedPath("viewer")
+            addEncodedPathSegment("viewer")
-            appendEncodedPath(quality)
+            addEncodedPathSegment(quality)
-            appendEncodedPath(chapter.url)
+            addEncodedPathSegments(chapter.url)
         }
 
+    override fun getMangaUrl(manga: SManga) =
+        "$baseUrl/$site/comic/${manga.slug}"
+
+    override fun getChapterUrl(chapter: SChapter) =
+        "$baseUrl/viewer/${chapter.url}"
+
     override fun getFilterList() =
         FilterList(GenreFilter.NOTE, GenreFilter())
 
@@ -213,6 +216,9 @@ class Netcomics(
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList) =
         throw UnsupportedOperationException("Not used")
 
+    override fun mangaDetailsRequest(manga: SManga) =
+        throw UnsupportedOperationException("Not used")
+
     override fun chapterListRequest(manga: SManga) =
         throw UnsupportedOperationException("Not used")
 
@@ -249,11 +255,11 @@ class Netcomics(
             },
         )
 
-    private inline fun <R> Uri.fetch(
+    private inline fun <R> HttpUrl.fetch(
         path: String,
         noinline parse: (Response) -> R,
-        block: Uri.Builder.() -> Uri.Builder,
+        block: HttpUrl.Builder.() -> HttpUrl.Builder,
-    ) = buildUpon().appendEncodedPath(path).let(block).toString().run {
+    ) = newBuilder().addEncodedPathSegment(path).let(block).run {
-        client.newCall(GET(this, apiHeaders)).asObservable().map(parse)!!
+        client.newCall(GET(build(), apiHeaders)).asObservable().map(parse)!!
     }
 }

src/all/netcomics/src/eu/kanade/tachiyomi/extension/all/netcomics/NetcomicsAPI.kt

@@ -1,3 +1,5 @@
+@file:Suppress("PrivatePropertyName")
+
 package eu.kanade.tachiyomi.extension.all.netcomics
 
 import kotlinx.serialization.Serializable