diff --git a/Src/API/cb01.py b/Src/API/cb01.py index 561dc16..2a0a9d2 100644 --- a/Src/API/cb01.py +++ b/Src/API/cb01.py @@ -4,8 +4,13 @@ from Src.Utilities.info import is_movie,get_info_tmdb,get_info_imdb from Src.Utilities.convert import get_TMDb_id_from_IMDb_id from fake_headers import Headers import Src.Utilities.config as config +from Src.Utilities.loadenv import load_env +HF = config.HF + +env_vars = load_env() ForwardProxy_list = config.ForwardProxy ForwardProxy = ForwardProxy_list[0] +PROXY_CREDENTIALS = env_vars.get('PROXY_CREDENTIALS') fake_headers = Headers() async def get_stayonline(link,client): @@ -24,9 +29,24 @@ async def get_stayonline(link,client): async def get_uprot(link,client): if "msf" in link: link = link.replace("msf","mse") - + if PROXY_CREDENTIALS : + import json + import random + proxy_list = json.loads(PROXY_CREDENTIALS) + proxy = random.choice(proxy_list) + if proxy == " ": + proxies = { + "http": proxy, + "https": proxy + } + else: + proxies = {} + else: + proxies = {} + headers = fake_headers.generate() - response = await client.get(link, headers=headers, allow_redirects=True, timeout=10) + print(ForwardProxy + link) + response = await client.get(ForwardProxy + link, headers=headers, allow_redirects=True, timeout=10, proxies=proxies) soup = BeautifulSoup(response.text, "lxml") maxstream_url = soup.find("a") maxstream_url = maxstream_url.get("href") @@ -54,7 +74,7 @@ async def get_true_link_mixdrop(real_link,client): async def get_true_link_maxstream(maxstream_url,client): headers = fake_headers.generate() # Send a GET request to the Maxstream URL - response = await client.get(maxstream_url, headers=headers, allow_redirects=True, timeout=10) + response = await client.get(ForwardProxy + maxstream_url, headers=headers, allow_redirects=True, timeout=10) [s1, s2] = re.search(r"\}\('(.+)',.+,'(.+)'\.split", response.text).group(1, 2) terms = s2.split("|") urlset_index = terms.index('urlset') @@ -250,7 +270,7 @@ async def cb01(id,client): -''' + async def test_animeworld(): from curl_cffi.requests import AsyncSession async with AsyncSession() as client: @@ -261,5 +281,3 @@ async def test_animeworld(): if __name__ == "__main__": import asyncio asyncio.run(test_animeworld()) -''' - diff --git a/Src/API/streamingcommunity.py b/Src/API/streamingcommunity.py index 857eb6a..406e4b3 100644 --- a/Src/API/streamingcommunity.py +++ b/Src/API/streamingcommunity.py @@ -39,7 +39,7 @@ async def get_version(client): version = "65e52dcf34d64173542cd2dc6b8bb75b" return version -async def search(query,date,ismovie, client,SC_FAST_SEARCH): +async def search(query,date,ismovie, client,SC_FAST_SEARCH,movie_id): random_headers = headers.generate() random_headers['Referer'] = "https://streamingcommunity.buzz/" random_headers['Origin'] = "https://streamingcommunity.buzz" @@ -65,16 +65,20 @@ async def search(query,date,ismovie, client,SC_FAST_SEARCH): random_headers['Referer'] = "https://streamingcommunity.buzz/" random_headers['Origin'] = "https://streamingcommunity.buzz" response = await client.get ( f'https://streamingcommunity.{SC_DOMAIN}/titles/{tid}-{slug}', headers = random_headers, allow_redirects=True,impersonate = "chrome120") - pattern = r']*class="features"[^>]*>.*?]*>(.*?)<\/span>' - match = re.search(pattern, response.text) - print(match.group(1).split("-")[0]) - first_air_year = match.group(1).split("-")[0] - date = int(date) - first_air_year = int(first_air_year) - if first_air_year == date: - return tid,slug + soup = BeautifulSoup(response.text, "lxml") + data = json.loads(soup.find("div", {"id": "app"}).get("data-page")) + version = data['version'] + if "tt" in movie_id: + imdb_id = data['props']['title']['imdb_id'] + if imdb_id == movie_id: + return tid,slug,version + else: + tmdb_id = str(data['props']['title']['tmdb_id']) + if tmdb_id == movie_id: + return tid,slug,version elif SC_FAST_SEARCH == "1": - return tid,slug + version = await get_version(client) + return tid,slug,version else: print("Couldn't find anything") @@ -108,15 +112,24 @@ async def get_film(tid,version,client): expires = re.search(r"'expires':\s*'(\d+)'", script).group(1) quality = re.search(r'"quality":(\d+)', script).group(1) #Example url https://vixcloud.co/playlist/231315?b=1&token=bce060eec3dc9d1965a5d258dc78c964&expires=1728995040&rendition=1080p - url = f'https://vixcloud.co/playlist/{vixid}.m3u8?token={token}&expires={expires}' + url = f'https://vixcloud.co/playlist/{vixid}.m3u8?expires={expires}' if 'canPlayFHD' in query_params: canPlayFHD = 'h=1' url += "&h=1" if 'b' in query_params: b = 'b=1' url += "&b=1" + if quality == "1080": + if "&h" in url: + url = url + elif "&b" in url and quality == "1080": + url = url.replace("&b=1","&h=1") + elif quality == "1080" and "&b" and "&h" not in url: + url = url + "&h=1" + else: + url = url + f"&token={token}" url720 = f'https://vixcloud.co/playlist/{vixid}.m3u8' - return url,url720,quality, + return url,url720,quality async def get_season_episode_id(tid,slug,season,episode,version,client): random_headers = headers.generate() @@ -165,13 +178,22 @@ async def get_episode_link(episode_id,tid,version,client): expires = re.search(r"'expires':\s*'(\d+)'", script).group(1) quality = re.search(r'"quality":(\d+)', script).group(1) #Example url https://vixcloud.co/playlist/231315?b=1&token=bce060eec3dc9d1965a5d258dc78c964&expires=1728995040&rendition=1080p - url = f'https://vixcloud.co/playlist/{vixid}.m3u8?token={token}&expires={expires}' + url = f'https://vixcloud.co/playlist/{vixid}.m3u8?expires={expires}' if 'canPlayFHD' in query_params: canPlayFHD = 'h=1' url += "&h=1" if 'b' in query_params: b = 'b=1' url += "&b=1" + if quality == "1080": + if "&h" in url: + url = url + elif "&b" in url and quality == "1080": + url = url.replace("&b=1","&h=1") + elif quality == "1080" and "&b" and "&h" not in url: + url = url + "&h=1" + else: + url = url + f"&token={token}" url720 = f'https://vixcloud.co/playlist/{vixid}.m3u8' return url,url720,quality @@ -190,6 +212,7 @@ async def streaming_community(imdb,client,SC_FAST_SEARCH): general = is_movie(imdb) ismovie = general[0] imdb_id = general[1] + if ismovie == 0 : season = int(general[2]) episode = int(general[3]) @@ -208,7 +231,8 @@ async def streaming_community(imdb,client,SC_FAST_SEARCH): showname = get_info_tmdb(tmdba,ismovie,type) elif SC_FAST_SEARCH == "0": type = "StreamingCommunity" - tmdba = await get_TMDb_id_from_IMDb_id(imdb_id,client) + if "tt" in imdb: + tmdba = await get_TMDb_id_from_IMDb_id(imdb_id,client) showname,date = get_info_tmdb(tmdba,ismovie,type) #HERE THE CASE IF IT IS A MOVIE else: @@ -234,31 +258,29 @@ async def streaming_community(imdb,client,SC_FAST_SEARCH): showname = showname.replace(" ", "+").replace("–", "+").replace("—","+") showname = urllib.parse.quote_plus(showname) query = f'https://streamingcommunity.{SC_DOMAIN}/api/search?q={showname}' - version = await get_version(client) - tid,slug = await search(query,date,ismovie,client,SC_FAST_SEARCH) + tid,slug,version = await search(query,date,ismovie,client,SC_FAST_SEARCH,imdb_id) if ismovie == 1: #TID means temporaly ID url,url720,quality = await get_film(tid,version,client) print("MammaMia found results for StreamingCommunity") - return url,url720,quality + return url,url720,quality,slug if ismovie == 0: #Uid = URL ID episode_id = await get_season_episode_id(tid,slug,season,episode,version,client) url,url720,quality = await get_episode_link(episode_id,tid,version,client) print("MammaMia found results for StreamingCommunity") - return url,url720,quality + return url,url720,quality,slug except Exception as e: print("MammaMia: StreamingCommunity failed",e) return None,None,None -''' + async def test_animeworld(): from curl_cffi.requests import AsyncSession async with AsyncSession() as client: # Replace with actual id, for example 'anime_id:episode' format - test_id = "tt12930350" # This is an example ID format + test_id = "tt0101414" # This is an example ID format results = await streaming_community(test_id, client,"0") if __name__ == "__main__": import asyncio asyncio.run(test_animeworld()) -''' \ No newline at end of file diff --git a/Src/API/tantifilm.py b/Src/API/tantifilm.py index f4cb5b1..10ed2e8 100644 --- a/Src/API/tantifilm.py +++ b/Src/API/tantifilm.py @@ -7,6 +7,8 @@ from Src.Utilities.loadenv import load_env HF = config.HF env_vars = load_env() PROXY_CREDENTIALS = env_vars.get('PROXY_CREDENTIALS') +ForwardProxy_list = config.ForwardProxy +ForwardProxy = ForwardProxy_list[0] TF_DOMAIN = config.TF_DOMAIN import urllib.parse async def search(showname,ismovie,date,client): @@ -160,15 +162,22 @@ async def true_url(protect_link,client): if HF == "1": import random import json + print(PROXY_CREDENTIALS) proxy_list = json.loads(PROXY_CREDENTIALS) proxy = random.choice(proxy_list) - proxies = { - "http": proxy, - "https": proxy - } - response = await client.get(protect_link, proxies=proxies, allow_redirects=True, impersonate = "chrome120") + if proxy == "": + proxies = {} + else: + proxies = { + "http": proxy, + "https": proxy + } + response = await client.head(protect_link, allow_redirects=True, impersonate = "chrome120", proxies = proxies) + doodstream_url = response.url else: - response = await client.get(protect_link, allow_redirects=True, impersonate = "chrome120") + proxies = {} + doodstream_url = protect_link + response = await client.get(ForwardProxy + doodstream_url, allow_redirects=True, impersonate = "chrome120", proxies = proxies) if response.status_code == 200: @@ -185,10 +194,7 @@ async def true_url(protect_link,client): if match: # Create real link (match[0] includes all matched elements) url =f'https://d000d.com{match[1]}' - if "HF" == "1" : - rebobo = await client.get(url, headers=headers, allow_redirects=True, impersonate = "chrome120",proxies= proxies) - else: - rebobo = await client.get(url, headers=headers, allow_redirects=True, impersonate = "chrome120") + rebobo = await client.get(ForwardProxy + url, headers=headers, allow_redirects=True, impersonate = "chrome120",proxies= proxies) real_url = f'{rebobo.text}123456789{match[2]}{real_time}' print("MammaMia: Found results for Tantifilm") return real_url diff --git a/Src/API/webru.py b/Src/API/webru.py index e8fbd6c..f1859e6 100644 --- a/Src/API/webru.py +++ b/Src/API/webru.py @@ -26,21 +26,23 @@ headers = { } medialink = config.MediaProxy -async def get_stream_link(id,site,client): +async def get_stream_link(id,site): try: if site == "dlhd": stream_url = "https://xyzdddd.mizhls.ru/lb/" + webru_dlhd[id] + "/index.m3u8" elif site == "vary": stream_url = "https://webuit.mizhls.ru/lb/"+ webru_vary[id] + "/index.m3u8" + mediaproxy = config.MediaProxy + medialink = random.choice(mediaproxy) + new_stream_url = f'{medialink}proxy/hls/manifest.m3u8?api_password={MEDIAFLOW_PASS}&d={stream_url}&h_Referer={Referer}&h_Origin={Origin}&h_User-Agent=Mozilla%2F5.0%20(Windows%20NT%2010.0%3B%20Win64%3B%20x64)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F58.0.3029.110%20Safari%2F537.3' + return stream_url,Referer,Origin except Exception as e: return None async def webru(id,site,client): try: - stream_url, Referer,Origin = await get_stream_link(id,site,client) - mediaproxy = config.MediaProxy - medialink = random.choice(mediaproxy) - new_stream_url = f'{medialink}proxy/hls/manifest.m3u8?api_password={MEDIAFLOW_PASS}&d={stream_url}&h_Referer={Referer}&h_Origin={Origin}&h_User-Agent=Mozilla%2F5.0%20(Windows%20NT%2010.0%3B%20Win64%3B%20x64)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F58.0.3029.110%20Safari%2F537.3' + new_stream_url = await get_stream_link(id,site,client) + return new_stream_url except Exception as e: print("WebRu failed",e) @@ -103,4 +105,35 @@ async def get_skystreaming_url(skystreaming_link,client): except Exception as e: print("WebRu failed",e) return None + ''' + + + +async def webru(id,site,client): + try: + print(id) + if site == "vary": + print("1") + url = await get_stream_link(id,site) + if any(keyword in id for keyword in ["cinema", "arte", "nature", "investigation", "sky-uno", "sky-serie"]): + print("2") + url = await get_stream_link(id,site) + else: + print("3") + response = await client.get(f"https://848b3516657c-worldwide-sports-tv.baby-beamup.club/stream/tv/wwstv-it-{id}.json", impersonate = "chrome120", headers = headers) + data = response.json() + url = data['streams'][0]['url'] + print(url) + return url + except Exception as e: + print("WorldSport failed",e) + return None + + + ''' + 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}}}}) + ''' \ No newline at end of file diff --git a/Src/API/whvx.py b/Src/API/whvx.py index f0a70bb..8fafab7 100644 --- a/Src/API/whvx.py +++ b/Src/API/whvx.py @@ -76,6 +76,7 @@ async def whvx(id,client): showname = urllib.parse.quote_plus(showname) response = await client.get(f'https://api.whvx.net/search', params = params, headers=headers, impersonate = "chrome120") data = json.loads(response.text) + print(data) url = data['url'] print(data) params = { @@ -110,7 +111,7 @@ async def whvx(id,client): print(resolution_links) return resolution_links -''' + async def test_animeworld(): from curl_cffi.requests import AsyncSession async with AsyncSession() as client: @@ -123,4 +124,3 @@ if __name__ == "__main__": asyncio.run(test_animeworld()) -''' \ No newline at end of file diff --git a/Src/Utilities/dictionaries.py b/Src/Utilities/dictionaries.py index c796046..2c4b3d9 100644 --- a/Src/Utilities/dictionaries.py +++ b/Src/Utilities/dictionaries.py @@ -766,32 +766,30 @@ webru_vary = { "sky-serie": "calcioXskyserie", "sky-uno": "calcioXskyuno", "sky-sport-24": "calcioXskysport24", + "sky-sport-golf": "calcioXskysportgolf", + "sky-sport-251": "calcioXskysport251", + "sky-sport-253": "calcioXskysport253", + "sky-sport-max": "calcioXskysportmax", + "sky-sport-255": "calcioXskysport255", + "sky-sport-259": "calcioXsky259", + "sky-sport-252": "calcioXskysport252", + "sky-sport-254": "calcioXskysport254", + "sky-sport-256": "calcioXskysport256", + "sky-sport-257": "calcioXskysport257", + "sky-sport-258": "calcioXsky258", + "sky-sport-259": "calcioXsky259", + "sky-sport-260": "calcioXsky260", + "sky-sport-261": "calcioXsky261", + "eurosport-1": "calcioXeurosport1", + "eurosport-2": "calcioXeurosport2", + "sky-sport-uno": "calcioXskysportuno", + "sky-sport-f1": "calcioXskysportf1", + "sky-sport-motogp": "calcioXskysportmotogp", + "sky-sport-calcio": "calcioXskysportcalcio", + "sky-sport-arena": "calcioXskysportarena", + "sky-sport-tennis": "calcioXskysporttennis", + "sky-sport-nba": "calcioXskysportnba", } -''' - "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", - "sky-sport-max": "https://webuit.mizhls.ru/lb/calcioXskysportmax/index.m3u8", - "sky-sport-255": "https://webuit.mizhls.ru/lb/calcioXskysport255/index.m3u8", - "sky-sport-259": "https://webuit.mizhls.ru/lb/calcioXsky259/index.m3u8", - "sky-sport-252": "https://webuit.mizhls.ru/lb/calcioXskysport252/index.m3u8", - "sky-sport-254": "https://webuit.mizhls.ru/lb/calcioXskysport254/index.m3u8", - "sky-sport-256": "https://webuit.mizhls.ru/lb/calcioXskysport256/index.m3u8", - "sky-sport-257": "https://webuit.mizhls.ru/lb/calcioXskysport257/index.m3u8", - "sky-sport-258": "https://webuit.mizhls.ru/lb/calcioXsky258/index.m3u8", - "sky-sport-259": "https://webuit.mizhls.ru/lb/calcioXsky259/index.m3u8", - "sky-sport-260": "https://webuit.mizhls.ru/lb/calcioXsky260/index.m3u8", - "sky-sport-261": "https://webuit.mizhls.ru/lb/calcioXsky261/index.m3u8", - "eurosport-1": "https://webuit.mizhls.ru/lb/calcioXeurosport1/index.m3u8", - "eurosport-2": "https://webuit.mizhls.ru/lb/calcioXeurosport2/index.m3u8", - "sky-sport-uno": "https://webuit.mizhls.ru/lb/calcioXskysportuno/index.m3u8", - "sky-sport-f1": "https://webuit.mizhls.ru/lb/calcioXskysportf1/index.m3u8", - "sky-sport-motogp": "https://webuit.mizhls.ru/lb/calcioXskysportmotogp/index.m3u8", - "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" webru_dlhd = { "sky-sport-tennis": "premium576", diff --git a/Src/Utilities/info.py b/Src/Utilities/info.py index d9c8c74..37850f9 100644 --- a/Src/Utilities/info.py +++ b/Src/Utilities/info.py @@ -68,9 +68,9 @@ def get_info_tmdb(tmbda,ismovie,type): #GET US RELEASE DATE because filmpertutti somewhy uses US release date return showname,date elif type == "StreamingCommunity": - date = show.release_dates + date = show.release_date date = date.split("-")[0] - return showname + return showname,date elif type == "StreamingCommunityFS": return showname elif type == "Tantifilm": @@ -106,7 +106,7 @@ def get_info_tmdb(tmbda,ismovie,type): async def get_info_imdb(imdb_id, ismovie, type,client): resp = await client.get(f'https://api.themoviedb.org/3/find/{imdb_id}?api_key={TMDB_KEY}&language=it&external_source=imdb_id') data = resp.json() - if ismovie == 0: + if ismovie == 0: showname = data['tv_results'][0]['name'] if type == "Filmpertutti": date= data['tv_results'][0]['first_air_date'] diff --git a/config.json b/config.json index b487d99..040b28c 100644 --- a/config.json +++ b/config.json @@ -29,13 +29,13 @@ } }, "General":{ - "load_env": "0", + "load_env": "1", "HOST": "0.0.0.0", "PORT": "8080", - "HF": "1", + "HF": "0", "Public_Instance": "0", - "MediaProxy": ["Test"], - "ForwardProxy": ["Test"], - "Proxy": [] + "MediaProxy": ["http://mammamia-urlo.serv00.net:1984/"], + "ForwardProxy": [""], + "Proxy": [""] } } diff --git a/run.py b/run.py index 6cd9b80..423a959 100644 --- a/run.py +++ b/run.py @@ -74,8 +74,17 @@ def respond_with(data): def config(): return RedirectResponse(url="/") @app.get('/{config}/manifest.json') -def addon_manifest(): - return respond_with(MANIFEST) +def addon_manifest(config: str): + manifest_copy = MANIFEST.copy() + print(config) + if "LIVETV" in config: + return respond_with(manifest_copy) + elif "LIVETV" not in config: + manifest_copy["catalogs"] = [] + if "catalog" in manifest_copy["resources"]: + manifest_copy["resources"].remove("catalog") + return respond_with(manifest_copy) + @app.get('/manifest.json') def manifest(): return RedirectResponse(url="/|SC|LC|SW|/manifest.json") @@ -211,6 +220,12 @@ async def addon_stream(request: Request,config, type, id,): i = i+1 webru_url_2 = await webru(id,"dlhd",client) streams['streams'].append({'title': f"{HF}Server {i} " + channel['title'],'url': webru_url_2}) + if id == "sky-sport-f1": + test= "https://mhdtv.co.in/daddy/stream.m3u8?id=577" + Referer1 = "https://mhdtv.co.in" + User_Agent1 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36" + streams['streams'].append({'title': f'{HF}Server {i} Test mhd', 'url': test, "behaviorHints": {"notWebReady": True, "proxyHeaders": {"request": {"User-Agent": User_Agent1, "Referer": Referer1}}}}) + if not streams['streams']: raise HTTPException(status_code=404) return respond_with(streams) @@ -240,22 +255,22 @@ async def addon_stream(request: Request,config, type, id,): print(provider_maps['STREAMINGCOMMUNITY']) if provider_maps['STREAMINGCOMMUNITY'] == "1": SC_FAST_SEARCH = provider_maps['SC_FAST_SEARCH'] - url_streaming_community,url_720_streaming_community,quality_sc = await streaming_community(id,client,SC_FAST_SEARCH) + url_streaming_community,url_720_streaming_community,quality_sc, slug_sc = await streaming_community(id,client,SC_FAST_SEARCH) if url_streaming_community is not None: print(f"StreamingCommunity Found Results for {id}") if quality_sc == "1080": - streams['streams'].append({'title': f'{HF}StreamingCommunity 1080p Max', 'url': url_streaming_community}) - streams['streams'].append({'title': f'{HF}StreamingCommunity 720p Max', 'url': url_720_streaming_community}) + streams['streams'].append({"name":f'MammaMia 1080p Max', 'title': f'{HF}StreamingCommunity\n {slug_sc.replace("-"," ").capitalize()}','url': url_streaming_community}) + streams['streams'].append({"name": f'MammaMia 720p Max','title': f'{HF}StreamingCommunity {slug_sc.replace("-","").capitalize()}', 'url': url_720_streaming_community}) else: streams['streams'].append({'title': f'{HF}StreamingCommunity 720p Max', 'url': url_streaming_community}) if provider_maps['LORDCHANNEL'] == "1": url_lordchannel,quality_lordchannel = await lordchannel(id,client) if quality_lordchannel == "FULL HD" and url_lordchannel != None: print(f"LordChannel Found Results for {id}") - streams['streams'].append({'title': f'{HF}LordChannel 1080p', 'url': url_lordchannel}) + streams['streams'].append({'name': "MammaMia 1080p",'title': f'{HF}LordChannel', 'url': url_lordchannel}) elif url_lordchannel != None: print(f"LordChannel Found Results for {id}") - streams['streams'].append({'title': f'{HF}LordChannel 720p', 'url': url_lordchannel}) + streams['streams'].append({"name": "MammaMia 720p",'title': f'{HF}LordChannel 720p', 'url': url_lordchannel}) if provider_maps['FILMPERTUTTI'] == "1": url_filmpertutti = await filmpertutti(id,client) if url_filmpertutti is not None: @@ -275,7 +290,7 @@ async def addon_stream(request: Request,config, type, id,): url_streamingwatch = await streamingwatch(id,client) if url_streamingwatch: print(f"Streaming Watch Found Results for {id}") - streams['streams'].append({'title': f'{HF}StreamingWatch 720p', 'url': url_streamingwatch}) + streams['streams'].append({'name': "MammaMia 720p",'title': f'{HF}StreamingWatch', 'url': url_streamingwatch}) if not streams['streams']: raise HTTPException(status_code=404) @@ -284,4 +299,5 @@ async def addon_stream(request: Request,config, type, id,): if __name__ == '__main__': import uvicorn - uvicorn.run("run:app", host=HOST, port=PORT, log_level="info") \ No newline at end of file + uvicorn.run("run:app", host=HOST, port=PORT, log_level="info") + \ No newline at end of file diff --git a/static/static.py b/static/static.py index 229e851..8529c29 100644 --- a/static/static.py +++ b/static/static.py @@ -227,6 +227,26 @@ HTML = """ Animeworld +
+ +
+
+ +
+
+ +
+
+ +
@@ -243,7 +263,11 @@ HTML = """ "tantifilm": "TF", "fast_search_tf": "TF_FS", "filmpertutti": "FT", - "animeworld": "AW" + "animeworld": "AW", + "livetv": "LIVETV", + "cb01": "CB", + "ddlstream": "DDL", + "whvx": "WHVX" }; for (const id in providers) {