StreamingCommunity 3.0.7__tar.gz → 3.0.8__tar.gz

{streamingcommunity-3.0.7/StreamingCommunity.egg-info → streamingcommunity-3.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.7
+Version: 3.0.8
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -35,7 +35,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 
 <p align="center">
-  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="600"/>
+  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="450"/>
 </p>
 
 <p align="center">

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="600"/>
+  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="450"/>
 </p>
 
 <p align="center">

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Api/Site/animeworld/util/ScrapeSerie.py

@@ -31,7 +31,8 @@ class ScrapSerie:
         self.client = httpx.Client(
             cookies={"sessionId": self.session_id},
             headers={"User-Agent": get_userAgent(), "csrf-token": self.csrf_token},
-            base_url=full_url
+            base_url=full_url,
+            verify=False
         )
 
         try:

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Api/Site/raiplay/__init__.py

@@ -21,7 +21,7 @@ from .film import download_film
 # Variable
 indice = 5
 _useFor = "Film_&_Serie"
-_priority = 1                # NOTE: Site search need the use of tmbd obj
+_priority = 0
 _engineDownload = "hls"
 _deprecate = False
 

streamingcommunity-3.0.8/StreamingCommunity/Api/Site/raiplay/site.py

@@ -0,0 +1,105 @@
+# 21.05.24
+
+# External libraries
+import httpx
+from rich.console import Console
+
+
+# Internal utilities
+from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.table import TVShowManager
+from StreamingCommunity.Api.Template.config_loader import site_constant
+from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
+from .util.ScrapeSerie import GetSerieInfo
+
+
+# Variable
+console = Console()
+media_search_manager = MediaManager()
+table_show_manager = TVShowManager()
+max_timeout = config_manager.get_int("REQUESTS", "timeout")
+
+
+def determine_media_type(item):
+    """
+    Determine if the item is a film or TV series by checking actual seasons count
+    using GetSerieInfo.
+    """
+    try:
+        # Extract program name from path_id
+        program_name = None
+        if item.get('path_id'):
+            parts = item['path_id'].strip('/').split('/')
+            if len(parts) >= 2:
+                program_name = parts[-1].split('.')[0]
+
+        if not program_name:
+            return "film"
+
+        scraper = GetSerieInfo(program_name)
+        scraper.collect_info_title()
+        return "tv" if scraper.getNumberSeason() > 0 else "film"
+    
+    except Exception as e:
+        console.print(f"[red]Error determining media type: {e}[/red]")
+        return "film"
+
+
+def title_search(query: str) -> int:
+    """
+    Search for titles based on a search query.
+      
+    Parameters:
+        - query (str): The query to search for.
+
+    Returns:
+        int: The number of titles found.
+    """
+    media_search_manager.clear()
+    table_show_manager.clear()
+
+    search_url = f"https://www.raiplay.it/atomatic/raiplay-search-service/api/v1/msearch"
+    console.print(f"[cyan]Search url: [yellow]{search_url}")
+
+    json_data = {
+        'templateIn': '6470a982e4e0301afe1f81f1',
+        'templateOut': '6516ac5d40da6c377b151642',
+        'params': {
+            'param': query,
+            'from': None,
+            'sort': 'relevance',
+            'onlyVideoQuery': False,
+        },
+    }
+
+    try:
+        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:
+        console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
+        return 0
+
+    # Limit to only 15 results for performance
+    data = response.json().get('agg').get('titoli').get('cards')
+    data = data[:15] if len(data) > 15 else data
+    
+    # Process each item and add to media manager
+    for item in data:
+        media_search_manager.add_media({
+            'id': item.get('id', ''),
+            'name': item.get('titolo', ''),
+            'type': determine_media_type(item),
+            'path_id': item.get('path_id', ''),
+            'url': f"https://www.raiplay.it{item.get('url', '')}",
+            'image': f"https://www.raiplay.it{item.get('immagine', '')}",
+        })
+          
+    return media_search_manager.get_length()

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Api/Site/raiplay/util/ScrapeSerie.py

@@ -30,28 +30,48 @@ class GetSerieInfo:
         try:
             program_url = f"{self.base_url}/programmi/{self.program_name}.json"
             response = httpx.get(url=program_url, headers=get_headers(), timeout=max_timeout)
+            
+            # If 404, content is not yet available
+            if response.status_code == 404:
+                logging.info(f"Content not yet available: {self.program_name}")
+                return
+                
             response.raise_for_status()
-
             json_data = response.json()
             
             # Look for seasons in the 'blocks' property
-            for block in json_data.get('blocks'):
-                if block.get('type') == 'RaiPlay Multimedia Block' and block.get('name', '').lower() == 'episodi':
-                    self.publishing_block_id = block.get('id')
-                    
-                    # Extract seasons from sets array
-                    for season_set in block.get('sets', []):
-                        if 'stagione' in season_set.get('name', '').lower():
-                            self.seasons_manager.add_season({
-                                'id': season_set.get('id', ''),
-                                'number': len(self.seasons_manager.seasons) + 1,
-                                'name': season_set.get('name', ''),
-                                'path': season_set.get('path_id', ''),
-                                'episodes_count': season_set.get('episode_size', {}).get('number', 0)
-                            })
-
-        except Exception as e:
+            for block in json_data.get('blocks', []):
+
+                # Check if block is a season block or episodi block
+                if block.get('type') == 'RaiPlay Multimedia Block':
+                    if block.get('name', '').lower() == 'episodi':
+                        self.publishing_block_id = block.get('id')
+
+                        # Extract seasons from sets array
+                        for season_set in block.get('sets', []):
+                            if 'stagione' in season_set.get('name', '').lower():
+                                self._add_season(season_set, block.get('id'))
+                                
+                    elif 'stagione' in block.get('name', '').lower():
+                        self.publishing_block_id = block.get('id')
+
+                        # Extract season directly from block's sets
+                        for season_set in block.get('sets', []):
+                            self._add_season(season_set, block.get('id'))
+
+        except httpx.HTTPError as e:
             logging.error(f"Error collecting series info: {e}")
+        except Exception as e:
+            logging.error(f"Unexpected error collecting series info: {e}")
+
+    def _add_season(self, season_set: dict, block_id: str):
+        self.seasons_manager.add_season({
+            'id': season_set.get('id', ''),
+            'number': len(self.seasons_manager.seasons) + 1,
+            'name': season_set.get('name', ''),
+            'path': season_set.get('path_id', ''),
+            'episodes_count': season_set.get('episode_size', {}).get('number', 0)
+        })
 
     def collect_info_season(self, number_season: int) -> None:
         """Get episodes for a specific season."""

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -121,14 +121,16 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
 
+    # Check proxy if not already set
+    finder = ProxyFinder(site_constant.FULL_URL)
+    proxy = finder.find_fast_proxy()
+    
     if direct_item:
         select_title_obj = MediaItem(**direct_item)
         process_search_result(select_title_obj, selections, proxy)
         return
     
-    # Check proxy if not already set
-    finder = ProxyFinder(site_constant.FULL_URL)
-    proxy = finder.find_fast_proxy()
+
 
     actual_search_query = get_user_input(string_to_search)
 
@@ -142,7 +144,7 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     # Perform search on the database using the obtained query
     finder = ProxyFinder(site_constant.FULL_URL)
     proxy = finder.find_fast_proxy()
-    len_database = title_search(string_to_search, proxy)
+    len_database = title_search(actual_search_query, proxy)
 
     # If only the database object (media_search_manager populated by title_search) is needed
     if get_onlyDatabase:

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Upload/version.py

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

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Util/config_json.py

@@ -39,9 +39,6 @@ class ConfigManager:
           
             # Get the actual path of the module file
             current_file_path = os.path.abspath(__file__)
-            # Navigate upwards to find the project root
-            # Assuming this file is in a package structure like StreamingCommunity/Util/config_json.py
-            # We need to go up 2 levels to reach the project root
             base_path = os.path.dirname(os.path.dirname(os.path.dirname(current_file_path)))
             
         # Initialize file paths
@@ -562,7 +559,6 @@ class ConfigManager:
         return section in config_source
 
 
-# Helper function to check the platform
 def get_use_large_bar():
     """
     Determine if the large bar feature should be enabled.

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/StreamingCommunity/Util/os.py

@@ -296,12 +296,6 @@ class InternManager():
             "Google": ["8.8.8.8", "8.8.4.4"],
             "OpenDNS": ["208.67.222.222", "208.67.220.220"],
             "Quad9": ["9.9.9.9", "149.112.112.112"],
-            "AdGuard": ["94.140.14.14", "94.140.15.15"],
-            "Comodo": ["8.26.56.26", "8.20.247.20"],
-            "Level3": ["209.244.0.3", "209.244.0.4"],
-            "Norton": ["199.85.126.10", "199.85.127.10"],
-            "CleanBrowsing": ["185.228.168.9", "185.228.169.9"],
-            "Yandex": ["77.88.8.8", "77.88.8.1"]
         }
         
         try:

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8/StreamingCommunity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.7
+Version: 3.0.8
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -35,7 +35,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 
 <p align="center">
-  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="600"/>
+  <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="450"/>
 </p>
 
 <p align="center">

{streamingcommunity-3.0.7 → streamingcommunity-3.0.8}/setup.py

@@ -10,7 +10,7 @@ with open(os.path.join(os.path.dirname(__file__), "requirements.txt"), "r", enco
 
 setup(
     name="StreamingCommunity",
-    version="3.0.7",
+    version="3.0.8",
     long_description=read_readme(),
     long_description_content_type="text/markdown",
     author="Lovi-0",

streamingcommunity-3.0.7/StreamingCommunity/Api/Site/raiplay/site.py

@@ -1,173 +0,0 @@
-# 21.05.24
-
-import threading
-import queue
-
-
-# External libraries
-import httpx
-from rich.console import Console
-
-
-# Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.table import TVShowManager
-from StreamingCommunity.Lib.TMBD.tmdb import tmdb
-
-
-# Logic class
-from StreamingCommunity.Api.Template.config_loader import site_constant
-from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
-
-
-# Variable
-console = Console()
-media_search_manager = MediaManager()
-table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-MAX_THREADS = 12
-
-
-def determine_media_type(title):
-    """
-    Use TMDB to determine if a title is a movie or TV show.
-    """
-    try:
-        # First search as a movie
-        movie_results = tmdb._make_request("search/movie", {"query": title})
-        movie_count = len(movie_results.get("results", []))
-        
-        # Then search as a TV show
-        tv_results = tmdb._make_request("search/tv", {"query": title})
-        tv_count = len(tv_results.get("results", []))
-        
-        # If results found in only one category, use that
-        if movie_count > 0 and tv_count == 0:
-            return "film"
-        elif tv_count > 0 and movie_count == 0:
-            return "tv"
-        
-        # If both have results, compare popularity
-        if movie_count > 0 and tv_count > 0:
-            top_movie = movie_results["results"][0]
-            top_tv = tv_results["results"][0]
-            
-            return "film" if top_movie.get("popularity", 0) > top_tv.get("popularity", 0) else "tv"
-
-        return "film"
-    
-    except Exception as e:
-        console.log(f"Error determining media type with TMDB: {e}")
-        return "film"
-
-
-def worker_determine_type(work_queue, result_dict, worker_id):
-    """
-    Worker function to process items from queue and determine media types.
-    
-    Parameters:
-        - work_queue: Queue containing items to process
-        - result_dict: Dictionary to store results
-        - worker_id: ID of the worker thread
-    """
-    while not work_queue.empty():
-        try:
-            index, item = work_queue.get(block=False)
-            title = item.get('titolo', '')
-            media_type = determine_media_type(title)
-            
-            result_dict[index] = {
-                'id': item.get('id', ''),
-                'name': title,
-                'type': media_type,
-                'path_id': item.get('path_id', ''),
-                'url': f"https://www.raiplay.it{item.get('url', '')}",
-                'image': f"https://www.raiplay.it{item.get('immagine', '')}",
-            }
-            
-            work_queue.task_done()
-
-        except queue.Empty:
-            break
-
-        except Exception as e:
-            console.log(f"Worker {worker_id} error: {e}")
-            work_queue.task_done()
-
-
-def title_search(query: str) -> int:
-    """
-    Search for titles based on a search query.
-      
-    Parameters:
-        - query (str): The query to search for.
-
-    Returns:
-        int: The number of titles found.
-    """
-    media_search_manager.clear()
-    table_show_manager.clear()
-
-    search_url = f"https://www.raiplay.it/atomatic/raiplay-search-service/api/v1/msearch"
-    console.print(f"[cyan]Search url: [yellow]{search_url}")
-
-    json_data = {
-        'templateIn': '6470a982e4e0301afe1f81f1',
-        'templateOut': '6516ac5d40da6c377b151642',
-        'params': {
-            'param': query,
-            'from': None,
-            'sort': 'relevance',
-            'onlyVideoQuery': False,
-        },
-    }
-
-    try:
-        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:
-        console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
-        return 0
-
-    # Limit to only 15 results for performance
-    data = response.json().get('agg').get('titoli').get('cards')
-    data = data[:15] if len(data) > 15 else data
-    
-    # Use multithreading to determine media types in parallel
-    work_queue = queue.Queue()
-    result_dict = {}
-    
-    # Add items to the work queue
-    for i, item in enumerate(data):
-        work_queue.put((i, item))
-    
-    # Create and start worker threads
-    threads = []
-    for i in range(min(MAX_THREADS, len(data))):
-        thread = threading.Thread(
-            target=worker_determine_type,
-            args=(work_queue, result_dict, i),
-            daemon=True
-        )
-        threads.append(thread)
-        thread.start()
-    
-    # Wait for all threads to complete
-    for thread in threads:
-        thread.join()
-    
-    # Add all results to media manager in correct order
-    for i in range(len(data)):
-        if i in result_dict:
-            media_search_manager.add_media(result_dict[i])
-          
-    # Return the number of titles found
-    return media_search_manager.get_length()