Patch 53ee7c5 restore for live YouTube Shorts display and playback

restore_53ee7c5.py

@@ -13,12 +13,130 @@ snapshot_dir = snapshot_download(
     local_dir_use_symlinks=False,
 )
 
+# Write a tiny runtime patch inside the restored snapshot.
+patch_code = r'''
+import re, time, requests
+import ai_runtime_final6 as baseapp
+from ai_runtime_final6 import app, HTMLResponse, JSONResponse, Query, rt
+try:
+    import main as main_mod
+except Exception:
+    main_mod = None
+
+_CACHE = {"t": 0, "d": []}
+CHANNELS = ["baodantri7941", "baosuckhoedoisongboyte"]
+
+def clean(s):
+    import html as html_lib
+    return re.sub(r"\s+", " ", html_lib.unescape(s or "")).strip()
+
+def fallback_shorts():
+    out=[];seen=set();c=[]
+    try:c += getattr(main_mod, 'SHORTS_FALLBACK', []) or []
+    except Exception:pass
+    hard=[
+        ('Lu_iCQ5YwNM','Công an lập hồ sơ xử lý người phụ nữ chửi bới, tát tài xế ô tô | Dân trí','baodantri7941'),
+        ('CwWvijF8BOA','Chú rể bật khóc nhận món quà bí mật người cha quá cố gửi 26 năm trước | Dân trí','baodantri7941'),
+        ('tvPewsc2ph4','Tính năng ẩn trên iPhone giúp giảm mỏi mắt | Dân trí','baodantri7941'),
+        ('b1Nxzv9ixlU','Y án 3 năm tù với nữ tài xế uống 8 lon bia lái xe gây tai nạn | Dân trí','baodantri7941'),
+        ('7Pd6vZ2Lz1M','Hành động ấm lòng trong tìm kiếm học sinh tử vong ở sông Lô | SKĐS','baosuckhoedoisongboyte'),
+        ('SlHLt_ZyPiE','Xử phạt người đàn ông xóa số điện thoại cứu hộ trên cao tốc Bắc - Nam | SKĐS','baosuckhoedoisongboyte'),
+        ('IUOprcJyYr4','Phụ nữ táo bón có phải do lười ăn rau? | SKĐS','baosuckhoedoisongboyte'),
+    ]
+    for vid,title,ch in hard:c.append({'id':vid,'title':title,'channel':ch})
+    for v in c:
+        vid=v.get('id')
+        if vid and vid not in seen:
+            seen.add(vid)
+            out.append({'id':vid,'title':v.get('title') or 'YouTube Short','channel':v.get('channel',''),'link':'https://www.youtube.com/watch?v='+vid,'img':'https://i.ytimg.com/vi/'+vid+'/hqdefault.jpg','source':'yt'})
+    return out
+
+def yt_dlp_shorts(handle, count=20):
+    try:
+        import yt_dlp
+        with yt_dlp.YoutubeDL({'quiet':True,'extract_flat':True,'skip_download':True,'playlistend':count,'ignoreerrors':True,'no_warnings':True}) as ydl:
+            info=ydl.extract_info(f'https://www.youtube.com/@{handle}/shorts', download=False)
+        out=[]
+        for e in (info or {}).get('entries') or []:
+            vid=e.get('id') or ''
+            if re.match(r'^[A-Za-z0-9_-]{11}$', vid):
+                out.append({'id':vid,'title':e.get('title') or 'YouTube Short','channel':handle,'link':'https://www.youtube.com/watch?v='+vid,'img':'https://i.ytimg.com/vi/'+vid+'/hqdefault.jpg','source':'yt'})
+        return out
+    except Exception:return []
+
+def html_shorts(handle, count=20):
+    try:
+        headers={"User-Agent":"Mozilla/5.0","Accept-Language":"vi,en;q=0.8"}
+        html=requests.get(f'https://www.youtube.com/@{handle}/shorts',headers=headers,timeout=15).text
+        ids=[];out=[]
+        for m in re.finditer(r'"videoId":"([A-Za-z0-9_-]{11})"', html):
+            vid=m.group(1)
+            if vid in ids:continue
+            ids.append(vid)
+            snip=html[max(0,m.start()-1200):m.start()+2000]
+            mt=re.search(r'"title":\{"runs":\[\{"text":"([^"]+)"',snip) or re.search(r'"accessibilityText":"([^"]+)"',snip)
+            title=clean(mt.group(1).replace('\\n',' ')) if mt else 'YouTube Short'
+            out.append({'id':vid,'title':title,'channel':handle,'link':'https://www.youtube.com/watch?v='+vid,'img':'https://i.ytimg.com/vi/'+vid+'/hqdefault.jpg','source':'yt'})
+            if len(out)>=count:break
+        return out
+    except Exception:return []
+
+def fresh_shorts():
+    seen=set();out=[]
+    for ch in CHANNELS:
+        for v in (yt_dlp_shorts(ch,24) or html_shorts(ch,24)):
+            if v['id'] not in seen:
+                seen.add(v['id']);out.append(v)
+    for v in fallback_shorts():
+        if v['id'] not in seen:
+            seen.add(v['id']);out.append(v)
+    return out[:60]
+
+# remove existing /api/shorts and /
+app.router.routes=[r for r in app.router.routes if not ((getattr(r,'path',None)=='/api/shorts' and 'GET' in getattr(r,'methods',set())) or (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set())))]
+
+@app.get('/api/shorts')
+def api_shorts(refresh:int=Query(default=0)):
+    now=time.time()
+    if not refresh and _CACHE['d'] and now-_CACHE['t']<900:
+        return JSONResponse(_CACHE['d'])
+    data=fresh_shorts()
+    _CACHE.update({'t':now,'d':data})
+    return JSONResponse(data)
+
+PATCH = r'''
+<style>
+#shorts-live-fix{margin:6px 4px;background:#1a1a1a;border:1px solid #2a2a2a;border-radius:8px;overflow:hidden}.ytshort-action{position:absolute;right:8px;bottom:95px;display:flex;flex-direction:column;gap:12px;z-index:20}.ytshort-action button{background:none;border:0;color:#fff;text-align:center;font-size:10px}.ytshort-action .ico{width:44px;height:44px;border-radius:50%;background:rgba(0,0,0,.48);display:flex;align-items:center;justify-content:center;font-size:21px}
+</style>
+<script>
+(function(){
+function esc(s){return String(s||'').replace(/[&<>"']/g,m=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));}
+let shortsLive=[];
+async function loadShortsLive(){shortsLive=await fetch('/api/shorts?refresh=1').then(r=>r.json()).catch(()=>[]);return shortsLive;}
+function renderShortsLive(){let home=document.getElementById('view-home');if(!home||document.getElementById('shorts-live-fix'))return;loadShortsLive().then(sh=>{if(!sh.length)return;let wrap=document.createElement('div');wrap.id='shorts-live-fix';let h='<div class="slider-header"><span class="slider-label">📱 Shorts Dân trí & SKĐS</span><span class="slider-note">YouTube mới nhất</span></div><div class="slider-track">';sh.slice(0,30).forEach((a,i)=>{h+=`<div class="slider-item shorts-item" onclick="openShortsLive(${i})"><div class="slider-thumb shorts-thumb">${a.img?`<img src="${a.img}">`:''}<div class="card-play">▶</div></div><div class="slider-title">${esc(a.title)}</div></div>`});h+='</div>';wrap.innerHTML=h;let after=document.querySelector('.ai-compose')||home.firstChild;if(after)after.after(wrap);else home.prepend(wrap);});}
+window.openShortsLive=async function(start){let arts=shortsLive.length?shortsLive:await loadShortsLive();if(!arts.length)return alert('Không tải được Shorts');let ordered=start>0?arts.slice(start).concat(arts.slice(0,start)):arts;showView('view-tiktok');let h='<button class="back-btn" onclick="switchCat(\'home\')">← Shorts Dân trí & SKĐS</button><div class="tiktok-container"><div class="tiktok-feed" id="tiktok-feed">';ordered.forEach((v,i)=>{let src='https://www.youtube.com/embed/'+v.id+'?autoplay=1&rel=0&playsinline=1';h+=`<div class="tiktok-slide"><iframe src="${src}" allowfullscreen allow="accelerometer;autoplay;clipboard-write;encrypted-media;gyroscope;picture-in-picture"></iframe><div class="tiktok-bottom"><span class="badge badge-fpt">YT</span><p class="tiktok-title">${esc(v.title)}</p></div><div class="ytshort-action"><button onclick="navigator.share?navigator.share({title:'${esc(v.title)}',url:'${v.link}'}):navigator.clipboard.writeText('${v.link}')"><div class="ico">📤</div><span>Share</span></button></div><span class="tiktok-counter">${i+1}/${ordered.length}</span></div>`});h+='</div></div>';document.getElementById('view-tiktok').innerHTML=h;}
+let oldOpen=window.openTikTok;window.openTikTok=function(type,i){if(type==='shorts')return openShortsLive(i||0);return oldOpen?oldOpen(type,i):null;};
+setTimeout(()=>{renderShortsLive();document.querySelectorAll('.slider-label').forEach(label=>{if((label.textContent||'').includes('Shorts'))label.closest('.slider-wrap')?.querySelectorAll('.slider-item').forEach((el,i)=>el.setAttribute('onclick',`openShortsLive(${i})`));});},1000);setInterval(()=>{if(document.getElementById('view-home')?.classList.contains('active'))renderShortsLive();},3000);
+})();
+</script>
+'''
+
+@app.get('/')
+async def index():
+    html=baseapp.f5.f4.f3.f2.f1._load_index_html()
+    body=getattr(baseapp.rt.old,'PATCH_INJECT','')+baseapp.f5.f4.f3.f2.f1.FINAL_INJECT+baseapp.f5.f4.f3.FINAL3_INJECT+baseapp.f5.f4.FINAL4_INJECT+baseapp.f5.FINAL5_INJECT+PATCH
+    return HTMLResponse(html.replace('</body>',body+'\n</body>') if '</body>' in html else html+body)
+'''
+
+with open(os.path.join(snapshot_dir, "runtime_53ee7c5_patch.py"), "w", encoding="utf-8") as f:
+    f.write(patch_code)
+
 os.chdir(snapshot_dir)
 sys.path.insert(0, snapshot_dir)
 
 cmd = [
     "uvicorn",
-    "ai_runtime_final6:app",
+    "runtime_53ee7c5_patch:app",
     "--host",
     "0.0.0.0",
     "--port",