Restore main.py + fix featured match priority (top leagues first, search today)

main.py

@@ -1 +1,366 @@
-placeholder_too_long
+"""VNEWS - FastAPI backend with livescore from bongda.com.vn"""
+import hashlib, re, time
+from datetime import datetime
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from fastapi import FastAPI, Query
+from fastapi.responses import HTMLResponse, JSONResponse
+from fastapi.staticfiles import StaticFiles
+from urllib.parse import unquote, quote
+import requests
+from bs4 import BeautifulSoup
+
+app = FastAPI()
+HEADERS = {"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36","Accept-Language":"vi-VN,vi;q=0.9,en;q=0.8"}
+BONGDA_HEADERS = {"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36","Accept-Language":"vi-VN,vi;q=0.9","Referer":"https://bongda.com.vn/lich-thi-dau","X-Requested-With":"XMLHttpRequest"}
+BASE_BDP = "https://bongdaplus.vn"
+BASE_24H = "https://www.24h.com.vn"
+SPACE_URL = "https://bep40-vnews.hf.space"
+_cache = {}
+_cache_ttl = 300
+_cache_ttl_live = 60
+TOP_LEAGUES = ["Ngoại Hạng Anh","Champions League","LaLiga","Serie A","Bundesliga","Ligue 1"]
+def _cached(key, fn, ttl=None):
+    now=time.time();t=ttl or _cache_ttl
+    if key in _cache and now-_cache[key]["t"]<t:return _cache[key]["d"]
+    try:data=fn()
+    except:data=_cache.get(key,{}).get("d",[])
+    _cache[key]={"d":data,"t":now};return data
+def _get(url,headers=None):
+    h=headers or HEADERS;r=requests.get(url,headers=h,timeout=15);r.encoding="utf-8"
+    return BeautifulSoup(r.text,"lxml")
+LEAGUE_IDS = {"nha":27110,"laliga":27233,"seriea":27044,"bundesliga":26891,"ligue1":27212}
+def fetch_bongda_api(endpoint):
+    try:
+        r=requests.get(f"https://bongda.com.vn{endpoint}",headers=BONGDA_HEADERS,timeout=10)
+        if r.status_code==200:
+            data=r.json()
+            if data.get("status")=="success":return data.get("html","")
+        return ""
+    except:return ""
+
+def _parse_match_from_li(li, status_type="live"):
+    """Parse a match from a li.match-detail element."""
+    match_div=li.select_one("div.match")
+    if not match_div:return None
+    home_el=match_div.select_one(".home-team .name")
+    away_el=match_div.select_one(".away-team .name")
+    if not home_el or not away_el:return None
+    status_el=match_div.select_one(".status a")
+    league_el=li.find_previous("strong")
+    time_el=match_div.select_one(".match-time")
+    home_logo=match_div.select_one(".home-team .logo img")
+    away_logo=match_div.select_one(".away-team .logo img")
+    event_id=""
+    if status_el:
+        href=status_el.get("href","")
+        m=re.search(r'/tran-dau/(\d+)/',href)
+        if m:event_id=m.group(1)
+    spans=status_el.find_all("span") if status_el else []
+    score="";minute=""
+    if len(spans)>=3:score=f"{spans[0].get_text(strip=True)} - {spans[2].get_text(strip=True)}"
+    if len(spans)>=4:minute=spans[3].get_text(strip=True)
+    if not score and status_el and status_el.select_one(".vs"):score="VS"
+    league=league_el.get_text(strip=True) if league_el else ""
+    return{"home":home_el.get_text(strip=True),"away":away_el.get_text(strip=True),"score":score or"VS","minute":minute,"league":league,"time":time_el.get_text(strip=True) if time_el else "","event_id":event_id,"home_logo":home_logo.get("src","") if home_logo else "","away_logo":away_logo.get("src","") if away_logo else "","status":status_type}
+
+@app.get("/api/livescore/live")
+def api_livescore_live():
+    html=_cached("ls_live",lambda:fetch_bongda_api("/api/fixtures/live"),ttl=_cache_ttl_live)
+    return JSONResponse({"html":html})
+@app.get("/api/livescore/incoming")
+def api_livescore_incoming():
+    html=_cached("ls_incoming",lambda:fetch_bongda_api("/api/fixtures/incoming"),ttl=_cache_ttl_live)
+    return JSONResponse({"html":html})
+@app.get("/api/livescore/today")
+def api_livescore_today():
+    today=datetime.now().strftime("%Y-%m-%d")
+    html=_cached("ls_today",lambda:fetch_bongda_api(f"/api/fixtures/get-by-date?date={today}"),ttl=_cache_ttl)
+    return JSONResponse({"html":html})
+@app.get("/api/livescore/results")
+def api_livescore_results():
+    today=datetime.now().strftime("%Y-%m-%d")
+    html=_cached("ls_results",lambda:fetch_bongda_api(f"/api/fixtures/get-by-date?date={today}&status=finished"),ttl=_cache_ttl)
+    return JSONResponse({"html":html})
+@app.get("/api/livescore/standings/{league}")
+def api_livescore_standings(league:str):
+    tid=LEAGUE_IDS.get(league,27110)
+    html=_cached(f"ls_bxh_{league}",lambda:fetch_bongda_api(f"/api/league-table/home?tournament_id={tid}&is_detail=True"),ttl=_cache_ttl)
+    return JSONResponse({"html":html})
+@app.get("/api/livescore/date/{date}")
+def api_livescore_date(date:str):
+    html=fetch_bongda_api(f"/api/fixtures/get-by-date?date={date}")
+    return JSONResponse({"html":html})
+@app.get("/api/match/{event_id}/commentaries")
+def api_match_commentaries(event_id:int):
+    html=fetch_bongda_api(f"/api/fixtures/commentaries?event_id={event_id}")
+    return JSONResponse({"html":html})
+@app.get("/api/match/{event_id}/stats")
+def api_match_stats(event_id:int):
+    html=fetch_bongda_api(f"/api/event-standing/player-performance?event_id={event_id}")
+    return JSONResponse({"html":html})
+
+@app.get("/api/livescore/featured")
+def api_livescore_featured():
+    """Trận tâm điểm: ưu tiên giải lớn (NHA, CL...), tìm trong live > today > incoming."""
+    def _f():
+        sources=[("/api/fixtures/live","live"),("/api/fixtures/get-by-date?date="+datetime.now().strftime("%Y-%m-%d"),"today"),("/api/fixtures/incoming","upcoming")]
+        for endpoint, stype in sources:
+            html=fetch_bongda_api(endpoint)
+            if not html or len(html)<100:continue
+            soup=BeautifulSoup(html,"lxml")
+            # First pass: find match from TOP league
+            for li in soup.select("li.match-detail"):
+                match=_parse_match_from_li(li, stype)
+                if not match or not match["event_id"]:continue
+                if any(tl in match["league"] for tl in TOP_LEAGUES):
+                    # For "today" source, only pick upcoming/live (not finished)
+                    if stype=="today" and "KT" in match.get("minute",""):continue
+                    return match
+            # Second pass: any match with event_id
+            for li in soup.select("li.match-detail"):
+                match=_parse_match_from_li(li, stype)
+                if match and match["event_id"]:
+                    if stype=="today" and "KT" in match.get("minute",""):continue
+                    return match
+        return None
+    return JSONResponse(_cached("ls_featured",_f,ttl=_cache_ttl_live))
+
+# ===== NEWS SCRAPERS =====
+def scrape_vne(cat_url):
+    try:
+        soup=_get(cat_url);arts=[]
+        for it in soup.select("article.item-news")[:15]:
+            a=it.select_one("h2.title-news a") or it.select_one("h3.title-news a")
+            if not a:continue
+            t=a.get("title","") or a.get_text(strip=True);lk=a.get("href","")
+            if not t or not lk:continue
+            im=it.find("img");img=(im.get("data-src") or im.get("src","")) if im else ""
+            if img and'blank'in img:
+                src=it.find("source")
+                if src:img=src.get("srcset","").split(",")[0].strip().split(" ")[0]
+            desc=it.select_one("p.description")
+            arts.append({"title":t,"link":lk,"img":img,"summary":(desc.get_text(strip=True)[:150] if desc else ""),"source":"vne"})
+        return arts
+    except:return[]
+def scrape_vne_article(url):
+    try:
+        soup=_get(url);h1=soup.select_one("h1.title-detail");desc=soup.select_one("p.description")
+        og=soup.find("meta",property="og:image");og_img=og.get("content","") if og else ""
+        cd=soup.select_one("article.fck_detail");body=[]
+        if cd:
+            for ch in cd.children:
+                if not hasattr(ch,'name') or not ch.name:continue
+                if ch.name=="p":t=ch.get_text(strip=True);(body.append({"type":"p","text":t}) if t else None)
+                elif ch.name=="figure":
+                    im=ch.find("img")
+                    if im:s=im.get("data-src") or im.get("src","");cap=ch.find("figcaption");(body.append({"type":"img","src":s,"alt":cap.get_text(strip=True) if cap else ""}) if s else None)
+                elif ch.name in("h2","h3"):body.append({"type":"heading","text":ch.get_text(strip=True)})
+        return{"title":h1.get_text(strip=True) if h1 else "","summary":desc.get_text(strip=True) if desc else "","og_image":og_img,"body":body,"source":"vne","url":url}
+    except:return None
+def scrape_dantri_hot():
+    try:
+        soup=_get("https://dantri.com.vn/tin-nong.htm");arts=[];seen=set()
+        for a in soup.find_all("a",href=True):
+            href=a.get("href","");title=a.get("title","") or a.get_text(strip=True)
+            if not title or len(title)<15 or"javascript:" in href:continue
+            if not href.startswith("http"):href="https://dantri.com.vn"+href
+            if href in seen or not href.endswith(".htm"):continue
+            if href=="https://dantri.com.vn/tin-nong.htm":continue
+            seen.add(href);arts.append({"title":title,"link":href,"img":"","source":"dantri"})
+            if len(arts)>=12:break
+        def _og(art):
+            try:r2=requests.get(art["link"],headers=HEADERS,timeout=8);r2.encoding="utf-8";og=BeautifulSoup(r2.text,"lxml").find("meta",property="og:image");art["img"]=og.get("content","") if og else ""
+            except:pass
+        with ThreadPoolExecutor(4) as ex:list(ex.map(_og,arts[:10]))
+        return[a for a in arts if a["img"]][:10]
+    except:return[]
+def scrape_dantri_article(url):
+    try:
+        r=requests.get(url,headers=HEADERS,timeout=15);r.encoding="utf-8";soup=BeautifulSoup(r.text,"lxml")
+        for tag in soup.find_all(["script","style","nav","footer","aside"]):tag.decompose()
+        h1=soup.find("h1");og=soup.find("meta",property="og:image");og_img=og.get("content","") if og else ""
+        content=soup.select_one("div.singular-content") or soup.select_one("article")
+        body=[]
+        if content:
+            for el in content.find_all(["p","h2","h3","figure","img"],recursive=True):
+                if el.name=="p":t=el.get_text(strip=True);(body.append({"type":"p","text":t}) if t and len(t)>15 else None)
+                elif el.name in("h2","h3"):t=el.get_text(strip=True);(body.append({"type":"heading","text":t}) if t else None)
+                elif el.name=="figure" or el.name=="img":
+                    im=el if el.name=="img" else el.find("img")
+                    if im:s=im.get("data-src") or im.get("src","");(body.append({"type":"img","src":s,"alt":im.get("alt","")}) if s and"base64" not in s else None)
+        desc="";sapo=soup.select_one("h2.singular-sapo")
+        if sapo:desc=sapo.get_text(strip=True)
+        return{"title":h1.get_text(strip=True) if h1 else "","summary":desc,"og_image":og_img,"body":body,"source":"dantri","url":url}
+    except:return None
+def scrape_bdp_videos():
+    try:
+        soup=_get(f"{BASE_BDP}/video");arts=[];seen=set()
+        for a in soup.find_all("a",href=True):
+            href=a.get("href","")
+            if"/video/" not in href or href in("/video/","/video/ban-thang-dep","/video/highlight"):continue
+            if not href.startswith("http"):href=BASE_BDP+href
+            if href in seen:continue
+            title=re.sub(r'^\d{2}:\d{2}','',a.get_text(strip=True)).strip()
+            if not title or len(title)<5:continue
+            img_tag=a.find("img") or(a.parent.find("img") if a.parent else None)
+            img=(img_tag.get("data-src") or img_tag.get("src","")) if img_tag else ""
+            seen.add(href);arts.append({"title":title,"link":href,"img":img,"source":"bdp"})
+        return arts[:20]
+    except:return[]
+def scrape_24h_highlights():
+    try:
+        soup=_get(f"{BASE_24H}/video-highlight-c953.html");arts=[];seen=set()
+        for a in soup.find_all("a",href=True):
+            href=a.get("href","");title=a.get("title","") or a.get_text(strip=True)
+            if not title or len(title)<15 or"javascript:" in href:continue
+            if not href.startswith("http"):href=BASE_24H+href
+            if href in seen or"video" not in href.lower() or href.endswith("-c953.html"):continue
+            seen.add(href)
+            img=a.find("img");img_src=""
+            if img:img_src=img.get("data-original") or img.get("data-src") or img.get("src","")
+            if img_src and"base64" in img_src:img_src=""
+            arts.append({"title":title,"link":href,"img":img_src,"source":"24h"})
+        def _og(art):
+            if art["img"]:return
+            try:r=requests.get(art["link"],headers=HEADERS,timeout=8);r.encoding="utf-8";og=BeautifulSoup(r.text,"lxml").find("meta",property="og:image");art["img"]=og.get("content","") if og else ""
+            except:pass
+        need=[a for a in arts if not a["img"]][:10]
+        if need:
+            with ThreadPoolExecutor(5) as ex:list(ex.map(_og,need))
+        return arts[:30]
+    except:return[]
+def scrape_24h_shorts():
+    try:
+        r=requests.get(f"{BASE_24H}/video/video-tin-tuc-cvd769.html",headers=HEADERS,timeout=15);r.encoding="utf-8"
+        soup=BeautifulSoup(r.text,"lxml");arts=[];seen=set()
+        for art in soup.find_all("article"):
+            a=art.find("a",href=True)
+            if not a:continue
+            href=a.get("href","")
+            if not href.startswith("http"):href=BASE_24H+href
+            if href in seen:continue
+            img_tag=art.find("img");title=(img_tag.get("alt","") if img_tag else "") or a.get("title","") or a.get_text(strip=True)
+            if not title or len(title)<10:continue
+            img_src=""
+            if img_tag:img_src=img_tag.get("data-original") or img_tag.get("data-src") or img_tag.get("src","")
+            if img_src and"base64" in img_src:img_src=""
+            seen.add(href);arts.append({"title":title,"link":href,"img":img_src,"source":"24h-shorts"})
+        return arts[:20]
+    except:return[]
+def scrape_bbc_vietnamese():
+    try:
+        bbc_h={"User-Agent":"Mozilla/5.0","Accept-Language":"en-GB,en;q=0.9"}
+        r=requests.get("https://www.bbc.com/vietnamese",headers=bbc_h,timeout=15);r.encoding="utf-8"
+        soup=BeautifulSoup(r.text,"lxml");arts=[];seen=set()
+        for a in soup.select("a[href*='/vietnamese/']"):
+            href=a.get("href","")
+            if not href or href=="/vietnamese" or href.count("/")<3:continue
+            if not href.startswith("http"):href="https://www.bbc.com"+href
+            if href in seen:continue
+            title=a.get_text(strip=True)
+            if not title or len(title)<15:continue
+            if any(x in title.lower() for x in["đăng nhập","trang chủ","bbc news"]):continue
+            img="";container=a.parent
+            for _ in range(3):
+                if container:
+                    im=container.find("img")
+                    if im:img=im.get("src","") or im.get("data-src","");break
+                    container=container.parent
+            seen.add(href);arts.append({"title":title,"link":href,"img":img,"source":"bbc","summary":""})
+            if len(arts)>=15:break
+        return arts
+    except:return[]
+def scrape_bbc_article(url):
+    try:
+        r=requests.get(url,headers={"User-Agent":"Mozilla/5.0","Accept-Language":"en-GB"},timeout=15);r.encoding="utf-8"
+        soup=BeautifulSoup(r.text,"lxml");h1=soup.find("h1")
+        og=soup.find("meta",property="og:image");og_img=og.get("content","") if og else ""
+        body=[]
+        for p in soup.select("[data-component='text-block'] p, article p, main p"):
+            t=p.get_text(strip=True)
+            if t and len(t)>20:body.append({"type":"p","text":t})
+        return{"title":h1.get_text(strip=True) if h1 else "","summary":"","og_image":og_img,"body":body,"source":"bbc","url":url}
+    except:return None
+def extract_video_url(article_url):
+    try:
+        r=requests.get(article_url,headers={**HEADERS,"Referer":"https://www.24h.com.vn/"},timeout=10);r.encoding="utf-8"
+        m3u8s=re.findall(r'(https?://cdn\.24h\.com\.vn/[^\s"\'\\<>]+\.m3u8)',r.text)
+        esc=[u.replace('\\//','/').replace('\\/','/') for u in re.findall(r'(https?:\\/\\/cdn\.24h\.com\.vn\\/[^\s"\'<>]+\.m3u8)',r.text)]
+        all_urls=list(dict.fromkeys(m3u8s+esc));primary=[u for u in all_urls if'_720p' not in u] or [u for u in all_urls if'_720p' in u]
+        if not primary:return None
+        soup=BeautifulSoup(r.text,"lxml");og=soup.find("meta",property="og:image");poster=og.get("content","") if og else ""
+        return{"src":primary[0],"poster":poster}
+    except:return None
+def extract_bdp_video(url):
+    try:
+        m=re.search(r'-(\d{6,})\.html',url)
+        if not m:return None
+        r=requests.get(f"{BASE_BDP}/video-embed/{m.group(1)}.html",headers=HEADERS,timeout=10);r.encoding="utf-8"
+        soup=BeautifulSoup(r.text,"lxml");video=soup.select_one("video#videoPlayer")
+        if not video:return None
+        source=video.find("source")
+        return{"src":source.get("src","") if source else "","poster":video.get("poster","")}
+    except:return None
+VNE_CATS={"thoi-su":("https://vnexpress.net/thoi-su","Thời Sự"),"the-gioi":("https://vnexpress.net/the-gioi","Thế Giới"),"kinh-doanh":("https://vnexpress.net/kinh-doanh","Kinh Doanh"),"cong-nghe":("https://vnexpress.net/so-hoa","Công Nghệ"),"the-thao":("https://vnexpress.net/the-thao","Thể Thao"),"giai-tri":("https://vnexpress.net/giai-tri","Giải Trí"),"suc-khoe":("https://vnexpress.net/suc-khoe","Sức Khỏe")}
+@app.get("/api/homepage")
+def api_homepage():
+    def _f():
+        articles=[]
+        with ThreadPoolExecutor(6) as ex:
+            futs={ex.submit(scrape_vne,VNE_CATS[k][0]):VNE_CATS[k][1] for k in["thoi-su","the-gioi","kinh-doanh","the-thao","giai-tri"]}
+            futs[ex.submit(scrape_bbc_vietnamese)]="BBC"
+            for f in as_completed(futs):
+                try:
+                    for a in f.result():a["group"]=futs[f];articles.append(a)
+                except:pass
+        return articles
+    return JSONResponse(_cached("homepage",_f))
+@app.get("/api/category/{cat_id}")
+def api_category(cat_id:str):
+    def _f():
+        if cat_id=="bbc":return scrape_bbc_vietnamese()
+        if cat_id in VNE_CATS:arts=scrape_vne(VNE_CATS[cat_id][0]);[a.update({"group":VNE_CATS[cat_id][1]}) for a in arts];return arts
+        return[]
+    return JSONResponse(_cached(f"cat_{cat_id}",_f))
+@app.get("/api/categories")
+def api_categories():
+    cats=[{"id":"bbc","name":"BBC Tiếng Việt","source":"bbc"}]
+    for k,(u,n) in VNE_CATS.items():cats.append({"id":k,"name":n,"source":"vne"})
+    return JSONResponse(cats)
+@app.get("/api/highlights")
+def api_highlights():return JSONResponse(_cached("highlights",scrape_24h_highlights))
+@app.get("/api/shorts")
+def api_shorts():return JSONResponse(_cached("shorts",scrape_24h_shorts))
+@app.get("/api/dantri_hot")
+def api_dantri_hot():return JSONResponse(_cached("dantri_hot",scrape_dantri_hot))
+@app.get("/api/bdp_videos")
+def api_bdp_videos():return JSONResponse(_cached("bdp_videos",scrape_bdp_videos))
+@app.get("/api/video_url")
+def api_video_url(url:str=Query(...)):
+    if"24h.com.vn" in url:v=extract_video_url(url)
+    elif"bongdaplus.vn" in url:v=extract_bdp_video(url)
+    else:v=None
+    return JSONResponse(v if v else{"error":"not found"})
+@app.get("/api/article")
+def api_article(url:str=Query(...)):
+    if"vnexpress.net" in url:data=scrape_vne_article(url)
+    elif"bbc.com" in url:data=scrape_bbc_article(url)
+    elif"dantri.com.vn" in url:data=scrape_dantri_article(url)
+    else:data=None
+    return JSONResponse(data if data else{"error":"not supported"})
+@app.get("/v")
+async def video_share(url:str=Query(default=""),title:str=Query(default="VNEWS Video"),img:str=Query(default=""),type:str=Query(default="highlights")):
+    og_image=unquote(img) if img else "https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
+    decoded_url=unquote(url);decoded_title=unquote(title)
+    redirect_script=f'<script>localStorage.setItem("pending_video",JSON.stringify({{"url":"{decoded_url}","type":"{type}"}}));location.href="{SPACE_URL}";</script>' if decoded_url else f'<script>location.href="{SPACE_URL}";</script>'
+    return HTMLResponse(f'''<!DOCTYPE html><html><head><meta charset="utf-8"><title>{decoded_title}</title><meta property="og:title" content="{decoded_title}"><meta property="og:image" content="{og_image}"></head><body style="background:#111;color:#fff;text-align:center;padding:40px"><p>⏳</p>{redirect_script}</body></html>''')
+@app.get("/s")
+async def share_redirect(url:str=Query(default=""),title:str=Query(default="VNEWS"),img:str=Query(default="")):
+    og_image=unquote(img) if img else "https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
+    decoded_url=unquote(url)
+    redirect_script=f'<script>localStorage.setItem("pending_article","{decoded_url}");location.href="{SPACE_URL}";</script>' if decoded_url else f'<script>location.href="{SPACE_URL}";</script>'
+    return HTMLResponse(f'''<!DOCTYPE html><html><head><meta charset="utf-8"><title>{unquote(title)}</title><meta property="og:title" content="{unquote(title)}"><meta property="og:image" content="{og_image}"></head><body>{redirect_script}</body></html>''')
+@app.get("/")
+async def index():
+    with open("/app/static/index.html","r",encoding="utf-8") as f:return HTMLResponse(content=f.read())
+app.mount("/static",StaticFiles(directory="/app/static"),name="static")