Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-01 03:11:32 +02:00
Code Issues Projects Releases Wiki Activity

refactor: normalize enum values

Browse source 
instead of adding new ones
This commit is contained in:
Gauthier Roebroeck 2020-08-03 11:45:51 +08:00 committed by Gauthier
parent 3ad438d53f
commit f797254f9f
3 changed files with 70 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicinfo/dto/AgeRating.kt
View file

@ -12,7 +12,6 @@ enum class AgeRating(val value: String, val ageRating: Int? = null) {
KIDS_TO_ADULTS("Kids to Adults", 6),
M("M", 17),
MA_15("MA 15+", 15),
MA_15_NOSPACE("MA15+", 15),
MATURE_17("Mature 17+", 17),
PG("PG", 8),
R_18("R18+", 18),
@ -21,10 +20,12 @@ enum class AgeRating(val value: String, val ageRating: Int? = null) {
X_18("X18+", 18);
companion object {
private val map = values().associateBy(AgeRating::value)
private val map = values().associateBy { it.value.toLowerNoSpace() }
@JvmStatic
@JsonCreator
fun fromValue(value: String) = map[value]
fun fromValue(value: String) = map[value.toLowerNoSpace()]
private fun String.toLowerNoSpace() = toLowerCase().replace(" ", "")
}
}

28
komga/src/test/kotlin/org/gotson/komga/infrastructure/metadata/comicinfo/dto/ComicInfoTest.kt
View file

@ -32,6 +32,34 @@ class ComicInfoTest {
}
}
@Test
fun `given another valid xml file when deserializing then properties are available`() {
val file = ClassPathResource("comicinfo/ComicInfo2.xml")
val mapper = XmlMapper()
val comicInfo = mapper.readValue(file.url, ComicInfo::class.java)
with(comicInfo) {
assertThat(title).isEqualTo("v01 - Preludes & Nocturnes - 30th Anniversary Edition")
assertThat(series).isEqualTo("Sandman")
assertThat(web).isEqualTo("https://www.comixology.com/Sandman/digital-comic/727888")
assertThat(summary).startsWith("Neil Gaiman's seminal series")
assertThat(notes).isEqualTo("Scraped metadata from Comixology [CMXDB727888], [RELDATE:2018-10-30]")
assertThat(publisher).isEqualTo("DC")
assertThat(imprint).isEqualTo("Vertigo")
assertThat(genre).isEqualTo("Fantasy, Supernatural/Occult, Horror, Mature, Superhero, Mythology, Drama")
assertThat(pageCount).isEqualTo(237)
assertThat(languageISO).isEqualTo("en")
assertThat(scanInformation).isEqualTo("")
assertThat(ageRating).isEqualTo(AgeRating.MA_15)
assertThat(blackAndWhite).isEqualTo(YesNo.NO)
assertThat(manga).isEqualTo(Manga.NO)
assertThat(seriesGroup).isEqualTo("Sandman")
assertThat(year).isEqualTo(2018)
assertThat(month).isEqualTo(10)
assertThat(day).isEqualTo(30)
}
}
@Test
fun `given incorrect enum values when deserializing then it is ignored`() {
val file = ClassPathResource("comicinfo/InvalidEnumValues.xml")

38
komga/src/test/resources/comicinfo/ComicInfo2.xml Normal file
View file

@ -0,0 +1,38 @@
<?xml version="1.0"?>
<ComicInfo>
<Title>v01 - Preludes &amp; Nocturnes - 30th Anniversary Edition</Title>
<Series>Sandman</Series>
<Web>https://www.comixology.com/Sandman/digital-comic/727888</Web>
<Summary>Neil Gaiman's seminal series, THE SANDMAN, celebrates its 30th anniversary with an all-new edition of THE
SANDMAN VOL. 1: PRELUDES &amp; NOCTURNES!
 New York Times best-selling author Neil Gaiman's transcendent series THE SANDMAN is often hailed as the
definitive Vertigo title and one of the finest achievements in graphic storytelling. Gaiman created an
unforgettable tale of the forces that exist beyond life and death by weaving ancient mythology, folklore and
fairy tales with his own distinct narrative vision.
 In PRELUDES &amp; NOCTURNES, an occultist attempting to capture Death to bargain for eternal life traps her
younger brother Dream instead. After his 70 year imprisonment and eventual escape, Dream, also known as
Morpheus, goes on a quest for his lost objects of power. On his arduous journey Morpheus encounters Lucifer,
John Constantine, and an all-powerful madman.
 This book also includes the story "The Sound of Her Wings," which introduces us to the pragmatic and perky goth
girl Death.
 Collects THE SANDMAN #1-8.
</Summary>
<Notes>Scraped metadata from Comixology [CMXDB727888], [RELDATE:2018-10-30]</Notes>
<Publisher>DC</Publisher>
<Imprint>Vertigo</Imprint>
<Genre>Fantasy, Supernatural/Occult, Horror, Mature, Superhero, Mythology, Drama</Genre>
<PageCount>237</PageCount>
<LanguageISO>en</LanguageISO>
<AgeRating>MA15+</AgeRating>
<BlackAndWhite>No</BlackAndWhite>
<Year>2018</Year>
<Month>10</Month>
<Day>30</Day>
<Manga>No</Manga>
<SeriesGroup>Sandman</SeriesGroup>
<ScanInformation></ScanInformation>
</ComicInfo>