delegate tsumino

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

@@ -4,6 +4,7 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.english.HentaiCafe
 import eu.kanade.tachiyomi.source.online.english.Pururin
+import eu.kanade.tachiyomi.source.online.english.Tsumino
 
 /**
  * Source helpers
@@ -18,7 +19,7 @@ const val PERV_EDEN_IT_SOURCE_ID = LEWD_SOURCE_SERIES + 6
 const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7
 val HENTAI_CAFE_SOURCE_ID = delegatedSourceId<HentaiCafe>()
 val PURURIN_SOURCE_ID = delegatedSourceId<Pururin>()
-const val TSUMINO_SOURCE_ID = LEWD_SOURCE_SERIES + 9
+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
@@ -26,7 +27,8 @@ const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69
 
 private val DELEGATED_LEWD_SOURCES = listOf(
         HentaiCafe::class,
-        Pururin::class
+        Pururin::class,
+        Tsumino::class
 )
 
 val LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf(

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

@@ -97,6 +97,21 @@ object EXHMigrations {
                         context.jobScheduler.cancelAll()
                     }
                 }
+                if (oldVersion < 8408) {
+                    db.inTransaction {
+                        // Migrate Tsumino source IDs
+                        db.lowLevel().executeSQL(RawQuery.builder()
+                                .query("""
+                            UPDATE ${MangaTable.TABLE}
+                                SET ${MangaTable.COL_SOURCE} = $TSUMINO_SOURCE_ID
+                                WHERE ${MangaTable.COL_SOURCE} = 6909
+                        """.trimIndent())
+                                .affectsTables(MangaTable.TABLE)
+                                .build())
+                    }
+                }
+
+
 
                 // TODO BE CAREFUL TO NOT FUCK UP MergedSources IF CHANGING URLs
 
@@ -118,6 +133,11 @@ object EXHMigrations {
             manga.source = HENTAI_CAFE_SOURCE_ID
         }
 
+        // Migrate Tsumino source IDs
+        if(manga.source == 6909L) {
+            manga.source = TSUMINO_SOURCE_ID
+        }
+
         // Migrate nhentai URLs
         if(manga.source == NHENTAI_SOURCE_ID) {
             manga.url = getUrlWithoutDomain(manga.url)

app/src/main/java/exh/debug/DebugFunctions.kt

@@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.util.jobScheduler
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
+import exh.EXHMigrations
 import exh.eh.EHentaiUpdateWorker
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.metadata.metadata.base.getFlatMetadataForManga
@@ -29,6 +30,11 @@ object DebugFunctions {
     val prefs: PreferencesHelper by injectLazy()
     val sourceManager: SourceManager by injectLazy()
 
+    fun forceUpgradeMigration() {
+	prefs.eh_lastVersionCode().set(0)
+        EXHMigrations.upgrade(prefs)
+    }
+
     fun resetAgedFlagInEXHManga() {
         runBlocking {
             val metadataManga = db.getFavoriteMangaWithMetadata().await()

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

@@ -77,7 +77,7 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
         val BASE_URL = "https://www.tsumino.com"
 
         fun tmIdFromUrl(url: String)
-                = Uri.parse(url).pathSegments[2]
+                = Uri.parse(url).lastPathSegment
 
         fun mangaUrlFromId(id: String) = "/Book/Info/$id"
 

app/src/main/java/exh/source/BlacklistedSources.kt

@@ -41,4 +41,4 @@ object BlacklistedSources {
     val HIDDEN_SOURCES = listOf(
             MERGED_SOURCE_ID
     )
-}
+}