diff --git a/Src/Api/page.py b/Src/Api/page.py index f2bb5b0..62ddeec 100644 --- a/Src/Api/page.py +++ b/Src/Api/page.py @@ -9,30 +9,34 @@ import requests, sys, json from bs4 import BeautifulSoup def domain_version(): - console.print("[green]Get rules ...") - req_repo = requests.get("https://raw.githubusercontent.com/Ghost6446/Streaming_comunity_data/main/data.json", headers={'user-agent': get_headers()}, timeout=5) - domain = req_repo.json()['domain'] + req_repo = None + try: + with open('data.json', 'r') as file: + req_repo = json.load(file) + except FileNotFoundError: + req_repo = {"domain": ""} + domain = req_repo['domain'] - if req_repo.ok: + while True: + if not domain: + domain = input("Insert domain (streamingcommunity.?): ") + req_repo['domain'] = domain + with open('data.json', 'w') as file: + json.dump(req_repo, file) console.print(f"[blue]Test domain [white]=> [red]{domain}") site_url = f"https://streamingcommunity.{domain}" - site_request = requests.get(site_url, headers={'user-agent': get_headers()}) - try: + site_request = requests.get(site_url, headers={'user-agent': get_headers()}) soup = BeautifulSoup(site_request.text, "lxml") version = json.loads(soup.find("div", {"id": "app"}).get("data-page"))['version'] console.print(f"[blue]Rules [white]=> [red].{domain}") - return domain, version - except: - console.log("[red]Cant get version, problem with domain") - sys.exit(0) - - else: - console.log(f"[red]Error: {req_repo.status_code}") - sys.exit(0) + except Exception as e: + console.log("[red]Cant get version, problem with domain. Try again.") + domain = None + continue def search(title_search, domain): diff --git a/Src/Lib/FFmpeg/my_m3u8.py b/Src/Lib/FFmpeg/my_m3u8.py index 09112b0..bcb34a7 100644 --- a/Src/Lib/FFmpeg/my_m3u8.py +++ b/Src/Lib/FFmpeg/my_m3u8.py @@ -193,7 +193,12 @@ class M3U8_Segments: """Single req to a ts file to get content""" url_number = self.segments.index(ts_url) - is_valid = ( str(url_number) in failed_segments ) + + is_valid = True + for failde_seg in failed_segments: + if str(failde_seg) in ts_url: + is_valid = False + break if is_valid: @@ -307,8 +312,8 @@ class M3U8_Segments: with open(file_list_path, 'w') as f: for ts_file in ts_files: - absolute_path = os.path.abspath(os.path.join(self.temp_folder, ts_file), current_dir) - f.write(f"file '{absolute_path}'\n") + relative_path = os.path.relpath(os.path.join(self.temp_folder, ts_file), current_dir) + f.write(f"file '{relative_path}'\n") console.log("[cyan]Start join all file") try: diff --git a/Src/Upload/__version__.py b/Src/Upload/__version__.py index d2dd26c..28ac16f 100644 --- a/Src/Upload/__version__.py +++ b/Src/Upload/__version__.py @@ -1,5 +1,5 @@ __title__ = 'Streaming_community' -__version__ = 'v0.8.6' +__version__ = 'v0.8.5' __author__ = 'Ghost6446' __description__ = 'A command-line program to download film' __license__ = 'MIT License' diff --git a/data.json b/data.json new file mode 100644 index 0000000..8edf9de --- /dev/null +++ b/data.json @@ -0,0 +1 @@ +{"domain": "express"} \ No newline at end of file