From 8a556c5c63a3a3e7982b49ef25cef4c48feda734 Mon Sep 17 00:00:00 2001
From: MattJackson <1085847+MattJackson@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:10:43 -0700
Subject: [PATCH] Merge JAR labels into streams during Disc::scan()

apply_jar_labels() matches JAR audio/subtitle labels to streams by
position and sets AudioStream.label. Apps read labels directly from
streams instead of doing their own JAR matching.
---
 src/disc.rs | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/disc.rs b/src/disc.rs
index 0660497..67d2bf4 100644
--- a/src/disc.rs
+++ b/src/disc.rs
@@ -421,8 +421,9 @@ impl Disc {
         // Step 4: Read disc title from META/DL/bdmt_eng.xml
         let meta_title = Self::read_meta_title(session, &udf_fs);
 
-        // Step 5: Extract JAR track labels
+        // Step 5: Extract JAR track labels and merge into streams
         let jar_labels = Self::read_jar_labels(session, &udf_fs);
+        Self::apply_jar_labels(&mut titles, &jar_labels);
 
         // Step 6: Detect AACS encryption
         let encrypted = udf_fs.find_dir("/AACS").is_some()
@@ -578,6 +579,39 @@ impl Disc {
         DiscFormat::Unknown
     }
 
+    /// Merge JAR labels into title streams.
+    /// Matches by position — JAR audio labels correspond to audio streams in order,
+    /// JAR subtitle labels correspond to subtitle streams in order.
+    fn apply_jar_labels(titles: &mut [Title], jar: &crate::jar::JarLabels) {
+        if jar.audio.is_empty() && jar.subtitle.is_empty() {
+            return;
+        }
+
+        for title in titles.iter_mut() {
+            let mut audio_idx = 0;
+            let mut sub_idx = 0;
+
+            for stream in &mut title.streams {
+                match stream {
+                    Stream::Audio(a) => {
+                        if let Some(label) = jar.audio.get(audio_idx) {
+                            if !label.description.is_empty() {
+                                a.label = label.description.clone();
+                            }
+                        }
+                        audio_idx += 1;
+                    }
+                    Stream::Subtitle(_s) => {
+                        // TODO: JAR subtitle labels could set forced flag or description
+                        sub_idx += 1;
+                    }
+                    _ => {}
+                }
+            }
+            let _ = sub_idx; // suppress warning
+        }
+    }
+
     /// Read disc title from META/DL/bdmt_eng.xml (Blu-ray Disc Meta Table).
     /// Prefers English, falls back to first available language.
     /// Returns None if META directory is empty or XML has no usable title.