fix: update Track to API change - add version field

fixes #68
xeruf · Jul 27, 2019 · 49317b6 · 49317b6
1 parent 2bbdd6c
commit 49317b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/xerus/monstercat/api/Cache.kt b/src/main/xerus/monstercat/api/Cache.kt
@@ -18,7 +18,7 @@ import xerus.monstercat.downloader.CONNECTSID
 import xerus.monstercat.globalDispatcher
 import java.io.File
 
-private const val cacheVersion = 4
+private const val cacheVersion = 5
 
 object Cache: Refresher() {
 	private val logger = KotlinLogging.logger { }

diff --git a/src/main/xerus/monstercat/api/response/Track.kt b/src/main/xerus/monstercat/api/response/Track.kt
@@ -16,6 +16,8 @@ open class Track: MusicItem() {
 	@Key
 	override var title: String = ""
 	@Key
+	var version: String = ""
+	@Key
 	var albums: List<Album> = emptyList()
 	@Key("artistRelationships")
 	var artists: List<ArtistRel> = emptyList()
@@ -55,7 +57,7 @@ open class Track: MusicItem() {
 
 		artistsTitle = formatArtists(artistsTitle)
 		artistsSplit = artistsTitle.splitArtists()
-		splitTitle = "$artistsTitle $title".splitTitleTrimmed()
+		splitTitle = "$artistsTitle $title $version".splitTitleTrimmed()
 
 		title.splitTitle().forEachIndexed { index, s ->
 			when {
@@ -74,7 +76,11 @@ open class Track: MusicItem() {
 		return super.toString(template, *additionalFields)
 	}
 
-	override fun toString(): String = artistsTitle.isEmpty().to("%2\$s", "%s - %s").format(artistsTitle, title)
+	override fun toString(): String = when {
+		artistsTitle.isEmpty() -> "%2\$s"
+		version.isEmpty() -> "%s - %s"
+		else -> "%s - %s (%s)"
+	}.format(artistsTitle, title, version)
 
 	override fun equals(other: Any?): Boolean =
 		this === other || (other is Track && id == other.id)