diff --git a/Src/API/webru.py b/Src/API/webru.py index 2d5a5cf..fdcd428 100644 --- a/Src/API/webru.py +++ b/Src/API/webru.py @@ -50,7 +50,28 @@ async def webru(id,site,client): async def get_skystreaming(id,client): - skystreaming_link = skystreaming[id] + try: + skystreaming_link = skystreaming[id] + m3u8_urls = [] + if type(skystreaming_link) == list: + + for link in skystreaming_link: + m3u8_url,Host = await get_skystreaming_url(link,client) + m3u8_urls.append(m3u8_url) + else: + m3u8_url,Host = await get_skystreaming_url(skystreaming_link,client) + m3u8_urls.append(m3u8_url) + return m3u8_urls,Host + + except Exception as e: + print("SkyStreaming failed",e) + return None,None + + + + + +async def get_skystreaming_url(skystreaming_link,client): response = await client.get(skystreaming_link, headers=headers, allow_redirects=True, impersonate = "chrome120") soup = BeautifulSoup(response.text, 'lxml', parse_only=SoupStrainer('source')) source_tag = soup.find('source') diff --git a/Src/Utilities/dictionaries.py b/Src/Utilities/dictionaries.py index d8ddc1c..0ca9bdc 100644 --- a/Src/Utilities/dictionaries.py +++ b/Src/Utilities/dictionaries.py @@ -758,7 +758,9 @@ webru_vary = { "sky-nature": "https://webuit.mizhls.ru/lb/calcioXskynature/index.m3u8", "sky-serie": "https://webuit.mizhls.ru/lb/calcioXskyserie/index.m3u8", "sky-uno": "https://webuit.mizhls.ru/lb/calcioXskyuno/index.m3u8", - "sky-sport-24": "https://webuit.mizhls.ru/lb/calcioXskysport24/index.m3u8", + "sky-sport-24": "https://webuit.mizhls.ru/lb/calcioXskysport24/index.m3u8", +} +''' "sky-sport-golf": "https://webuit.mizhls.ru/lb/calcioXskysportgolf/index.m3u8", "sky-sport-251": "https://webuit.mizhls.ru/lb/calcioXskysport251/index.m3u8", "sky-sport-253": "https://webuit.mizhls.ru/lb/calcioXskysport253/index.m3u8", @@ -781,11 +783,9 @@ webru_vary = { "sky-sport-calcio": "https://webuit.mizhls.ru/lb/calcioXskysportcalcio/index.m3u8", "sky-sport-arena": "https://webuit.mizhls.ru/lb/calcioXskysportarena/index.m3u8", "sky-sport-tennis": "https://webuit.mizhls.ru/lb/calcioXskysporttennis/index.m3u8", - "sky-sport-nba": "https://webuit.mizhls.ru/lb/calcioXskysportnba/index.m3u8", - "dazn-zona-a": "https://webuit.mizhls.ru/lb/calcioXzona/index.m3u8" -} - - + "sky-sport-nba": "https://webuit.mizhls.ru/lb/calcioXskysportnba/index.m3u8", +''' +#"dazn-zona-a": "https://webuit.mizhls.ru/lb/calcioXzona/index.m3u8" webru_dlhd = { "sky-sport-tennis": "https://webhdrunns.mizhls.ru/lb/premium576/index.m3u8", "sky-sport-uno": "https://webhdrunns.mizhls.ru/lb/premium461/index.m3u8", @@ -860,6 +860,21 @@ skystreaming ={ "sky-sport-golf": "https://skystreaming.guru/embed/s9L5f", "eurosport-1": "https://skystreaming.guru/embed/Vyv99", "eurosport-2": "https://skystreaming.guru/embed/um8E5", + "dazn-zona-a": ["https://skystreaming.guru/embed/tIswJ","https://skystreaming.guru/embed/16U0s"], +} +huhu = { + "canale-5": "1101559666", + "sky-sport-motogp": "2090703806", + "rai-1": "1225653759", + "sky-cinema-drama": "1235530177", + "sky-cinema-action": "3812796171", + "Dazn": "2745635299", + "sky-sport-uno": "3192996672", + "canale-5": "1534161807", + "mediaset-extra": "477466531", + "Dazn-1": "1376440573", + "sky-sport-24": "2775802255", + "sky-sport-24": "3445562519", } provider_map = { 'SC': 'STREAMINGCOMMUNITY', diff --git a/run.py b/run.py index 5ffb640..2bbf65c 100644 --- a/run.py +++ b/run.py @@ -184,7 +184,7 @@ async def addon_stream(request: Request,config, type, id,): i = i+1 channel_url = await okru_get_url(id,client) streams['streams'].append({ - 'title': f"Server {i} " + channel['title'] + " OKRU", + 'title': f"{HF}Server {i} " + channel['title'] + " OKRU", 'url': channel_url }) if id in extra_sources: @@ -193,10 +193,12 @@ async def addon_stream(request: Request,config, type, id,): i = i+1 streams['streams'].append({'title':f"{HF}Server {i} " + channel['title'],'url': item}) if id in skystreaming: - i = i+1 - url,Host = await get_skystreaming(id,client) - streams['streams'].append({'title': f'{HF}Server {i}', 'url': url, "behaviorHints": {"notWebReady": True, "proxyHeaders": {"request": {"User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:127.0) Gecko/20100101 Firefox/127.0", "Accept": "*/*", "Accept-Language": "en-US,en;q=0.5", "Origin": "https://skystreaming.guru", "DNT": "1", "Sec-GPC": "1", "Connection": "keep-alive", "Referer": "https://skystreaming.guru/", "Sec-Fetch-Dest": "empty", "Sec-Fetch-Mode": "cors", "Sec-Fetch-Site": "cross-site", "Pragma": "no-cache", "Cache-Control": "no-cache", "TE": "trailers","Host": Host}}}}) - + + urls,Host = await get_skystreaming(id,client) + for url in urls: + i = i+1 + streams['streams'].append({'title': f'{HF}Server {i}', 'url': url, "behaviorHints": {"notWebReady": True, "proxyHeaders": {"request": {"User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:127.0) Gecko/20100101 Firefox/127.0", "Accept": "*/*", "Accept-Language": "en-US,en;q=0.5", "Origin": "https://skystreaming.guru", "DNT": "1", "Sec-GPC": "1", "Connection": "keep-alive", "Referer": "https://skystreaming.guru/", "Sec-Fetch-Dest": "empty", "Sec-Fetch-Mode": "cors", "Sec-Fetch-Site": "cross-site", "Pragma": "no-cache", "Cache-Control": "no-cache", "TE": "trailers","Host": Host}}}}) + if id in webru_vary: i = i+1 webru_url = await webru(id,"vary",client)