From c2d0308ac0319485d443d93ee5bd6ae657001922 Mon Sep 17 00:00:00 2001 From: BrutuZ Date: Sun, 11 May 2025 15:16:43 -0300 Subject: [PATCH] Populate Author field and clear Description on a couple of delegated (#1432) --- .../exh/metadata/metadata/EHentaiSearchMetadata.kt | 13 +++++++++---- .../exh/metadata/metadata/NHentaiSearchMetadata.kt | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/source-api/src/commonMain/kotlin/exh/metadata/metadata/EHentaiSearchMetadata.kt b/source-api/src/commonMain/kotlin/exh/metadata/metadata/EHentaiSearchMetadata.kt index 44a78c921..82aa9fa2c 100644 --- a/source-api/src/commonMain/kotlin/exh/metadata/metadata/EHentaiSearchMetadata.kt +++ b/source-api/src/commonMain/kotlin/exh/metadata/metadata/EHentaiSearchMetadata.kt @@ -66,6 +66,11 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { .ifEmpty { null } ?.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 val genres = tagsToGenreString() @@ -80,13 +85,12 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { } } - val description = "meta" - return manga.copy( url = key ?: manga.url, title = title ?: manga.title, - artist = artist ?: manga.artist, - description = description, + artist = group ?: manga.artist, + author = artist ?: manga.artist, + description = null, genre = genres, status = status, thumbnail_url = cover ?: manga.thumbnail_url, @@ -145,6 +149,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { const val EH_GENRE_NAMESPACE = "genre" private const val EH_ARTIST_NAMESPACE = "artist" + private const val EH_GROUP_NAMESPACE = "group" const val EH_LANGUAGE_NAMESPACE = "language" const val EH_META_NAMESPACE = "meta" const val EH_UPLOADER_NAMESPACE = "uploader" diff --git a/source-api/src/commonMain/kotlin/exh/metadata/metadata/NHentaiSearchMetadata.kt b/source-api/src/commonMain/kotlin/exh/metadata/metadata/NHentaiSearchMetadata.kt index d3565ed47..3885f1e6b 100644 --- a/source-api/src/commonMain/kotlin/exh/metadata/metadata/NHentaiSearchMetadata.kt +++ b/source-api/src/commonMain/kotlin/exh/metadata/metadata/NHentaiSearchMetadata.kt @@ -63,6 +63,11 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() { 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 val genres = tagsToGenreString() @@ -77,16 +82,15 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() { } } - val description = "meta" - return manga.copy( url = key ?: manga.url, thumbnail_url = cover ?: manga.thumbnail_url, title = title, - artist = artist ?: manga.artist, + artist = group ?: manga.artist, + author = artist ?: manga.artist, genre = genres, status = status, - description = description, + description = null, ) } @@ -126,6 +130,7 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() { const val BASE_URL = "https://nhentai.net" private const val NHENTAI_ARTIST_NAMESPACE = "artist" + private const val NHENTAI_GROUP_NAMESPACE = "group" const val NHENTAI_CATEGORIES_NAMESPACE = "category" fun typeToExtension(t: String?) =