fix: all video links (BDP+24h) from slider open in TikTok mode, remove broken 02.m3u8 probe

app_wrapper.py

@@ -1,4 +1,4 @@
-"""Entry point: shorts carousel + TikTok-style shorts playback (reusing existing JS)."""
+"""Entry point: shorts carousel + TikTok-style video playback for ALL video sources."""
 import sys, os
 
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
@@ -48,26 +48,14 @@ if "shorts-feed-mode" not in app.CSS:
 if "FULLWIDTH: kill all Gradio padding" not in app.CSS:
     app.CSS += FULLWIDTH_CSS
 
-# ══ Patch homepage slider: change bdpOpenTikTok to bdpOpen for highlight videos ══
-# The homepage slider uses render_video_slider_html which calls bdpOpenTikTok
-# But bdpOpenTikTok is broken/dead. Change it to bdpOpen so clicking a highlight
-# opens the article (which for 24h URLs renders as TikTok feed via our read_article patch)
+# ══ Fix homepage slider: replace bdpOpenTikTok with bdpOpen ══
 _orig_render_video_slider = getattr(app, 'render_video_slider_html', None)
 if _orig_render_video_slider:
     def _patched_render_video_slider(videos):
         html = _orig_render_video_slider(videos)
-        # Replace bdpOpenTikTok with bdpOpen (add slug param)
+        # bdpOpenTikTok doesn't work. Replace with bdpOpen.
         # bdpOpenTikTok('url','aid') → bdpOpen('url','aid','')
-        html = html.replace("window.bdpOpenTikTok(", "window.bdpOpen(")
-        # Fix: bdpOpen needs 3 params (url, aid, slug). Add empty slug where missing.
-        import re as _r
-        def _fix_bdpopen(m):
-            # If only 2 params, add third empty one
-            params = m.group(1)
-            if params.count(",") < 2:
-                params = params.rstrip(")") + ",''"
-            return "window.bdpOpen(" + params + ")"
-        html = _r.sub(r"window\.bdpOpen\(([^)]+)\)", _fix_bdpopen, html)
+        html = html.replace("bdpOpenTikTok(", "bdpOpen(")
         return html
     app.render_video_slider_html = _patched_render_video_slider
 
@@ -91,61 +79,6 @@ def _patched_render_homepage(articles, *args, **kwargs):
     return html
 app.render_homepage_html = _patched_render_homepage
 
-# ══ Patch fetch_tiktok_feed_videos: ensure multi-part 24h videos create multiple slides ══
-_orig_fetch_tiktok = app.fetch_tiktok_feed_videos
-def _patched_fetch_tiktok():
-    """Override to ensure multi-part 24h videos are fully expanded."""
-    from concurrent.futures import ThreadPoolExecutor, as_completed
-    results = []
-
-    def _fetch_bdp_vid(art):
-        vid_id = app._extract_bdp_video_id(art["link"])
-        if not vid_id: return None
-        embed = app.fetch_bdp_embed_data(vid_id)
-        if not embed or not embed.get("mp4"): return None
-        return [{"title": art["title"], "src": embed["mp4"], "poster": embed.get("poster",""),
-                "vtype": "mp4", "source": "bdp", "link": art["link"]}]
-
-    def _fetch_24h_vid(art):
-        # Use the PLURAL version that probes for 02, 03, etc.
-        vids = app._extract_24h_video_urls(art["link"])
-        if not vids: return []
-        out = []
-        for pi, v in enumerate(vids):
-            label = f" (Phần {pi+1})" if len(vids) > 1 else ""
-            out.append({"title": art["title"] + label, "src": v["src"], "poster": v["poster"],
-                "vtype": v["vtype"], "source": "24h", "link": art["link"]})
-        return out
-
-    bdp_list = app.scrape_bdp_video_list()[:12]
-    h24_list = app.scrape_24h_video_list()[:12]
-
-    bdp_results, h24_results = [], []
-    with ThreadPoolExecutor(max_workers=8) as ex:
-        bdp_futures = {ex.submit(_fetch_bdp_vid, a): a for a in bdp_list}
-        h24_futures = {ex.submit(_fetch_24h_vid, a): a for a in h24_list}
-        for f in as_completed(bdp_futures):
-            try:
-                r = f.result()
-                if r: bdp_results.extend(r)
-            except: pass
-        for f in as_completed(h24_futures):
-            try:
-                r = f.result()
-                if r: h24_results.extend(r)
-            except: pass
-
-    # Interleave
-    bi, hi = 0, 0
-    while bi < len(bdp_results) or hi < len(h24_results):
-        if bi < len(bdp_results):
-            results.append(bdp_results[bi]); bi += 1
-        if hi < len(h24_results):
-            results.append(h24_results[hi]); hi += 1
-    return results[:25]
-
-app.fetch_tiktok_feed_videos = _patched_fetch_tiktok
-
 # ══ Patch render_video_page_html: fullheight button ══
 _orig_render_video_page = app.render_video_page_html
 def _patched_render_video_page():
@@ -155,59 +88,104 @@ def _patched_render_video_page():
     return html
 app.render_video_page_html = _patched_render_video_page
 
-# ══ Patch read_article: 24h URLs → shorts TikTok feed ══
+# ══ Patch read_article: video URLs → TikTok feed ══
 _orig_read_article = app.read_article
 def _patched_read_article(url):
     if not url or url == "#" or len(url) < 10:
         return "<p>Không tìm thấy bài viết.</p>"
+    
+    # 24h URLs → shorts/highlight TikTok feed
     if "24h.com.vn" in url:
-        result = _render_shorts_tiktok_feed(url)
+        result = _render_24h_tiktok_feed(url)
         if result:
             return result
+    
+    # BDP video URLs → BDP TikTok feed  
+    if "bongdaplus.vn/video/" in url:
+        result = _render_bdp_tiktok_feed(url)
+        if result:
+            return result
+    
     return _orig_read_article(url)
 
-def _render_shorts_tiktok_feed(current_url):
-    """Render shorts/24h article as TikTok feed with ALL videos from shorts list."""
+def _render_bdp_tiktok_feed(current_url):
+    """Render BDP video in TikTok feed style (with other BDP videos)."""
     from concurrent.futures import ThreadPoolExecutor, as_completed
-
+    
+    # Get BDP video list
     try:
-        all_shorts = scrape_24h_news_shorts()[:15]
+        bdp_list = app.scrape_bdp_video_list()[:15]
     except:
-        all_shorts = []
+        return None
+    
+    if not bdp_list:
+        return None
+    
+    def _fetch_bdp(art):
+        vid_id = app._extract_bdp_video_id(art["link"])
+        if not vid_id: return None
+        embed = app.fetch_bdp_embed_data(vid_id)
+        if not embed or not embed.get("mp4"): return None
+        return {"title": art["title"], "link": art["link"], "img": art.get("img",""),
+                "src": embed["mp4"], "poster": embed.get("poster",""), "vtype": "mp4"}
+    
+    videos = []
+    with ThreadPoolExecutor(max_workers=6) as ex:
+        futures = {ex.submit(_fetch_bdp, a): a for a in bdp_list}
+        for f in as_completed(futures):
+            try:
+                r = f.result()
+                if r: videos.append(r)
+            except: pass
+    
+    if not videos:
+        return None
+    
+    return _build_tiktok_html(videos, current_url, "bdp")
+
+def _render_24h_tiktok_feed(current_url):
+    """Render 24h video in TikTok feed style (with other 24h videos)."""
+    from concurrent.futures import ThreadPoolExecutor, as_completed
 
-    if not all_shorts:
+    # Try shorts list first, then highlights
+    try:
+        all_articles = scrape_24h_news_shorts()[:15]
+    except:
+        all_articles = []
+    
+    if not all_articles:
+        try:
+            all_articles = app.scrape_24h_video_list()[:15]
+        except:
+            all_articles = []
+    
+    if not all_articles:
         return None
 
     def _fetch_video(art):
-        # Use plural version to get all parts
-        vids = app._extract_24h_video_urls(art["link"])
-        if not vids:
-            # Fallback to singular
-            vid = _extract_24h_video_url(art["link"])
-            if vid:
-                vids = [vid]
-        if not vids:
-            return []
-        out = []
-        for pi, v in enumerate(vids):
-            label = f" (Phần {pi+1})" if len(vids) > 1 else ""
-            out.append({"title": art["title"] + label, "link": art["link"], "img": art.get("img",""),
-                    "src": v["src"], "poster": v["poster"], "vtype": v["vtype"]})
-        return out
+        vid = _extract_24h_video_url(art["link"])
+        if vid:
+            return {"title": art["title"], "link": art["link"], "img": art.get("img",""),
+                    "src": vid["src"], "poster": vid["poster"], "vtype": vid["vtype"]}
+        return None
 
     videos = []
     with ThreadPoolExecutor(max_workers=6) as ex:
-        futures = {ex.submit(_fetch_video, a): a for a in all_shorts}
+        futures = {ex.submit(_fetch_video, a): a for a in all_articles}
         for f in as_completed(futures):
             try:
                 r = f.result()
-                if r: videos.extend(r)
+                if r: videos.append(r)
             except: pass
 
     if not videos:
         return None
+    
+    return _build_tiktok_html(videos, current_url, "24h")
 
-    # Reorder: clicked video (and its parts) first
+def _build_tiktok_html(videos, current_url, source_label):
+    """Build TikTok feed HTML from video list. Clicked video placed first."""
+    # Reorder: clicked video first
     current_aid = app.make_id(current_url)
     ordered = []
     rest = []
@@ -218,6 +196,9 @@ def _render_shorts_tiktok_feed(current_url):
             rest.append(v)
     ordered.extend(rest)
 
+    badge_cls = "bdp-badge-24h" if source_label == "24h" else "bdp-badge-bdp"
+    is_shorts = source_label == "24h"
+
     slides = []
     for vi, v in enumerate(ordered):
         poster = app.safe_url(v.get("poster", ""))
@@ -232,6 +213,10 @@ def _render_shorts_tiktok_feed(current_url):
         else:
             vtag = f'<video class="tiktok-video" playsinline preload="metadata"{poster_attr} muted loop><source src="{app.safe_url(vsrc)}" type="video/mp4"></video>'
 
+        fullheight_btn = ''
+        if not is_shorts:
+            fullheight_btn = '<button class="tiktok-fullheight-btn" onclick="event.stopPropagation();var c=this.closest(\'.tiktok-fullscreen-container\');c.classList.toggle(\'fullheight-mode\');var on=c.classList.contains(\'fullheight-mode\');c.querySelectorAll(\'.tiktok-fullheight-btn\').forEach(function(b){b.classList.toggle(\'active\',on);b.textContent=on?\'\\u2B07 Contain\':\'\\u2922 Fullheight\';});">\u2922 Fullheight</button>'
+
         slides.append(f'''<div class="tiktok-slide" data-index="{vi}" data-aid="{aid}">
 {vtag}
 <div class="tiktok-pause-icon">\u25b6</div>
@@ -240,16 +225,18 @@ def _render_shorts_tiktok_feed(current_url):
 <button class="tiktok-seek-btn" onclick="event.stopPropagation();window.bdpSeek(this,10)">10s \u23e9</button>
 </div>
 <div class="tiktok-bottom">
-<span class="bdp-badge bdp-badge-24h">24h</span>
+<span class="bdp-badge {badge_cls}">{source_label}</span>
 <p class="tiktok-title">{v["title"]}</p>
 <div class="tiktok-actions">
 <button class="tiktok-action-btn" onclick="{share_js}">\U0001f4e4 Chia s\u1ebb</button>
 </div>
 </div>
+{fullheight_btn}
 <div class="tiktok-unmute-hint" onclick="window.bdpTikTokUnmute(this)">\U0001f507 B\u1eadt ti\u1ebfng</div>
 <span class="tiktok-counter">{vi+1}/{len(ordered)}</span>
 </div>''')
 
+    # Video list cards below
     list_cards = []
     for v in ordered:
         img = app.safe_url(v.get("img") or v.get("poster",""))
@@ -258,13 +245,14 @@ def _render_shorts_tiktok_feed(current_url):
         click = f"window.bdpOpen('{app.esc(v['link'])}','{aid}','{sl}')"
         list_cards.append(f'''<div class="bdp-card" onclick="{click}">
 <div class="bdp-card-img"><img src="{img}" alt="" class="bdp-lazy-img"><div class="bdp-play-overlay">\u25b6</div></div>
-<div class="bdp-card-body"><span class="bdp-badge bdp-badge-24h">24h Shorts</span>
+<div class="bdp-card-body"><span class="bdp-badge {badge_cls}">{source_label}</span>
 <h3 class="bdp-card-title">{v["title"]}</h3></div></div>''')
 
-    grid_html = f'''<div class="bdp-wrap"><div class="bdp-topbar"><span>\U0001f4f1 Shorts Tin T\u1ee9c</span><span>{len(ordered)} video</span></div>
+    grid_html = f'''<div class="bdp-wrap"><div class="bdp-topbar"><span>\U0001f3ac Video</span><span>{len(ordered)} video</span></div>
 <div class="bdp-grid">{''.join(list_cards)}</div></div>'''
 
-    return f'''<div class="tiktok-fullscreen-container shorts-feed-mode" id="tiktok-fullscreen-feed">
+    mode_class = "shorts-feed-mode" if is_shorts else ""
+    return f'''<div class="tiktok-fullscreen-container {mode_class}" id="tiktok-fullscreen-feed">
 <div class="tiktok-fullscreen-feed">{''.join(slides)}</div>
 </div>
 {grid_html}'''