Address some lints

This commit is contained in:
Jobobby04
2021-06-03 16:28:38 -04:00
parent 330b7990fe
commit b35aa30ea7
7 changed files with 25 additions and 27 deletions
@@ -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<String>, sourceId: Long): MangaInfo {
return parseToManga(manga, input.parseAs<MangaResponse>(MdUtil.jsonParser), coverUrls, sourceId)
suspend fun parseToManga(manga: MangaInfo, input: Response, sourceId: Long): MangaInfo {
return parseToManga(manga, input.parseAs<MangaResponse>(MdUtil.jsonParser), sourceId)
}
suspend fun parseToManga(manga: MangaInfo, input: MangaResponse, coverUrls: List<String>, 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<String>) {
parseIntoMetadata(metadata, input.parseAs<MangaResponse>(MdUtil.jsonParser), coverUrls)
suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response) {
parseIntoMetadata(metadata, input.parseAs<MangaResponse>(MdUtil.jsonParser))
}
suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, networkApiManga: MangaResponse, coverUrls: List<String>) {
suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, networkApiManga: MangaResponse) {
with(metadata) {
try {
val networkManga = networkApiManga.data.attributes
@@ -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
@@ -37,20 +37,18 @@ class MangaHandler(
suspend fun fetchMangaAndChapterDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): Pair<MangaInfo, List<ChapterInfo>> {
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<String> {
/* if (forceLatestCovers) {
/*suspend fun getCovers(manga: MangaInfo, forceLatestCovers: Boolean): List<String> {
*//* if (forceLatestCovers) {
val covers = client.newCall(coverRequest(manga)).await().parseAs<ApiCovers>(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<SManga> {
@@ -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)
})
}