Update app.py

app.py

@@ -11,8 +11,8 @@ import gc
 import math
 import uuid
 import re
-from datetime import timedelta
 from urllib.parse import quote
+from datetime import timedelta
 
 # --- CRITICAL ENVIRONMENT FIXES ---
 if os.environ.get("OMP_NUM_THREADS", "").endswith("m"):
@@ -127,15 +127,21 @@ 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 Timecode-Agnostic XML for robust Replace Edit workflows."""
+    """Constructs a Robust XML for Premiere AND Resolve."""
     
-    # UNIFIED ID: Keeps the bin clean (1 offline item)
-    unified_file_id = "unified-source-master"
+    # Static UUID ensures all cuts link to the SAME file object (Clean Bin)
+    master_id = "masterfile-1"
     
     # FPS Logic
     timebase = int(round(fps))
     is_ntsc = "TRUE" if fps % 1 != 0 else "FALSE"
     
+    # --- NAME & PATH LOGIC ---
+    # We use URL encoding but NO .mov extension.
+    # This allows Resolve to find it by name, and Premiere to import it as "Offline".
+    encoded_name = quote(source_name)
+    path_url = f"file://localhost/{encoded_name}" 
+
     lines = []
     lines.append('<?xml version="1.0" encoding="UTF-8"?>')
     lines.append('<!DOCTYPE xmeml>')
@@ -172,10 +178,8 @@ 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
-        
-        clip_id = f"clip-v-{i}-{uuid.uuid4()}"
 
-        lines.append(f'\t\t\t\t<clipitem id="{clip_id}">')
+        lines.append(f'\t\t\t\t<clipitem id="clipitem-v-{i}">')
         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,15 +187,20 @@ 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>')
         
-        # --- AGNOSTIC FILE DEFINITION ---
-        # NO <timecode> block: Forces Premiere to use relative frame offset
-        # NO <reel>: Prevents metadata mismatch
-        lines.append(f'\t\t\t\t\t<file id="{unified_file_id}">')
+        # --- ROBUST FILE DEFINITION ---
+        lines.append(f'\t\t\t\t\t<file id="{master_id}">')
         lines.append(f'\t\t\t\t\t\t<name>{source_name}</name>')
+        lines.append(f'\t\t\t\t\t\t<pathurl>{path_url}</pathurl>') 
         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>') 
-        # TIMECODE REMOVED HERE
+        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<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>')
@@ -202,7 +211,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>')
         
@@ -228,10 +237,8 @@ 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
-        
-        clip_id = f"clip-a-{i}-{uuid.uuid4()}"
 
-        lines.append(f'\t\t\t\t<clipitem id="{clip_id}">')
+        lines.append(f'\t\t\t\t<clipitem id="clipitem-a-{i}">')
         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>')
@@ -239,11 +246,32 @@ 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 UNIFIED FILE ID
-        lines.append(f'\t\t\t\t\t<file id="{unified_file_id}"/>')
+        # Reuse same file definition (Verbose)
+        lines.append(f'\t\t\t\t\t<file id="{master_id}">')
+        lines.append(f'\t\t\t\t\t\t<name>{source_name}</name>')
+        lines.append(f'\t\t\t\t\t\t<pathurl>{path_url}</pathurl>') 
+        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<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
+        # SOURCE TRACK MAPPING (Simple Mono)
         lines.append('\t\t\t\t\t<sourcetrack>')
         lines.append('\t\t\t\t\t\t<mediatype>audio</mediatype>')
         lines.append('\t\t\t\t\t\t<trackindex>1</trackindex>')
@@ -314,7 +342,7 @@ st.markdown("""
 * 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.
 * **Resolve Users:** Uncheck "Automatically import source clips into media pool" during import.
-* **Premiere Users:** Import the XML. A **single** offline clip will appear in your bin. Hold **Alt (Win) / Option (Mac)** and drag your Multicam Sequence from the bin onto this **single** offline clip to link the entire timeline instantly.
+* **Premiere Users:** Use the EDL option if XML conformance fails for Multicam sequences.
 """)
 
 st.divider()