From b35aa30ea7c75be120fe5570cfc721f7d9f10755 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 3 Jun 2021 16:28:38 -0400 Subject: [PATCH] Address some lints --- .../kanade/tachiyomi/data/track/mdlist/MdList.kt | 2 +- .../tachiyomi/source/online/all/MangaDex.kt | 6 +++--- .../advanced/design/MigrationSourceHolder.kt | 1 + .../main/java/exh/md/handlers/ApiMangaParser.kt | 14 +++++++------- .../main/java/exh/md/handlers/FollowsHandler.kt | 12 ++++++------ app/src/main/java/exh/md/handlers/MangaHandler.kt | 15 ++++++--------- .../main/java/exh/md/handlers/SearchHandler.kt | 2 +- 7 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index 86d95b8f2..9cb4fe74e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -96,7 +96,7 @@ class MdList(private val context: Context, id: Int) : TrackService(id) { override suspend fun refresh(track: Track): Track { return withIOContext { val mdex = mdex ?: throw MangaDexNotFoundException() - val (remoteTrack, mangaMetadata) = mdex.getTrackingAndMangaInfo(track) + val (remoteTrack/*, mangaMetadata*/) = mdex.getTrackingAndMangaInfo(track) track.copyPersonalFrom(remoteTrack) /*if (track.total_chapters == 0 && mangaMetadata.status == SManga.COMPLETED) { track.total_chapters = mangaMetadata.maxChapterNumber ?: 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index 54e023fe2..09cbd8ba5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -176,7 +176,7 @@ class MangaDex(delegate: HttpSource, val context: Context) : } override suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response) { - apiMangaParser.parseIntoMetadata(metadata, input, emptyList()) + apiMangaParser.parseIntoMetadata(metadata, input) } override suspend fun fetchFollows(page: Int): MangasPage { @@ -231,13 +231,13 @@ class MangaDex(delegate: HttpSource, val context: Context) : return followsHandler.fetchAllFollows() } - suspend fun updateReadingProgress(track: Track): Boolean { + /*suspend fun updateReadingProgress(track: Track): Boolean { return followsHandler.updateReadingProgress(track) } suspend fun updateRating(track: Track): Boolean { return followsHandler.updateRating(track) - } + }*/ override suspend fun fetchTrackingInfo(url: String): Track { if (!isLogged()) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceHolder.kt index 2d44c86c1..7a2684a40 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceHolder.kt @@ -6,6 +6,7 @@ import eu.davidea.viewholders.FlexibleViewHolder import eu.kanade.tachiyomi.databinding.MigrationSourceItemBinding import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.online.HttpSource +import exh.util.capitalize class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) : FlexibleViewHolder(view, adapter) { diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index a18ea3aa9..2b612c7d3 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -40,18 +40,18 @@ class ApiMangaParser(val client: OkHttpClient, private val lang: String) { }?.call() ?: error("Could not find no-args constructor for meta class: ${metaClass.qualifiedName}!") - suspend fun parseToManga(manga: MangaInfo, input: Response, coverUrls: List, sourceId: Long): MangaInfo { - return parseToManga(manga, input.parseAs(MdUtil.jsonParser), coverUrls, sourceId) + suspend fun parseToManga(manga: MangaInfo, input: Response, sourceId: Long): MangaInfo { + return parseToManga(manga, input.parseAs(MdUtil.jsonParser), sourceId) } - suspend fun parseToManga(manga: MangaInfo, input: MangaResponse, coverUrls: List, sourceId: Long): MangaInfo { + suspend fun parseToManga(manga: MangaInfo, input: MangaResponse, sourceId: Long): MangaInfo { val mangaId = db.getManga(manga.key, sourceId).executeOnIO()?.id val metadata = if (mangaId != null) { val flatMetadata = db.getFlatMetadataForManga(mangaId).executeOnIO() flatMetadata?.raise(metaClass) ?: newMetaInstance() } else newMetaInstance() - parseIntoMetadata(metadata, input, coverUrls) + parseIntoMetadata(metadata, input) if (mangaId != null) { metadata.mangaId = mangaId db.insertFlatMetadata(metadata.flatten()) @@ -63,11 +63,11 @@ class ApiMangaParser(val client: OkHttpClient, private val lang: String) { /** * Parse the manga details json into metadata object */ - suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response, coverUrls: List) { - parseIntoMetadata(metadata, input.parseAs(MdUtil.jsonParser), coverUrls) + suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response) { + parseIntoMetadata(metadata, input.parseAs(MdUtil.jsonParser)) } - suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, networkApiManga: MangaResponse, coverUrls: List) { + suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, networkApiManga: MangaResponse) { with(metadata) { try { val networkManga = networkApiManga.data.attributes diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt index 60686f499..c025f6508 100644 --- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt +++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt @@ -153,9 +153,9 @@ class FollowsHandler( } } - suspend fun updateReadingProgress(track: Track): Boolean { + /*suspend fun updateReadingProgress(track: Track): Boolean { return true - /*return withIOContext { + return withIOContext { val mangaID = getMangaId(track.tracking_url) val formBody = FormBody.Builder() .add("volume", "0") @@ -179,12 +179,12 @@ class FollowsHandler( } } result.isSuccess - }*/ + } } suspend fun updateRating(track: Track): Boolean { return true - /*return withIOContext { + return withIOContext { val mangaID = getMangaId(track.tracking_url) val result = runCatching { client.newCall( @@ -205,8 +205,8 @@ class FollowsHandler( } } result.isSuccess - }*/ - } + } + }*/ /** * fetch all manga from all possible pages diff --git a/app/src/main/java/exh/md/handlers/MangaHandler.kt b/app/src/main/java/exh/md/handlers/MangaHandler.kt index 8406c89a8..b3fa974de 100644 --- a/app/src/main/java/exh/md/handlers/MangaHandler.kt +++ b/app/src/main/java/exh/md/handlers/MangaHandler.kt @@ -37,20 +37,18 @@ class MangaHandler( suspend fun fetchMangaAndChapterDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): Pair> { return withIOContext { val response = client.newCall(mangaRequest(manga)).await() - val covers = getCovers(manga, forceLatestCovers) - - apiMangaParser.parseToManga(manga, response, covers, sourceId) to getChapterList(manga) + apiMangaParser.parseToManga(manga, response, sourceId) to getChapterList(manga) } } - suspend fun getCovers(manga: MangaInfo, forceLatestCovers: Boolean): List { - /* if (forceLatestCovers) { + /*suspend fun getCovers(manga: MangaInfo, forceLatestCovers: Boolean): List { + *//* if (forceLatestCovers) { val covers = client.newCall(coverRequest(manga)).await().parseAs(MdUtil.jsonParser) return covers.data.map { it.url } - } else {*/ + } else {*//* return emptyList() // } - } + }*/ suspend fun getMangaIdFromChapterId(urlChapterId: String): String { return withIOContext { @@ -62,8 +60,7 @@ class MangaHandler( suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): MangaInfo { val response = withIOContext { client.newCall(mangaRequest(manga)).await() } - val covers = withIOContext { getCovers(manga, forceLatestCovers) } - return apiMangaParser.parseToManga(manga, response, covers, sourceId) + return apiMangaParser.parseToManga(manga, response, sourceId) } fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long, forceLatestCovers: Boolean): Observable { diff --git a/app/src/main/java/exh/md/handlers/SearchHandler.kt b/app/src/main/java/exh/md/handlers/SearchHandler.kt index 9945d8044..1154bc279 100644 --- a/app/src/main/java/exh/md/handlers/SearchHandler.kt +++ b/app/src/main/java/exh/md/handlers/SearchHandler.kt @@ -44,7 +44,7 @@ class SearchHandler(val client: OkHttpClient, private val headers: Headers, val }*/ val details = apiMangaParser - .parseToManga(MdUtil.createMangaEntry(mangaResponse, lang, coverUrl), response, emptyList(), sourceId).toSManga() + .parseToManga(MdUtil.createMangaEntry(mangaResponse, lang, coverUrl), response, sourceId).toSManga() MangasPage(listOf(details), false) }) }