StreamingCommunity 2.8.0__tar.gz → 2.9.1__tar.gz

{StreamingCommunity-2.8.0/StreamingCommunity.egg-info → StreamingCommunity-2.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: StreamingCommunity
-Version: 2.8.0
+Version: 2.9.1
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Player/supervideo.py

@@ -12,7 +12,7 @@ from bs4 import BeautifulSoup
 
 # Internal utilities
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.headers import get_headers
 
 
 # Variable
@@ -27,11 +27,7 @@ class VideoSource:
         Attributes:
             - url (str): The URL of the video source.
         """
-        self.headers = {
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8',
-            'accept-language': 'it-IT,it;q=0.9,en-US;q=0.8,en;q=0.7',
-            'User-Agent': get_userAgent()
-        }
+        self.headers = get_headers()
         self.client = httpx.Client()
         self.url = url
 
@@ -66,7 +62,7 @@ class VideoSource:
         """
         iframes = soup.find_all("iframe")
         if iframes and len(iframes) > 1:
-            return iframes[1].get("src")
+            return iframes[0].get("src") or iframes[0].get("data-src")
         
         return None
 
@@ -115,13 +111,8 @@ class VideoSource:
                 logging.error("Failed to fetch HTML content.")
                 return None
 
-            soup = BeautifulSoup(html_content, "html.parser")
-            if not soup:
-                logging.error("Failed to parse HTML content.")
-                return None
-
             # Find master playlist
-            data_js = self.get_result_node_js(soup)
+            data_js = self.get_result_node_js(BeautifulSoup(html_content, "html.parser"))
 
             if data_js is not None:
                 match = re.search(r'sources:\s*\[\{\s*file:\s*"([^"]+)"', data_js)
@@ -131,7 +122,7 @@ class VideoSource:
                     
             else:
 
-                iframe_src = self.get_iframe(soup)
+                iframe_src = self.get_iframe(BeautifulSoup(html_content, "html.parser"))
                 if not iframe_src:
                     logging.error("No iframe found.")
                     return None

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/1337xx/site.py

@@ -41,7 +41,7 @@ def title_search(word_to_search: str) -> int:
     table_show_manager.clear()
 
     # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
 
     if domain_to_use is None or base_url is None:
         console.log("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/animeunity/site.py

@@ -111,7 +111,7 @@ def title_search(title: str) -> int:
     table_show_manager.clear()
 
     # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
 
     if domain_to_use is None or base_url is None:
         console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/cb01new/film.py

@@ -55,10 +55,8 @@ def download_film(select_title: MediaItem) -> str:
         output_path=os.path.join(mp4_path, title_name)
     ).start()
 
-    if "error" in r_proc.keys():
-        try:
-            os.remove(r_proc['path'])
-        except:
-            pass
+    if r_proc['error'] is not None:
+        try: os.remove(r_proc['path'])
+        except: pass
 
     return r_proc['path']

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/cb01new/site.py

@@ -42,7 +42,7 @@ def title_search(word_to_search: str) -> int:
     table_show_manager.clear()
 
     # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
 
     if domain_to_use is None or base_url is None:
         console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/ddlstreamitaly/site.py

@@ -43,7 +43,7 @@ def title_search(word_to_search: str) -> int:
     table_show_manager.clear()
 
     # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
 
     if domain_to_use is None or base_url is None:
         console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/guardaserie/series.py

@@ -72,13 +72,10 @@ def download_video(index_season_selected: int, index_episode_selected: int, scap
         m3u8_url=master_playlist, 
         output_path=os.path.join(mp4_path, mp4_name)
     ).start()
-
-            
-    if "error" in r_proc.keys():
-        try:
-            os.remove(r_proc['path'])
-        except:
-            pass
+     
+    if r_proc['error'] is not None:
+        try: os.remove(r_proc['path'])
+        except: pass
 
     return r_proc['path'], r_proc['stopped']
 

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/guardaserie/site.py

@@ -42,7 +42,7 @@ def title_search(word_to_search: str) -> int:
     table_show_manager.clear()
 
     # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
 
     if domain_to_use is None or base_url is None:
         console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/mostraguarda/film.py

@@ -86,10 +86,8 @@ def download_film(movie_details: Json_film) -> str:
         output_path=os.path.join(mp4_path, title_name)
     ).start()
 
-    if "error" in r_proc.keys():
-        try:
-            os.remove(r_proc['path'])
-        except:
-            pass
+    if r_proc['error'] is not None:
+        try: os.remove(r_proc['path'])
+        except: pass
 
     return r_proc['path']

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -80,10 +80,8 @@ def download_film(select_title: MediaItem) -> str:
         if script_id != "unknown":
             TelegramSession.deleteScriptId(script_id)
 
-    if "error" in r_proc.keys():
-        try:
-            os.remove(r_proc['path'])
-        except:
-            pass
+    if r_proc['error'] is not None:
+        try: os.remove(r_proc['path'])
+        except: pass
 
     return r_proc['path']

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -86,11 +86,9 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         output_path=os.path.join(mp4_path, mp4_name)
     ).start()
 
-    if "error" in r_proc.keys():
-        try:
-            os.remove(r_proc['path'])
-        except:
-            pass
+    if r_proc['error'] is not None:
+        try: os.remove(r_proc['path'])
+        except: pass
 
     return r_proc['path'], r_proc['stopped']
 

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -38,7 +38,7 @@ def title_search(title_search: str) -> int:
     Returns:
         int: The number of titles found.
     """
-    domain_to_use, base_url = search_domain(site_constant.SITE_NAME, site_constant.FULL_URL)
+    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
 
     if domain_to_use is None or base_url is None:
         console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Api/Template/Util/get_domain.py

@@ -67,7 +67,8 @@ def validate_url(url, base_url):
         return False, None
     
     client = httpx.Client(
-        verify=VERIFY,
+        http1=True,
+        verify=certifi.where(),
         headers=get_headers(),
         timeout=MAX_TIMEOUT
     )
@@ -82,7 +83,7 @@ def validate_url(url, base_url):
         
     return True, base_domain
 
-def search_domain(site_name: str, base_url: str, get_first: bool = False):
+def search_domain(base_url: str):
     """Search for valid domain matching site name and base URL."""    
     try:
         is_correct, redirect_tld = validate_url(base_url, base_url)

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Lib/Downloader/HLS/downloader.py

@@ -429,7 +429,8 @@ class HLS_Downloader:
                     'path': self.path_manager.output_path,
                     'url': self.m3u8_url,
                     'is_master': False,
-                    'error': 'File already exists',
+                    'msg': 'File already exists',
+                    'error': None,
                     'stopped': False
                 }
                 if TELEGRAM_BOT:
@@ -473,6 +474,8 @@ class HLS_Downloader:
                 'path': self.path_manager.output_path,
                 'url': self.m3u8_url,
                 'is_master': self.m3u8_manager.is_master,
+                'msg': None,
+                'error': None,
                 'stopped': download_stopped
             }
 
@@ -485,6 +488,7 @@ class HLS_Downloader:
                 'path': None,
                 'url': self.m3u8_url,
                 'is_master': getattr(self.m3u8_manager, 'is_master', None),
+                'msg': None,
                 'error': error_msg,
                 'stopped': False
             }

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Lib/Downloader/MP4/downloader.py

@@ -84,7 +84,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
         console.log("[red]Output file already exists.")
         if TELEGRAM_BOT:
             bot.send_message(f"Contenuto già scaricato!", None)
-        return 400
+        return None, False
 
     if GET_ONLY_LINK:
         return {'path': path, 'url': url}
@@ -92,23 +92,19 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     if not (url.lower().startswith('http://') or url.lower().startswith('https://')):
         logging.error(f"Invalid URL: {url}")
         console.print(f"[bold red]Invalid URL: {url}[/bold red]")
-        return None
+        return None, False
 
-    try:
-        headers = {}
-        if referer:
-            headers['Referer'] = referer
-        
-        if headers_:
-            headers.update(headers_)
-        else:
-            headers['User-Agent'] = get_userAgent()
-
-    except Exception as header_err:
-        logging.error(f"Error preparing headers: {header_err}")
-        console.print(f"[bold red]Error preparing headers: {header_err}[/bold red]")
-        return None
+    # Set headers
+    headers = {}
+    if referer:
+        headers['Referer'] = referer
     
+    if headers_:
+        headers.update(headers_)
+    else:
+        headers['User-Agent'] = get_userAgent()
+
+    # Set interrupt handler
     temp_path = f"{path}.temp"
     interrupt_handler = InterruptHandler()
     original_handler = signal.signal(signal.SIGINT, partial(signal_handler, interrupt_handler=interrupt_handler, original_handler=signal.getsignal(signal.SIGINT)))
@@ -123,7 +119,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
                 
                 if total == 0:
                     console.print("[bold red]No video stream found.[/bold red]")
-                    return None
+                    return None, False
 
                 progress_bar = tqdm(
                     total=total,

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Lib/M3U8/parser.py

@@ -503,25 +503,35 @@ class M3U8_Parser:
         except Exception as e:
             logging.error(f"Error parsing video info: {e}")
 
-    def __parse_encryption_keys__(self, m3u8_obj) -> None:
+    def __parse_encryption_keys__(self, obj) -> None:
         """
-        Extracts encryption keys from the M3U8 object.
+        Extracts encryption keys either from the M3U8 object or from individual segments.
 
         Parameters:
-            - m3u8_obj: The M3U8 object containing encryption keys.
+            - obj: Either the main M3U8 object or an individual segment.
         """
         try:
-            if m3u8_obj.key is not None:
+            if hasattr(obj, 'key') and obj.key is not None:
+                key_info = {
+                    'method': obj.key.method,
+                    'iv': obj.key.iv,
+                    'uri': obj.key.uri
+                }
+                
                 if self.keys is None:
-                    self.keys = {
-                        'method': m3u8_obj.key.method,
-                        'iv': m3u8_obj.key.iv,
-                        'uri': m3u8_obj.key.uri
-                    }
+                    self.keys = key_info
+
+                """
+                elif obj.key.uri not in self.keys:
+                    if isinstance(self.keys, dict):
+                        self.keys[obj.key.uri] = key_info
+                    else:
+                        old_key = self.keys
+                        self.keys = {'default': old_key, obj.key.uri: key_info}
+                """
 
         except Exception as e:
             logging.error(f"Error parsing encryption keys: {e}")
-            sys.exit(0)
             pass
 
     def __parse_subtitles_and_audio__(self, m3u8_obj) -> None:
@@ -574,6 +584,10 @@ class M3U8_Parser:
                     self.segments.append(segment.uri)
                 else:
                     self.subtitle.append(segment.uri)
+            
+            # Second check if there is key in main m3u8 obj
+            if self.keys is None:
+                self.__parse_encryption_keys__(m3u8_obj)
 
         except Exception as e:
             logging.error(f"Error parsing segments: {e}")

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/StreamingCommunity/Upload/version.py

@@ -1,5 +1,5 @@
 __title__ = 'StreamingCommunity'
-__version__ = '2.8.0'
+__version__ = '2.9.1'
 __author__ = 'Arrowar'
 __description__ = 'A command-line program to download film'
 __copyright__ = 'Copyright 2024'

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1/StreamingCommunity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: StreamingCommunity
-Version: 2.8.0
+Version: 2.9.1
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues

{StreamingCommunity-2.8.0 → StreamingCommunity-2.9.1}/setup.py

@@ -10,7 +10,7 @@ with open("requirements.txt", "r", encoding="utf-8-sig") as f:
 
 setup(
     name="StreamingCommunity",
-    version="2.8.0",
+    version="2.9.1",
     long_description=read_readme(),
     long_description_content_type="text/markdown",
     author="Lovi-0",