Update app.py

app.py

@@ -11,8 +11,8 @@ import gc
 import math
 import uuid
 import re
-from urllib.parse import quote
 from datetime import timedelta
+from urllib.parse import quote
 
 # --- CRITICAL ENVIRONMENT FIXES ---
 if os.environ.get("OMP_NUM_THREADS", "").endswith("m"):
@@ -127,17 +127,12 @@ def generate_cmx_edl(edl_title, segments, source_name, fps=25):
     return "\n".join(edl_lines)
 
 def generate_xml(sequence_name, segments, source_name, fps=25):
-    """Constructs a Robust XML for Premiere AND Resolve."""
-    
-    master_id = "masterfile-1"
+    """Constructs a 'Dumb' XML that forces Premiere to respect timeline In/Outs on replace."""
     
     # FPS Logic
     timebase = int(round(fps))
     is_ntsc = "TRUE" if fps % 1 != 0 else "FALSE"
     
-    # NOTE: We intentionally OMIT pathurl for Multicam workflows.
-    # This forces Premiere/Resolve to match by NAME in the project bin.
-
     lines = []
     lines.append('<?xml version="1.0" encoding="UTF-8"?>')
     lines.append('<!DOCTYPE xmeml>')
@@ -173,9 +168,13 @@ def generate_xml(sequence_name, segments, source_name, fps=25):
         tl_end = tl_start + duration_frames
         
         raw_note = seg.get('note', 'Junior Editor Selection')
+        # Truncate for safety
         clip_note = (raw_note[:75] + '..') if len(raw_note) > 75 else raw_note
+        
+        # Unique ID for every single clip item to prevent "Master Clip" logic grouping
+        clip_id = f"clip-v-{i}-{uuid.uuid4()}"
 
-        lines.append(f'\t\t\t\t<clipitem id="clipitem-v-{i}">')
+        lines.append(f'\t\t\t\t<clipitem id="{clip_id}">')
         lines.append(f'\t\t\t\t\t<name>{clip_note}</name>')
         lines.append(f'\t\t\t\t\t<duration>{duration_frames}</duration>')
         lines.append(f'\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
@@ -183,12 +182,11 @@ def generate_xml(sequence_name, segments, source_name, fps=25):
         lines.append(f'\t\t\t\t\t<end>{tl_end}</end>')
         lines.append(f'\t\t\t\t\t<in>{src_in_frames}</in>')
         lines.append(f'\t\t\t\t\t<out>{src_out_frames}</out>')
-        lines.append(f'\t\t\t\t\t<masterclipid>{master_id}</masterclipid>')
         
-        # --- NAME-ONLY FILE DEFINITION ---
-        lines.append(f'\t\t\t\t\t<file id="{master_id}">')
+        # --- DUMB FILE DEFINITION (No MasterClipID, No Path) ---
+        # This forces the NLE to treat it as a standalone event needing a source.
+        lines.append(f'\t\t\t\t\t<file id="file-v-{i}">')
         lines.append(f'\t\t\t\t\t\t<name>{source_name}</name>')
-        # NO PATHURL - Forces bin search
         lines.append(f'\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
         lines.append(f'\t\t\t\t\t\t<duration>8640000</duration>') 
         lines.append(f'\t\t\t\t\t\t<timecode>')
@@ -197,6 +195,8 @@ def generate_xml(sequence_name, segments, source_name, fps=25):
         lines.append(f'\t\t\t\t\t\t\t<frame>0</frame>')
         lines.append(f'\t\t\t\t\t\t\t<displayformat>NDF</displayformat>')
         lines.append(f'\t\t\t\t\t\t</timecode>')
+        # Reel name helps Resolve link if file name fails
+        lines.append(f'\t\t\t\t\t\t<reel><name>{source_name}</name></reel>')
         lines.append(f'\t\t\t\t\t\t<media>')
         lines.append(f'\t\t\t\t\t\t\t<video>')
         lines.append(f'\t\t\t\t\t\t\t\t<samplecharacteristics><width>1920</width><height>1080</height></samplecharacteristics>')
@@ -207,7 +207,7 @@ def generate_xml(sequence_name, segments, source_name, fps=25):
         lines.append(f'\t\t\t\t\t\t\t</audio>')
         lines.append(f'\t\t\t\t\t\t</media>')
         lines.append(f'\t\t\t\t\t</file>')
-        # -----------------------------------
+        # ----------------------------------------------
         
         lines.append(f'\t\t\t\t</clipitem>')
         
@@ -233,8 +233,11 @@ def generate_xml(sequence_name, segments, source_name, fps=25):
         
         raw_note = seg.get('note', 'Junior Editor Selection')
         clip_note = (raw_note[:75] + '..') if len(raw_note) > 75 else raw_note
+        
+        # Unique ID for audio clip too
+        clip_id = f"clip-a-{i}-{uuid.uuid4()}"
 
-        lines.append(f'\t\t\t\t<clipitem id="clipitem-a-{i}">')
+        lines.append(f'\t\t\t\t<clipitem id="{clip_id}">')
         lines.append(f'\t\t\t\t\t<name>{clip_note}</name>')
         lines.append(f'\t\t\t\t\t<duration>{duration_frames}</duration>')
         lines.append(f'\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
@@ -242,10 +245,29 @@ def generate_xml(sequence_name, segments, source_name, fps=25):
         lines.append(f'\t\t\t\t\t<end>{tl_end}</end>')
         lines.append(f'\t\t\t\t\t<in>{src_in_frames}</in>')
         lines.append(f'\t\t\t\t\t<out>{src_out_frames}</out>')
-        lines.append(f'\t\t\t\t\t<masterclipid>{master_id}</masterclipid>')
         
-        # Reuse same file definition
-        lines.append(f'\t\t\t\t\t<file id="{master_id}"/>')
+        # Reuse same file definition (No Master ID)
+        lines.append(f'\t\t\t\t\t<file id="file-a-{i}">')
+        lines.append(f'\t\t\t\t\t\t<name>{source_name}</name>')
+        lines.append(f'\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
+        lines.append(f'\t\t\t\t\t\t<duration>8640000</duration>') 
+        lines.append(f'\t\t\t\t\t\t<timecode>')
+        lines.append(f'\t\t\t\t\t\t\t<rate><timebase>{timebase}</timebase></rate>')
+        lines.append(f'\t\t\t\t\t\t\t<string>00:00:00:00</string>') 
+        lines.append(f'\t\t\t\t\t\t\t<frame>0</frame>')
+        lines.append(f'\t\t\t\t\t\t\t<displayformat>NDF</displayformat>')
+        lines.append(f'\t\t\t\t\t\t</timecode>')
+        lines.append(f'\t\t\t\t\t\t<reel><name>{source_name}</name></reel>')
+        lines.append(f'\t\t\t\t\t\t<media>')
+        lines.append(f'\t\t\t\t\t\t\t<video>')
+        lines.append(f'\t\t\t\t\t\t\t\t<samplecharacteristics><width>1920</width><height>1080</height></samplecharacteristics>')
+        lines.append(f'\t\t\t\t\t\t\t</video>')
+        lines.append(f'\t\t\t\t\t\t\t<audio>')
+        lines.append(f'\t\t\t\t\t\t\t\t<samplecharacteristics><depth>16</depth><samplerate>48000</samplerate></samplecharacteristics>')
+        lines.append(f'\t\t\t\t\t\t\t\t<channelcount>2</channelcount>')
+        lines.append(f'\t\t\t\t\t\t\t</audio>')
+        lines.append(f'\t\t\t\t\t\t</media>')
+        lines.append(f'\t\t\t\t\t</file>')
         
         # SOURCE TRACK MAPPING
         lines.append('\t\t\t\t\t<sourcetrack>')
@@ -316,7 +338,9 @@ st.markdown("""
 * Set your timeline FPS and transcription quality.
 * Junior Editor will transcribe and separate speakers. You can then instruct it to find engaging bits or construct a narrative.
 * It will create an EDL or XML to import back into your editing software (Resolve, Premiere).
-* **For Multicam Workflows:** Use the **XML** option in the sidebar and enter the **exact name** of your Multicam Sequence. **Uncheck "Automatically import source clips into media pool" when importing into DaVinci Resolve.**
+* **For Multicam Workflows:** Use the **XML** option in the sidebar and enter the **exact name** of your Multicam Sequence.
+* **Resolve Users:** Uncheck "Automatically import source clips into media pool" during import.
+* **Premiere Users:** Import the XML. Select all clips on the timeline. Hold **Alt (Win) / Option (Mac)** and drag your Multicam Sequence from the bin onto the selected clips to link them instantly.
 """)
 
 st.divider()