github/StreamingCommunity
1
1
Fork 0
mirror of https://github.com/Arrowar/StreamingCommunity.git synced 2025-06-07 20:15:24 +00:00
Code Issues 2 Packages Projects Releases Wiki Activity

Fix some bug m3u8

Browse Source
This commit is contained in:
Lovi-0 2024-07-09 22:21:59 +02:00
parent 7ce51745a0
commit 8c1baf929a
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Src/Lib/Downloader/HLS/downloader.py
View File

@ -139,13 +139,13 @@ class HLS_Downloader():
str: The text content of the response. str: The text content of the response.
""" """
if "http" not in url or "https" not in url: if "http" not in str(url).lower().strip() or "https" not in str(url).lower().strip():
logging.error(f"Invalid url: {url}") logging.error(f"Invalid url: {url}")
sys.exit(0) sys.exit(0)
# Send a GET request to the provided URL # Send a GET request to the provided URL
logging.info(f"Test url: {url}") logging.info(f"Test url: {url}")
response = httpx.get(url, headers=headers_index) response = httpx.get(url, headers=headers_index, timeout=20)
try: try:
response.raise_for_status() response.raise_for_status()
@ -268,7 +268,7 @@ class HLS_Downloader():
# Download the video segments # Download the video segments
self.expected_real_time = video_m3u8.expected_real_time self.expected_real_time = video_m3u8.expected_real_time
list_available_resolution_size = self.main_obj_parser._video.get_list_resolution_and_size(video_m3u8.expected_real_time_s) #list_available_resolution_size = self.main_obj_parser._video.get_list_resolution_and_size(video_m3u8.expected_real_time_s)
#console.print(f"[cyan]Estimate size [white]=> [red]{sorted(list_available_resolution_size, reverse=True)}") #console.print(f"[cyan]Estimate size [white]=> [red]{sorted(list_available_resolution_size, reverse=True)}")
video_m3u8.download_streams(f"{Colors.MAGENTA}video") video_m3u8.download_streams(f"{Colors.MAGENTA}video")
@ -406,6 +406,10 @@ class HLS_Downloader():
if not os.path.exists(path_join_video): if not os.path.exists(path_join_video):
# If codec not exist set to None
if not hasattr(self, 'codec'):
self.codec = None
# Join the video segments into a single video file # Join the video segments into a single video file
join_video( join_video(
video_path = self.downloaded_video[0].get('path'), video_path = self.downloaded_video[0].get('path'),
@ -428,6 +432,10 @@ class HLS_Downloader():
if not os.path.exists(path_join_video_audio): if not os.path.exists(path_join_video_audio):
# If codec not exist set to None
if not hasattr(self, 'codec'):
self.codec = None
# Join the video with audio segments into a single video with audio file # Join the video with audio segments into a single video with audio file
join_audios( join_audios(
video_path = self.downloaded_video[0].get('path'), video_path = self.downloaded_video[0].get('path'),

8
Src/Lib/Downloader/HLS/segments.py
View File

@ -217,16 +217,16 @@ class M3U8_Segments:
with httpx.Client(proxies=proxy, verify=True) as client: with httpx.Client(proxies=proxy, verify=True) as client:
if 'key_base_url' in self.__dict__: if 'key_base_url' in self.__dict__:
response = client.get(ts_url, headers=random_headers(self.key_base_url), timeout=REQUEST_TIMEOUT) response = client.get(ts_url, headers=random_headers(self.key_base_url), timeout=REQUEST_TIMEOUT, follow_redirects=True)
else: else:
response = client.get(ts_url, headers={'user-agent': get_headers()}, timeout=REQUEST_TIMEOUT) response = client.get(ts_url, headers={'user-agent': get_headers()}, timeout=REQUEST_TIMEOUT, follow_redirects=True)
else: else:
with httpx.Client(verify=True) as client_2: with httpx.Client(verify=True) as client_2:
if 'key_base_url' in self.__dict__: if 'key_base_url' in self.__dict__:
response = client_2.get(ts_url, headers=random_headers(self.key_base_url), timeout=REQUEST_TIMEOUT) response = client_2.get(ts_url, headers=random_headers(self.key_base_url), timeout=REQUEST_TIMEOUT, follow_redirects=True)
else: else:
response = client_2.get(ts_url, headers={'user-agent': get_headers()}, timeout=REQUEST_TIMEOUT) response = client_2.get(ts_url, headers={'user-agent': get_headers()}, timeout=REQUEST_TIMEOUT, follow_redirects=True)
# Get response content # Get response content
response.raise_for_status() response.raise_for_status()

4
Src/Lib/FFmpeg/util.py
View File

@ -68,7 +68,11 @@ def get_video_duration(file_path: str) -> float:
probe_result = json.loads(stdout) probe_result = json.loads(stdout)
# Extract duration from the video information # Extract duration from the video information
try:
return float(probe_result['format']['duration']) return float(probe_result['format']['duration'])
except:
logging.error("Cant get duration.")
return 1
except Exception as e: except Exception as e:
logging.error(f"Error get video duration: {e}") logging.error(f"Error get video duration: {e}")