StreamingCommunity 2.9.9__tar.gz → 3.0.0__tar.gz

{streamingcommunity-2.9.9/StreamingCommunity.egg-info → streamingcommunity-3.0.0}/PKG-INFO

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

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/1337xx/__init__.py

@@ -22,8 +22,7 @@ from .title import download_title
 # Variable
 indice = 3
 _useFor = "film_serie"
-_deprecate = False
-_priority = 2
+_priority = 0
 _engineDownload = "tor"
 
 console = Console()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/1337xx/site.py

@@ -43,7 +43,12 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
+        response = httpx.get(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout, 
+            follow_redirects=True
+        )
         response.raise_for_status()
 
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -25,8 +25,7 @@ from .series import download_series
 # Variable
 indice = 2
 _useFor = "film_serie"
-_deprecate = False
-_priority = 1
+_priority = 0
 _engineDownload = "hls"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/altadefinizione/site.py

@@ -46,7 +46,12 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.post(search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
+        response = httpx.post(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout, 
+            follow_redirects=True
+        )
         response.raise_for_status()
 
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/animeunity/__init__.py

@@ -25,8 +25,7 @@ from .serie import download_series
 # Variable
 indice = 1
 _useFor = "anime"
-_deprecate = False
-_priority = 2
+_priority = 0
 _engineDownload = "mp4"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/animeunity/site.py

@@ -51,10 +51,8 @@ def get_token() -> dict:
     
     for html_meta in soup.find_all("meta"):
         if html_meta.get('name') == "csrf-token":
-
             find_csrf_token = html_meta.get('content')
 
-    logging.info(f"Extract: ('animeunity_session': {response.cookies['animeunity_session']}, 'csrf_token': {find_csrf_token})")
     return {
         'animeunity_session': response.cookies['animeunity_session'],
         'csrf_token': find_csrf_token
@@ -64,9 +62,6 @@ def get_token() -> dict:
 def get_real_title(record):
     """
     Get the real title from a record.
-
-    This function takes a record, which is assumed to be a dictionary representing a row of JSON data.
-    It looks for a title in the record, prioritizing English over Italian titles if available.
     
     Parameters:
         - record (dict): A dictionary representing a row of JSON data.
@@ -84,7 +79,7 @@ def get_real_title(record):
 
 def title_search(query: str) -> int:
     """
-    Function to perform an anime search using a provided query.
+    Function to perform an anime search using both APIs and combine results.
 
     Parameters:
         - query (str): The query to search for.
@@ -97,43 +92,85 @@ def title_search(query: str) -> int:
     
     media_search_manager.clear()
     table_show_manager.clear()
+    seen_titles = set()
+    choices = [] if site_constant.TELEGRAM_BOT else None
 
     # Create parameter for request
     data = get_token()
-    cookies = {'animeunity_session': data.get('animeunity_session')}
+    cookies = {
+        'animeunity_session': data.get('animeunity_session')
+    }
     headers = {
         'user-agent': get_userAgent(),
         'x-csrf-token': data.get('csrf_token')
     }
-    json_data =  {'title': query}
 
-    # Send a POST request to the API endpoint for live search
+    # First API call - livesearch
+    try:
+        response1 = httpx.post(
+            f'{site_constant.FULL_URL}/livesearch',
+            cookies=cookies,
+            headers=headers,
+            json={'title': query},
+            timeout=max_timeout
+        )
+        
+        response1.raise_for_status()
+        process_results(response1.json()['records'], seen_titles, media_search_manager, choices)
+
+    except Exception as e:
+        console.print(f"Site: {site_constant.SITE_NAME}, livesearch error: {e}")
+
+    # Second API call - archivio
     try:
-        response = httpx.post(
-            f'{site_constant.FULL_URL}/livesearch', 
-            cookies=cookies, 
-            headers=headers, 
+        json_data = {
+            'title': query,
+            'type': False,
+            'year': False,
+            'order': 'Lista A-Z',
+            'status': False,
+            'genres': False,
+            'offset': 0,
+            'dubbed': False,
+            'season': False
+        }
+
+        response2 = httpx.post(
+            f'{site_constant.FULL_URL}/archivio/get-animes',
+            cookies=cookies,
+            headers=headers,
             json=json_data,
             timeout=max_timeout
         )
-        response.raise_for_status()
+
+        response2.raise_for_status()
+        process_results(response2.json()['records'], seen_titles, media_search_manager, choices)
 
     except Exception as e:
-        console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
-        return 0
+        console.print(f"Site: {site_constant.SITE_NAME}, archivio search error: {e}")
 
-    # Inizializza la lista delle scelte
-    if site_constant.TELEGRAM_BOT:
-        choices = []
+    if site_constant.TELEGRAM_BOT and choices and len(choices) > 0:
+        bot.send_message(f"Lista dei risultati:", choices)
+    
+    result_count = media_search_manager.get_length()
+    if result_count == 0:
+        console.print(f"Nothing matching was found for: {query}")
+    
+    return result_count
 
-    for dict_title in response.json()['records']:
+def process_results(records: list, seen_titles: set, media_manager: MediaManager, choices: list = None) -> None:
+    """Helper function to process search results and add unique entries."""
+    for dict_title in records:
         try:
-
-            # Rename keys for consistency
+            title_id = dict_title.get('id')
+            if title_id in seen_titles:
+                continue
+                
+            seen_titles.add(title_id)
             dict_title['name'] = get_real_title(dict_title)
 
-            media_search_manager.add_media({
-                'id': dict_title.get('id'),
+            media_manager.add_media({
+                'id': title_id,
                 'slug': dict_title.get('slug'),
                 'name': dict_title.get('name'),
                 'type': dict_title.get('type'),
@@ -142,18 +179,9 @@ def title_search(query: str) -> int:
                 'image': dict_title.get('imageurl')
             })
 
-            if site_constant.TELEGRAM_BOT:
-                
-                # Crea una stringa formattata per ogni scelta con numero
+            if choices is not None:
                 choice_text = f"{len(choices)} - {dict_title.get('name')} ({dict_title.get('type')}) - Episodi: {dict_title.get('episodes_count')}"
                 choices.append(choice_text)
 
         except Exception as e:
-            print(f"Error parsing a film entry: {e}")
-
-    if site_constant.TELEGRAM_BOT:
-        if choices:
-            bot.send_message(f"Lista dei risultati:", choices)
-
-    # Return the length of media search manager
-    return media_search_manager.get_length()
+            print(f"Error parsing a title entry: {e}")

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/animeunity/util/ScrapeSerie.py

@@ -29,6 +29,7 @@ class ScrapeSerieAnime:
         self.is_series = False
         self.headers = {'user-agent': get_userAgent()}
         self.url = url
+        self.episodes_cache = None
 
     def setup(self, version: str = None, media_id: int = None, series_name: str = None):
         self.version = version
@@ -62,38 +63,41 @@ class ScrapeSerieAnime:
             logging.error(f"Error fetching episode count: {e}")
             return None
     
-    def get_info_episode(self, index_ep: int) -> Episode:
+    def _fetch_all_episodes(self):
         """
-        Fetch detailed information for a specific episode.
-        
-        Args:
-            index_ep (int): Zero-based index of the target episode
-        
-        Returns:
-            Episode: Detailed episode information
+        Fetch all episodes data at once and cache it
         """
         try:
-
-            params = {
-                "start_range": index_ep, 
-                "end_range": index_ep + 1
-            }
+            count = self.get_count_episodes()
+            if not count:
+                return
 
             response = httpx.get(
-                url=f"{self.url}/info_api/{self.media_id}/{index_ep}", 
-                headers=self.headers, 
-                params=params, 
+                url=f"{self.url}/info_api/{self.media_id}/1",
+                params={
+                    "start_range": 1,
+                    "end_range": count
+                },
+                headers=self.headers,
                 timeout=max_timeout
             )
             response.raise_for_status()
-
-            # Return information about the episode
-            json_data = response.json()["episodes"][-1]
-            return Episode(json_data)
-        
+            
+            self.episodes_cache = response.json()["episodes"]
         except Exception as e:
-            logging.error(f"Error fetching episode information: {e}")
-            return None
+            logging.error(f"Error fetching all episodes: {e}")
+            self.episodes_cache = None
+
+    def get_info_episode(self, index_ep: int) -> Episode:
+        """
+        Get episode info from cache
+        """
+        if self.episodes_cache is None:
+            self._fetch_all_episodes()
+            
+        if self.episodes_cache and 0 <= index_ep < len(self.episodes_cache):
+            return Episode(self.episodes_cache[index_ep])
+        return None
 
 
     # ------------- FOR GUI -------------
@@ -108,4 +112,4 @@ class ScrapeSerieAnime:
         """
         Get information for a specific episode.
         """
-        return self.get_info_episode(episode_index)
+        return self.get_info_episode(episode_index)

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/animeworld/__init__.py

@@ -20,8 +20,7 @@ from .film import download_film
 # Variable
 indice = 8
 _useFor = "anime"
-_deprecate = False
-_priority = 2
+_priority = 0
 _engineDownload = "mp4"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/animeworld/site.py

@@ -70,7 +70,12 @@ def title_search(query: str) -> int:
 
     # Make the GET request
     try:
-        response = httpx.get(search_url, headers={'User-Agent': get_userAgent()})
+        response = httpx.get(
+            search_url, 
+            headers={'User-Agent': get_userAgent()},
+            timeout=max_timeout,
+            verify=False
+        )
 
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/cb01new/__init__.py

@@ -22,8 +22,7 @@ from .film import download_film
 # Variable
 indice = 4
 _useFor = "film"
-_deprecate = False
-_priority = 2
+_priority = 0
 _engineDownload = "mp4"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/cb01new/site.py

@@ -44,7 +44,13 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(url=search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
+        response = httpx.get(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout, 
+            follow_redirects=True, 
+            verify=False
+        )
         response.raise_for_status()
 
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/ddlstreamitaly/__init__.py

@@ -23,8 +23,7 @@ from .series import download_thread
 # Variable
 indice = 6
 _useFor = "serie"
-_deprecate = False
-_priority = 2
+_priority = 0
 _engineDownload = "mp4"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/ddlstreamitaly/site.py

@@ -44,7 +44,12 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
+        response = httpx.get(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout, 
+            follow_redirects=True
+        )
         response.raise_for_status()
 
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -22,8 +22,7 @@ from .series import download_series
 # Variable
 indice = 5
 _useFor = "serie"
-_deprecate = False
-_priority = 2
+_priority = 0
 _engineDownload = "hls"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/guardaserie/site.py

@@ -44,7 +44,13 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
+        response = httpx.get(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout, 
+            follow_redirects=True, 
+            verify=False
+        )
         response.raise_for_status()
     
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/raiplay/__init__.py

@@ -21,8 +21,7 @@ from .film import download_film
 # Variable
 indice = 8
 _useFor = "film_serie"
-_deprecate = False
-_priority = 3
+_priority = 1                # NOTE: Site search need the use of tmbd obj
 _engineDownload = "hls"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/raiplay/film.py

@@ -1,4 +1,4 @@
-# 3.12.23
+# 21.05.24
 
 import os
 from typing import Tuple

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/raiplay/series.py

@@ -1,4 +1,4 @@
-# 3.12.23
+# 21.05.24
 
 import os
 from typing import Tuple

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/raiplay/site.py

@@ -1,8 +1,9 @@
-# 10.12.23
+# 21.05.24
 
 import threading
 import queue
 
+
 # External libraries
 import httpx
 from rich.console import Console
@@ -123,7 +124,13 @@ def title_search(query: str) -> int:
     }
 
     try:
-        response = httpx.post(search_url, headers={'user-agent': get_userAgent()}, json=json_data, timeout=max_timeout, follow_redirects=True)
+        response = httpx.post(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            json=json_data, 
+            timeout=max_timeout, 
+            follow_redirects=True
+        )
         response.raise_for_status()
 
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/raiplay/util/ScrapeSerie.py

@@ -1,4 +1,4 @@
-# 01.03.24
+# 21.05.24
 
 import logging
 

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -26,8 +26,7 @@ from .series import download_series
 # Variable
 indice = 0
 _useFor = "film_serie"
-_deprecate = False
-_priority = 1
+_priority = 0
 _engineDownload = "hls"
 
 msg = Prompt()

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -45,7 +45,13 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(search_url, headers={'user-agent': get_userAgent()}, timeout=max_timeout, follow_redirects=True)
+        response = httpx.get(
+            search_url, 
+            headers={'user-agent': get_userAgent()}, 
+            timeout=max_timeout, 
+            follow_redirects=True, 
+            verify=False
+        )
         response.raise_for_status()
 
     except Exception as e:

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Lib/Downloader/HLS/segments.py

@@ -23,7 +23,7 @@ from rich.console import Console
 # Internal utilities
 from StreamingCommunity.Util.color import Colors
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.config_json import config_manager, get_use_large_bar
+from StreamingCommunity.Util.config_json import config_manager
 
 
 # Logic class
@@ -407,20 +407,12 @@ class M3U8_Segments:
         """
         Generate platform-appropriate progress bar format.
         """
-        if not get_use_large_bar():
-            return (
-                f"{Colors.YELLOW}Proc{Colors.WHITE}: "
-                f"{Colors.RED}{{percentage:.2f}}% "
-                f"{Colors.CYAN}{{remaining}}{{postfix}} {Colors.WHITE}]"
-            )
-            
-        else:
-            return (
-                f"{Colors.YELLOW}[HLS] {Colors.WHITE}({Colors.CYAN}{description}{Colors.WHITE}): "
-                f"{Colors.RED}{{percentage:.2f}}% "
-                f"{Colors.MAGENTA}{{bar}} "
-                f"{Colors.YELLOW}{{elapsed}}{Colors.WHITE} < {Colors.CYAN}{{remaining}}{Colors.WHITE}{{postfix}}{Colors.WHITE}"
-            )
+        return (
+            f"{Colors.YELLOW}[HLS] {Colors.WHITE}({Colors.CYAN}{description}{Colors.WHITE}): "
+            f"{Colors.RED}{{percentage:.2f}}% "
+            f"{Colors.MAGENTA}{{bar}} "
+            f"{Colors.YELLOW}{{elapsed}}{Colors.WHITE} < {Colors.CYAN}{{remaining}}{Colors.WHITE}{{postfix}}{Colors.WHITE}"
+        )
     
     def _get_worker_count(self, stream_type: str) -> int:
         """

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Lib/Downloader/TOR/downloader.py

@@ -18,7 +18,7 @@ import qbittorrentapi
 # Internal utilities
 from StreamingCommunity.Util.color import Colors
 from StreamingCommunity.Util.os import internet_manager
-from StreamingCommunity.Util.config_json import config_manager, get_use_large_bar
+from StreamingCommunity.Util.config_json import config_manager
 
 
 # Configuration
@@ -316,19 +316,12 @@ class TOR_downloader:
             # Ensure the torrent is started
             self.qb.torrents_resume(torrent_hashes=self.latest_torrent_hash)
             
-            # Configure progress bar display format based on device
-            if get_use_large_bar():
-                bar_format = (
-                    f"{Colors.YELLOW}[TOR] {Colors.WHITE}({Colors.CYAN}video{Colors.WHITE}): "
-                    f"{Colors.RED}{{percentage:.2f}}% {Colors.MAGENTA}{{bar}} {Colors.WHITE}[ "
-                    f"{Colors.YELLOW}{{elapsed}} {Colors.WHITE}< {Colors.CYAN}{{remaining}}{{postfix}} {Colors.WHITE}]"
-                )
-            else:
-                bar_format = (
-                    f"{Colors.YELLOW}Proc{Colors.WHITE}: "
-                    f"{Colors.RED}{{percentage:.2f}}% {Colors.WHITE}| "
-                    f"{Colors.CYAN}{{remaining}}{{postfix}} {Colors.WHITE}]"
-                )
+            # Configure progress bar display format
+            bar_format = (
+                f"{Colors.YELLOW}[TOR] {Colors.WHITE}({Colors.CYAN}video{Colors.WHITE}): "
+                f"{Colors.RED}{{percentage:.2f}}% {Colors.MAGENTA}{{bar}} {Colors.WHITE}[ "
+                f"{Colors.YELLOW}{{elapsed}} {Colors.WHITE}< {Colors.CYAN}{{remaining}}{{postfix}} {Colors.WHITE}]"
+            )
 
             # Initialize progress bar
             with tqdm(

{streamingcommunity-2.9.9 → streamingcommunity-3.0.0}/StreamingCommunity/Lib/FFmpeg/capture.py

@@ -36,11 +36,7 @@ def capture_output(process: subprocess.Popen, description: str) -> None:
                 if not line:
                     continue
 
-                logging.info(f"FFMPEG line: {line}")
-
-                # Capture only error
-                if "rror" in str(line):
-                    console.log(f"[red]FFMPEG: {str(line).strip()}")
+                logging.info(f"CAPTURE ffmpeg line: {line}")
 
                 # Check if termination is requested
                 if terminate_flag.is_set():