Update app.py

app.py

@@ -3,16 +3,19 @@ import json
 import random
 import string
 import gradio as gr
+from difflib import get_close_matches
 
 # Local JSON file path
 CHANNELS_JSON = "channels_fixed.json"
 
 # --- Helpers ---
-def normalize(s):
-    return re.sub(r'[^a-z0-9]', '', s.lower())
+def normalize(name):
+    name = name.lower()
+    name = re.sub(r'[^a-z0-9]', '', name)
+    name = re.sub(r'0+', '', name)  # remove leading zeros
+    return name
 
 def fuzzy_match(name, json_keys, cutoff=0.8):
-    from difflib import get_close_matches
     matches = get_close_matches(normalize(name), [normalize(k) for k in json_keys], n=1, cutoff=cutoff)
     if matches:
         for k in json_keys:
@@ -26,17 +29,14 @@ def generate_filename(upper=False):
 
 # --- Main Processing ---
 def process_playlist(m3u_content):
-    # Use pasted M3U content
     m3u_lines = m3u_content.splitlines()
 
-    # Load JSON reference
     try:
         with open(CHANNELS_JSON, 'r', encoding='utf-8') as f:
             channels_ref = json.load(f)
     except Exception as e:
         return f"Error reading JSON: {e}", None, None
 
-    # Split 24/7 vs Events
     m3u_24_7 = []
     m3u_events = []
     current_section = None
@@ -60,27 +60,45 @@ def process_playlist(m3u_content):
 
     log_lines = []
 
-    def update_tvg_id(lines):
+    def update_tvg_id(lines, is_event=False):
         updated = []
         for line in lines:
             if line.startswith('#EXTINF'):
                 parts = line.split(',')
                 ch_name = parts[-1].strip()
-                match_key = fuzzy_match(ch_name, channels_ref.keys())
-                if match_key:
-                    new_tvg_id = channels_ref[match_key].get('tvg_id', '')
-                    if 'tvg-id=' in line:
-                        line = re.sub(r'tvg-id=".*?"', f'tvg-id="{new_tvg_id}"', line)
-                    else:
-                        line = line.replace('#EXTINF:', f'#EXTINF:-1 tvg-id="{new_tvg_id}",')
-                    log_lines.append(f"✅ {ch_name} → {new_tvg_id}")
+
+                if is_event:
+                    match_brackets = re.search(r'\[(.*?)\]', ch_name)
+                    ch_name_to_match = match_brackets.group(1) if match_brackets else ch_name
+
+                    ch_name_norm = normalize(ch_name_to_match)
+                    json_keys_norm = {k: normalize(k) for k in channels_ref.keys()}
+
+                    match_key = None
+                    matches = get_close_matches(ch_name_norm, list(json_keys_norm.values()), n=1, cutoff=0.7)
+                    if matches:
+                        for k, v in json_keys_norm.items():
+                            if v == matches[0]:
+                                match_key = k
+                                break
+
+                    new_tvg_id = channels_ref[match_key]['tvg_id'] if match_key else 'Live.Event.us'
                 else:
-                    log_lines.append(f"⚠️ {ch_name} (no match)")
+                    match_key = fuzzy_match(ch_name, channels_ref.keys())
+                    new_tvg_id = channels_ref[match_key]['tvg_id'] if match_key else 'Info.Guide.Dummy.us'
+
+                if 'tvg-id=' in line:
+                    line = re.sub(r'tvg-id=".*?"', f'tvg-id="{new_tvg_id}"', line)
+                else:
+                    line = line.replace('#EXTINF:', f'#EXTINF:-1 tvg-id="{new_tvg_id}",')
+
+                log_lines.append(f"{'✅' if (match_key or not is_event) else '⚠️'} {ch_name} → {new_tvg_id}")
+
             updated.append(line)
         return updated
 
-    updated_24_7 = update_tvg_id(m3u_24_7)
-    updated_events = update_tvg_id(m3u_events)
+    updated_24_7 = update_tvg_id(m3u_24_7, is_event=False)
+    updated_events = update_tvg_id(m3u_events, is_event=True)
 
     filename_24_7 = generate_filename(upper=True)
     filename_events = generate_filename(upper=False)
@@ -103,8 +121,8 @@ demo = gr.Interface(
         gr.File(label="Download 24/7 Channels M3U"),
         gr.File(label="Download Events M3U")
     ],
-    title="Project 1 Playlist Updater - Paste M3U8",
-    description="Paste the M3U8 playlist content and update tvg-ids using channels_fixed.json with fuzzy matching."
+    title="Project 1 Playlist Updater - Smart Events",
+    description="Paste the M3U8 playlist content. Updates 24/7 and Events channels tvg-id using channels_fixed.json with smart Events matching."
 )
 
 demo.launch()