Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 1.x source models (#7781)

Browse Source 
(cherry picked from commit e36e9d9d5c1b2a7b55f28f2bf0ef064880cbac8f)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
This commit is contained in:
stevenyomi 2022-08-19 02:07:13 +08:00 committed by Jobobby04
parent fff031cf1c
commit 39e0d7f4e8
58 changed files with 414 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@ -160,9 +160,6 @@ dependencies {
implementation(kotlinx.reflect) implementation(kotlinx.reflect)
implementation(kotlinx.bundles.coroutines) implementation(kotlinx.bundles.coroutines)
// Source models and interfaces from Tachiyomi 1.x
implementation(libs.tachiyomi.api)
// AndroidX libraries // AndroidX libraries
implementation(androidx.annotation) implementation(androidx.annotation)
implementation(androidx.appcompat) implementation(androidx.appcompat)

3
app/src/main/java/eu/kanade/domain/manga/interactor/GetPagePreviews.kt
View File

@ -2,7 +2,6 @@ package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.domain.manga.model.PagePreview import eu.kanade.domain.manga.model.PagePreview
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.data.cache.PagePreviewCache import eu.kanade.tachiyomi.data.cache.PagePreviewCache
import eu.kanade.tachiyomi.source.PagePreviewSource import eu.kanade.tachiyomi.source.PagePreviewSource
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
@ -19,7 +18,7 @@ class GetPagePreviews(
val pagePreviews = try { val pagePreviews = try {
pagePreviewCache.getPageListFromCache(manga, page) pagePreviewCache.getPageListFromCache(manga, page)
} catch (e: Exception) { } catch (e: Exception) {
source.getPagePreviewList(manga.toMangaInfo(), page).also { source.getPagePreviewList(manga.toSManga(), page).also {
pagePreviewCache.putPageListToCache(manga, it) pagePreviewCache.putPageListToCache(manga, it)
} }
} }

16
app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
View File

@ -8,7 +8,7 @@ import eu.kanade.domain.manga.model.toDbManga
import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.domain.manga.repository.MangaRepository
import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadManager
import tachiyomi.source.model.MangaInfo import eu.kanade.tachiyomi.source.model.SManga
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.util.Date import java.util.Date
@ -27,7 +27,7 @@ class UpdateManga(
suspend fun awaitUpdateFromSource( suspend fun awaitUpdateFromSource(
localManga: Manga, localManga: Manga,
remoteManga: MangaInfo, remoteManga: SManga,
manualFetch: Boolean, manualFetch: Boolean,
coverCache: CoverCache = Injekt.get(), coverCache: CoverCache = Injekt.get(),
// SY --> // SY -->
@ -41,10 +41,11 @@ class UpdateManga(
} else null } else null
// SY <-- // SY <--
// Never refresh covers if the url is empty to avoid "losing" existing covers val coverLastModified =
val updateCover = remoteManga.cover.isNotEmpty() && (manualFetch || localManga.thumbnailUrl != remoteManga.cover)
val coverLastModified = if (updateCover) {
when { when {
// Never refresh covers if the url is empty to avoid "losing" existing covers
remoteManga.thumbnail_url.isNullOrEmpty() -> null
!manualFetch && localManga.thumbnailUrl == remoteManga.thumbnail_url -> null
localManga.isLocal() -> Date().time localManga.isLocal() -> Date().time
localManga.hasCustomCover(coverCache) -> { localManga.hasCustomCover(coverCache) -> {
coverCache.deleteFromCache(localManga.toDbManga(), false) coverCache.deleteFromCache(localManga.toDbManga(), false)
@ -55,7 +56,6 @@ class UpdateManga(
Date().time Date().time
} }
} }
} else null
return mangaRepository.update( return mangaRepository.update(
MangaUpdate( MangaUpdate(
@ -65,8 +65,8 @@ class UpdateManga(
author = remoteManga.author, author = remoteManga.author,
artist = remoteManga.artist, artist = remoteManga.artist,
description = remoteManga.description, description = remoteManga.description,
genre = remoteManga.genres, genre = remoteManga.getGenres(),
thumbnailUrl = remoteManga.cover.takeIf { it.isNotEmpty() }, thumbnailUrl = remoteManga.thumbnail_url?.takeIf { it.isNotEmpty() },
status = remoteManga.status.toLong(), status = remoteManga.status.toLong(),
initialized = true, initialized = true,
), ),

42
app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
View File

@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.LocalSource
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.widget.ExtendedNavigationView import eu.kanade.tachiyomi.widget.ExtendedNavigationView
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -119,12 +118,14 @@ data class Manga(
fun toSManga(): SManga = SManga.create().also { fun toSManga(): SManga = SManga.create().also {
it.url = url it.url = url
it.title = title // SY -->
it.artist = artist it.title = ogTitle
it.author = author it.artist = ogArtist
it.description = description it.author = ogAuthor
it.genre = genre.orEmpty().joinToString() it.description = ogDescription
it.status = status.toInt() it.genre = ogGenre.orEmpty().joinToString()
it.status = ogStatus.toInt()
// SY <--
it.thumbnail_url = thumbnailUrl it.thumbnail_url = thumbnailUrl
it.initialized = initialized it.initialized = initialized
} }
@ -228,19 +229,6 @@ fun Manga.toDbManga(): DbManga = MangaImpl().also {
it.initialized = initialized it.initialized = initialized
} }
fun Manga.toMangaInfo(): MangaInfo = MangaInfo(
// SY -->
artist = ogArtist ?: "",
author = ogAuthor ?: "",
cover = thumbnailUrl ?: "",
description = ogDescription ?: "",
genres = ogGenre ?: emptyList(),
key = url,
status = ogStatus.toInt(),
title = ogTitle,
// SY <--
)
fun Manga.toMangaUpdate(): MangaUpdate { fun Manga.toMangaUpdate(): MangaUpdate {
return MangaUpdate( return MangaUpdate(
id = id, id = id,
@ -252,12 +240,14 @@ fun Manga.toMangaUpdate(): MangaUpdate {
chapterFlags = chapterFlags, chapterFlags = chapterFlags,
coverLastModified = coverLastModified, coverLastModified = coverLastModified,
url = url, url = url,
title = title, // SY -->
artist = artist, title = ogTitle,
author = author, artist = ogArtist,
description = description, author = ogAuthor,
genre = genre, description = ogDescription,
status = status, genre = ogGenre,
status = ogStatus,
// SY <--
thumbnailUrl = thumbnailUrl, thumbnailUrl = thumbnailUrl,
initialized = initialized, initialized = initialized,
) )

2
app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
View File

@ -24,6 +24,7 @@ import androidx.compose.ui.unit.dp
import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.FlowRow
import eu.kanade.presentation.components.SuggestionChip import eu.kanade.presentation.components.SuggestionChip
import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.presentation.theme.TachiyomiTheme
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.online.all.EHentai import eu.kanade.tachiyomi.source.online.all.EHentai
import exh.metadata.metadata.EHentaiSearchMetadata import exh.metadata.metadata.EHentaiSearchMetadata
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
@ -31,7 +32,6 @@ import exh.metadata.metadata.base.RaisedTag
import exh.source.EH_SOURCE_ID import exh.source.EH_SOURCE_ID
import exh.source.EXH_SOURCE_ID import exh.source.EXH_SOURCE_ID
import exh.util.SourceTagsUtil import exh.util.SourceTagsUtil
import tachiyomi.source.Source
@Immutable @Immutable
data class DisplayTag( data class DisplayTag(

14
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View File

@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import tachiyomi.source.model.MangaInfo
import eu.kanade.domain.manga.model.Manga as DomainManga import eu.kanade.domain.manga.model.Manga as DomainManga
interface Manga : SManga { interface Manga : SManga {
@ -84,19 +83,6 @@ interface Manga : SManga {
} }
} }
fun Manga.toMangaInfo(): MangaInfo {
return MangaInfo(
artist = this.artist ?: "",
author = this.author ?: "",
cover = this.thumbnail_url ?: "",
description = this.description ?: "",
genres = this.getGenres() ?: emptyList(),
key = this.url,
status = this.status,
title = this.title,
)
}
fun Manga.toDomainManga(): DomainManga? { fun Manga.toDomainManga(): DomainManga? {
val mangaId = id ?: return null val mangaId = id ?: return null
return DomainManga( return DomainManga(

39
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -21,7 +21,6 @@ import eu.kanade.domain.manga.interactor.InsertFlatMetadata
import eu.kanade.domain.manga.interactor.InsertManga import eu.kanade.domain.manga.interactor.InsertManga
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.toDbManga import eu.kanade.domain.manga.model.toDbManga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.domain.manga.model.toMangaUpdate import eu.kanade.domain.manga.model.toMangaUpdate
import eu.kanade.domain.track.interactor.GetTracks import eu.kanade.domain.track.interactor.GetTracks
import eu.kanade.domain.track.interactor.InsertTrack import eu.kanade.domain.track.interactor.InsertTrack
@ -34,7 +33,6 @@ import eu.kanade.tachiyomi.data.database.models.LibraryManga
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainChapter import eu.kanade.tachiyomi.data.database.models.toDomainChapter
import eu.kanade.tachiyomi.data.database.models.toDomainManga import eu.kanade.tachiyomi.data.database.models.toDomainManga
import eu.kanade.tachiyomi.data.database.models.toMangaInfo
import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.data.download.DownloadService import eu.kanade.tachiyomi.data.download.DownloadService
import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start
@ -51,9 +49,6 @@ import eu.kanade.tachiyomi.data.track.TrackStatus
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.UnmeteredSource import eu.kanade.tachiyomi.source.UnmeteredSource
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toMangaInfo
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.source.online.all.MergedSource import eu.kanade.tachiyomi.source.online.all.MergedSource
import eu.kanade.tachiyomi.ui.library.LibraryGroup import eu.kanade.tachiyomi.ui.library.LibraryGroup
import eu.kanade.tachiyomi.ui.manga.track.TrackItem import eu.kanade.tachiyomi.ui.manga.track.TrackItem
@ -88,7 +83,6 @@ import kotlinx.coroutines.supervisorScope
import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit import kotlinx.coroutines.sync.withPermit
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.io.File import java.io.File
@ -532,12 +526,10 @@ class LibraryUpdateService(
private suspend fun updateManga(manga: DomainManga, loggedServices: List<TrackService>): List<DomainChapter> { private suspend fun updateManga(manga: DomainManga, loggedServices: List<TrackService>): List<DomainChapter> {
val source = sourceManager.getOrStub(manga.source) val source = sourceManager.getOrStub(manga.source)
val mangaInfo: MangaInfo = manga.toMangaInfo()
// Update manga metadata if needed // Update manga metadata if needed
if (preferences.autoUpdateMetadata()) { if (preferences.autoUpdateMetadata()) {
val updatedMangaInfo = source.getMangaDetails(manga.toMangaInfo()) val networkManga = source.getMangaDetails(manga.toSManga())
updateManga.awaitUpdateFromSource(manga, updatedMangaInfo, manualFetch = false, coverCache) updateManga.awaitUpdateFromSource(manga, networkManga, manualFetch = false, coverCache)
} }
// SY --> // SY -->
@ -559,8 +551,7 @@ class LibraryUpdateService(
} }
// SY <-- // SY <--
val chapters = source.getChapterList(mangaInfo) val chapters = source.getChapterList(manga.toSManga())
.map { it.toSChapter() }
// Get manga from database to account for if it was removed during the update // Get manga from database to account for if it was removed during the update
val dbManga = getManga.await(manga.id) val dbManga = getManga.await(manga.id)
@ -592,22 +583,15 @@ class LibraryUpdateService(
progressCount, progressCount,
manga, manga,
) { mangaWithNotif -> ) { mangaWithNotif ->
sourceManager.get(mangaWithNotif.source)?.let { source -> val source = sourceManager.get(mangaWithNotif.source) ?: return@withUpdateNotification
try { try {
val networkManga = val networkManga = source.getMangaDetails(mangaWithNotif.copy())
source.getMangaDetails(mangaWithNotif.toMangaInfo()) mangaWithNotif.prepUpdateCover(coverCache, networkManga, true)
val sManga = networkManga.toSManga() mangaWithNotif.copyFrom(networkManga)
mangaWithNotif.prepUpdateCover(coverCache, sManga, true)
sManga.thumbnail_url?.let {
mangaWithNotif.thumbnail_url = it
try { try {
updateManga.await( updateManga.await(mangaWithNotif.toDomainManga()!!.toMangaUpdate())
mangaWithNotif.toDomainManga()!!
.toMangaUpdate(),
)
} catch (e: Exception) { } catch (e: Exception) {
logcat(LogPriority.ERROR) { "Manga don't exist anymore" } logcat(LogPriority.ERROR) { "Manga doesn't exist anymore" }
}
} }
} catch (e: Throwable) { } catch (e: Throwable) {
// Ignore errors and continue // Ignore errors and continue
@ -618,7 +602,6 @@ class LibraryUpdateService(
} }
} }
} }
}
.awaitAll() .awaitAll()
} }
@ -697,7 +680,7 @@ class LibraryUpdateService(
} }
updatingManga.remove(manga) updatingManga.remove(manga)
completed.andIncrement completed.getAndIncrement()
notifier.showProgressNotification( notifier.showProgressNotification(
updatingManga, updatingManga,
completed.get(), completed.get(),
@ -748,7 +731,7 @@ class LibraryUpdateService(
updateManga.awaitUpdateFavorite(dbManga.id, true) updateManga.awaitUpdateFavorite(dbManga.id, true)
} }
updateManga.awaitUpdateFromSource(dbManga, networkManga.toMangaInfo(), true) updateManga.awaitUpdateFromSource(dbManga, networkManga, true)
metadata.mangaId = dbManga.id metadata.mangaId = dbManga.id
insertFlatMetadata.await(metadata) insertFlatMetadata.await(metadata)
} }

13
app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt
View File

@ -10,13 +10,12 @@ import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.data.track.TrackService
import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.toMangaInfo import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.lang.awaitSingle import eu.kanade.tachiyomi.util.lang.awaitSingle
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.runAsObservable
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import exh.md.utils.FollowStatus import exh.md.utils.FollowStatus
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
@ -134,7 +133,7 @@ class MdList(private val context: Context, id: Long) : TrackService(id) {
.flatMap { page -> .flatMap { page ->
runAsObservable { runAsObservable {
page.mangas.map { page.mangas.map {
toTrackSearch(mdex.getMangaDetails(it.toMangaInfo())) toTrackSearch(mdex.getMangaDetails(it))
} }
} }
} }
@ -142,11 +141,11 @@ class MdList(private val context: Context, id: Long) : TrackService(id) {
} }
} }
private fun toTrackSearch(mangaInfo: MangaInfo): TrackSearch = TrackSearch.create(TrackManager.MDLIST).apply { private fun toTrackSearch(mangaInfo: SManga): TrackSearch = TrackSearch.create(TrackManager.MDLIST).apply {
tracking_url = MdUtil.baseUrl + mangaInfo.key tracking_url = MdUtil.baseUrl + mangaInfo.url
title = mangaInfo.title title = mangaInfo.title
cover_url = mangaInfo.cover cover_url = mangaInfo.thumbnail_url.orEmpty()
summary = mangaInfo.description summary = mangaInfo.description.orEmpty()
} }
override suspend fun login(username: String, password: String): Unit = throw Exception("not used") override suspend fun login(username: String, password: String): Unit = throw Exception("not used")

89
app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
View File

@ -10,10 +10,6 @@ import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toChapterInfo
import eu.kanade.tachiyomi.source.model.toMangaInfo
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.util.chapter.ChapterRecognition import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.DiskUtil
@ -27,8 +23,6 @@ import kotlinx.serialization.json.decodeFromStream
import kotlinx.serialization.json.encodeToStream import kotlinx.serialization.json.encodeToStream
import logcat.LogPriority import logcat.LogPriority
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.io.File import java.io.File
import java.io.FileInputStream import java.io.FileInputStream
@ -125,11 +119,10 @@ class LocalSource(
// Fetch chapters of all the manga // Fetch chapters of all the manga
mangas.forEach { manga -> mangas.forEach { manga ->
val mangaInfo = manga.toMangaInfo()
runBlocking { runBlocking {
val chapters = getChapterList(mangaInfo) val chapters = getChapterList(manga)
if (chapters.isNotEmpty()) { if (chapters.isNotEmpty()) {
val chapter = chapters.last().toSChapter() val chapter = chapters.last()
val format = getFormat(chapter) val format = getFormat(chapter)
if (format is Format.Epub) { if (format is Format.Epub) {
@ -161,12 +154,37 @@ class LocalSource(
} }
} }
private fun SManga.toJson(): MangaJson { private fun SManga.toJson(): MangaDetails {
return MangaJson(title, author, artist, description, genre?.split(", "), status) return MangaDetails(title, author, artist, description, genre?.split(", "), status)
}
// SY <--
// Manga details related
override suspend fun getMangaDetails(manga: SManga): SManga {
val baseDirsFile = getBaseDirectoriesFiles(context)
getCoverFile(manga.url, baseDirsFile)?.let {
manga.thumbnail_url = it.absolutePath
}
getMangaDirsFiles(manga.url, baseDirsFile)
.firstOrNull { it.extension.equals("json", ignoreCase = true) }
?.let { file ->
json.decodeFromStream<MangaDetails>(file.inputStream()).run {
title?.let { manga.title = it }
author?.let { manga.author = it }
artist?.let { manga.artist = it }
description?.let { manga.description = it }
genre?.let { manga.genre = it.joinToString() }
status?.let { manga.status = it }
}
}
return manga
} }
@Serializable @Serializable
data class MangaJson( data class MangaDetails(
val title: String? = null, val title: String? = null,
val author: String? = null, val author: String? = null,
val artist: String? = null, val artist: String? = null,
@ -174,50 +192,16 @@ class LocalSource(
val genre: List<String>? = null, val genre: List<String>? = null,
val status: Int? = null, val status: Int? = null,
) )
// SY <--
// Manga details related
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo {
var mangaInfo = manga
val baseDirsFile = getBaseDirectoriesFiles(context)
val coverFile = getCoverFile(manga.key, baseDirsFile)
coverFile?.let {
mangaInfo = mangaInfo.copy(cover = it.absolutePath)
}
val localDetails = getMangaDirsFiles(manga.key, baseDirsFile)
.firstOrNull { it.extension.equals("json", ignoreCase = true) }
if (localDetails != null) {
val mangaJson = json.decodeFromStream<MangaJson>(localDetails.inputStream())
mangaInfo = mangaInfo.copy(
title = mangaJson.title ?: mangaInfo.title,
author = mangaJson.author ?: mangaInfo.author,
artist = mangaJson.artist ?: mangaInfo.artist,
description = mangaJson.description ?: mangaInfo.description,
genres = mangaJson.genre ?: mangaInfo.genres,
status = mangaJson.status ?: mangaInfo.status,
)
}
return mangaInfo
}
// Chapters // Chapters
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> { override suspend fun getChapterList(manga: SManga): List<SChapter> {
val sManga = manga.toSManga()
val baseDirsFile = getBaseDirectoriesFiles(context) val baseDirsFile = getBaseDirectoriesFiles(context)
return getMangaDirsFiles(manga.key, baseDirsFile) return getMangaDirsFiles(manga.url, baseDirsFile)
// Only keep supported formats // Only keep supported formats
.filter { it.isDirectory || isSupportedFile(it.extension) } .filter { it.isDirectory || isSupportedFile(it.extension) }
.map { chapterFile -> .map { chapterFile ->
SChapter.create().apply { SChapter.create().apply {
url = "${manga.key}/${chapterFile.name}" url = "${manga.url}/${chapterFile.name}"
name = if (chapterFile.isDirectory) { name = if (chapterFile.isDirectory) {
chapterFile.name chapterFile.name
} else { } else {
@ -225,7 +209,7 @@ class LocalSource(
} }
date_upload = chapterFile.lastModified() date_upload = chapterFile.lastModified()
chapter_number = ChapterRecognition.parseChapterNumber(sManga.title, this.name, this.chapter_number) chapter_number = ChapterRecognition.parseChapterNumber(manga.title, this.name, this.chapter_number)
val format = getFormat(chapterFile) val format = getFormat(chapterFile)
if (format is Format.Epub) { if (format is Format.Epub) {
@ -235,9 +219,8 @@ class LocalSource(
} }
} }
} }
.map { it.toChapterInfo() }
.sortedWith { c1, c2 -> .sortedWith { c1, c2 ->
val c = c2.number.compareTo(c1.number) val c = c2.chapter_number.compareTo(c1.chapter_number)
if (c == 0) c2.name.compareToCaseInsensitiveNaturalOrder(c1.name) else c if (c == 0) c2.name.compareToCaseInsensitiveNaturalOrder(c1.name) else c
} }
.toList() .toList()
@ -256,7 +239,7 @@ class LocalSource(
) )
// Unused stuff // Unused stuff
override suspend fun getPageList(chapter: ChapterInfo) = throw UnsupportedOperationException("Unused") override suspend fun getPageList(chapter: SChapter) = throw UnsupportedOperationException("Unused")
// Miscellaneous // Miscellaneous
private fun isSupportedFile(extension: String): Boolean { private fun isSupportedFile(extension: String): Boolean {

4
app/src/main/java/eu/kanade/tachiyomi/source/PagePreviewSource.kt
View File

@ -1,17 +1,17 @@
package eu.kanade.tachiyomi.source package eu.kanade.tachiyomi.source
import eu.kanade.tachiyomi.network.ProgressListener import eu.kanade.tachiyomi.network.ProgressListener
import eu.kanade.tachiyomi.source.model.SManga
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient import kotlinx.serialization.Transient
import okhttp3.CacheControl import okhttp3.CacheControl
import okhttp3.Response import okhttp3.Response
import tachiyomi.source.model.MangaInfo
interface PagePreviewSource : Source { interface PagePreviewSource : Source {
suspend fun getPagePreviewList(manga: MangaInfo, page: Int): PagePreviewPage suspend fun getPagePreviewList(manga: SManga, page: Int): PagePreviewPage
suspend fun fetchPreviewImage(page: PagePreviewInfo, cacheControl: CacheControl? = null): Response suspend fun fetchPreviewImage(page: PagePreviewInfo, cacheControl: CacheControl? = null): Response
} }

32
app/src/main/java/eu/kanade/tachiyomi/source/Source.kt
View File

@ -7,35 +7,28 @@ import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toChapterInfo
import eu.kanade.tachiyomi.source.model.toMangaInfo
import eu.kanade.tachiyomi.source.model.toPageUrl
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.ui.manga.MergedMangaData import eu.kanade.tachiyomi.ui.manga.MergedMangaData
import eu.kanade.tachiyomi.util.lang.awaitSingle import eu.kanade.tachiyomi.util.lang.awaitSingle
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
/** /**
* A basic interface for creating a source. It could be an online source, a local source, etc... * A basic interface for creating a source. It could be an online source, a local source, etc...
*/ */
interface Source : tachiyomi.source.Source { interface Source {
/** /**
* Id for the source. Must be unique. * Id for the source. Must be unique.
*/ */
override val id: Long val id: Long
/** /**
* Name of the source. * Name of the source.
*/ */
override val name: String val name: String
override val lang: String val lang: String
get() = "" get() = ""
/** /**
@ -76,29 +69,24 @@ interface Source : tachiyomi.source.Source {
* [1.x API] Get the updated details for a manga. * [1.x API] Get the updated details for a manga.
*/ */
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { suspend fun getMangaDetails(manga: SManga): SManga {
val sManga = manga.toSManga() return fetchMangaDetails(manga).awaitSingle()
val networkManga = fetchMangaDetails(sManga).awaitSingle()
sManga.copyFrom(networkManga)
return sManga.toMangaInfo()
} }
/** /**
* [1.x API] Get all the available chapters for a manga. * [1.x API] Get all the available chapters for a manga.
*/ */
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> { suspend fun getChapterList(manga: SManga): List<SChapter> {
return fetchChapterList(manga.toSManga()).awaitSingle() return fetchChapterList(manga).awaitSingle()
.map { it.toChapterInfo() }
} }
/** /**
* [1.x API] Get the list of pages a chapter has. * [1.x API] Get the list of pages a chapter has.
*/ */
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
override suspend fun getPageList(chapter: ChapterInfo): List<tachiyomi.source.model.Page> { suspend fun getPageList(chapter: SChapter): List<Page> {
return fetchPageList(chapter.toSChapter()).awaitSingle() return fetchPageList(chapter).awaitSingle()
.map { it.toPageUrl() }
} }
} }

8
app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
View File

@ -45,8 +45,6 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -208,7 +206,7 @@ class SourceManager(
override val lang: String = sourceData.lang override val lang: String = sourceData.lang
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
throw getSourceNotInstalledException() throw getSourceNotInstalledException()
} }
@ -216,7 +214,7 @@ class SourceManager(
return Observable.error(getSourceNotInstalledException()) return Observable.error(getSourceNotInstalledException())
} }
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> { override suspend fun getChapterList(manga: SManga): List<SChapter> {
throw getSourceNotInstalledException() throw getSourceNotInstalledException()
} }
@ -224,7 +222,7 @@ class SourceManager(
return Observable.error(getSourceNotInstalledException()) return Observable.error(getSourceNotInstalledException())
} }
override suspend fun getPageList(chapter: ChapterInfo): List<tachiyomi.source.model.Page> { override suspend fun getPageList(chapter: SChapter): List<Page> {
throw getSourceNotInstalledException() throw getSourceNotInstalledException()
} }

14
app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt
View File

@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.network.ProgressListener
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient import kotlinx.serialization.Transient
import rx.subjects.Subject import rx.subjects.Subject
import tachiyomi.source.model.PageUrl
@Serializable @Serializable
open class Page( open class Page(
@ -66,16 +65,3 @@ open class Page(
const val ERROR = 4 const val ERROR = 4
} }
} }
fun Page.toPageUrl(): PageUrl {
return PageUrl(
url = this.imageUrl ?: this.url,
)
}
fun PageUrl.toPage(index: Int): Page {
return Page(
index = index,
imageUrl = this.url,
)
}

38
app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt
View File

@ -1,7 +1,6 @@
package eu.kanade.tachiyomi.source.model package eu.kanade.tachiyomi.source.model
import data.Chapters import data.Chapters
import tachiyomi.source.model.ChapterInfo
import java.io.Serializable import java.io.Serializable
interface SChapter : Serializable { interface SChapter : Serializable {
@ -36,26 +35,23 @@ interface SChapter : Serializable {
fun create(): SChapter { fun create(): SChapter {
return SChapterImpl() return SChapterImpl()
} }
}
}
fun SChapter.toChapterInfo(): ChapterInfo { // SY -->
return ChapterInfo( operator fun invoke(
dateUpload = this.date_upload, name: String,
key = this.url, url: String,
name = this.name, date_upload: Long = 0,
number = this.chapter_number, chapter_number: Float = -1F,
scanlator = this.scanlator ?: "", scanlator: String? = null,
) ): SChapter {
} return create().apply {
this.name = name
fun ChapterInfo.toSChapter(): SChapter { this.url = url
val chapter = this this.date_upload = date_upload
return SChapter.create().apply { this.chapter_number = chapter_number
url = chapter.key this.scanlator = scanlator
name = chapter.name }
date_upload = chapter.dateUpload }
chapter_number = chapter.number // SY <--
scanlator = chapter.scanlator
} }
} }

88
app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
View File

@ -4,7 +4,6 @@ import data.Mangas
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaImpl import eu.kanade.tachiyomi.data.database.models.MangaImpl
import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadManager
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.io.Serializable import java.io.Serializable
@ -127,6 +126,20 @@ interface SManga : Serializable {
} }
} }
fun copy() = create().also {
it.url = url
// SY -->
it.title = originalTitle
it.artist = originalArtist
it.author = originalAuthor
it.description = originalDescription
it.genre = originalGenre
it.status = originalStatus
// SY <--
it.thumbnail_url = thumbnail_url
it.initialized = initialized
}
companion object { companion object {
const val UNKNOWN = 0 const val UNKNOWN = 0
const val ONGOING = 1 const val ONGOING = 1
@ -139,32 +152,55 @@ interface SManga : Serializable {
fun create(): SManga { fun create(): SManga {
return SMangaImpl() return SMangaImpl()
} }
// SY -->
operator fun invoke(
url: String,
title: String,
artist: String? = null,
author: String? = null,
description: String? = null,
genre: String? = null,
status: Int = 0,
thumbnail_url: String? = null,
initialized: Boolean = false,
): SManga {
return create().also {
it.url = url
it.title = title
it.artist = artist
it.author = author
it.description = description
it.genre = genre
it.status = status
it.thumbnail_url = thumbnail_url
it.initialized = initialized
}
}
// SY <--
} }
} }
fun SManga.toMangaInfo(): MangaInfo { // SY -->
return MangaInfo( fun SManga.copy(
key = this.url, url: String = this.url,
title = this.title, title: String = this.originalTitle,
artist = this.artist ?: "", artist: String? = this.originalArtist,
author = this.author ?: "", author: String? = this.originalAuthor,
description = this.description ?: "", description: String? = this.originalDescription,
genres = this.getGenres() ?: emptyList(), genre: String? = this.originalGenre,
status = this.status, status: Int = this.status,
cover = this.thumbnail_url ?: "", thumbnail_url: String? = this.thumbnail_url,
) initialized: Boolean = this.initialized,
} ) = SManga.create().also {
it.url = url
fun MangaInfo.toSManga(): SManga { it.title = title
val mangaInfo = this it.artist = artist
return SManga.create().apply { it.author = author
url = mangaInfo.key it.description = description
title = mangaInfo.title it.genre = genre
artist = mangaInfo.artist it.status = status
author = mangaInfo.author it.thumbnail_url = thumbnail_url
description = mangaInfo.description it.initialized = initialized
genre = mangaInfo.genres.joinToString(", ")
status = mangaInfo.status
thumbnail_url = mangaInfo.cover
}
} }
// SY <--

10
app/src/main/java/eu/kanade/tachiyomi/source/online/MetadataSource.kt
View File

@ -6,14 +6,12 @@ import eu.kanade.domain.manga.interactor.GetManga
import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.InsertFlatMetadata
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toMangaInfo
import eu.kanade.tachiyomi.ui.manga.MangaScreenState import eu.kanade.tachiyomi.ui.manga.MangaScreenState
import eu.kanade.tachiyomi.util.lang.awaitSingle import eu.kanade.tachiyomi.util.lang.awaitSingle
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.runAsObservable
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import rx.Completable import rx.Completable
import rx.Single import rx.Single
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -51,11 +49,11 @@ interface MetadataSource<M : RaisedSearchMetadata, I> : CatalogueSource {
*/ */
@Suppress("DeprecatedCallableAddReplaceWith") @Suppress("DeprecatedCallableAddReplaceWith")
@Deprecated("Use the MangaInfo variant") @Deprecated("Use the MangaInfo variant")
fun parseToManga(manga: SManga, input: I): Completable = runAsObservable { fun parseToMangaCompletable(manga: SManga, input: I): Completable = runAsObservable {
parseToManga(manga.toMangaInfo(), input) parseToManga(manga, input)
}.toCompletable() }.toCompletable()
suspend fun parseToManga(manga: MangaInfo, input: I): MangaInfo { suspend fun parseToManga(manga: SManga, input: I): SManga {
val mangaId = manga.id() val mangaId = manga.id()
val metadata = if (mangaId != null) { val metadata = if (mangaId != null) {
val flatMetadata = getFlatMetadataById.await(mangaId) val flatMetadata = getFlatMetadataById.await(mangaId)
@ -114,5 +112,5 @@ interface MetadataSource<M : RaisedSearchMetadata, I> : CatalogueSource {
@Composable @Composable
fun DescriptionComposable(state: MangaScreenState.Success, openMetadataViewer: () -> Unit, search: (String) -> Unit) fun DescriptionComposable(state: MangaScreenState.Success, openMetadataViewer: () -> Unit, search: (String) -> Unit)
suspend fun MangaInfo.id() = getManga.await(key, id)?.id suspend fun SManga.id() = getManga.await(url, id)?.id
} }

2
app/src/main/java/eu/kanade/tachiyomi/source/online/RandomMangaSource.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.source.online package eu.kanade.tachiyomi.source.online
import tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
interface RandomMangaSource : Source { interface RandomMangaSource : Source {
suspend fun fetchRandomMangaUrl(): String suspend fun fetchRandomMangaUrl(): String

56
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -23,9 +23,7 @@ import eu.kanade.tachiyomi.source.model.MetadataMangasPage
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toMangaInfo import eu.kanade.tachiyomi.source.model.copy
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -92,8 +90,6 @@ import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import org.jsoup.nodes.TextNode import org.jsoup.nodes.TextNode
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.IOException import java.io.IOException
@ -306,13 +302,13 @@ class EHentai(
MetadataMangasPage(mangaFromSource.first.map { it.manga }, mangaFromSource.second, mangaFromSource.first.map { it.metadata }) MetadataMangasPage(mangaFromSource.first.map { it.manga }, mangaFromSource.second, mangaFromSource.first.map { it.metadata })
} }
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> = getChapterList(manga) {} override suspend fun getChapterList(manga: SManga): List<SChapter> = getChapterList(manga) {}
suspend fun getChapterList(manga: MangaInfo, throttleFunc: suspend () -> Unit): List<ChapterInfo> { suspend fun getChapterList(manga: SManga, throttleFunc: suspend () -> Unit): List<SChapter> {
// Pull all the way to the root gallery // Pull all the way to the root gallery
// We can't do this with RxJava or we run into stack overflows on shit like this: // We can't do this with RxJava or we run into stack overflows on shit like this:
// https://exhentai.org/g/1073061/f9345f1c12/ // https://exhentai.org/g/1073061/f9345f1c12/
var url = manga.key var url = manga.url
var doc: Document var doc: Document
while (true) { while (true) {
@ -348,11 +344,11 @@ class EHentai(
} }
val newDisplay = doc.select("#gnd a") val newDisplay = doc.select("#gnd a")
// Build chapter for root gallery // Build chapter for root gallery
val self = ChapterInfo( val self = SChapter(
key = EHentaiSearchMetadata.normalizeUrl(doc.location()), url = EHentaiSearchMetadata.normalizeUrl(doc.location()),
name = "v1: " + doc.selectFirst("#gn")!!.text(), name = "v1: " + doc.selectFirst("#gn")!!.text(),
number = 1f, chapter_number = 1f,
dateUpload = MetadataUtil.EX_DATE_FORMAT.parse( date_upload = MetadataUtil.EX_DATE_FORMAT.parse(
doc.select("#gdd .gdt1").find { el -> doc.select("#gdd .gdt1").find { el ->
el.text().lowercase() == "posted:" el.text().lowercase() == "posted:"
}!!.nextElementSibling()!!.text(), }!!.nextElementSibling()!!.text(),
@ -366,26 +362,28 @@ class EHentai(
val link = newGallery.attr("href") val link = newGallery.attr("href")
val name = newGallery.text() val name = newGallery.text()
val posted = (newGallery.nextSibling() as TextNode).text().removePrefix(", added ") val posted = (newGallery.nextSibling() as TextNode).text().removePrefix(", added ")
ChapterInfo( SChapter(
key = EHentaiSearchMetadata.normalizeUrl(link), url = EHentaiSearchMetadata.normalizeUrl(link),
name = "v${index + 2}: $name", name = "v${index + 2}: $name",
number = index + 2f, chapter_number = index + 2f,
dateUpload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time, date_upload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time,
) )
}.reversed() + self }.reversed() + self
} }
} }
@Suppress("OverridingDeprecatedMember", "DEPRECATION") @Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList"))
@Suppress("DEPRECATION")
override fun fetchChapterList(manga: SManga) = fetchChapterList(manga) {} override fun fetchChapterList(manga: SManga) = fetchChapterList(manga) {}
@Suppress("DeprecatedCallableAddReplaceWith") @Suppress("DeprecatedCallableAddReplaceWith")
@Deprecated("Use getChapterList instead") @Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList"))
fun fetchChapterList(manga: SManga, throttleFunc: suspend () -> Unit) = runAsObservable { fun fetchChapterList(manga: SManga, throttleFunc: suspend () -> Unit) = runAsObservable {
getChapterList(manga.toMangaInfo(), throttleFunc).map { it.toSChapter() } getChapterList(manga, throttleFunc)
} }
override fun fetchPageList(chapter: SChapter) = fetchChapterPage(chapter, baseUrl + chapter.url) @Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList"))
override fun fetchPageList(chapter: SChapter): Observable<List<Page>> = fetchChapterPage(chapter, baseUrl + chapter.url)
.map { .map {
it.mapIndexed { i, s -> it.mapIndexed { i, s ->
Page(i, s) Page(i, s)
@ -541,6 +539,7 @@ class EHentai(
* *
* @param manga the manga to be updated. * @param manga the manga to be updated.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getMangaDetails"))
override fun fetchMangaDetails(manga: SManga): Observable<SManga> { override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
return client.newCall(mangaDetailsRequest(manga)) return client.newCall(mangaDetailsRequest(manga))
.asObservableWithAsyncStacktrace() .asObservableWithAsyncStacktrace()
@ -556,7 +555,8 @@ class EHentai(
} else Observable.just(doc) } else Observable.just(doc)
pre.flatMap { pre.flatMap {
parseToManga(manga, it).andThen( @Suppress("DEPRECATION")
parseToMangaCompletable(manga, it).andThen(
Observable.just( Observable.just(
manga.apply { manga.apply {
initialized = true initialized = true
@ -576,17 +576,17 @@ class EHentai(
} }
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val exception = Exception("Async stacktrace") val exception = Exception("Async stacktrace")
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).awaitResponse() val response = client.newCall(mangaDetailsRequest(manga)).awaitResponse()
if (response.isSuccessful) { if (response.isSuccessful) {
// Pull to most recent // Pull to most recent
val doc = response.asJsoup() val doc = response.asJsoup()
val newerGallery = doc.select("#gnd a").lastOrNull() val newerGallery = doc.select("#gnd a").lastOrNull()
val pre = if (newerGallery != null && DebugToggles.PULL_TO_ROOT_WHEN_LOADING_EXH_MANGA_DETAILS.enabled) { val pre = if (newerGallery != null && DebugToggles.PULL_TO_ROOT_WHEN_LOADING_EXH_MANGA_DETAILS.enabled) {
val sManga = manga.toSManga().apply { val sManga = manga.copy(
url = EHentaiSearchMetadata.normalizeUrl(newerGallery.attr("href")) url = EHentaiSearchMetadata.normalizeUrl(newerGallery.attr("href")),
} )
client.newCall(mangaDetailsRequest(sManga)).await().asJsoup() client.newCall(mangaDetailsRequest(sManga)).await().asJsoup()
} else doc } else doc
return parseToManga(manga, pre) return parseToManga(manga, pre)
@ -1097,12 +1097,12 @@ class EHentai(
} }
override suspend fun getPagePreviewList( override suspend fun getPagePreviewList(
manga: MangaInfo, manga: SManga,
page: Int, page: Int,
): PagePreviewPage { ): PagePreviewPage {
val doc = client.newCall( val doc = client.newCall(
exGet( exGet(
(baseUrl + manga.key) (baseUrl + manga.url)
.toHttpUrl() .toHttpUrl()
.newBuilder() .newBuilder()
.removeAllQueryParameters("nw") .removeAllQueryParameters("nw")

7
app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
View File

@ -6,7 +6,7 @@ import android.os.Build
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -20,7 +20,6 @@ import exh.source.DelegatedHttpSource
import exh.ui.metadata.adapters.HitomiDescription import exh.ui.metadata.adapters.HitomiDescription
import exh.util.urlImportFetchSearchManga import exh.util.urlImportFetchSearchManga
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import tachiyomi.source.model.MangaInfo
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
@ -38,8 +37,8 @@ class Hitomi(delegate: HttpSource, val context: Context) :
super.fetchSearchManga(page, query, filters) super.fetchSearchManga(page, query, filters)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response.asJsoup()) return parseToManga(manga, response.asJsoup())
} }

16
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
View File

@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.source.model.MetadataMangasPage
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toChapterInfo
import eu.kanade.tachiyomi.source.online.BrowseSourceFilterHeader import eu.kanade.tachiyomi.source.online.BrowseSourceFilterHeader
import eu.kanade.tachiyomi.source.online.FollowsSource import eu.kanade.tachiyomi.source.online.FollowsSource
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
@ -54,8 +53,6 @@ import exh.ui.metadata.adapters.MangaDexDescription
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Response import okhttp3.Response
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -182,24 +179,27 @@ class MangaDex(delegate: HttpSource, val context: Context) :
} }
} }
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getMangaDetails"))
override fun fetchMangaDetails(manga: SManga): Observable<SManga> { override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
return mangaHandler.fetchMangaDetailsObservable(manga, id) return mangaHandler.fetchMangaDetailsObservable(manga, id)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
return mangaHandler.getMangaDetails(manga, id) return mangaHandler.getMangaDetails(manga, id)
} }
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList"))
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> { override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
return mangaHandler.fetchChapterListObservable(manga, blockedGroups(), blockedUploaders()) return mangaHandler.fetchChapterListObservable(manga, blockedGroups(), blockedUploaders())
} }
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> { override suspend fun getChapterList(manga: SManga): List<SChapter> {
return mangaHandler.getChapterList(manga, blockedGroups(), blockedUploaders()) return mangaHandler.getChapterList(manga, blockedGroups(), blockedUploaders())
} }
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList"))
override fun fetchPageList(chapter: SChapter): Observable<List<Page>> { override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
return runAsObservable { pageHandler.fetchPageList(chapter.toChapterInfo(), isLogged(), usePort443Only(), dataSaver(), delegate) } return runAsObservable { pageHandler.fetchPageList(chapter, isLogged(), usePort443Only(), dataSaver(), delegate) }
} }
override fun fetchImage(page: Page): Observable<Response> { override fun fetchImage(page: Page): Observable<Response> {
@ -301,11 +301,11 @@ class MangaDex(delegate: HttpSource, val context: Context) :
return mangaHandler.fetchRandomMangaId() return mangaHandler.fetchRandomMangaId()
} }
suspend fun getMangaSimilar(manga: MangaInfo): MetadataMangasPage { suspend fun getMangaSimilar(manga: SManga): MetadataMangasPage {
return similarHandler.getSimilar(manga) return similarHandler.getSimilar(manga)
} }
suspend fun getMangaRelated(manga: MangaInfo): MetadataMangasPage { suspend fun getMangaRelated(manga: SManga): MetadataMangasPage {
return similarHandler.getRelated(manga) return similarHandler.getRelated(manga)
} }

26
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt
View File

@ -10,7 +10,6 @@ import eu.kanade.domain.manga.interactor.GetMergedReferencesById
import eu.kanade.domain.manga.interactor.InsertManga import eu.kanade.domain.manga.interactor.InsertManga
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
@ -19,7 +18,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSChapter import eu.kanade.tachiyomi.source.model.copy
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.shouldDownloadNewChapters import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
@ -33,8 +32,6 @@ import kotlinx.coroutines.supervisorScope
import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit import kotlinx.coroutines.sync.withPermit
import okhttp3.Response import okhttp3.Response
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -64,18 +61,20 @@ class MergedSource : HttpSource() {
override fun chapterListParse(response: Response) = throw UnsupportedOperationException() override fun chapterListParse(response: Response) = throw UnsupportedOperationException()
override fun pageListParse(response: Response) = throw UnsupportedOperationException() override fun pageListParse(response: Response) = throw UnsupportedOperationException()
override fun imageUrlParse(response: Response) = throw UnsupportedOperationException() override fun imageUrlParse(response: Response) = throw UnsupportedOperationException()
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList"))
override fun fetchChapterList(manga: SManga) = throw UnsupportedOperationException() override fun fetchChapterList(manga: SManga) = throw UnsupportedOperationException()
override suspend fun getChapterList(manga: MangaInfo) = throw UnsupportedOperationException() override suspend fun getChapterList(manga: SManga) = throw UnsupportedOperationException()
override fun fetchImage(page: Page) = throw UnsupportedOperationException() override fun fetchImage(page: Page) = throw UnsupportedOperationException()
override fun fetchImageUrl(page: Page) = throw UnsupportedOperationException() override fun fetchImageUrl(page: Page) = throw UnsupportedOperationException()
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList"))
override fun fetchPageList(chapter: SChapter) = throw UnsupportedOperationException() override fun fetchPageList(chapter: SChapter) = throw UnsupportedOperationException()
override suspend fun getPageList(chapter: ChapterInfo) = throw UnsupportedOperationException() override suspend fun getPageList(chapter: SChapter) = throw UnsupportedOperationException()
override fun fetchLatestUpdates(page: Int) = throw UnsupportedOperationException() override fun fetchLatestUpdates(page: Int) = throw UnsupportedOperationException()
override fun fetchPopularManga(page: Int) = throw UnsupportedOperationException() override fun fetchPopularManga(page: Int) = throw UnsupportedOperationException()
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
return withIOContext { return withIOContext {
val mergedManga = getManga.await(manga.key, id) ?: throw Exception("merged manga not in db") val mergedManga = getManga.await(manga.url, id) ?: throw Exception("merged manga not in db")
val mangaReferences = getMergedReferencesById.await(mergedManga.id) val mangaReferences = getMergedReferencesById.await(mergedManga.id)
.apply { .apply {
if (isEmpty()) { if (isEmpty()) {
@ -93,10 +92,10 @@ class MergedSource : HttpSource() {
val mangaInfoReference = mangaReferences.firstOrNull { it.isInfoManga } val mangaInfoReference = mangaReferences.firstOrNull { it.isInfoManga }
?: mangaReferences.firstOrNull { it.mangaId != it.mergeId } ?: mangaReferences.firstOrNull { it.mangaId != it.mergeId }
val dbManga = mangaInfoReference?.run { val dbManga = mangaInfoReference?.run {
getManga.await(mangaUrl, mangaSourceId)?.toMangaInfo() getManga.await(mangaUrl, mangaSourceId)?.toSManga()
} }
(dbManga ?: mergedManga.toMangaInfo()).copy( (dbManga ?: mergedManga.toSManga()).copy(
key = manga.key, url = manga.url,
) )
} }
} }
@ -185,8 +184,7 @@ class MergedSource : HttpSource() {
val (source, loadedManga, reference) = val (source, loadedManga, reference) =
it.load(sourceManager, getManga, insertManga, updateManga) it.load(sourceManager, getManga, insertManga, updateManga)
if (loadedManga != null && reference.getChapterUpdates) { if (loadedManga != null && reference.getChapterUpdates) {
val chapterList = source.getChapterList(loadedManga.toMangaInfo()) val chapterList = source.getChapterList(loadedManga.toSManga())
.map(ChapterInfo::toSChapter)
val results = val results =
syncChaptersWithSource.await(chapterList, loadedManga, source) syncChaptersWithSource.await(chapterList, loadedManga, source)
if (ifDownloadNewChapters && reference.downloadChapters) { if (ifDownloadNewChapters && reference.downloadChapters) {
@ -226,7 +224,7 @@ class MergedSource : HttpSource() {
), ),
)!! )!!
val newManga = getManga.await(id)!! val newManga = getManga.await(id)!!
updateManga.awaitUpdateFromSource(newManga, source.getMangaDetails(newManga.toMangaInfo()), false) updateManga.awaitUpdateFromSource(newManga, source.getMangaDetails(newManga.toSManga()), false)
manga = getManga.await(id)!! manga = getManga.await(id)!!
} }
return LoadedMangaSource(source, manga, this) return LoadedMangaSource(source, manga, this)

11
app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt
View File

@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.PagePreviewInfo
import eu.kanade.tachiyomi.source.PagePreviewPage import eu.kanade.tachiyomi.source.PagePreviewPage
import eu.kanade.tachiyomi.source.PagePreviewSource import eu.kanade.tachiyomi.source.PagePreviewSource
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -30,7 +30,6 @@ import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import okhttp3.CacheControl import okhttp3.CacheControl
import okhttp3.Response import okhttp3.Response
import tachiyomi.source.model.MangaInfo
class NHentai(delegate: HttpSource, val context: Context) : class NHentai(delegate: HttpSource, val context: Context) :
DelegatedHttpSource(delegate), DelegatedHttpSource(delegate),
@ -57,8 +56,8 @@ class NHentai(delegate: HttpSource, val context: Context) :
super.fetchSearchManga(page, query, filters) super.fetchSearchManga(page, query, filters)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response) return parseToManga(manga, response)
} }
@ -181,9 +180,9 @@ class NHentai(delegate: HttpSource, val context: Context) :
NHentaiDescription(state, openMetadataViewer) NHentaiDescription(state, openMetadataViewer)
} }
override suspend fun getPagePreviewList(manga: MangaInfo, page: Int): PagePreviewPage { override suspend fun getPagePreviewList(manga: SManga, page: Int): PagePreviewPage {
val metadata = fetchOrLoadMetadata(manga.id()) { val metadata = fetchOrLoadMetadata(manga.id()) {
client.newCall(mangaDetailsRequest(manga.toSManga())).await() client.newCall(mangaDetailsRequest(manga)).await()
} }
return PagePreviewPage( return PagePreviewPage(
page, page,

7
app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt
View File

@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
import androidx.core.net.toUri import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.UrlImportableSource import eu.kanade.tachiyomi.source.online.UrlImportableSource
@ -21,7 +21,6 @@ import exh.util.urlImportFetchSearchManga
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import org.jsoup.nodes.TextNode import org.jsoup.nodes.TextNode
import tachiyomi.source.model.MangaInfo
class PervEden(delegate: HttpSource, val context: Context) : class PervEden(delegate: HttpSource, val context: Context) :
DelegatedHttpSource(delegate), DelegatedHttpSource(delegate),
@ -36,8 +35,8 @@ class PervEden(delegate: HttpSource, val context: Context) :
super.fetchSearchManga(page, query, filters) super.fetchSearchManga(page, query, filters)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response.asJsoup()) return parseToManga(manga, response.asJsoup())
} }

7
app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt
View File

@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
import androidx.core.net.toUri import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -20,7 +20,6 @@ import exh.ui.metadata.adapters.EightMusesDescription
import exh.util.urlImportFetchSearchManga import exh.util.urlImportFetchSearchManga
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import tachiyomi.source.model.MangaInfo
class EightMuses(delegate: HttpSource, val context: Context) : class EightMuses(delegate: HttpSource, val context: Context) :
DelegatedHttpSource(delegate), DelegatedHttpSource(delegate),
@ -36,8 +35,8 @@ class EightMuses(delegate: HttpSource, val context: Context) :
super.fetchSearchManga(page, query, filters) super.fetchSearchManga(page, query, filters)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response.asJsoup()) return parseToManga(manga, response.asJsoup())
} }

7
app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
View File

@ -5,7 +5,7 @@ import android.net.Uri
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -19,7 +19,6 @@ import exh.ui.metadata.adapters.HBrowseDescription
import exh.util.urlImportFetchSearchManga import exh.util.urlImportFetchSearchManga
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import tachiyomi.source.model.MangaInfo
class HBrowse(delegate: HttpSource, val context: Context) : class HBrowse(delegate: HttpSource, val context: Context) :
DelegatedHttpSource(delegate), DelegatedHttpSource(delegate),
@ -35,8 +34,8 @@ class HBrowse(delegate: HttpSource, val context: Context) :
super.fetchSearchManga(page, query, filters) super.fetchSearchManga(page, query, filters)
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response.asJsoup()) return parseToManga(manga, response.asJsoup())
} }

7
app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt
View File

@ -7,7 +7,7 @@ import androidx.core.net.toUri
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -24,7 +24,6 @@ import exh.util.trimAll
import exh.util.urlImportFetchSearchManga import exh.util.urlImportFetchSearchManga
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import rx.Observable import rx.Observable
import tachiyomi.source.model.MangaInfo
class Pururin(delegate: HttpSource, val context: Context) : class Pururin(delegate: HttpSource, val context: Context) :
DelegatedHttpSource(delegate), DelegatedHttpSource(delegate),
@ -53,8 +52,8 @@ class Pururin(delegate: HttpSource, val context: Context) :
} }
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response.asJsoup()) return parseToManga(manga, response.asJsoup())
} }

7
app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt
View File

@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
import eu.kanade.tachiyomi.network.await import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.NamespaceSource import eu.kanade.tachiyomi.source.online.NamespaceSource
@ -24,7 +24,6 @@ import exh.util.trimAll
import exh.util.urlImportFetchSearchManga import exh.util.urlImportFetchSearchManga
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import rx.Observable import rx.Observable
import tachiyomi.source.model.MangaInfo
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
@ -50,8 +49,8 @@ class Tsumino(delegate: HttpSource, val context: Context) :
return "https://tsumino.com/Book/Info/${uri.lastPathSegment}" return "https://tsumino.com/Book/Info/${uri.lastPathSegment}"
} }
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
val response = client.newCall(mangaDetailsRequest(manga.toSManga())).await() val response = client.newCall(mangaDetailsRequest(manga)).await()
return parseToManga(manga, response.asJsoup()) return parseToManga(manga, response.asJsoup())
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedPresenter.kt
View File

@ -14,7 +14,6 @@ import eu.kanade.domain.source.interactor.GetSavedSearchGlobalFeed
import eu.kanade.domain.source.interactor.InsertFeedSavedSearch import eu.kanade.domain.source.interactor.InsertFeedSavedSearch
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainManga import eu.kanade.tachiyomi.data.database.models.toDomainManga
import eu.kanade.tachiyomi.data.database.models.toMangaInfo
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
@ -22,7 +21,6 @@ import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.runAsObservable
@ -272,8 +270,8 @@ open class FeedPresenter(
*/ */
private fun getMangaDetailsObservable(manga: Manga, source: Source): Observable<Manga> { private fun getMangaDetailsObservable(manga: Manga, source: Source): Observable<Manga> {
return runAsObservable { return runAsObservable {
val networkManga = source.getMangaDetails(manga.toMangaInfo()) val networkManga = source.getMangaDetails(manga.copy())
manga.copyFrom(networkManga.toSManga()) manga.copyFrom(networkManga)
manga.initialized = true manga.initialized = true
updateManga.await(manga.toDomainManga()!!.toMangaUpdate()) updateManga.await(manga.toDomainManga()!!.toMangaUpdate())
manga manga

21
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt
View File

@ -20,14 +20,12 @@ import eu.kanade.domain.manga.interactor.GetManga
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.domain.manga.model.toDbManga import eu.kanade.domain.manga.model.toDbManga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.MigrationListControllerBinding import eu.kanade.tachiyomi.databinding.MigrationListControllerBinding
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.online.all.EHentai import eu.kanade.tachiyomi.source.online.all.EHentai
import eu.kanade.tachiyomi.ui.base.changehandler.OneWayFadeChangeHandler import eu.kanade.tachiyomi.ui.base.changehandler.OneWayFadeChangeHandler
import eu.kanade.tachiyomi.ui.base.controller.BaseController import eu.kanade.tachiyomi.ui.base.controller.BaseController
@ -186,13 +184,13 @@ class MigrationListController(bundle: Bundle? = null) :
) )
val chapters = if (source is EHentai) { val chapters = if (source is EHentai) {
source.getChapterList(localManga.toMangaInfo(), throttleManager::throttle) source.getChapterList(localManga.toSManga(), throttleManager::throttle)
} else { } else {
source.getChapterList(localManga.toMangaInfo()) source.getChapterList(localManga.toSManga())
} }
try { try {
syncChaptersWithSource.await(chapters.map { it.toSChapter() }, localManga, source) syncChaptersWithSource.await(chapters, localManga, source)
} catch (e: Exception) { } catch (e: Exception) {
return@async2 null return@async2 null
} }
@ -223,10 +221,10 @@ class MigrationListController(bundle: Bundle? = null) :
val localManga = smartSearchEngine.networkToLocalManga(searchResult, source.id) val localManga = smartSearchEngine.networkToLocalManga(searchResult, source.id)
val chapters = try { val chapters = try {
if (source is EHentai) { if (source is EHentai) {
source.getChapterList(localManga.toMangaInfo(), throttleManager::throttle) source.getChapterList(localManga.toSManga(), throttleManager::throttle)
} else { } else {
source.getChapterList(localManga.toMangaInfo()) source.getChapterList(localManga.toSManga())
}.map { it.toSChapter() } }
} catch (e: Exception) { } catch (e: Exception) {
this@MigrationListController.logcat(LogPriority.ERROR, e) this@MigrationListController.logcat(LogPriority.ERROR, e)
emptyList() emptyList()
@ -254,7 +252,7 @@ class MigrationListController(bundle: Bundle? = null) :
if (result != null && result.thumbnailUrl == null) { if (result != null && result.thumbnailUrl == null) {
try { try {
val newManga = sourceManager.getOrStub(result.source).getMangaDetails(result.toMangaInfo()) val newManga = sourceManager.getOrStub(result.source).getMangaDetails(result.toSManga())
updateManga.awaitUpdateFromSource(result, newManga, true) updateManga.awaitUpdateFromSource(result, newManga, true)
} catch (e: CancellationException) { } catch (e: CancellationException) {
// Ignore cancellations // Ignore cancellations
@ -359,8 +357,7 @@ class MigrationListController(bundle: Bundle? = null) :
val result = CoroutineScope(migratingManga.manga.migrationJob).async { val result = CoroutineScope(migratingManga.manga.migrationJob).async {
val localManga = smartSearchEngine.networkToLocalManga(manga.toDbManga(), source.id) val localManga = smartSearchEngine.networkToLocalManga(manga.toDbManga(), source.id)
try { try {
val chapters = source.getChapterList(localManga.toMangaInfo()) val chapters = source.getChapterList(localManga.toSManga())
.map { it.toSChapter() }
syncChaptersWithSource.await(chapters, localManga, source) syncChaptersWithSource.await(chapters, localManga, source)
} catch (e: Exception) { } catch (e: Exception) {
return@async null return@async null
@ -370,7 +367,7 @@ class MigrationListController(bundle: Bundle? = null) :
if (result != null) { if (result != null) {
try { try {
val newManga = sourceManager.getOrStub(result.source).getMangaDetails(result.toMangaInfo()) val newManga = sourceManager.getOrStub(result.source).getMangaDetails(result.toSManga())
updateManga.awaitUpdateFromSource(result, newManga, true) updateManga.awaitUpdateFromSource(result, newManga, true)
} catch (e: CancellationException) { } catch (e: CancellationException) {
// Ignore cancellations // Ignore cancellations

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
View File

@ -20,7 +20,6 @@ import eu.kanade.domain.track.model.toDomainTrack
import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainManga import eu.kanade.tachiyomi.data.database.models.toDomainManga
import eu.kanade.tachiyomi.data.database.models.toMangaInfo
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.EnhancedTrackService import eu.kanade.tachiyomi.data.track.EnhancedTrackService
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
@ -30,7 +29,6 @@ import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.ui.browse.source.filter.AutoComplete import eu.kanade.tachiyomi.ui.browse.source.filter.AutoComplete
import eu.kanade.tachiyomi.ui.browse.source.filter.AutoCompleteSectionItem import eu.kanade.tachiyomi.ui.browse.source.filter.AutoCompleteSectionItem
@ -331,8 +329,8 @@ open class BrowseSourcePresenter(
*/ */
private suspend fun getMangaDetails(manga: Manga): Manga { private suspend fun getMangaDetails(manga: Manga): Manga {
try { try {
val networkManga = source.getMangaDetails(manga.toMangaInfo()) val networkManga = source.getMangaDetails(manga.copy())
manga.copyFrom(networkManga.toSManga()) manga.copyFrom(networkManga)
manga.initialized = true manga.initialized = true
updateManga.await( updateManga.await(
manga manga

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedPresenter.kt
View File

@ -16,14 +16,12 @@ import eu.kanade.domain.source.interactor.GetSavedSearchBySourceIdFeed
import eu.kanade.domain.source.interactor.InsertFeedSavedSearch import eu.kanade.domain.source.interactor.InsertFeedSavedSearch
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainManga import eu.kanade.tachiyomi.data.database.models.toDomainManga
import eu.kanade.tachiyomi.data.database.models.toMangaInfo
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter.Companion.toItems import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter.Companion.toItems
import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.launchIO
@ -289,8 +287,8 @@ open class SourceFeedPresenter(
*/ */
private fun getMangaDetailsObservable(manga: Manga, source: Source): Observable<Manga> { private fun getMangaDetailsObservable(manga: Manga, source: Source): Observable<Manga> {
return runAsObservable { return runAsObservable {
val networkManga = source.getMangaDetails(manga.toMangaInfo()) val networkManga = source.getMangaDetails(manga.copy())
manga.copyFrom(networkManga.toSManga()) manga.copyFrom(networkManga)
manga.initialized = true manga.initialized = true
updateManga.await(manga.toDomainManga()!!.toMangaUpdate()) updateManga.await(manga.toDomainManga()!!.toMangaUpdate())
manga manga

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
View File

@ -8,7 +8,6 @@ import eu.kanade.domain.manga.model.toDbManga
import eu.kanade.domain.manga.model.toMangaUpdate import eu.kanade.domain.manga.model.toMangaUpdate
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainManga import eu.kanade.tachiyomi.data.database.models.toDomainManga
import eu.kanade.tachiyomi.data.database.models.toMangaInfo
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.extension.ExtensionManager
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
@ -16,7 +15,6 @@ import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.runAsObservable
@ -247,8 +245,8 @@ open class GlobalSearchPresenter(
* @return The initialized manga. * @return The initialized manga.
*/ */
private suspend fun getMangaDetails(manga: Manga, source: Source): Manga { private suspend fun getMangaDetails(manga: Manga, source: Source): Manga {
val networkManga = source.getMangaDetails(manga.toMangaInfo()) val networkManga = source.getMangaDetails(manga.copy())
manga.copyFrom(networkManga.toSManga()) manga.copyFrom(networkManga)
manga.initialized = true manga.initialized = true
updateManga.await(manga.toDomainManga()!!.toMangaUpdate()) updateManga.await(manga.toDomainManga()!!.toMangaUpdate())
return manga return manga

7
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -35,7 +35,6 @@ import eu.kanade.domain.manga.model.PagePreview
import eu.kanade.domain.manga.model.TriStateFilter import eu.kanade.domain.manga.model.TriStateFilter
import eu.kanade.domain.manga.model.isLocal import eu.kanade.domain.manga.model.isLocal
import eu.kanade.domain.manga.model.toDbManga import eu.kanade.domain.manga.model.toDbManga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.domain.track.interactor.DeleteTrack import eu.kanade.domain.track.interactor.DeleteTrack
import eu.kanade.domain.track.interactor.GetTracks import eu.kanade.domain.track.interactor.GetTracks
import eu.kanade.domain.track.interactor.InsertTrack import eu.kanade.domain.track.interactor.InsertTrack
@ -55,7 +54,6 @@ import eu.kanade.tachiyomi.source.LocalSource
import eu.kanade.tachiyomi.source.PagePreviewSource import eu.kanade.tachiyomi.source.PagePreviewSource
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.source.online.all.MergedSource import eu.kanade.tachiyomi.source.online.all.MergedSource
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
@ -416,7 +414,7 @@ class MangaPresenter(
updateSuccessState { it.copy(isRefreshingInfo = true) } updateSuccessState { it.copy(isRefreshingInfo = true) }
try { try {
successState?.let { successState?.let {
val networkManga = it.source.getMangaDetails(it.manga.toMangaInfo()) val networkManga = it.source.getMangaDetails(it.manga.toSManga())
updateManga.awaitUpdateFromSource(it.manga, networkManga, manualFetch) updateManga.awaitUpdateFromSource(it.manga, networkManga, manualFetch)
} }
} catch (e: Throwable) { } catch (e: Throwable) {
@ -964,8 +962,7 @@ class MangaPresenter(
try { try {
successState?.let { successState -> successState?.let { successState ->
if (successState.source !is MergedSource) { if (successState.source !is MergedSource) {
val chapters = successState.source.getChapterList(successState.manga.toMangaInfo()) val chapters = successState.source.getChapterList(successState.manga.toSManga())
.map { it.toSChapter() }
val newChapters = syncChaptersWithSource.await( val newChapters = syncChaptersWithSource.await(
chapters, chapters,

5
app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt
View File

@ -29,11 +29,12 @@ fun Manga.prepUpdateCover(coverCache: CoverCache, remoteManga: SManga, refreshSa
if (!refreshSameUrl && thumbnail_url == newUrl) return if (!refreshSameUrl && thumbnail_url == newUrl) return
val domainManga = toDomainManga()!!
when { when {
toDomainManga()!!.isLocal() -> { domainManga.isLocal() -> {
cover_last_modified = Date().time cover_last_modified = Date().time
} }
toDomainManga()!!.hasCustomCover(coverCache) -> { domainManga.hasCustomCover(coverCache) -> {
coverCache.deleteFromCache(this, false) coverCache.deleteFromCache(this, false)
} }
else -> { else -> {

10
app/src/main/java/exh/GalleryAdder.kt
View File

@ -9,11 +9,9 @@ import eu.kanade.domain.manga.interactor.GetManga
import eu.kanade.domain.manga.interactor.InsertManga import eu.kanade.domain.manga.interactor.InsertManga
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.online.UrlImportableSource import eu.kanade.tachiyomi.source.online.UrlImportableSource
import eu.kanade.tachiyomi.source.online.all.EHentai import eu.kanade.tachiyomi.source.online.all.EHentai
import exh.log.xLogStack import exh.log.xLogStack
@ -135,7 +133,7 @@ class GalleryAdder(
} }
// Fetch and copy details // Fetch and copy details
val newManga = source.getMangaDetails(manga.toMangaInfo()) val newManga = source.getMangaDetails(manga.toSManga())
updateManga.awaitUpdateFromSource(manga, newManga, false) updateManga.awaitUpdateFromSource(manga, newManga, false)
manga = getManga.await(manga.id)!! manga = getManga.await(manga.id)!!
@ -147,10 +145,10 @@ class GalleryAdder(
// Fetch and copy chapters // Fetch and copy chapters
try { try {
val chapterList = if (source is EHentai) { val chapterList = if (source is EHentai) {
source.getChapterList(manga.toMangaInfo(), throttleFunc) source.getChapterList(manga.toSManga(), throttleFunc)
} else { } else {
source.getChapterList(manga.toMangaInfo()) source.getChapterList(manga.toSManga())
}.map { it.toSChapter() } }
if (chapterList.isNotEmpty()) { if (chapterList.isNotEmpty()) {
syncChaptersWithSource.await(chapterList, manga, source) syncChaptersWithSource.await(chapterList, manga, source)

3
app/src/main/java/exh/debug/DebugFunctions.kt
View File

@ -10,7 +10,6 @@ import eu.kanade.domain.manga.interactor.GetFlatMetadataById
import eu.kanade.domain.manga.interactor.GetSearchMetadata import eu.kanade.domain.manga.interactor.GetSearchMetadata
import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.InsertFlatMetadata
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.all.NHentai import eu.kanade.tachiyomi.source.online.all.NHentai
@ -79,7 +78,7 @@ object DebugFunctions {
EH_SOURCE_ID -> eh EH_SOURCE_ID -> eh
EXH_SOURCE_ID -> ex EXH_SOURCE_ID -> ex
else -> return@forEach else -> return@forEach
}?.getMangaDetails(manga.toMangaInfo()) ?: return@forEach }?.getMangaDetails(manga.toSManga()) ?: return@forEach
updateManga.awaitUpdateFromSource(manga, networkManga, true) updateManga.awaitUpdateFromSource(manga, networkManga, true)
} }

7
app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
View File

@ -19,13 +19,11 @@ import eu.kanade.domain.manga.interactor.GetFlatMetadataById
import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.InsertFlatMetadata
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.data.library.LibraryUpdateNotifier import eu.kanade.tachiyomi.data.library.LibraryUpdateNotifier
import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING
import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.online.all.EHentai import eu.kanade.tachiyomi.source.online.all.EHentai
import eu.kanade.tachiyomi.util.system.isConnectedToWifi import eu.kanade.tachiyomi.util.system.isConnectedToWifi
import exh.debug.DebugToggles import exh.debug.DebugToggles
@ -203,11 +201,10 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara
?: throw GalleryNotUpdatedException(false, IllegalStateException("Missing EH-based source (${manga.source})!")) ?: throw GalleryNotUpdatedException(false, IllegalStateException("Missing EH-based source (${manga.source})!"))
try { try {
val updatedManga = source.getMangaDetails(manga.toMangaInfo()) val updatedManga = source.getMangaDetails(manga.toSManga())
updateManga.awaitUpdateFromSource(manga, updatedManga, false) updateManga.awaitUpdateFromSource(manga, updatedManga, false)
val newChapters = source.getChapterList(manga.toMangaInfo()) val newChapters = source.getChapterList(manga.toSManga())
.map { it.toSChapter() }
val new = syncChaptersWithSource.await(newChapters, manga, source) val new = syncChaptersWithSource.await(newChapters, manga, source)
return new to getChapterByMangaId.await(manga.id) return new to getChapterByMangaId.await(manga.id)

19
app/src/main/java/exh/md/handlers/ApiMangaParser.kt
View File

@ -3,6 +3,7 @@ package exh.md.handlers
import eu.kanade.domain.manga.interactor.GetFlatMetadataById import eu.kanade.domain.manga.interactor.GetFlatMetadataById
import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.domain.manga.interactor.GetManga
import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.InsertFlatMetadata
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import exh.log.xLogE import exh.log.xLogE
import exh.md.dto.ChapterDataDto import exh.md.dto.ChapterDataDto
@ -17,8 +18,6 @@ import exh.metadata.metadata.base.RaisedTag
import exh.util.capitalize import exh.util.capitalize
import exh.util.floor import exh.util.floor
import exh.util.nullIfEmpty import exh.util.nullIfEmpty
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.util.Locale import java.util.Locale
@ -40,13 +39,13 @@ class ApiMangaParser(
?: error("Could not find no-args constructor for meta class: ${metaClass.qualifiedName}!") ?: error("Could not find no-args constructor for meta class: ${metaClass.qualifiedName}!")
suspend fun parseToManga( suspend fun parseToManga(
manga: MangaInfo, manga: SManga,
sourceId: Long, sourceId: Long,
input: MangaDto, input: MangaDto,
simpleChapters: List<String>, simpleChapters: List<String>,
statistics: StatisticsMangaDto?, statistics: StatisticsMangaDto?,
): MangaInfo { ): SManga {
val mangaId = getManga.await(manga.key, sourceId)?.id val mangaId = getManga.await(manga.url, sourceId)?.id
val metadata = if (mangaId != null) { val metadata = if (mangaId != null) {
val flatMetadata = getFlatMetadataById.await(mangaId) val flatMetadata = getFlatMetadataById.await(mangaId)
flatMetadata?.raise(metaClass) ?: newMetaInstance() flatMetadata?.raise(metaClass) ?: newMetaInstance()
@ -184,7 +183,7 @@ class ApiMangaParser(
else -> SManga.UNKNOWN else -> SManga.UNKNOWN
} }
fun chapterListParse(chapterListResponse: List<ChapterDataDto>, groupMap: Map<String, String>): List<ChapterInfo> { fun chapterListParse(chapterListResponse: List<ChapterDataDto>, groupMap: Map<String, String>): List<SChapter> {
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
return chapterListResponse return chapterListResponse
.filterNot { MdUtil.parseDate(it.attributes.publishAt) > now && it.attributes.externalUrl == null } .filterNot { MdUtil.parseDate(it.attributes.publishAt) > now && it.attributes.externalUrl == null }
@ -202,7 +201,7 @@ class ApiMangaParser(
private fun mapChapter( private fun mapChapter(
networkChapter: ChapterDataDto, networkChapter: ChapterDataDto,
groups: Map<String, String>, groups: Map<String, String>,
): ChapterInfo { ): SChapter {
val attributes = networkChapter.attributes val attributes = networkChapter.attributes
val key = MdUtil.chapterSuffix + networkChapter.id val key = MdUtil.chapterSuffix + networkChapter.id
val chapterName = StringBuilder() val chapterName = StringBuilder()
@ -265,11 +264,11 @@ class ApiMangaParser(
// chapter.language = MdLang.fromIsoCode(attributes.translatedLanguage)?.prettyPrint ?: "" // chapter.language = MdLang.fromIsoCode(attributes.translatedLanguage)?.prettyPrint ?: ""
return ChapterInfo( return SChapter(
key = key, url = key,
name = name, name = name,
scanlator = scanlator, scanlator = scanlator,
dateUpload = dateUpload, date_upload = dateUpload,
) )
} }
} }

16
app/src/main/java/exh/md/handlers/BilibiliHandler.kt
View File

@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.network.await
import eu.kanade.tachiyomi.network.interceptor.rateLimit import eu.kanade.tachiyomi.network.interceptor.rateLimit
import eu.kanade.tachiyomi.network.parseAs import eu.kanade.tachiyomi.network.parseAs
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import exh.log.xLogD import exh.log.xLogD
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -20,7 +21,6 @@ import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response import okhttp3.Response
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
class BilibiliHandler(currentClient: OkHttpClient) { class BilibiliHandler(currentClient: OkHttpClient) {
@ -44,9 +44,9 @@ class BilibiliHandler(currentClient: OkHttpClient) {
val mangaUrl = getMangaUrl(externalUrl) val mangaUrl = getMangaUrl(externalUrl)
val chapters = getChapterList(mangaUrl) val chapters = getChapterList(mangaUrl)
val chapter = chapters val chapter = chapters
.find { it.number == chapterNumber.toFloatOrNull() } .find { it.chapter_number == chapterNumber.toFloatOrNull() }
?: throw Exception("Unknown chapter $chapterNumber") ?: throw Exception("Unknown chapter $chapterNumber")
chapter.key chapter.url
} }
return fetchPageList(chapterUrl) return fetchPageList(chapterUrl)
@ -91,12 +91,12 @@ class BilibiliHandler(currentClient: OkHttpClient) {
) )
} }
suspend fun getChapterList(mangaUrl: String): List<ChapterInfo> { suspend fun getChapterList(mangaUrl: String): List<SChapter> {
val response = client.newCall(mangaDetailsApiRequest(mangaUrl)).await() val response = client.newCall(mangaDetailsApiRequest(mangaUrl)).await()
return chapterListParse(response) return chapterListParse(response)
} }
fun chapterListParse(response: Response): List<ChapterInfo> { fun chapterListParse(response: Response): List<SChapter> {
val result = response.parseAs<BilibiliResultDto<BilibiliComicDto>>() val result = response.parseAs<BilibiliResultDto<BilibiliComicDto>>()
if (result.code != 0) { if (result.code != 0) {
@ -108,10 +108,10 @@ class BilibiliHandler(currentClient: OkHttpClient) {
.map { ep -> chapterFromObject(ep, result.data.id) } .map { ep -> chapterFromObject(ep, result.data.id) }
} }
private fun chapterFromObject(episode: BilibiliEpisodeDto, comicId: Int): ChapterInfo = ChapterInfo( private fun chapterFromObject(episode: BilibiliEpisodeDto, comicId: Int): SChapter = SChapter(
key = "/mc$comicId/${episode.id}", url = "/mc$comicId/${episode.id}",
name = "Ep. " + episode.order.toString().removeSuffix(".0") + " - " + episode.title, name = "Ep. " + episode.order.toString().removeSuffix(".0") + " - " + episode.title,
number = episode.order, chapter_number = episode.order,
) )
private suspend fun fetchPageList(chapterUrl: String): List<Page> { private suspend fun fetchPageList(chapterUrl: String): List<Page> {

3
app/src/main/java/exh/md/handlers/FollowsHandler.kt
View File

@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.source.model.MetadataMangasPage import eu.kanade.tachiyomi.source.model.MetadataMangasPage
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import exh.md.dto.MangaDataDto import exh.md.dto.MangaDataDto
import exh.md.dto.PersonalRatingDto import exh.md.dto.PersonalRatingDto
@ -57,7 +56,7 @@ class FollowsHandler(
MdUtil.createMangaEntry( MdUtil.createMangaEntry(
it, it,
lang, lang,
).toSManga() to MangaDexSearchMetadata().apply { ) to MangaDexSearchMetadata().apply {
followStatus = FollowStatus.fromDex(statuses[it.id]).int followStatus = FollowStatus.fromDex(statuses[it.id]).int
} }
}.sortedWith(comparator) }.sortedWith(comparator)

21
app/src/main/java/exh/md/handlers/MangaHandler.kt
View File

@ -3,9 +3,6 @@ package exh.md.handlers
import eu.kanade.tachiyomi.data.database.models.Track import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toMangaInfo
import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.model.toSManga
import eu.kanade.tachiyomi.util.lang.runAsObservable import eu.kanade.tachiyomi.util.lang.runAsObservable
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import exh.md.dto.ChapterDataDto import exh.md.dto.ChapterDataDto
@ -19,8 +16,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
class MangaHandler( class MangaHandler(
private val lang: String, private val lang: String,
@ -28,9 +23,9 @@ class MangaHandler(
private val apiMangaParser: ApiMangaParser, private val apiMangaParser: ApiMangaParser,
private val followsHandler: FollowsHandler, private val followsHandler: FollowsHandler,
) { ) {
suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long): MangaInfo { suspend fun getMangaDetails(manga: SManga, sourceId: Long): SManga {
return coroutineScope { return coroutineScope {
val mangaId = MdUtil.getMangaId(manga.key) val mangaId = MdUtil.getMangaId(manga.url)
val response = async(Dispatchers.IO) { service.viewManga(mangaId) } val response = async(Dispatchers.IO) { service.viewManga(mangaId) }
val simpleChapters = async(Dispatchers.IO) { getSimpleChapters(manga) } val simpleChapters = async(Dispatchers.IO) { getSimpleChapters(manga) }
val statistics = async(Dispatchers.IO) { service.mangasRating(mangaId).statistics[mangaId] } val statistics = async(Dispatchers.IO) { service.mangasRating(mangaId).statistics[mangaId] }
@ -46,19 +41,19 @@ class MangaHandler(
fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long): Observable<SManga> { fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long): Observable<SManga> {
return runAsObservable { return runAsObservable {
getMangaDetails(manga.toMangaInfo(), sourceId).toSManga() getMangaDetails(manga, sourceId)
} }
} }
fun fetchChapterListObservable(manga: SManga, blockedGroups: String, blockedUploaders: String): Observable<List<SChapter>> = runAsObservable { fun fetchChapterListObservable(manga: SManga, blockedGroups: String, blockedUploaders: String): Observable<List<SChapter>> = runAsObservable {
getChapterList(manga.toMangaInfo(), blockedGroups, blockedUploaders).map { it.toSChapter() } getChapterList(manga, blockedGroups, blockedUploaders)
} }
suspend fun getChapterList(manga: MangaInfo, blockedGroups: String, blockedUploaders: String): List<ChapterInfo> { suspend fun getChapterList(manga: SManga, blockedGroups: String, blockedUploaders: String): List<SChapter> {
return withIOContext { return withIOContext {
val results = mdListCall { val results = mdListCall {
service.viewChapters( service.viewChapters(
MdUtil.getMangaId(manga.key), MdUtil.getMangaId(manga.url),
lang, lang,
it, it,
blockedGroups, blockedGroups,
@ -109,8 +104,8 @@ class MangaHandler(
} }
} }
private suspend fun getSimpleChapters(manga: MangaInfo): List<String> { private suspend fun getSimpleChapters(manga: SManga): List<String> {
return runCatching { service.aggregateChapters(MdUtil.getMangaId(manga.key), lang) } return runCatching { service.aggregateChapters(MdUtil.getMangaId(manga.url), lang) }
.onFailure { .onFailure {
if (it is CancellationException) throw it if (it is CancellationException) throw it
} }

12
app/src/main/java/exh/md/handlers/PageHandler.kt
View File

@ -4,7 +4,9 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.mdlist.MdList import eu.kanade.tachiyomi.data.track.mdlist.MdList
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import exh.log.xLogD import exh.log.xLogD
import exh.md.dto.AtHomeDto import exh.md.dto.AtHomeDto
@ -14,8 +16,6 @@ import exh.md.utils.MdUtil
import okhttp3.Headers import okhttp3.Headers
import okhttp3.Response import okhttp3.Response
import rx.Observable import rx.Observable
import tachiyomi.source.Source
import tachiyomi.source.model.ChapterInfo
import kotlin.reflect.full.superclasses import kotlin.reflect.full.superclasses
import kotlin.reflect.jvm.isAccessible import kotlin.reflect.jvm.isAccessible
@ -31,9 +31,9 @@ class PageHandler(
private val mdList: MdList, private val mdList: MdList,
) { ) {
suspend fun fetchPageList(chapter: ChapterInfo, isLogged: Boolean, usePort443Only: Boolean, dataSaver: Boolean, mangadex: Source): List<Page> { suspend fun fetchPageList(chapter: SChapter, isLogged: Boolean, usePort443Only: Boolean, dataSaver: Boolean, mangadex: Source): List<Page> {
return withIOContext { return withIOContext {
val chapterResponse = service.viewChapter(MdUtil.getChapterId(chapter.key)) val chapterResponse = service.viewChapter(MdUtil.getChapterId(chapter.url))
if (chapterResponse.data.attributes.externalUrl != null && chapterResponse.data.attributes.pages == 0) { if (chapterResponse.data.attributes.externalUrl != null && chapterResponse.data.attributes.pages == 0) {
when { when {
@ -63,9 +63,9 @@ class PageHandler(
} }
val atHomeRequestUrl = if (usePort443Only) { val atHomeRequestUrl = if (usePort443Only) {
"${MdApi.atHomeServer}/${MdUtil.getChapterId(chapter.key)}?forcePort443=true" "${MdApi.atHomeServer}/${MdUtil.getChapterId(chapter.url)}?forcePort443=true"
} else { } else {
"${MdApi.atHomeServer}/${MdUtil.getChapterId(chapter.key)}" "${MdApi.atHomeServer}/${MdUtil.getChapterId(chapter.url)}"
} }
updateExtensionVariable(mangadex, atHomeRequestUrl) updateExtensionVariable(mangadex, atHomeRequestUrl)

15
app/src/main/java/exh/md/handlers/SimilarHandler.kt
View File

@ -1,7 +1,7 @@
package exh.md.handlers package exh.md.handlers
import eu.kanade.tachiyomi.source.model.MetadataMangasPage import eu.kanade.tachiyomi.source.model.MetadataMangasPage
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import exh.md.dto.RelationListDto import exh.md.dto.RelationListDto
import exh.md.dto.SimilarMangaDto import exh.md.dto.SimilarMangaDto
@ -10,7 +10,6 @@ import exh.md.service.SimilarService
import exh.md.utils.MangaDexRelation import exh.md.utils.MangaDexRelation
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.MangaDexSearchMetadata
import tachiyomi.source.model.MangaInfo
class SimilarHandler( class SimilarHandler(
private val lang: String, private val lang: String,
@ -18,8 +17,8 @@ class SimilarHandler(
private val similarService: SimilarService, private val similarService: SimilarService,
) { ) {
suspend fun getSimilar(manga: MangaInfo): MetadataMangasPage { suspend fun getSimilar(manga: SManga): MetadataMangasPage {
val similarDto = withIOContext { similarService.getSimilarManga(MdUtil.getMangaId(manga.key)) } val similarDto = withIOContext { similarService.getSimilarManga(MdUtil.getMangaId(manga.url)) }
return similarDtoToMangaListPage(similarDto) return similarDtoToMangaListPage(similarDto)
} }
@ -31,14 +30,14 @@ class SimilarHandler(
} }
val mangaList = service.viewMangas(ids).data.map { val mangaList = service.viewMangas(ids).data.map {
MdUtil.createMangaEntry(it, lang).toSManga() MdUtil.createMangaEntry(it, lang)
} }
return MetadataMangasPage(mangaList, false, List(mangaList.size) { MangaDexSearchMetadata().also { it.relation = MangaDexRelation.SIMILAR } }) return MetadataMangasPage(mangaList, false, List(mangaList.size) { MangaDexSearchMetadata().also { it.relation = MangaDexRelation.SIMILAR } })
} }
suspend fun getRelated(manga: MangaInfo): MetadataMangasPage { suspend fun getRelated(manga: SManga): MetadataMangasPage {
val relatedListDto = withIOContext { service.relatedManga(MdUtil.getMangaId(manga.key)) } val relatedListDto = withIOContext { service.relatedManga(MdUtil.getMangaId(manga.url)) }
return relatedDtoToMangaListPage(relatedListDto) return relatedDtoToMangaListPage(relatedListDto)
} }
@ -50,7 +49,7 @@ class SimilarHandler(
.map { it.id } .map { it.id }
val mangaList = service.viewMangas(ids).data.map { val mangaList = service.viewMangas(ids).data.map {
MdUtil.createMangaEntry(it, lang).toSManga() MdUtil.createMangaEntry(it, lang)
} }
return MetadataMangasPage( return MetadataMangasPage(

5
app/src/main/java/exh/md/similar/MangaDexSimilarPager.kt
View File

@ -1,7 +1,6 @@
package exh.md.similar package exh.md.similar
import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.Manga
import eu.kanade.domain.manga.model.toMangaInfo
import eu.kanade.tachiyomi.source.model.MetadataMangasPage import eu.kanade.tachiyomi.source.model.MetadataMangasPage
import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.source.online.all.MangaDex
import eu.kanade.tachiyomi.ui.browse.source.browse.NoResultsException import eu.kanade.tachiyomi.ui.browse.source.browse.NoResultsException
@ -16,8 +15,8 @@ class MangaDexSimilarPager(val manga: Manga, val source: MangaDex) : Pager() {
override suspend fun requestNextPage() { override suspend fun requestNextPage() {
val mangasPage = coroutineScope { val mangasPage = coroutineScope {
val similarPageDef = async { source.getMangaSimilar(manga.toMangaInfo()) } val similarPageDef = async { source.getMangaSimilar(manga.toSManga()) }
val relatedPageDef = async { source.getMangaRelated(manga.toMangaInfo()) } val relatedPageDef = async { source.getMangaRelated(manga.toSManga()) }
val similarPage = similarPageDef.await() val similarPage = similarPageDef.await()
val relatedPage = relatedPageDef.await() val relatedPage = relatedPageDef.await()

19
app/src/main/java/exh/md/utils/MdUtil.kt
View File

@ -3,6 +3,7 @@ package exh.md.utils
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.mdlist.MdList import eu.kanade.tachiyomi.data.track.mdlist.MdList
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.source.online.all.MangaDex
import exh.log.xLogD import exh.log.xLogD
@ -24,8 +25,6 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.RequestBody import okhttp3.RequestBody
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import org.jsoup.parser.Parser import org.jsoup.parser.Parser
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@ -233,7 +232,7 @@ class MdUtil {
return scanlators.sorted().joinToString(scanlatorSeparator) return scanlators.sorted().joinToString(scanlatorSeparator)
} }
fun getMissingChapterCount(chapters: List<ChapterInfo>, mangaStatus: Int): String? { fun getMissingChapterCount(chapters: List<SChapter>, mangaStatus: Int): String? {
if (mangaStatus == SManga.COMPLETED) return null if (mangaStatus == SManga.COMPLETED) return null
val remove0ChaptersFromCount = chapters.distinctBy { val remove0ChaptersFromCount = chapters.distinctBy {
@ -242,14 +241,14 @@ class MdUtil {
} else {*/ } else {*/
it.name it.name
/*}*/ /*}*/
}.sortedByDescending { it.number } }.sortedByDescending { it.chapter_number }
remove0ChaptersFromCount.firstOrNull()?.let { chapter -> remove0ChaptersFromCount.firstOrNull()?.let { chapter ->
val chpNumber = chapter.number.floor() val chpNumber = chapter.chapter_number.floor()
val allChapters = (1..chpNumber).toMutableSet() val allChapters = (1..chpNumber).toMutableSet()
remove0ChaptersFromCount.forEach { remove0ChaptersFromCount.forEach {
allChapters.remove(it.number.floor()) allChapters.remove(it.chapter_number.floor())
} }
if (allChapters.isEmpty()) return null if (allChapters.isEmpty()) return null
@ -264,11 +263,11 @@ class MdUtil {
fun parseDate(dateAsString: String): Long = fun parseDate(dateAsString: String): Long =
dateFormatter.parse(dateAsString)?.time ?: 0 dateFormatter.parse(dateAsString)?.time ?: 0
fun createMangaEntry(json: MangaDataDto, lang: String): MangaInfo { fun createMangaEntry(json: MangaDataDto, lang: String): SManga {
return MangaInfo( return SManga(
key = buildMangaUrl(json.id), url = buildMangaUrl(json.id),
title = cleanString(getTitleFromManga(json.attributes, lang)), title = cleanString(getTitleFromManga(json.attributes, lang)),
cover = json.relationships thumbnail_url = json.relationships
.firstOrNull { relationshipDto -> relationshipDto.type == MdConstants.Types.coverArt } .firstOrNull { relationshipDto -> relationshipDto.type == MdConstants.Types.coverArt }
?.attributes ?.attributes
?.fileName ?.fileName

17
app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt
View File

@ -4,10 +4,11 @@ import android.content.Context
import androidx.core.net.toUri import androidx.core.net.toUri
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.MetadataUtil import exh.metadata.MetadataUtil
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.util.Date import java.util.Date
@ -42,7 +43,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
var aged: Boolean = false var aged: Boolean = false
var lastUpdateCheck: Long = 0 var lastUpdateCheck: Long = 0
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = gId?.let { gId -> val key = gId?.let { gId ->
gToken?.let { gToken -> gToken?.let { gToken ->
idAndTokenToUrl(gId, gToken) idAndTokenToUrl(gId, gToken)
@ -61,29 +62,29 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
?.joinToString { it.name } ?.joinToString { it.name }
// Copy tags -> genres // Copy tags -> genres
val genres = tagsToGenreList() val genres = tagsToGenreString()
// Try to automatically identify if it is ongoing, we try not to be too lenient here to avoid making mistakes // Try to automatically identify if it is ongoing, we try not to be too lenient here to avoid making mistakes
// We default to completed // We default to completed
var status = MangaInfo.COMPLETED var status = SManga.COMPLETED
title?.let { t -> title?.let { t ->
MetadataUtil.ONGOING_SUFFIX.find { MetadataUtil.ONGOING_SUFFIX.find {
t.endsWith(it, ignoreCase = true) t.endsWith(it, ignoreCase = true)
}?.let { }?.let {
status = MangaInfo.ONGOING status = SManga.ONGOING
} }
} }
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
key = key ?: manga.key, url = key ?: manga.url,
title = title ?: manga.title, title = title ?: manga.title,
artist = artist ?: manga.artist, artist = artist ?: manga.artist,
description = description, description = description,
genres = genres, genre = genres,
status = status, status = status,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
) )
} }

13
app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt
View File

@ -2,10 +2,11 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.util.nullIfEmpty import exh.util.nullIfEmpty
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
@Serializable @Serializable
class EightMusesSearchMetadata : RaisedSearchMetadata() { class EightMusesSearchMetadata : RaisedSearchMetadata() {
@ -15,7 +16,7 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() {
var thumbnailUrl: String? = null var thumbnailUrl: String? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = path.joinToString("/", prefix = "/") val key = path.joinToString("/", prefix = "/")
val title = title val title = title
@ -24,16 +25,16 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() {
val artist = tags.ofNamespace(ARTIST_NAMESPACE).joinToString { it.name } val artist = tags.ofNamespace(ARTIST_NAMESPACE).joinToString { it.name }
val genres = tagsToGenreList() val genres = tagsToGenreString()
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
key = key, url = key,
title = title ?: manga.title, title = title ?: manga.title,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
artist = artist, artist = artist,
genres = genres, genre = genres,
description = description, description = description,
) )
} }

15
app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt
View File

@ -2,9 +2,10 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
@Serializable @Serializable
class HBrowseSearchMetadata : RaisedSearchMetadata() { class HBrowseSearchMetadata : RaisedSearchMetadata() {
@ -19,28 +20,28 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
// Length in pages // Length in pages
var length: Int? = null var length: Int? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = hbUrl val key = hbUrl
val title = title val title = title
// Guess thumbnail URL if manga does not have thumbnail URL // Guess thumbnail URL if manga does not have thumbnail URL
val cover = if (manga.cover.isBlank()) { val cover = if (manga.thumbnail_url.isNullOrBlank()) {
guessThumbnailUrl(hbId.toString()) guessThumbnailUrl(hbId.toString())
} else null } else null
val artist = tags.ofNamespace(ARTIST_NAMESPACE).joinToString { it.name } val artist = tags.ofNamespace(ARTIST_NAMESPACE).joinToString { it.name }
val genres = tagsToGenreList() val genres = tagsToGenreString()
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
key = key ?: manga.key, url = key ?: manga.url,
title = title ?: manga.title, title = title ?: manga.title,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
artist = artist, artist = artist,
genres = genres, genre = genres,
description = description, description = description,
) )
} }

13
app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt
View File

@ -2,11 +2,12 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.MetadataUtil import exh.metadata.MetadataUtil
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.util.nullIfEmpty import exh.util.nullIfEmpty
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
import java.util.Date import java.util.Date
@Serializable @Serializable
@ -32,24 +33,24 @@ class HitomiSearchMetadata : RaisedSearchMetadata() {
var uploadDate: Long? = null var uploadDate: Long? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val cover = thumbnailUrl val cover = thumbnailUrl
val title = title val title = title
// Copy tags -> genres // Copy tags -> genres
val genres = tagsToGenreList() val genres = tagsToGenreString()
val artist = artists.joinToString() val artist = artists.joinToString()
val status = MangaInfo.UNKNOWN val status = SManga.UNKNOWN
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
title = title ?: manga.title, title = title ?: manga.title,
genres = genres, genre = genres,
artist = artist, artist = artist,
status = status, status = status,
description = description, description = description,

13
app/src/main/java/exh/metadata/metadata/MangaDexSearchMetadata.kt
View File

@ -2,11 +2,12 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.md.utils.MangaDexRelation import exh.md.utils.MangaDexRelation
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
@Serializable @Serializable
class MangaDexSearchMetadata : RaisedSearchMetadata() { class MangaDexSearchMetadata : RaisedSearchMetadata() {
@ -45,7 +46,7 @@ class MangaDexSearchMetadata : RaisedSearchMetadata() {
// var maxChapterNumber: Int? = null // var maxChapterNumber: Int? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = mdUuid?.let { MdUtil.buildMangaUrl(it) } val key = mdUuid?.let { MdUtil.buildMangaUrl(it) }
val title = title val title = title
@ -58,18 +59,18 @@ class MangaDexSearchMetadata : RaisedSearchMetadata() {
val status = status val status = status
val genres = tagsToGenreList() val genres = tagsToGenreString()
val description = description val description = description
return manga.copy( return manga.copy(
key = key ?: manga.key, url = key ?: manga.url,
title = title ?: manga.title, title = title ?: manga.title,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
author = author ?: manga.author, author = author ?: manga.author,
artist = artist ?: manga.artist, artist = artist ?: manga.artist,
status = status ?: manga.status, status = status ?: manga.status,
genres = genres, genre = genres,
description = description ?: manga.description, description = description ?: manga.description,
) )
} }

12
app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt
View File

@ -3,10 +3,10 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.MetadataUtil import exh.metadata.MetadataUtil
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
import java.util.Date import java.util.Date
@Serializable @Serializable
@ -38,7 +38,7 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
var preferredTitle: Int? = null var preferredTitle: Int? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = nhId?.let { nhIdToPath(it) } val key = nhId?.let { nhIdToPath(it) }
val cover = if (mediaId != null) { val cover = if (mediaId != null) {
@ -59,7 +59,7 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
} }
// Copy tags -> genres // Copy tags -> genres
val genres = tagsToGenreList() val genres = tagsToGenreString()
// Try to automatically identify if it is ongoing, we try not to be too lenient here to avoid making mistakes // Try to automatically identify if it is ongoing, we try not to be too lenient here to avoid making mistakes
// We default to completed // We default to completed
@ -75,11 +75,11 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
key = key ?: manga.key, url = key ?: manga.url,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
title = title, title = title,
artist = artist ?: manga.artist, artist = artist ?: manga.artist,
genres = genres, genre = genres,
status = status, status = status,
description = description, description = description,
) )

19
app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt
View File

@ -3,11 +3,12 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import androidx.core.net.toUri import androidx.core.net.toUri
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.metadata.metadata.base.RaisedTitle import exh.metadata.metadata.base.RaisedTitle
import exh.util.nullIfEmpty import exh.util.nullIfEmpty
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
@Serializable @Serializable
class PervEdenSearchMetadata : RaisedSearchMetadata() { class PervEdenSearchMetadata : RaisedSearchMetadata() {
@ -34,7 +35,7 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
var lang: String? = null var lang: String? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = url val key = url
val cover = thumbnailUrl val cover = thumbnailUrl
@ -43,23 +44,23 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
val artist = artist val artist = artist
val status = when (status) { val status = when (status) {
"Ongoing" -> MangaInfo.ONGOING "Ongoing" -> SManga.ONGOING
"Completed", "Suspended" -> MangaInfo.COMPLETED "Completed", "Suspended" -> SManga.COMPLETED
else -> MangaInfo.UNKNOWN else -> SManga.UNKNOWN
} }
// Copy tags -> genres // Copy tags -> genres
val genres = tagsToGenreList() val genres = tagsToGenreString()
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
key = key ?: manga.key, url = key ?: manga.url,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
title = title ?: manga.title, title = title ?: manga.title,
artist = artist ?: manga.artist, artist = artist ?: manga.artist,
status = status, status = status,
genres = genres, genre = genres,
description = description, description = description,
) )
} }

13
app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt
View File

@ -2,9 +2,10 @@ package exh.metadata.metadata
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
@Serializable @Serializable
class PururinSearchMetadata : RaisedSearchMetadata() { class PururinSearchMetadata : RaisedSearchMetadata() {
@ -26,7 +27,7 @@ class PururinSearchMetadata : RaisedSearchMetadata() {
var ratingCount: Int? = null var ratingCount: Int? = null
var averageRating: Double? = null var averageRating: Double? = null
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val key = prId?.let { prId -> val key = prId?.let { prId ->
prShortLink?.let { prShortLink -> prShortLink?.let { prShortLink ->
"/gallery/$prId/$prShortLink" "/gallery/$prId/$prShortLink"
@ -39,16 +40,16 @@ class PururinSearchMetadata : RaisedSearchMetadata() {
val artist = tags.ofNamespace(TAG_NAMESPACE_ARTIST).joinToString { it.name } val artist = tags.ofNamespace(TAG_NAMESPACE_ARTIST).joinToString { it.name }
val genres = tagsToGenreList() val genres = tagsToGenreString()
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
key = key ?: manga.key, url = key ?: manga.url,
title = title ?: manga.title, title = title ?: manga.title,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
artist = artist, artist = artist,
genres = genres, genre = genres,
description = description, description = description,
) )
} }

10
app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt
View File

@ -4,11 +4,11 @@ import android.content.Context
import androidx.core.net.toUri import androidx.core.net.toUri
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.copy
import exh.metadata.MetadataUtil import exh.metadata.MetadataUtil
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.util.nullIfEmpty import exh.util.nullIfEmpty
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tachiyomi.source.model.MangaInfo
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
@ -43,7 +43,7 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
var character: List<String> = emptyList() var character: List<String> = emptyList()
override fun createMangaInfo(manga: MangaInfo): MangaInfo { override fun createMangaInfo(manga: SManga): SManga {
val title = title val title = title
val cover = tmId?.let { BASE_URL.replace("www", "content") + thumbUrlFromId(it.toString()) } val cover = tmId?.let { BASE_URL.replace("www", "content") + thumbUrlFromId(it.toString()) }
@ -52,16 +52,16 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
val status = SManga.UNKNOWN val status = SManga.UNKNOWN
// Copy tags -> genres // Copy tags -> genres
val genres = tagsToGenreList() val genres = tagsToGenreString()
val description = "meta" val description = "meta"
return manga.copy( return manga.copy(
title = title ?: manga.title, title = title ?: manga.title,
cover = cover ?: manga.cover, thumbnail_url = cover ?: manga.thumbnail_url,
artist = artist ?: manga.artist, artist = artist ?: manga.artist,
status = status, status = status,
genres = genres, genre = genres,
description = description, description = description,
) )
} }

7
app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt
View File

@ -2,8 +2,6 @@ package exh.metadata.metadata.base
import android.content.Context import android.content.Context
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toMangaInfo
import eu.kanade.tachiyomi.source.model.toSManga
import exh.metadata.metadata.EHentaiSearchMetadata import exh.metadata.metadata.EHentaiSearchMetadata
import exh.metadata.metadata.EightMusesSearchMetadata import exh.metadata.metadata.EightMusesSearchMetadata
import exh.metadata.metadata.HBrowseSearchMetadata import exh.metadata.metadata.HBrowseSearchMetadata
@ -25,7 +23,6 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.modules.SerializersModule import kotlinx.serialization.modules.SerializersModule
import kotlinx.serialization.modules.polymorphic import kotlinx.serialization.modules.polymorphic
import kotlinx.serialization.modules.subclass import kotlinx.serialization.modules.subclass
import tachiyomi.source.model.MangaInfo
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
@ -64,11 +61,11 @@ abstract class RaisedSearchMetadata {
} }
open fun copyTo(manga: SManga) { open fun copyTo(manga: SManga) {
val infoManga = createMangaInfo(manga.toMangaInfo()).toSManga() val infoManga = createMangaInfo(manga.copy())
manga.copyFrom(infoManga) manga.copyFrom(infoManga)
} }
abstract fun createMangaInfo(manga: MangaInfo): MangaInfo abstract fun createMangaInfo(manga: SManga): SManga
fun tagsToGenreString() = tags.toGenreString() fun tagsToGenreString() = tags.toGenreString()

11
app/src/main/java/exh/source/DelegatedHttpSource.kt
View File

@ -10,8 +10,6 @@ import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import rx.Observable import rx.Observable
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
@Suppress("OverridingDeprecatedMember", "DEPRECATION") @Suppress("OverridingDeprecatedMember", "DEPRECATION")
abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() { abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
@ -183,6 +181,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
* *
* @param manga the manga to be updated. * @param manga the manga to be updated.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getMangaDetails"))
override fun fetchMangaDetails(manga: SManga): Observable<SManga> { override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
ensureDelegateCompatible() ensureDelegateCompatible()
return delegate.fetchMangaDetails(manga) return delegate.fetchMangaDetails(manga)
@ -191,7 +190,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
/** /**
* [1.x API] Get the updated details for a manga. * [1.x API] Get the updated details for a manga.
*/ */
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { override suspend fun getMangaDetails(manga: SManga): SManga {
ensureDelegateCompatible() ensureDelegateCompatible()
return delegate.getMangaDetails(manga) return delegate.getMangaDetails(manga)
} }
@ -213,6 +212,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
* *
* @param manga the manga to look for chapters. * @param manga the manga to look for chapters.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList"))
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> { override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
ensureDelegateCompatible() ensureDelegateCompatible()
return delegate.fetchChapterList(manga) return delegate.fetchChapterList(manga)
@ -221,7 +221,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
/** /**
* [1.x API] Get all the available chapters for a manga. * [1.x API] Get all the available chapters for a manga.
*/ */
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> { override suspend fun getChapterList(manga: SManga): List<SChapter> {
ensureDelegateCompatible() ensureDelegateCompatible()
return delegate.getChapterList(manga) return delegate.getChapterList(manga)
} }
@ -231,6 +231,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
* *
* @param chapter the chapter whose page list has to be fetched. * @param chapter the chapter whose page list has to be fetched.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList"))
override fun fetchPageList(chapter: SChapter): Observable<List<Page>> { override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
ensureDelegateCompatible() ensureDelegateCompatible()
return delegate.fetchPageList(chapter) return delegate.fetchPageList(chapter)
@ -239,7 +240,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
/** /**
* [1.x API] Get the list of pages a chapter has. * [1.x API] Get the list of pages a chapter has.
*/ */
override suspend fun getPageList(chapter: ChapterInfo): List<tachiyomi.source.model.Page> { override suspend fun getPageList(chapter: SChapter): List<Page> {
ensureDelegateCompatible() ensureDelegateCompatible()
return delegate.getPageList(chapter) return delegate.getPageList(chapter)
} }

11
app/src/main/java/exh/source/EnhancedHttpSource.kt
View File

@ -8,8 +8,6 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import okhttp3.Response import okhttp3.Response
import tachiyomi.source.model.ChapterInfo
import tachiyomi.source.model.MangaInfo
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@Suppress("OverridingDeprecatedMember", "DEPRECATION") @Suppress("OverridingDeprecatedMember", "DEPRECATION")
@ -177,12 +175,13 @@ class EnhancedHttpSource(
* *
* @param manga the manga to be updated. * @param manga the manga to be updated.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getMangaDetails"))
override fun fetchMangaDetails(manga: SManga) = source().fetchMangaDetails(manga) override fun fetchMangaDetails(manga: SManga) = source().fetchMangaDetails(manga)
/** /**
* [1.x API] Get the updated details for a manga. * [1.x API] Get the updated details for a manga.
*/ */
override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo = source().getMangaDetails(manga) override suspend fun getMangaDetails(manga: SManga): SManga = source().getMangaDetails(manga)
/** /**
* Returns the request for the details of a manga. Override only if it's needed to change the * Returns the request for the details of a manga. Override only if it's needed to change the
@ -198,24 +197,26 @@ class EnhancedHttpSource(
* *
* @param manga the manga to look for chapters. * @param manga the manga to look for chapters.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList"))
override fun fetchChapterList(manga: SManga) = source().fetchChapterList(manga) override fun fetchChapterList(manga: SManga) = source().fetchChapterList(manga)
/** /**
* [1.x API] Get all the available chapters for a manga. * [1.x API] Get all the available chapters for a manga.
*/ */
override suspend fun getChapterList(manga: MangaInfo): List<ChapterInfo> = source().getChapterList(manga) override suspend fun getChapterList(manga: SManga): List<SChapter> = source().getChapterList(manga)
/** /**
* Returns an observable with the page list for a chapter. * Returns an observable with the page list for a chapter.
* *
* @param chapter the chapter whose page list has to be fetched. * @param chapter the chapter whose page list has to be fetched.
*/ */
@Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList"))
override fun fetchPageList(chapter: SChapter) = source().fetchPageList(chapter) override fun fetchPageList(chapter: SChapter) = source().fetchPageList(chapter)
/** /**
* [1.x API] Get the list of pages a chapter has. * [1.x API] Get the list of pages a chapter has.
*/ */
override suspend fun getPageList(chapter: ChapterInfo): List<tachiyomi.source.model.Page> = source().getPageList(chapter) override suspend fun getPageList(chapter: SChapter): List<Page> = source().getPageList(chapter)
/** /**
* Returns an observable with the page containing the source url of the image. If there's any * Returns an observable with the page containing the source url of the image. If there's any

2
gradle/libs.versions.toml
View File

@ -13,8 +13,6 @@ leakcanary = "2.9.1"
android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2" android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2"
google-services-gradle = "com.google.gms:google-services:4.3.10" google-services-gradle = "com.google.gms:google-services:4.3.10"
tachiyomi-api = "org.tachiyomi:source-api:1.1"
rxandroid = "io.reactivex:rxandroid:1.2.1" rxandroid = "io.reactivex:rxandroid:1.2.1"
rxjava = "io.reactivex:rxjava:1.3.8" rxjava = "io.reactivex:rxjava:1.3.8"
rxrelay = "com.jakewharton.rxrelay:rxrelay:1.2.0" rxrelay = "com.jakewharton.rxrelay:rxrelay:1.2.0"