diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index a320f2e4a..48a685174 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -416,6 +416,7 @@ class EHentai(override val id: Long, if(datePosted != null && lastUpdateCheck - datePosted!! > EHentaiUpdateWorkerConstants.GALLERY_AGE_TIME) { aged = true + XLog.d("aged %s - too old", title) } //Parse ratings diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt index 027233cf7..56ecb973f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt @@ -336,7 +336,7 @@ class Hitomi : HttpSource(), LewdSource, UrlImpo } override fun pageListRequest(chapter: SChapter): Request { - return GET("$LTN_BASE_URL/galleries/${HitomiSearchMetadata.hlIdFromUrl(chapter.url)}.js") + return GET("$LTN_BASE_URL/manga/${HitomiSearchMetadata.hlIdFromUrl(chapter.url)}.js") } /** @@ -366,7 +366,7 @@ class Hitomi : HttpSource(), LewdSource, UrlImpo Page( index, "", - "https://${subdomainFromGalleryId(hlId)}a.hitomi.la/galleries/$hlId/${jsonElement["name"].string}" + "https://${subdomainFromGalleryId(hlId)}a.hitomi.la/manga/$hlId/${jsonElement["name"].string}" ) } } @@ -399,10 +399,10 @@ class Hitomi : HttpSource(), LewdSource, UrlImpo override fun mapUrlToMangaUrl(uri: Uri): String? { val lcFirstPathSegment = uri.pathSegments.firstOrNull()?.toLowerCase() ?: return null - if(lcFirstPathSegment != "galleries" && lcFirstPathSegment != "reader") + if(lcFirstPathSegment != "manga" && lcFirstPathSegment != "reader") return null - return "https://hitomi.la/galleries/${uri.pathSegments[1].substringBefore('.')}.html" + return "https://hitomi.la/manga/${uri.pathSegments[1].substringBefore('.')}.html" } companion object { diff --git a/app/src/main/java/exh/debug/DebugFunctions.kt b/app/src/main/java/exh/debug/DebugFunctions.kt index 48a7e1cbf..20e534a89 100644 --- a/app/src/main/java/exh/debug/DebugFunctions.kt +++ b/app/src/main/java/exh/debug/DebugFunctions.kt @@ -11,7 +11,17 @@ import eu.kanade.tachiyomi.util.jobScheduler import exh.EH_SOURCE_ID import exh.EXH_SOURCE_ID import exh.eh.EHentaiUpdateWorker +import exh.metadata.metadata.EHentaiSearchMetadata +import exh.metadata.metadata.base.getFlatMetadataForManga +import exh.metadata.metadata.base.insertFlatMetadata +import exh.util.await +import exh.util.cancellable import uy.kohesive.injekt.injectLazy +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.asFlow +import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.flow.toList +import kotlin.coroutines.CoroutineContext object DebugFunctions { val app: Application by injectLazy() @@ -19,6 +29,27 @@ object DebugFunctions { val prefs: PreferencesHelper by injectLazy() val sourceManager: SourceManager by injectLazy() + fun resetAgedFlagInEXHManga() { + runBlocking { + val metadataManga = db.getFavoriteMangaWithMetadata().await() + + val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> + if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) + return@mapNotNull null + manga + }.toList() + + for (manga in allManga) { + val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() + if(meta != null) { + // remove age flag + meta.aged = false + db.insertFlatMetadata(meta.flatten()).await() + } + } + } + } + fun addAllMangaInDatabaseToLibrary() { db.inTransaction { db.lowLevel().executeSQL(RawQuery.builder() @@ -100,4 +131,4 @@ object DebugFunctions { .affectsTables(MangaTable.TABLE) .build()) } -} \ No newline at end of file +} diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt index ad98505c8..ae09bae68 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt @@ -259,6 +259,7 @@ class EHentaiUpdateWorker: JobService(), CoroutineScope { val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() if(meta != null) { // Age dead galleries + logger.d("Aged %s - notfound", manga.id) meta.aged = true db.insertFlatMetadata(meta.flatten()).await() }