Update changelogs and add hitomi.la URL importing

This commit is contained in:
NerdNumber9
2018-04-15 14:35:00 -04:00
parent 234c3bb72a
commit 995a1155e4
4 changed files with 50 additions and 11 deletions

View File

@ -190,27 +190,33 @@ class Hitomi(private val context: Context)
}
override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
return trySearch(page, query).map {
val res = it.map {
SManga.create().apply {
setUrlWithoutDomain(it.url!!)
return urlImportFetchSearchManga(query, {
trySearch(page, query).map {
val res = it.map {
SManga.create().apply {
setUrlWithoutDomain(it.url!!)
title = it.title!!
title = it.title!!
it.thumbnailUrl?.let {
thumbnail_url = it
it.thumbnailUrl?.let {
thumbnail_url = it
}
}
}
}
MangasPage(res, it.isNotEmpty())
}
MangasPage(res, it.isNotEmpty())
}
})
}
override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
return lazyLoadMetaPages(HitomiGalleryMetadata.hlIdFromUrl(manga.url), true)
.map {
manga.copyFrom(parseToManga(queryFromUrl(manga.url), it.first))
val newManga = parseToManga(queryFromUrl(manga.url), it.first)
manga.copyFrom(newManga)
// Forcibly copy title as copyFrom does not
manga.title = newManga.title
manga
}
.subscribeOn(parseToMangaScheduler())

View File

@ -78,6 +78,7 @@ class GalleryAdder {
}
"hentai.cafe" -> HENTAI_CAFE_SOURCE_ID
"www.tsumino.com" -> TSUMINO_SOURCE_ID
"hitomi.la" -> HITOMI_SOURCE_ID
else -> return GalleryAddEvent.Fail.UnknownType(url)
}
@ -123,6 +124,12 @@ class GalleryAdder {
"https://tsumino.com/Book/Info/${urlObj.pathSegments[2]}"
}
HITOMI_SOURCE_ID -> {
if(lcFirstPathSegment != "galleries" && lcFirstPathSegment != "reader")
return GalleryAddEvent.Fail.UnknownType(url)
"https://hitomi.la/galleries/${urlObj.pathSegments[1].substringBefore('.')}.html"
}
else -> return GalleryAddEvent.Fail.UnknownType(url)
}
@ -136,6 +143,7 @@ class GalleryAdder {
PERV_EDEN_IT_SOURCE_ID -> getUrlWithoutDomain(realUrl)
HENTAI_CAFE_SOURCE_ID -> getUrlWithoutDomain(realUrl)
TSUMINO_SOURCE_ID -> getUrlWithoutDomain(realUrl)
HITOMI_SOURCE_ID -> getUrlWithoutDomain(realUrl)
else -> return GalleryAddEvent.Fail.UnknownType(url)
}