Delegate HBrowse

app/src/main/java/exh/EHSourceHelpers.kt

@@ -2,6 +2,7 @@ package exh
 
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.online.english.HBrowse
 import eu.kanade.tachiyomi.source.online.english.HentaiCafe
 import eu.kanade.tachiyomi.source.online.english.Pururin
 import eu.kanade.tachiyomi.source.online.english.Tsumino
@@ -22,13 +23,14 @@ val PURURIN_SOURCE_ID = delegatedSourceId<Pururin>()
 val TSUMINO_SOURCE_ID = delegatedSourceId<Tsumino>()
 const val HITOMI_SOURCE_ID = LEWD_SOURCE_SERIES + 10
 const val EIGHTMUSES_SOURCE_ID = LEWD_SOURCE_SERIES + 11
-const val HBROWSE_SOURCE_ID = LEWD_SOURCE_SERIES + 12
+val HBROWSE_SOURCE_ID = delegatedSourceId<HBrowse>()
 const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69
 
 private val DELEGATED_LEWD_SOURCES = listOf(
     HentaiCafe::class,
     Pururin::class,
-    Tsumino::class
+    Tsumino::class,
+    HBrowse::class
 )
 
 val LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf(

app/src/main/java/exh/EXHMigrations.kt

@@ -2,6 +2,8 @@ package exh
 
 import android.content.Context
 import com.elvishew.xlog.XLog
+import com.pushtorefresh.storio.sqlite.queries.Query
+import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.data.backup.models.DHistory
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -9,6 +11,8 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.database.resolvers.MangaUrlPutResolver
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.updater.UpdaterJob
@@ -43,6 +47,44 @@ object EXHMigrations {
                     LibraryUpdateJob.setupTask(context)
                     return false
                 }
+                if (oldVersion < 4) {
+                    db.inTransaction {
+                        // Migrate Tsumino source IDs
+                        db.lowLevel().executeSQL(
+                            RawQuery.builder()
+                                .query(
+                                    """
+                                    UPDATE ${MangaTable.TABLE}
+                                        SET ${MangaTable.COL_SOURCE} = $HBROWSE_SOURCE_ID
+                                        WHERE ${MangaTable.COL_SOURCE} = 6912
+                                    """.trimIndent()
+                                )
+                                .affectsTables(MangaTable.TABLE)
+                                .build()
+                        )
+                        // Migrate BHrowse URLs
+                        val hBrowseManga = db.db.get()
+                            .listOfObjects(Manga::class.java)
+                            .withQuery(
+                                Query.builder()
+                                    .table(MangaTable.TABLE)
+                                    .where("${MangaTable.COL_SOURCE} = $HBROWSE_SOURCE_ID")
+                                    .build()
+                            )
+                            .prepare()
+                            .executeAsBlocking()
+                        hBrowseManga.forEach {
+                            it.url = it.url + "/c00001"
+                        }
+
+                        db.db.put()
+                            .objects(hBrowseManga)
+                            // Extremely slow without the resolver :/
+                            .withPutResolver(MangaUrlPutResolver())
+                            .prepare()
+                            .executeAsBlocking()
+                    }
+                }
 
                 // if (oldVersion < 1) { }
                 // do stuff here when releasing changed crap
@@ -70,6 +112,10 @@ object EXHMigrations {
             manga.source = TSUMINO_SOURCE_ID!!
         }
 
+        if (manga.source == 6912L) {
+            manga.source = HBROWSE_SOURCE_ID!!
+        }
+
         // Migrate nhentai URLs
         if (manga.source == NHENTAI_SOURCE_ID) {
             manga.url = getUrlWithoutDomain(manga.url)

app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt

@@ -9,13 +9,17 @@ import exh.metadata.metadata.base.RaisedSearchMetadata
 class HBrowseSearchMetadata : RaisedSearchMetadata() {
     var hbId: Long? = null
 
+    var hbUrlExtra: String? = null
+
+    var thumbnail: String? = null
+
     var title: String? by titleDelegate(TITLE_TYPE_MAIN)
 
     // Length in pages
     var length: Int? = null
 
     override fun copyTo(manga: SManga) {
-        manga.url = "/$hbId"
+        manga.url = "/$hbId/$hbUrlExtra"
 
         title?.let {
             manga.title = it
@@ -44,6 +48,8 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
     override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
         val pairs = mutableListOf<Pair<String, String>>()
         hbId?.let { pairs += Pair(context.getString(R.string.id), it.toString()) }
+        hbUrlExtra?.let { pairs += Pair(context.getString(R.string.id), it.toString()) }
+        thumbnail?.let { pairs += Pair(context.getString(R.string.thumbnail_url), it.toString()) }
         title?.let { pairs += Pair(context.getString(R.string.title), it) }
         length?.let { pairs += Pair(context.getString(R.string.page_count), it.toString()) }
         return pairs