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

Metadata cleanup

Browse Source
This commit is contained in:
Jobobby04 2021-05-24 14:48:30 -04:00
parent 99d23a47b7
commit c39ec81f42
10 changed files with 138 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt
View File

@ -58,7 +58,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
} }
// Set artist (if we can find one) // Set artist (if we can find one)
val artist = tags.filter { it.namespace == EH_ARTIST_NAMESPACE }.let { tags -> val artist = tags.ofNamespace(EH_ARTIST_NAMESPACE).let { tags ->
if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
} }
@ -90,29 +90,29 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
listOfNotNull(
gId?.let { pairs += context.getString(R.string.id) to it } gId?.let { getString(R.string.id) to it },
gToken?.let { pairs += context.getString(R.string.token) to it } gToken?.let { getString(R.string.token) to it },
exh?.let { pairs += context.getString(R.string.is_exhentai_gallery) to context.getString(if (it) android.R.string.yes else android.R.string.no) } exh?.let { getString(R.string.is_exhentai_gallery) to it.toString() },
thumbnailUrl?.let { pairs += context.getString(R.string.thumbnail_url) to it } thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
title?.let { pairs += context.getString(R.string.title) to it } title?.let { getString(R.string.title) to it },
altTitle?.let { pairs += context.getString(R.string.alt_title) to it } altTitle?.let { getString(R.string.alt_title) to it },
genre?.let { pairs += context.getString(R.string.genre) to it } genre?.let { getString(R.string.genre) to it },
datePosted?.let { pairs += context.getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) } datePosted?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
parent?.let { pairs += context.getString(R.string.parent) to it } parent?.let { getString(R.string.parent) to it },
visible?.let { pairs += context.getString(R.string.visible) to it } visible?.let { getString(R.string.visible) to it },
language?.let { pairs += context.getString(R.string.language) to it } language?.let { getString(R.string.language) to it },
translated?.let { pairs += "Translated" to context.getString(if (it) android.R.string.yes else android.R.string.no) } translated?.let { getString(R.string.translated) to it.toString() },
size?.let { pairs += context.getString(R.string.gallery_size) to MetadataUtil.humanReadableByteCount(it, true) } size?.let { getString(R.string.gallery_size) to MetadataUtil.humanReadableByteCount(it, true) },
length?.let { pairs += context.getString(R.string.page_count) to it.toString() } length?.let { getString(R.string.page_count) to it.toString() },
favorites?.let { pairs += context.getString(R.string.total_favorites) to it.toString() } favorites?.let { getString(R.string.total_favorites) to it.toString() },
ratingCount?.let { pairs += context.getString(R.string.total_ratings) to it.toString() } ratingCount?.let { getString(R.string.total_ratings) to it.toString() },
averageRating?.let { pairs += context.getString(R.string.average_rating) to it.toString() } averageRating?.let { getString(R.string.average_rating) to it.toString() },
aged.let { pairs += context.getString(R.string.aged) to context.getString(if (it) android.R.string.yes else android.R.string.no) } aged.let { getString(R.string.aged) to it.toString() },
lastUpdateCheck.let { pairs += context.getString(R.string.last_update_check) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) } lastUpdateCheck.let { getString(R.string.last_update_check) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
)
return pairs }
} }
companion object { companion object {

14
app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt
View File

@ -38,14 +38,14 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
title?.let { pairs += context.getString(R.string.title) to it } listOfNotNull(
val path = path.joinToString("/", prefix = "/") title?.let { getString(R.string.title) to it },
if (path.isNotBlank()) { path.takeUnless { it.isEmpty() }?.joinToString("/", prefix = "/")
pairs += context.getString(R.string.path) to path ?.let { getString(R.string.path) to it },
thumbnailUrl?.let { getString(R.string.thumbnail_url) to it }
)
} }
thumbnailUrl?.let { pairs += context.getString(R.string.thumbnail_url) to it }
return pairs
} }
companion object { companion object {

16
app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt
View File

@ -46,13 +46,15 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
hbId?.let { pairs += context.getString(R.string.id) to it.toString() } listOfNotNull(
hbUrl?.let { pairs += context.getString(R.string.url) to it } hbId?.let { getString(R.string.id) to it.toString() },
thumbnail?.let { pairs += context.getString(R.string.thumbnail_url) to it } hbUrl?.let { getString(R.string.url) to it },
title?.let { pairs += context.getString(R.string.title) to it } thumbnail?.let { getString(R.string.thumbnail_url) to it },
length?.let { pairs += context.getString(R.string.page_count) to it.toString() } title?.let { getString(R.string.title) to it },
return pairs length?.let { getString(R.string.page_count) to it.toString() }
)
}
} }
companion object { companion object {

35
app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt
View File

@ -62,29 +62,20 @@ class HitomiSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
with(context) { listOfNotNull(
hlId?.let { pairs += getString(R.string.id) to it } hlId?.let { getString(R.string.id) to it },
title?.let { pairs += getString(R.string.title) to it } title?.let { getString(R.string.title) to it },
thumbnailUrl?.let { pairs += getString(R.string.thumbnail_url) to it } thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
val artists = artists.joinToString() artists.takeUnless { it.isEmpty() }?.joinToString()?.let { getString(R.string.artist) to it },
if (artists.isNotBlank()) { group?.let { getString(R.string.group) to it },
pairs += getString(R.string.artist) to artists genre?.let { getString(R.string.genre) to it },
} language?.let { getString(R.string.language) to it },
group?.let { pairs += getString(R.string.group) to it } series.takeUnless { it.isEmpty() }?.joinToString()?.let { getString(R.string.series) to it },
genre?.let { pairs += getString(R.string.genre) to it } characters.takeUnless { it.isEmpty() }?.joinToString()?.let { getString(R.string.characters) to it },
language?.let { pairs += getString(R.string.language) to it } uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }
val series = series.joinToString() )
if (series.isNotBlank()) {
pairs += getString(R.string.series) to series
}
val characters = characters.joinToString()
if (characters.isNotBlank()) {
pairs += getString(R.string.characters) to characters
}
uploadDate?.let { pairs += getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }
} }
return pairs
} }
companion object { companion object {

42
app/src/main/java/exh/metadata/metadata/MangaDexSearchMetadata.kt
View File

@ -73,26 +73,28 @@ class MangaDexSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
mdUuid?.let { pairs += context.getString(R.string.id) to it } listOfNotNull(
// mdUrl?.let { pairs += context.getString(R.string.url) to it } mdUuid?.let { getString(R.string.id) to it },
cover?.let { pairs += context.getString(R.string.thumbnail_url) to it } // mdUrl?.let { getString(R.string.url) to it },
title?.let { pairs += context.getString(R.string.title) to it } cover?.let { getString(R.string.thumbnail_url) to it },
authors?.let { pairs += context.getString(R.string.author) to it.joinToString() } title?.let { getString(R.string.title) to it },
artists?.let { pairs += context.getString(R.string.artist) to it.joinToString() } authors?.let { getString(R.string.author) to it.joinToString() },
langFlag?.let { pairs += context.getString(R.string.language) to it } artists?.let { getString(R.string.artist) to it.joinToString() },
lastChapterNumber?.let { pairs += context.getString(R.string.last_chapter_number) to it.toString() } langFlag?.let { getString(R.string.language) to it },
// rating?.let { pairs += context.getString(R.string.average_rating) to it } lastChapterNumber?.let { getString(R.string.last_chapter_number) to it.toString() },
// users?.let { pairs += context.getString(R.string.total_ratings) to it } // rating?.let { getString(R.string.average_rating) to it },
status?.let { pairs += context.getString(R.string.status) to it.toString() } // users?.let { getString(R.string.total_ratings) to it },
// missing_chapters?.let { pairs += context.getString(R.string.missing_chapters) to it } status?.let { getString(R.string.status) to it.toString() },
followStatus?.let { pairs += context.getString(R.string.follow_status) to it.toString() } // missing_chapters?.let { getString(R.string.missing_chapters) to it },
anilistId?.let { pairs += context.getString(R.string.anilist_id) to it } followStatus?.let { getString(R.string.follow_status) to it.toString() },
kitsuId?.let { pairs += context.getString(R.string.kitsu_id) to it } anilistId?.let { getString(R.string.anilist_id) to it },
myAnimeListId?.let { pairs += context.getString(R.string.mal_id) to it } kitsuId?.let { getString(R.string.kitsu_id) to it },
mangaUpdatesId?.let { pairs += context.getString(R.string.manga_updates_id) to it } myAnimeListId?.let { getString(R.string.mal_id) to it },
animePlanetId?.let { pairs += context.getString(R.string.anime_planet_id) to it } mangaUpdatesId?.let { getString(R.string.manga_updates_id) to it },
return pairs animePlanetId?.let { getString(R.string.anime_planet_id) to it },
)
}
} }
companion object { companion object {

30
app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt
View File

@ -54,7 +54,7 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
} }
// Set artist (if we can find one) // Set artist (if we can find one)
val artist = tags.filter { it.namespace == NHENTAI_ARTIST_NAMESPACE }.let { tags -> val artist = tags.ofNamespace(NHENTAI_ARTIST_NAMESPACE).let { tags ->
if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
} }
@ -86,19 +86,21 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
nhId?.let { pairs += context.getString(R.string.id) to it.toString() } listOfNotNull(
uploadDate?.let { pairs += context.getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it * 1000)) } nhId?.let { getString(R.string.id) to it.toString() },
favoritesCount?.let { pairs += context.getString(R.string.total_favorites) to it.toString() } uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it * 1000)) },
mediaId?.let { pairs += context.getString(R.string.media_id) to it } favoritesCount?.let { getString(R.string.total_favorites) to it.toString() },
japaneseTitle?.let { pairs += context.getString(R.string.japanese_title) to it } mediaId?.let { getString(R.string.media_id) to it },
englishTitle?.let { pairs += context.getString(R.string.english_title) to it } japaneseTitle?.let { getString(R.string.japanese_title) to it },
shortTitle?.let { pairs += context.getString(R.string.short_title) to it } englishTitle?.let { getString(R.string.english_title) to it },
coverImageType?.let { pairs += context.getString(R.string.cover_image_file_type) to it } shortTitle?.let { getString(R.string.short_title) to it },
pageImageTypes.size.let { pairs += context.getString(R.string.page_count) to it.toString() } coverImageType?.let { getString(R.string.cover_image_file_type) to it },
thumbnailImageType?.let { pairs += context.getString(R.string.thumbnail_image_file_type) to it } pageImageTypes.size.let { getString(R.string.page_count) to it.toString() },
scanlator?.let { pairs += context.getString(R.string.scanlator) to it } thumbnailImageType?.let { getString(R.string.thumbnail_image_file_type) to it },
return pairs scanlator?.let { getString(R.string.scanlator) to it },
)
}
} }
companion object { companion object {

32
app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt
View File

@ -64,21 +64,21 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
pvId?.let { pairs += context.getString(R.string.id) to it } listOfNotNull(
url?.let { pairs += context.getString(R.string.url) to it } pvId?.let { getString(R.string.id) to it },
thumbnailUrl?.let { pairs += context.getString(R.string.thumbnail_url) to it } url?.let { getString(R.string.url) to it },
title?.let { pairs += context.getString(R.string.title) to it } thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
val altTitles = altTitles.joinToString() title?.let { getString(R.string.title) to it },
if (altTitles.isNotBlank()) { altTitles.takeUnless { it.isEmpty() }?.joinToString()
pairs += context.getString(R.string.alt_titles) to altTitles ?.let { getString(R.string.alt_titles) to it },
artist?.let { getString(R.string.artist) to it },
genre?.let { getString(R.string.genre) to it },
rating?.let { getString(R.string.average_rating) to it.toString() },
status?.let { getString(R.string.status) to it },
lang?.let { getString(R.string.language) to it },
)
} }
artist?.let { pairs += context.getString(R.string.artist) to it }
genre?.let { pairs += context.getString(R.string.genre) to it }
rating?.let { pairs += context.getString(R.string.average_rating) to it.toString() }
status?.let { pairs += context.getString(R.string.status) to it }
lang?.let { pairs += context.getString(R.string.language) to it }
return pairs
} }
companion object { companion object {
@ -88,9 +88,7 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() {
const val TAG_TYPE_DEFAULT = 0 const val TAG_TYPE_DEFAULT = 0
private fun splitGalleryUrl(url: String) = private fun splitGalleryUrl(url: String) =
url.let { url.toUri().pathSegments.filterNot(String::isNullOrBlank)
it.toUri().pathSegments.filterNot(String::isNullOrBlank)
}
fun pvIdFromUrl(url: String): String = splitGalleryUrl(url).last() fun pvIdFromUrl(url: String): String = splitGalleryUrl(url).last()
} }

26
app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt
View File

@ -54,18 +54,20 @@ class PururinSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
prId?.let { pairs += context.getString(R.string.id) to it.toString() } listOfNotNull(
title?.let { pairs += context.getString(R.string.title) to it } prId?.let { getString(R.string.id) to it.toString() },
altTitle?.let { pairs += context.getString(R.string.alt_title) to it } title?.let { getString(R.string.title) to it },
thumbnailUrl?.let { pairs += context.getString(R.string.thumbnail_url) to it } altTitle?.let { getString(R.string.alt_title) to it },
uploaderDisp?.let { pairs += context.getString(R.string.uploader_capital) to it } thumbnailUrl?.let { getString(R.string.thumbnail_url) to it },
uploader?.let { pairs += context.getString(R.string.uploader) to it } uploaderDisp?.let { getString(R.string.uploader_capital) to it },
pages?.let { pairs += context.getString(R.string.page_count) to it.toString() } uploader?.let { getString(R.string.uploader) to it },
fileSize?.let { pairs += context.getString(R.string.gallery_size) to it } pages?.let { getString(R.string.page_count) to it.toString() },
ratingCount?.let { pairs += context.getString(R.string.total_ratings) to it.toString() } fileSize?.let { getString(R.string.gallery_size) to it },
averageRating?.let { pairs += context.getString(R.string.average_rating) to it.toString() } ratingCount?.let { getString(R.string.total_ratings) to it.toString() },
return pairs averageRating?.let { getString(R.string.average_rating) to it.toString() },
)
}
} }
companion object { companion object {

38
app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt
View File

@ -66,28 +66,24 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() {
} }
override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> { override fun getExtraInfoPairs(context: Context): List<Pair<String, String>> {
val pairs = mutableListOf<Pair<String, String>>() return with(context) {
tmId?.let { pairs += context.getString(R.string.id) to it.toString() } listOfNotNull(
title?.let { pairs += context.getString(R.string.title) to it } tmId?.let { getString(R.string.id) to it.toString() },
uploader?.let { pairs += context.getString(R.string.uploader) to it } title?.let { getString(R.string.title) to it },
uploadDate?.let { pairs += context.getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) } uploader?.let { getString(R.string.uploader) to it },
length?.let { pairs += context.getString(R.string.page_count) to it.toString() } uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) },
ratingString?.let { pairs += context.getString(R.string.rating_string) to it } length?.let { getString(R.string.page_count) to it.toString() },
averageRating?.let { pairs += context.getString(R.string.average_rating) to it.toString() } ratingString?.let { getString(R.string.rating_string) to it },
userRatings?.let { pairs += context.getString(R.string.total_ratings) to it.toString() } averageRating?.let { getString(R.string.average_rating) to it.toString() },
favorites?.let { pairs += context.getString(R.string.total_favorites) to it.toString() } userRatings?.let { getString(R.string.total_ratings) to it.toString() },
category?.let { pairs += context.getString(R.string.genre) to it } favorites?.let { getString(R.string.total_favorites) to it.toString() },
collection?.let { pairs += context.getString(R.string.collection) to it } category?.let { getString(R.string.genre) to it },
group?.let { pairs += context.getString(R.string.group) to it } collection?.let { getString(R.string.collection) to it },
val parodiesString = parody.joinToString() group?.let { getString(R.string.group) to it },
if (parodiesString.isNotEmpty()) { parody.takeUnless { it.isEmpty() }?.joinToString()?.let { getString(R.string.parodies) to it },
pairs += context.getString(R.string.parodies) to parodiesString character.takeUnless { it.isEmpty() }?.joinToString()?.let { getString(R.string.characters) to it },
)
} }
val charactersString = character.joinToString()
if (charactersString.isNotEmpty()) {
pairs += context.getString(R.string.characters) to charactersString
}
return pairs
} }
companion object { companion object {

1
app/src/main/res/values/strings_sy.xml
View File

@ -584,6 +584,7 @@
<string name="mal_id">Mal id</string> <string name="mal_id">Mal id</string>
<string name="manga_updates_id">Manga updates id</string> <string name="manga_updates_id">Manga updates id</string>
<string name="anime_planet_id">Anime planet id</string> <string name="anime_planet_id">Anime planet id</string>
<string name="translated">Translated</string>
<!-- Extra gallery info --> <!-- Extra gallery info -->
<plurals name="num_pages"> <plurals name="num_pages">