Update app.py

app.py

@@ -1,154 +1,143 @@
 import gradio as gr
-import random
-import string
 import re
+import random
 import json
-from difflib import get_close_matches
 
-# Load channel mapping JSON
+# Load JSON file at startup
 with open("channels_fixed.json", "r", encoding="utf-8") as f:
-    channel_map = json.load(f)
-
-# Random 3-character filename generator
-def random_filename(uppercase=True):
-    letters = string.ascii_uppercase if uppercase else string.ascii_lowercase
-    return "".join(random.choice(letters) for _ in range(3)) + ".m3u"
-
-# Insert tvg-id immediately after #EXTINF:-1
-def insert_tvg_id(extinf_line, tvg_id):
-    # Remove existing tvg-id if present
-    line = re.sub(r'tvg-id="[^"]*"', '', extinf_line)
-    # Insert tvg-id immediately after #EXTINF:-1
-    line = line.replace('#EXTINF:-1', f'#EXTINF:-1 tvg-id="{tvg_id}"', 1)
-    # Clean multiple spaces
-    line = re.sub(r'\s+', ' ', line).strip()
-    return line
-
-# Apply special event rules
-def apply_event_special_cases(extinf_line, channel_name):
-    line = extinf_line
-    if "MLB LEAGUE PASS" in channel_name:
-        return insert_tvg_id(line, "MLB.Baseball.Dummy.us")
-    if "NHL GAMECENTER" in channel_name:
-        return insert_tvg_id(line, "NHL.Hockey.Dummy.us")
-    if "ATP" in channel_name or "WTA" in channel_name:
-        return insert_tvg_id(line, "Tennis.Channel.us")
-    if 'tvg-id="test"' in line:
-        return insert_tvg_id(line, "Live.Event.us")
-    return line
-
-# Main processor
+    CHANNELS_JSON = json.load(f)
+
+# Hardcoded corrections and forced mappings
+HARDCODED_FIXES = {
+    "BTN USA": "Big.Ten.Network.HD.us2",
+    "SNY": "SNY.SportsNet.New.York.HD.us2",
+    "MASN": "MASN.-.Mid.Atlantic.Sports.Network.us2",
+    "YES": "Yes.Network.us2",
+    "MSG": "MSG.National.us2",
+    "REELZ USA": "ReelzChannel.HD.us2",
+    "ABCNY USA": "ABC.(WABC).New.York,.NY.us",
+    "OWN USA": "Oprah.Winfrey.Network.HD.us2",
+    "DISCOVERY USA": "Discovery.Channel.ca2",
+    "OUTDOOR CHANNEL": "Outdoor.Channel.HD.us2",
+    "OUTDOOR CHANNEL USA": "Outdoor.Channel.HD.us2",
+    "LOITV": "Soccer.Dummy.us",
+}
+
+# Function to generate random 3-letter filename
+def random_filename(is_upper=False):
+    letters = ''.join(random.choices("ABCDEFGHIJKLMNOPQRSTUVWXYZ", k=3))
+    return letters + ".m3u" if is_upper else letters.lower() + ".m3u"
+
+# Resolve tvg-id using priority
+def get_tvg_id(channel_name, json_data):
+    """
+    Priority:
+    1. Hardcoded fixes
+    2. JSON matches
+    3. Event special fallbacks
+    4. Default Live.Event.us
+    """
+    # Step 1: Hardcoded
+    for key, val in HARDCODED_FIXES.items():
+        if key.lower() in channel_name.lower():
+            return val
+
+    # Step 2: JSON lookup
+    for json_channel, info in json_data.items():
+        if channel_name.lower() in json_channel.lower():
+            return info.get("tvg_id", "")
+
+    # Step 3: Event fallback rules
+    if "MLB" in channel_name.upper():
+        return "MLB.Baseball.Dummy.us"
+    if "NHL" in channel_name.upper():
+        return "NHL.Hockey.Dummy.us"
+    if "ATP" in channel_name.upper() or "WTA" in channel_name.upper():
+        return "Tennis.Channel.us"
+
+    # Step 4: Default
+    return "Live.Event.us"
+
+# Process the M3U
 def process_m3u(m3u_text):
-    lines = m3u_text.splitlines()
-    out_247_blocks = []
-    out_events_blocks = []
-    log = []
-
-    # Hardcoded abbreviation exceptions for Events
-    exceptions = {
-        "BTN": "Big.Ten.Network.HD.us2",
-        "SNY": "SNY.SportsNet.New.York.HD.us2",
-        "MASN": "MASN.-.Mid.Atlantic.Sports.Network.us2",
-        "YES": "Yes.Network.us2",
-        "MSG": "MSG.National.us2",
-        "NESN": "New.England.Sports.Network.HD.us2",
-        "REELZ USA": "ReelzChannel.HD.us2",
-        "ABCNY USA": "ABC.(WABC).New.York,.NY.us",
-        "OWN USA": "Oprah.Winfrey.Network.HD.us2",
-        "DISCOVERY USA": "Discovery.Channel.ca2",
-        "OUTDOOR CHANNEL": "Outdoor.Channel.HD.us2",
-        "OUTDOOR CHANNEL USA": "Outdoor.Channel.HD.us2",
-        "LOITV": "Soccer.Dummy.us",
-    }
-
-    for i, line in enumerate(lines):
+    lines = m3u_text.strip().splitlines()
+
+    out_247, out_events = ["#EXTM3U"], ["#EXTM3U"]
+
+    for i in range(len(lines)):
+        line = lines[i]
+
         if line.startswith("#EXTINF"):
-            url = lines[i+1] if i+1 < len(lines) else ""
-            extinf = line
-
-            # Extract tvg-id and channel name
-            tvg_match = re.search(r'tvg-id="([^"]*)"', extinf)
-            tvg_id = tvg_match.group(1) if tvg_match else None
-            name_match = re.search(r",(.*)", extinf)
-            channel_name = name_match.group(1).strip() if name_match else ""
-
-            # Extract group
-            group_match = re.search(r'group-title="([^"]*)"', extinf)
-            group_title = group_match.group(1).upper().strip() if group_match else ""
-
-            # --- 24/7 CHANNELS ---
-            if group_title and "24/7" in group_title:
-                if tvg_id == "test" or not tvg_id:
-                    new_ext = insert_tvg_id(extinf, "Info.Guide.Dummy.us")
-                    log.append(f"ℹ️ 24/7 | {channel_name} → Info.Guide.Dummy.us")
-                else:
-                    new_ext = extinf
-                out_247_blocks.append((new_ext, url))
-
-            # --- EVENTS ---
-            elif group_title and "EVENTS" in group_title:
-                candidate = channel_name
-
-                # Check hardcoded abbreviation exceptions
-                matched_exception = False
-                for abbr, fixed_id in exceptions.items():
-                    if candidate.upper().startswith(abbr):
-                        new_ext = insert_tvg_id(extinf, fixed_id)
-                        new_ext = apply_event_special_cases(new_ext, candidate)
-                        out_events_blocks.append((new_ext, url))
-                        log.append(f"✅ EVENTS | {candidate} → {fixed_id} (hardcoded {abbr} exception)")
-                        matched_exception = True
-                        break
-                if matched_exception:
-                    continue
-
-                # Try matching against JSON
-                match = None
-                for key, data in channel_map.items():
-                    if data.get("tvg_id") and key.lower() in candidate.lower():
-                        match = data["tvg_id"]
-                        break
-                if not match:
-                    keys = list(channel_map.keys())
-                    guesses = get_close_matches(candidate, keys, n=1, cutoff=0.6)
-                    if guesses:
-                        match = channel_map[guesses[0]].get("tvg_id")
-
-                if match:
-                    new_ext = insert_tvg_id(extinf, match)
-                    log.append(f"✅ EVENTS | {candidate} → {match}")
-                else:
-                    new_ext = insert_tvg_id(extinf, "Live.Event.us")
-                    log.append(f"⚠️ EVENTS | {candidate} → Live.Event.us (fallback)")
-
-                new_ext = apply_event_special_cases(new_ext, candidate)
-                out_events_blocks.append((new_ext, url))
-
-    # Build output playlists
-    out_247 = "\n".join([f"{ext}\n{url}" for ext, url in out_247_blocks])
-    out_events = "\n".join([f"{ext}\n{url}" for ext, url in out_events_blocks])
-
-    return out_247, out_events, "\n".join(log)
-
-# Gradio UI with file downloads
+            # Extract channel name from EXTINF line
+            match = re.search(r",(.*)", line)
+            if not match:
+                continue
+            channel_name = match.group(1)
+
+            # Decide if it's 24/7 or Events
+            is_event = "EVENTS" in line.upper()
+
+            # Resolve tvg-id
+            tvg_id = get_tvg_id(channel_name, CHANNELS_JSON)
+
+            # Ensure "test" → Live.Event.us in Events
+            if tvg_id == "test" and is_event:
+                tvg_id = "Live.Event.us"
+            if tvg_id == "test" and not is_event:
+                tvg_id = "Info.Guide.Dummy.us"
+
+            # Replace or insert tvg-id
+            if 'tvg-id="' in line:
+                line = re.sub(r'tvg-id="[^"]*"', f'tvg-id="{tvg_id}"', line)
+            else:
+                line = line.replace("#EXTINF:-1", f'#EXTINF:-1 tvg-id="{tvg_id}"')
+
+            # Append to correct list
+            if is_event:
+                out_events.append(line)
+                if i + 1 < len(lines):
+                    out_events.append(lines[i+1])
+            else:
+                out_247.append(line)
+                if i + 1 < len(lines):
+                    out_247.append(lines[i+1])
+
+    # Generate random filenames
+    filename_247 = random_filename(is_upper=True)
+    filename_events = random_filename(is_upper=False)
+
+    return (
+        "\n".join(out_247),
+        "\n".join(out_events),
+        filename_247,
+        filename_events
+    )
+
+# Gradio UI
 def run_app(m3u_text):
-    out_247, out_events, log = process_m3u(m3u_text)
-    file_247 = random_filename(uppercase=True)
-    file_events = random_filename(uppercase=False)
-    with open(file_247, "w", encoding="utf-8") as f:
-        f.write(out_247)
-    with open(file_events, "w", encoding="utf-8") as f:
-        f.write(out_events)
-
-    return file_247, file_events, log
-
-iface = gr.Interface(
-    fn=run_app,
-    inputs=gr.Textbox(lines=15, placeholder="Paste your M3U playlist here..."),
-    outputs=[gr.File(label="24/7 Playlist"), gr.File(label="Events Playlist"), gr.Textbox(label="Log")],
-    title="Project 1 Playlist Processor",
-    description="Splits 24/7 and Events playlists, applies JSON tvg-id mappings, adds special sports rules, and outputs two clean M3Us."
-)
+    out_247, out_events, file_247, file_events = process_m3u(m3u_text)
+    return out_247, out_events, (file_247, out_247), (file_events, out_events)
+
+with gr.Blocks() as demo:
+    gr.Markdown("## 📺 M3U Playlist Processor (Project 1)")
+
+    m3u_input = gr.Textbox(label="Paste M3U Playlist", lines=15, placeholder="Paste your .m3u playlist here...")
+
+    with gr.Row():
+        out_247 = gr.Textbox(label="24/7 Channels Output", lines=20)
+        out_events = gr.Textbox(label="Events Channels Output", lines=20)
+
+    with gr.Row():
+        dl_247 = gr.File(label="Download 24/7 M3U", type="binary")
+        dl_events = gr.File(label="Download Events M3U", type="binary")
+
+    process_btn = gr.Button("Process Playlist")
+
+    process_btn.click(
+        fn=run_app,
+        inputs=[m3u_input],
+        outputs=[out_247, out_events, dl_247, dl_events]
+    )
 
 if __name__ == "__main__":
-    iface.launch()
+    demo.launch()