mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-03-13 16:20:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NHentai and PervEden sources

Browse Source 
Version bump to v6.1.2
This commit is contained in:
NerdNumber9 2017-08-25 19:08:33 -04:00
parent 9f4540a4f1
commit 08dffda2a1
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -44,8 +44,8 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 25 targetSdkVersion 25
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 6101 versionCode 6102
versionName "v6.1.1-EH" versionName "v6.1.2-EH"
buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\"" buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\"" buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""

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

@ -116,7 +116,7 @@ class NHentai(context: Context) : HttpSource() {
fun rawParseGallery(obj: JsonObject) = realmTrans { realm -> fun rawParseGallery(obj: JsonObject) = realmTrans { realm ->
val nhId = obj.get("id").asLong val nhId = obj.get("id").asLong
(realm.loadNhentai(nhId) realm.copyFromRealm((realm.loadNhentai(nhId)
?: realm.createUUIDObj(NHentaiMetadata::class.java)).apply { ?: realm.createUUIDObj(NHentaiMetadata::class.java)).apply {
this.nhId = nhId this.nhId = nhId
@ -156,7 +156,7 @@ class NHentai(context: Context) : HttpSource() {
if(it.first != null && it.second != null) if(it.first != null && it.second != null)
tags.add(Tag(it.first!!, it.second!!, false)) tags.add(Tag(it.first!!, it.second!!, false))
} }
} })
} }
fun parseGallery(obj: JsonObject) = rawParseGallery(obj).let { fun parseGallery(obj: JsonObject) = rawParseGallery(obj).let {
@ -167,18 +167,16 @@ class NHentai(context: Context) : HttpSource() {
fun lazyLoadMetadata(url: String) = fun lazyLoadMetadata(url: String) =
defRealm { realm -> defRealm { realm ->
realm.loadNhentaiAsync(NHentaiMetadata.nhIdFromUrl(url)) val meta = realm.loadNhentai(NHentaiMetadata.nhIdFromUrl(url))
.flatMap { if(meta == null)
if(it == null) client.newCall(urlToDetailsRequest(url))
client.newCall(urlToDetailsRequest(url)) .asObservableSuccess()
.asObservableSuccess() .map {
.map { rawParseGallery(jsonParser.parse(it.body()!!.string())
rawParseGallery(jsonParser.parse(it.body()!!.string()) .asJsonObject)
.asJsonObject) }.first()
}.first() else
else Observable.just(realm.copyFromRealm(meta))
Observable.just(it)
}.map { realm.copyFromRealm(it) }
} }
override fun fetchChapterList(manga: SManga) override fun fetchChapterList(manga: SManga)

2
app/src/main/java/exh/metadata/MetdataCopier.kt
View File

@ -112,7 +112,7 @@ fun PervEdenGalleryMetadata.copyTo(manga: SManga) {
} }
if(altTitles.isNotEmpty()) if(altTitles.isNotEmpty())
titleDesc += "Alternate Titles: \n" + altTitles.map { titleDesc += "Alternate Titles: \n" + altTitles.map {
"▪ $it" "▪ ${it.title}"
}.joinToString(separator = "\n", postfix = "\n") }.joinToString(separator = "\n", postfix = "\n")
val detailsDesc = StringBuilder() val detailsDesc = StringBuilder()