Minor cleanup of metadata
(cherry picked from commit 5b7539ac3eae805e262f86750268fb7a164a70b7)
This commit is contained in:
Jobobby04
parent
6d3095b503
commit
e5fd460bb0
@ -51,16 +51,14 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
|||||||
val cover = thumbnailUrl
|
val cover = thumbnailUrl
|
||||||
|
|
||||||
// No title bug?
|
// No title bug?
|
||||||
val title = if (Injekt.get<PreferencesHelper>().useJapaneseTitle().get()) {
|
val title = altTitle
|
||||||
altTitle ?: title
|
?.takeIf { Injekt.get<PreferencesHelper>().useJapaneseTitle().get() }
|
||||||
} else {
|
?: title
|
||||||
title
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set artist (if we can find one)
|
// Set artist (if we can find one)
|
||||||
val artist = tags.ofNamespace(EH_ARTIST_NAMESPACE).let { tags ->
|
val artist = tags.ofNamespace(EH_ARTIST_NAMESPACE)
|
||||||
if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
|
.ifEmpty { null }
|
||||||
}
|
?.joinToString { it.name }
|
||||||
|
|
||||||
// Copy tags -> genres
|
// Copy tags -> genres
|
||||||
val genres = tagsToGenreList()
|
val genres = tagsToGenreList()
|
||||||
@ -92,25 +90,25 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
gId?.let { getString(R.string.id) to it },
|
getItem(gId) { getString(R.string.id) },
|
||||||
gToken?.let { getString(R.string.token) to it },
|
getItem(gToken) { getString(R.string.token) },
|
||||||
exh?.let { getString(R.string.is_exhentai_gallery) to it.toString() },
|
getItem(exh) { getString(R.string.is_exhentai_gallery) },
|
||||||
thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
|
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
altTitle?.let { getString(R.string.alt_title) to it },
|
getItem(altTitle) { getString(R.string.alt_title) },
|
||||||
genre?.let { getString(R.string.genre) to it },
|
getItem(genre) { getString(R.string.genre) },
|
||||||
datePosted?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
|
getItem(datePosted, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) { getString(R.string.date_posted) },
|
||||||
parent?.let { getString(R.string.parent) to it },
|
getItem(parent) { getString(R.string.parent) },
|
||||||
visible?.let { getString(R.string.visible) to it },
|
getItem(visible) { getString(R.string.visible) },
|
||||||
language?.let { getString(R.string.language) to it },
|
getItem(language) { getString(R.string.language) },
|
||||||
translated?.let { getString(R.string.translated) to it.toString() },
|
getItem(translated) { getString(R.string.translated) },
|
||||||
size?.let { getString(R.string.gallery_size) to MetadataUtil.humanReadableByteCount(it, true) },
|
getItem(size, { MetadataUtil.humanReadableByteCount(it, true) }) { getString(R.string.gallery_size) },
|
||||||
length?.let { getString(R.string.page_count) to it.toString() },
|
getItem(length) { getString(R.string.page_count) },
|
||||||
favorites?.let { getString(R.string.total_favorites) to it.toString() },
|
getItem(favorites) { getString(R.string.total_favorites) },
|
||||||
ratingCount?.let { getString(R.string.total_ratings) to it.toString() },
|
getItem(ratingCount) { getString(R.string.total_ratings) },
|
||||||
averageRating?.let { getString(R.string.average_rating) to it.toString() },
|
getItem(averageRating) { getString(R.string.average_rating) },
|
||||||
aged.let { getString(R.string.aged) to it.toString() },
|
getItem(aged) { getString(R.string.aged) },
|
||||||
lastUpdateCheck.let { getString(R.string.last_update_check) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
|
getItem(lastUpdateCheck, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) { getString(R.string.last_update_check) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,10 +41,9 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
path.nullIfEmpty()?.joinToString("/", prefix = "/")
|
getItem(path.nullIfEmpty(), { it.joinToString("/", prefix = "/") }) { getString(R.string.path) },
|
||||||
?.let { getString(R.string.path) to it },
|
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||||
thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -48,11 +48,11 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
hbId?.let { getString(R.string.id) to it.toString() },
|
getItem(hbId) { getString(R.string.id) },
|
||||||
hbUrl?.let { getString(R.string.url) to it },
|
getItem(hbUrl) { getString(R.string.url) },
|
||||||
thumbnail?.let { getString(R.string.thumbnail_url) to it },
|
getItem(thumbnail) { getString(R.string.thumbnail_url) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
length?.let { getString(R.string.page_count) to it.toString() },
|
getItem(length) { getString(R.string.page_count) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -59,13 +59,13 @@ class HitomiSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
hlId?.let { getString(R.string.id) to it },
|
getItem(hlId) { getString(R.string.id) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
|
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||||
artists.nullIfEmpty()?.joinToString()?.let { getString(R.string.artist) to it },
|
getItem(artists.nullIfEmpty(), { it.joinToString() }) { getString(R.string.artist) },
|
||||||
genre?.let { getString(R.string.genre) to it },
|
getItem(genre) { getString(R.string.genre) },
|
||||||
language?.let { getString(R.string.language) to it },
|
getItem(language) { getString(R.string.language) },
|
||||||
uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
|
getItem(uploadDate, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) { getString(R.string.date_posted) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,24 +77,24 @@ class MangaDexSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
mdUuid?.let { getString(R.string.id) to it },
|
getItem(mdUuid) { getString(R.string.id) },
|
||||||
// mdUrl?.let { getString(R.string.url) to it },
|
// getItem(mdUrl) { getString(R.string.url) },
|
||||||
cover?.let { getString(R.string.thumbnail_url) to it },
|
getItem(cover) { getString(R.string.thumbnail_url) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
authors?.let { getString(R.string.author) to it.joinToString() },
|
getItem(authors, { it.joinToString() }) { getString(R.string.author) },
|
||||||
artists?.let { getString(R.string.artist) to it.joinToString() },
|
getItem(artists, { it.joinToString() }) { getString(R.string.artist) },
|
||||||
langFlag?.let { getString(R.string.language) to it },
|
getItem(langFlag) { getString(R.string.language) },
|
||||||
lastChapterNumber?.let { getString(R.string.last_chapter_number) to it.toString() },
|
getItem(lastChapterNumber) { getString(R.string.last_chapter_number) },
|
||||||
rating?.let { getString(R.string.average_rating) to it.toString() },
|
getItem(rating) { getString(R.string.average_rating) },
|
||||||
// users?.let { getString(R.string.total_ratings) to it },
|
// getItem(users) { getString(R.string.total_ratings) },
|
||||||
status?.let { getString(R.string.status) to it.toString() },
|
getItem(status) { getString(R.string.status) },
|
||||||
// missing_chapters?.let { getString(R.string.missing_chapters) to it },
|
// getItem(missing_chapters) { getString(R.string.missing_chapters) },
|
||||||
followStatus?.let { getString(R.string.follow_status) to it.toString() },
|
getItem(followStatus) { getString(R.string.follow_status) },
|
||||||
anilistId?.let { getString(R.string.anilist_id) to it },
|
getItem(anilistId) { getString(R.string.anilist_id) },
|
||||||
kitsuId?.let { getString(R.string.kitsu_id) to it },
|
getItem(kitsuId) { getString(R.string.kitsu_id) },
|
||||||
myAnimeListId?.let { getString(R.string.mal_id) to it },
|
getItem(myAnimeListId) { getString(R.string.mal_id) },
|
||||||
mangaUpdatesId?.let { getString(R.string.manga_updates_id) to it },
|
getItem(mangaUpdatesId) { getString(R.string.manga_updates_id) },
|
||||||
animePlanetId?.let { getString(R.string.anime_planet_id) to it },
|
getItem(animePlanetId) { getString(R.string.anime_planet_id) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -88,17 +88,17 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
nhId?.let { getString(R.string.id) to it.toString() },
|
getItem(nhId) { getString(R.string.id) },
|
||||||
uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it * 1000)) },
|
getItem(uploadDate, { MetadataUtil.EX_DATE_FORMAT.format(Date(it * 1000)) }) { getString(R.string.date_posted) },
|
||||||
favoritesCount?.let { getString(R.string.total_favorites) to it.toString() },
|
getItem(favoritesCount) { getString(R.string.total_favorites) },
|
||||||
mediaId?.let { getString(R.string.media_id) to it },
|
getItem(mediaId) { getString(R.string.media_id) },
|
||||||
japaneseTitle?.let { getString(R.string.japanese_title) to it },
|
getItem(japaneseTitle) { getString(R.string.japanese_title) },
|
||||||
englishTitle?.let { getString(R.string.english_title) to it },
|
getItem(englishTitle) { getString(R.string.english_title) },
|
||||||
shortTitle?.let { getString(R.string.short_title) to it },
|
getItem(shortTitle) { getString(R.string.short_title) },
|
||||||
coverImageType?.let { getString(R.string.cover_image_file_type) to it },
|
getItem(coverImageType) { getString(R.string.cover_image_file_type) },
|
||||||
pageImageTypes.size.let { getString(R.string.page_count) to it.toString() },
|
getItem(pageImageTypes.size) { getString(R.string.page_count) },
|
||||||
thumbnailImageType?.let { getString(R.string.thumbnail_image_file_type) to it },
|
getItem(thumbnailImageType) { getString(R.string.thumbnail_image_file_type) },
|
||||||
scanlator?.let { getString(R.string.scanlator) to it },
|
getItem(scanlator) { getString(R.string.scanlator) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,17 +67,16 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
pvId?.let { getString(R.string.id) to it },
|
getItem(pvId) { getString(R.string.id) },
|
||||||
url?.let { getString(R.string.url) to it },
|
getItem(url) { getString(R.string.url) },
|
||||||
thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
|
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
altTitles.nullIfEmpty()?.joinToString()
|
getItem(altTitles.nullIfEmpty(), { it.joinToString() }) { getString(R.string.alt_titles) },
|
||||||
?.let { getString(R.string.alt_titles) to it },
|
getItem(artist) { getString(R.string.artist) },
|
||||||
artist?.let { getString(R.string.artist) to it },
|
getItem(genre) { getString(R.string.genre) },
|
||||||
genre?.let { getString(R.string.genre) to it },
|
getItem(rating) { getString(R.string.average_rating) },
|
||||||
rating?.let { getString(R.string.average_rating) to it.toString() },
|
getItem(status) { getString(R.string.status) },
|
||||||
status?.let { getString(R.string.status) to it },
|
getItem(lang) { getString(R.string.language) },
|
||||||
lang?.let { getString(R.string.language) to it },
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -56,16 +56,16 @@ class PururinSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
prId?.let { getString(R.string.id) to it.toString() },
|
getItem(prId) { getString(R.string.id) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
altTitle?.let { getString(R.string.alt_title) to it },
|
getItem(altTitle) { getString(R.string.alt_title) },
|
||||||
thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
|
getItem(thumbnailUrl) { getString(R.string.thumbnail_url) },
|
||||||
uploaderDisp?.let { getString(R.string.uploader_capital) to it },
|
getItem(uploaderDisp) { getString(R.string.uploader_capital) },
|
||||||
uploader?.let { getString(R.string.uploader) to it },
|
getItem(uploader) { getString(R.string.uploader) },
|
||||||
pages?.let { getString(R.string.page_count) to it.toString() },
|
getItem(pages) { getString(R.string.page_count) },
|
||||||
fileSize?.let { getString(R.string.gallery_size) to it },
|
getItem(fileSize) { getString(R.string.gallery_size) },
|
||||||
ratingCount?.let { getString(R.string.total_ratings) to it.toString() },
|
getItem(ratingCount) { getString(R.string.total_ratings) },
|
||||||
averageRating?.let { getString(R.string.average_rating) to it.toString() },
|
getItem(averageRating) { getString(R.string.average_rating) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -69,20 +69,20 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
|
|||||||
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
|
||||||
return with(context) {
|
return with(context) {
|
||||||
listOfNotNull(
|
listOfNotNull(
|
||||||
tmId?.let { getString(R.string.id) to it.toString() },
|
getItem(tmId) { getString(R.string.id) },
|
||||||
title?.let { getString(R.string.title) to it },
|
getItem(title) { getString(R.string.title) },
|
||||||
uploader?.let { getString(R.string.uploader) to it },
|
getItem(uploader) { getString(R.string.uploader) },
|
||||||
uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
|
getItem(uploadDate, { MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }) { getString(R.string.date_posted) },
|
||||||
length?.let { getString(R.string.page_count) to it.toString() },
|
getItem(length) { getString(R.string.page_count) },
|
||||||
ratingString?.let { getString(R.string.rating_string) to it },
|
getItem(ratingString) { getString(R.string.rating_string) },
|
||||||
averageRating?.let { getString(R.string.average_rating) to it.toString() },
|
getItem(averageRating) { getString(R.string.average_rating) },
|
||||||
userRatings?.let { getString(R.string.total_ratings) to it.toString() },
|
getItem(userRatings) { getString(R.string.total_ratings) },
|
||||||
favorites?.let { getString(R.string.total_favorites) to it.toString() },
|
getItem(favorites) { getString(R.string.total_favorites) },
|
||||||
category?.let { getString(R.string.genre) to it },
|
getItem(category) { getString(R.string.genre) },
|
||||||
collection?.let { getString(R.string.collection) to it },
|
getItem(collection) { getString(R.string.collection) },
|
||||||
group?.let { getString(R.string.group) to it },
|
getItem(group) { getString(R.string.group) },
|
||||||
parody.nullIfEmpty()?.joinToString()?.let { getString(R.string.parodies) to it },
|
getItem(parody.nullIfEmpty(), { it.joinToString() }) { getString(R.string.parodies) },
|
||||||
character.nullIfEmpty()?.joinToString()?.let { getString(R.string.characters) to it },
|
getItem(character.nullIfEmpty(), { it.joinToString() }) { getString(R.string.characters) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,6 +54,15 @@ abstract class RaisedSearchMetadata {
|
|||||||
if (newTitle != null) titles += RaisedTitle(newTitle, type)
|
if (newTitle != null) titles += RaisedTitle(newTitle, type)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun <T : Any> getItem(
|
||||||
|
item: T?,
|
||||||
|
toString: (T) -> String = Any::toString,
|
||||||
|
block: (T) -> String,
|
||||||
|
): Pair<String, String>? {
|
||||||
|
item ?: return null
|
||||||
|
return block(item) to toString(item)
|
||||||
|
}
|
||||||
|
|
||||||
open fun copyTo(manga: SManga) {
|
open fun copyTo(manga: SManga) {
|
||||||
val infoManga = createMangaInfo(manga.toMangaInfo()).toSManga()
|
val infoManga = createMangaInfo(manga.toMangaInfo()).toSManga()
|
||||||
manga.copyFrom(infoManga)
|
manga.copyFrom(infoManga)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user