Update app.py

app.py

@@ -14,17 +14,27 @@ 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 re.sub(r'tvg-id="[^"]*"', 'tvg-id="MLB.Baseball.Dummy.us"', line)
+        return insert_tvg_id(line, "MLB.Baseball.Dummy.us")
     if "NHL GAMECENTER" in channel_name:
-        return re.sub(r'tvg-id="[^"]*"', 'tvg-id="NHL.Hockey.Dummy.us"', line)
+        return insert_tvg_id(line, "NHL.Hockey.Dummy.us")
     if "ATP" in channel_name or "WTA" in channel_name:
-        return re.sub(r'tvg-id="[^"]*"', 'tvg-id="Tennis.Channel.us"', line)
+        return insert_tvg_id(line, "Tennis.Channel.us")
     if 'tvg-id="test"' in line:
-        return line.replace('tvg-id="test"', 'tvg-id="Live.Event.us"')
+        return insert_tvg_id(line, "Live.Event.us")
     return line
 
 # Main processor
@@ -34,11 +44,13 @@ def process_m3u(m3u_text):
     out_events_blocks = []
     log = []
 
-    # Hardcoded abbreviation exceptions
+    # 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",
     }
 
     for i, line in enumerate(lines):
@@ -59,8 +71,7 @@ def process_m3u(m3u_text):
             # --- 24/7 CHANNELS ---
             if "24/7" in group_title:
                 if tvg_id == "test" or not tvg_id:
-                    new_ext = re.sub(r'tvg-id="[^"]*"', 'tvg-id="Info.Guide.Dummy.us"', extinf) \
-                        if 'tvg-id="' in extinf else extinf + ' tvg-id="Info.Guide.Dummy.us"'
+                    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
@@ -74,12 +85,10 @@ def process_m3u(m3u_text):
                 matched_exception = False
                 for abbr, fixed_id in exceptions.items():
                     if candidate.upper().startswith(abbr):
-                        tvg_id = fixed_id
-                        new_ext = re.sub(r'tvg-id="[^"]*"', f'tvg-id="{tvg_id}"', extinf) \
-                            if 'tvg-id="' in extinf else extinf + f' tvg-id="{tvg_id}"'
+                        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} → {tvg_id} (hardcoded {abbr} exception)")
+                        log.append(f"✅ EVENTS | {candidate} → {fixed_id} (hardcoded {abbr} exception)")
                         matched_exception = True
                         break
                 if matched_exception:
@@ -98,12 +107,10 @@ def process_m3u(m3u_text):
                         match = channel_map[guesses[0]].get("tvg_id")
 
                 if match:
-                    new_ext = re.sub(r'tvg-id="[^"]*"', f'tvg-id="{match}"', extinf) \
-                        if 'tvg-id="' in extinf else extinf + f' tvg-id="{match}"'
+                    new_ext = insert_tvg_id(extinf, match)
                     log.append(f"✅ EVENTS | {candidate} → {match}")
                 else:
-                    new_ext = re.sub(r'tvg-id="[^"]*"', 'tvg-id="Live.Event.us"', extinf) \
-                        if 'tvg-id="' in extinf else extinf + ' tvg-id="Live.Event.us"'
+                    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)