Populate Author field and clear Description on a couple of delegated (jobobby04/tachiyomiSY#1432)
(cherry picked from commit c2d0308ac0319485d443d93ee5bd6ae657001922)
This commit is contained in:
parent
bd93329372
commit
b2f90d19c3
2 changed files with 18 additions and 8 deletions
|
|
@ -66,6 +66,11 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||||
.ifEmpty { null }
|
.ifEmpty { null }
|
||||||
?.joinToString { it.name }
|
?.joinToString { it.name }
|
||||||
|
|
||||||
|
// Set group (if we can find one)
|
||||||
|
val group = tags.ofNamespace(EH_GROUP_NAMESPACE)
|
||||||
|
.ifEmpty { null }
|
||||||
|
?.joinToString { it.name }
|
||||||
|
|
||||||
// Copy tags -> genres
|
// Copy tags -> genres
|
||||||
val genres = tagsToGenreString()
|
val genres = tagsToGenreString()
|
||||||
|
|
||||||
|
|
@ -80,13 +85,12 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val description = null
|
|
||||||
|
|
||||||
return manga.copy(
|
return manga.copy(
|
||||||
url = key ?: manga.url,
|
url = key ?: manga.url,
|
||||||
title = title ?: manga.title,
|
title = title ?: manga.title,
|
||||||
artist = artist ?: manga.artist,
|
artist = group ?: manga.artist,
|
||||||
description = description,
|
author = artist ?: manga.artist,
|
||||||
|
description = null,
|
||||||
genre = genres,
|
genre = genres,
|
||||||
status = status,
|
status = status,
|
||||||
thumbnail_url = cover ?: manga.thumbnail_url,
|
thumbnail_url = cover ?: manga.thumbnail_url,
|
||||||
|
|
@ -145,6 +149,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||||
|
|
||||||
const val EH_GENRE_NAMESPACE = "genre"
|
const val EH_GENRE_NAMESPACE = "genre"
|
||||||
private const val EH_ARTIST_NAMESPACE = "artist"
|
private const val EH_ARTIST_NAMESPACE = "artist"
|
||||||
|
private const val EH_GROUP_NAMESPACE = "group"
|
||||||
const val EH_LANGUAGE_NAMESPACE = "language"
|
const val EH_LANGUAGE_NAMESPACE = "language"
|
||||||
const val EH_META_NAMESPACE = "meta"
|
const val EH_META_NAMESPACE = "meta"
|
||||||
const val EH_UPLOADER_NAMESPACE = "uploader"
|
const val EH_UPLOADER_NAMESPACE = "uploader"
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,11 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||||
if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
|
if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set group (if we can find one)
|
||||||
|
val group = tags.ofNamespace(NHENTAI_GROUP_NAMESPACE).let { tags ->
|
||||||
|
if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
|
||||||
|
}
|
||||||
|
|
||||||
// Copy tags -> genres
|
// Copy tags -> genres
|
||||||
val genres = tagsToGenreString()
|
val genres = tagsToGenreString()
|
||||||
|
|
||||||
|
|
@ -85,16 +90,15 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val description = null
|
|
||||||
|
|
||||||
return manga.copy(
|
return manga.copy(
|
||||||
url = key ?: manga.url,
|
url = key ?: manga.url,
|
||||||
thumbnail_url = cover ?: manga.thumbnail_url,
|
thumbnail_url = cover ?: manga.thumbnail_url,
|
||||||
title = title,
|
title = title,
|
||||||
artist = artist ?: manga.artist,
|
artist = group ?: manga.artist,
|
||||||
|
author = artist ?: manga.artist,
|
||||||
genre = genres,
|
genre = genres,
|
||||||
status = status,
|
status = status,
|
||||||
description = description,
|
description = null,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -134,6 +138,7 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||||
const val BASE_URL = "https://nhentai.net"
|
const val BASE_URL = "https://nhentai.net"
|
||||||
|
|
||||||
private const val NHENTAI_ARTIST_NAMESPACE = "artist"
|
private const val NHENTAI_ARTIST_NAMESPACE = "artist"
|
||||||
|
private const val NHENTAI_GROUP_NAMESPACE = "group"
|
||||||
const val NHENTAI_CATEGORIES_NAMESPACE = "category"
|
const val NHENTAI_CATEGORIES_NAMESPACE = "category"
|
||||||
|
|
||||||
fun typeToExtension(t: String?) =
|
fun typeToExtension(t: String?) =
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue