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

Address some lints

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ class MdList(private val context: Context, id: Int) : TrackService(id) {
override suspend fun refresh(track: Track): Track { override suspend fun refresh(track: Track): Track {
return withIOContext { return withIOContext {
val mdex = mdex ?: throw MangaDexNotFoundException() val mdex = mdex ?: throw MangaDexNotFoundException()
val (remoteTrack, mangaMetadata) = mdex.getTrackingAndMangaInfo(track) val (remoteTrack/*, mangaMetadata*/) = mdex.getTrackingAndMangaInfo(track)
track.copyPersonalFrom(remoteTrack) track.copyPersonalFrom(remoteTrack)
/*if (track.total_chapters == 0 && mangaMetadata.status == SManga.COMPLETED) { /*if (track.total_chapters == 0 && mangaMetadata.status == SManga.COMPLETED) {
track.total_chapters = mangaMetadata.maxChapterNumber ?: 0 track.total_chapters = mangaMetadata.maxChapterNumber ?: 0

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

@ -176,7 +176,7 @@ class MangaDex(delegate: HttpSource, val context: Context) :
} }
override suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response) { override suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response) {
apiMangaParser.parseIntoMetadata(metadata, input, emptyList()) apiMangaParser.parseIntoMetadata(metadata, input)
} }
override suspend fun fetchFollows(page: Int): MangasPage { override suspend fun fetchFollows(page: Int): MangasPage {
@ -231,13 +231,13 @@ class MangaDex(delegate: HttpSource, val context: Context) :
return followsHandler.fetchAllFollows() return followsHandler.fetchAllFollows()
} }
suspend fun updateReadingProgress(track: Track): Boolean { /*suspend fun updateReadingProgress(track: Track): Boolean {
return followsHandler.updateReadingProgress(track) return followsHandler.updateReadingProgress(track)
} }
suspend fun updateRating(track: Track): Boolean { suspend fun updateRating(track: Track): Boolean {
return followsHandler.updateRating(track) return followsHandler.updateRating(track)
} }*/
override suspend fun fetchTrackingInfo(url: String): Track { override suspend fun fetchTrackingInfo(url: String): Track {
if (!isLogged()) { if (!isLogged()) {

1
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceHolder.kt
View File

@ -6,6 +6,7 @@ import eu.davidea.viewholders.FlexibleViewHolder
import eu.kanade.tachiyomi.databinding.MigrationSourceItemBinding import eu.kanade.tachiyomi.databinding.MigrationSourceItemBinding
import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.icon
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import exh.util.capitalize
class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) : class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) :
FlexibleViewHolder(view, adapter) { FlexibleViewHolder(view, adapter) {

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

@ -40,18 +40,18 @@ class ApiMangaParser(val client: OkHttpClient, private val lang: String) {
}?.call() }?.call()
?: 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(manga: MangaInfo, input: Response, coverUrls: List<String>, sourceId: Long): MangaInfo { suspend fun parseToManga(manga: MangaInfo, input: Response, sourceId: Long): MangaInfo {
return parseToManga(manga, input.parseAs<MangaResponse>(MdUtil.jsonParser), coverUrls, sourceId) 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 mangaId = db.getManga(manga.key, sourceId).executeOnIO()?.id
val metadata = if (mangaId != null) { val metadata = if (mangaId != null) {
val flatMetadata = db.getFlatMetadataForManga(mangaId).executeOnIO() val flatMetadata = db.getFlatMetadataForManga(mangaId).executeOnIO()
flatMetadata?.raise(metaClass) ?: newMetaInstance() flatMetadata?.raise(metaClass) ?: newMetaInstance()
} else newMetaInstance() } else newMetaInstance()
parseIntoMetadata(metadata, input, coverUrls) parseIntoMetadata(metadata, input)
if (mangaId != null) { if (mangaId != null) {
metadata.mangaId = mangaId metadata.mangaId = mangaId
db.insertFlatMetadata(metadata.flatten()) 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 * Parse the manga details json into metadata object
*/ */
suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response, coverUrls: List<String>) { suspend fun parseIntoMetadata(metadata: MangaDexSearchMetadata, input: Response) {
parseIntoMetadata(metadata, input.parseAs<MangaResponse>(MdUtil.jsonParser), coverUrls) 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) { with(metadata) {
try { try {
val networkManga = networkApiManga.data.attributes val networkManga = networkApiManga.data.attributes

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

@ -153,9 +153,9 @@ class FollowsHandler(
} }
} }
suspend fun updateReadingProgress(track: Track): Boolean { /*suspend fun updateReadingProgress(track: Track): Boolean {
return true return true
/*return withIOContext { return withIOContext {
val mangaID = getMangaId(track.tracking_url) val mangaID = getMangaId(track.tracking_url)
val formBody = FormBody.Builder() val formBody = FormBody.Builder()
.add("volume", "0") .add("volume", "0")
@ -179,12 +179,12 @@ class FollowsHandler(
} }
} }
result.isSuccess result.isSuccess
}*/ }
} }
suspend fun updateRating(track: Track): Boolean { suspend fun updateRating(track: Track): Boolean {
return true return true
/*return withIOContext { return withIOContext {
val mangaID = getMangaId(track.tracking_url) val mangaID = getMangaId(track.tracking_url)
val result = runCatching { val result = runCatching {
client.newCall( client.newCall(
@ -205,8 +205,8 @@ class FollowsHandler(
} }
} }
result.isSuccess result.isSuccess
}*/
} }
}*/
/** /**
* fetch all manga from all possible pages * fetch all manga from all possible pages

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

@ -37,20 +37,18 @@ class MangaHandler(
suspend fun fetchMangaAndChapterDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): Pair<MangaInfo, List<ChapterInfo>> { suspend fun fetchMangaAndChapterDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): Pair<MangaInfo, List<ChapterInfo>> {
return withIOContext { return withIOContext {
val response = client.newCall(mangaRequest(manga)).await() val response = client.newCall(mangaRequest(manga)).await()
val covers = getCovers(manga, forceLatestCovers) apiMangaParser.parseToManga(manga, response, sourceId) to getChapterList(manga)
apiMangaParser.parseToManga(manga, response, covers, sourceId) to getChapterList(manga)
} }
} }
suspend fun getCovers(manga: MangaInfo, forceLatestCovers: Boolean): List<String> { /*suspend fun getCovers(manga: MangaInfo, forceLatestCovers: Boolean): List<String> {
/* if (forceLatestCovers) { *//* if (forceLatestCovers) {
val covers = client.newCall(coverRequest(manga)).await().parseAs<ApiCovers>(MdUtil.jsonParser) val covers = client.newCall(coverRequest(manga)).await().parseAs<ApiCovers>(MdUtil.jsonParser)
return covers.data.map { it.url } return covers.data.map { it.url }
} else {*/ } else {*//*
return emptyList() return emptyList()
// } // }
} }*/
suspend fun getMangaIdFromChapterId(urlChapterId: String): String { suspend fun getMangaIdFromChapterId(urlChapterId: String): String {
return withIOContext { return withIOContext {
@ -62,8 +60,7 @@ class MangaHandler(
suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): MangaInfo { suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): MangaInfo {
val response = withIOContext { client.newCall(mangaRequest(manga)).await() } val response = withIOContext { client.newCall(mangaRequest(manga)).await() }
val covers = withIOContext { getCovers(manga, forceLatestCovers) } return apiMangaParser.parseToManga(manga, response, sourceId)
return apiMangaParser.parseToManga(manga, response, covers, sourceId)
} }
fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long, forceLatestCovers: Boolean): Observable<SManga> { fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long, forceLatestCovers: Boolean): Observable<SManga> {

2
app/src/main/java/exh/md/handlers/SearchHandler.kt
View File

@ -44,7 +44,7 @@ class SearchHandler(val client: OkHttpClient, private val headers: Headers, val
}*/ }*/
val details = apiMangaParser 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) MangasPage(listOf(details), false)
}) })
} }