Merge pull request #156 from sdercolin/hotfix/support-ustx-trackname

Add support for track name in USTX
sdercolin · Jan 2, 2024 · 6c10612 · 6c10612
2 parents 7b188f4 + 4b9c62c
commit 6c10612
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/jsMain/kotlin/Main.kt b/src/jsMain/kotlin/Main.kt
@@ -6,7 +6,7 @@ import ui.strings.Language
 import ui.strings.initializeI18n
 
 const val APP_NAME = "UtaFormatix"
-const val APP_VERSION = "3.20.1"
+const val APP_VERSION = "3.20.2"
 
 suspend fun main() {
     initializeI18n(Language.English)

diff --git a/src/jsMain/kotlin/io/Ustx.kt b/src/jsMain/kotlin/io/Ustx.kt
@@ -85,7 +85,7 @@ object Ustx {
         val trackMap = List(project.tracks.size) { index: Int ->
             model.Track(
                 id = index,
-                name = "Track ${index + 1}",
+                name = project.tracks[index].trackName ?: "Track ${index + 1}",
                 notes = listOf(),
             )
         }.associateBy { it.id }.toMutableMap()
@@ -193,7 +193,7 @@ object Ustx {
         val template = jsonSerializer.decodeFromString(Project.serializer(), templateJsonText)
         val trackTemplate = template.tracks.first()
         val tracks = project.tracks.map {
-            trackTemplate.copy()
+            trackTemplate.copy(trackName = it.name)
         }
         val voicePartTemplate = template.voiceParts.first()
         val voiceParts = project.tracks.map {
@@ -317,6 +317,7 @@ object Ustx {
         val mute: Boolean = false,
         val solo: Boolean = false,
         val volume: Double = 0.0,
+        @SerialName("track_name") val trackName: String? = null,
     )
 
     @Serializable