StreamingCommunity 2.2.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

StreamingCommunity/Api/Site/ilcorsaronero/site.py

@@ -2,6 +2,7 @@
 
 
 # Internal utilities
+from StreamingCommunity.Util._jsonConfig import config_manager
 from StreamingCommunity.Util.table import TVShowManager
 
 
@@ -13,9 +14,11 @@ from .util.ilCorsarScraper import IlCorsaroNeroScraper
 
 
 # Variable
-from .costant import SITE_NAME
+from .costant import SITE_NAME, DOMAIN_NOW
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
+max_timeout = config_manager.get_int("REQUESTS", "timeout")
+disable_searchDomain = config_manager.get_bool("DEFAULT", "disable_searchDomain")
 
 
 async def title_search(word_to_search: str) -> int:
@@ -32,25 +35,31 @@ async def title_search(word_to_search: str) -> int:
     table_show_manager.clear()
 
     # Find new domain if prev dont work
-    domain_to_use, _ = search_domain(SITE_NAME, f"https://{SITE_NAME}")
+    domain_to_use = DOMAIN_NOW
+    
+    if not disable_searchDomain:
+        domain_to_use, base_url = search_domain(SITE_NAME, f"https://{SITE_NAME}.{DOMAIN_NOW}")
 
     # Create scraper and collect result
     print("\n")
     scraper = IlCorsaroNeroScraper(f"https://{SITE_NAME}.{domain_to_use}/", 1)
     results = await scraper.search(word_to_search)
 
-    # Add all result to media manager
     for i, torrent in enumerate(results):
-        media_search_manager.add_media({
-            'name': torrent['name'],
-            'type': torrent['type'],
-            'seed': torrent['seed'],
-            'leech': torrent['leech'],
-            'size': torrent['size'],
-            'date': torrent['date'],
-            'url': torrent['url']
-        })
-
+        try:
+            
+            media_search_manager.add_media({
+                'name': torrent['name'],
+                'type': torrent['type'],
+                'seed': torrent['seed'],
+                'leech': torrent['leech'],
+                'size': torrent['size'],
+                'date': torrent['date'],
+                'url': torrent['url']
+            })
+
+        except Exception as e:
+            print(f"Error parsing a film entry: {e}")
 
     # Return the number of titles found
     return media_search_manager.get_length()

StreamingCommunity/Api/Site/ilcorsaronero/title.py

@@ -15,7 +15,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Config
-from .costant import ROOT_PATH, MOVIE_FOLDER
+from .costant import MOVIE_FOLDER
 
 
 def download_title(select_title: MediaItem):
@@ -27,13 +27,13 @@ def download_title(select_title: MediaItem):
     """
 
     start_message()
-    console.print(f"[yellow]Download:  [red]{select_title.name} \n")
+    console.print(f"[yellow]Download: [red]{select_title.name} \n")
     print() 
 
     # Define output path
     title_name = os_manager.get_sanitize_file(select_title.name)
     mp4_path = os_manager.get_sanitize_path(
-        os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", ""))
+        os.path.join(MOVIE_FOLDER, title_name.replace(".mp4", ""))
     )
 
     # Create output folder

StreamingCommunity/Api/Site/ilcorsaronero/util/ilCorsarScraper.py

@@ -54,7 +54,7 @@ class IlCorsaroNeroScraper:
                 return response.text
             
         except Exception as e:
-            logging.error(f"Error fetching {url}: {e}")
+            logging.error(f"Error fetching from {url}: {e}")
             return None
 
     def parse_torrents(self, html: str) -> List[Dict[str, str]]:

StreamingCommunity/Api/Site/mostraguarda/costant.py

@@ -11,5 +11,9 @@ SITE_NAME = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 ROOT_PATH = config_manager.get('DEFAULT', 'root_path')
 DOMAIN_NOW = config_manager.get_dict('SITE', SITE_NAME)['domain']
 
-SERIES_FOLDER = config_manager.get('DEFAULT', 'serie_folder_name')
-MOVIE_FOLDER = config_manager.get('DEFAULT', 'movie_folder_name')
+SERIES_FOLDER = os.path.join(ROOT_PATH, config_manager.get('DEFAULT', 'serie_folder_name'))
+MOVIE_FOLDER = os.path.join(ROOT_PATH, config_manager.get('DEFAULT', 'movie_folder_name'))
+
+if config_manager.get_bool("DEFAULT", "add_siteName"):
+    SERIES_FOLDER = os.path.join(ROOT_PATH, SITE_NAME, config_manager.get('DEFAULT', 'serie_folder_name'))
+    MOVIE_FOLDER = os.path.join(ROOT_PATH, SITE_NAME, config_manager.get('DEFAULT', 'movie_folder_name'))   

StreamingCommunity/Api/Site/mostraguarda/film.py

@@ -33,7 +33,7 @@ from StreamingCommunity.Lib.TMBD import Json_film
 
 
 # Config
-from .costant import ROOT_PATH, SITE_NAME, DOMAIN_NOW, MOVIE_FOLDER
+from .costant import SITE_NAME, DOMAIN_NOW, MOVIE_FOLDER
 
 
 def download_film(movie_details: Json_film) -> str:
@@ -75,7 +75,7 @@ def download_film(movie_details: Json_film) -> str:
     
     # Define output path
     title_name = os_manager.get_sanitize_file(movie_details.title) + ".mp4"
-    mp4_path = os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", ""))
+    mp4_path = os.path.join(MOVIE_FOLDER, title_name.replace(".mp4", ""))
 
     # Get m3u8 master playlist
     master_playlist = video_source.get_playlist()

StreamingCommunity/Api/Site/streamingcommunity/costant.py

@@ -9,7 +9,11 @@ from StreamingCommunity.Util._jsonConfig import config_manager
 
 SITE_NAME = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 ROOT_PATH = config_manager.get('DEFAULT', 'root_path')
-DOMAIN_NOW = config_manager.get('SITE', SITE_NAME)
+DOMAIN_NOW = config_manager.get_dict('SITE', SITE_NAME)['domain']
 
-SERIES_FOLDER = config_manager.get('DEFAULT', 'serie_folder_name')
-MOVIE_FOLDER = config_manager.get('DEFAULT', 'movie_folder_name')
+SERIES_FOLDER = os.path.join(ROOT_PATH, config_manager.get('DEFAULT', 'serie_folder_name'))
+MOVIE_FOLDER = os.path.join(ROOT_PATH, config_manager.get('DEFAULT', 'movie_folder_name'))
+
+if config_manager.get_bool("DEFAULT", "add_siteName"):
+    SERIES_FOLDER = os.path.join(ROOT_PATH, SITE_NAME, config_manager.get('DEFAULT', 'serie_folder_name'))
+    MOVIE_FOLDER = os.path.join(ROOT_PATH, SITE_NAME, config_manager.get('DEFAULT', 'movie_folder_name'))   

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -22,7 +22,7 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 
 # Variable
-from .costant import ROOT_PATH, SITE_NAME, MOVIE_FOLDER
+from .costant import SITE_NAME, MOVIE_FOLDER
         
 
 def download_film(select_title: MediaItem) -> str:
@@ -51,8 +51,8 @@ def download_film(select_title: MediaItem) -> str:
     master_playlist = video_source.get_playlist()
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.slug) + ".mp4"
-    mp4_path = os.path.join(ROOT_PATH, MOVIE_FOLDER, select_title.slug)
+    title_name = os_manager.get_sanitize_file(select_title.name) + ".mp4"
+    mp4_path = os.path.join(MOVIE_FOLDER, select_title.name)
 
     # Download the film using the m3u8 playlist, and output filename
     r_proc = HLS_Downloader(

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -24,7 +24,7 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 
 # Variable
-from .costant import ROOT_PATH, SITE_NAME, SERIES_FOLDER
+from .costant import SITE_NAME, SERIES_FOLDER
 
 
 
@@ -48,7 +48,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Define filename and path for the downloaded video
     mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
-    mp4_path = os.path.join(ROOT_PATH, SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
+    mp4_path = os.path.join(SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
 
     # Retrieve scws and if available master playlist
     video_source.get_iframe(obj_episode.id)
@@ -199,7 +199,7 @@ def display_episodes_list(scrape_serie) -> str:
     # Run the table and handle user input
     last_command = table_show_manager.run()
 
-    if last_command == "q":
+    if last_command == "q" or last_command == "quit":
         console.print("\n[red]Quit [white]...")
         sys.exit(0)
 

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -1,6 +1,5 @@
 # 10.12.23
 
-import sys
 import json
 import logging
 import secrets
@@ -26,30 +25,36 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
 
 # Config
-from .costant import SITE_NAME
+from .costant import SITE_NAME, DOMAIN_NOW
 
 
 # Variable
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
+disable_searchDomain = config_manager.get_bool("DEFAULT", "disable_searchDomain")
 
 
-def get_version(text: str):
+def get_version(domain: str):
     """
     Extracts the version from the HTML text of a webpage.
 
     Parameters:
-        - text (str): The HTML text of the webpage.
+        - domain (str): The domain of the site.
 
     Returns:
         str: The version extracted from the webpage.
-        list: Top 10 titles headlines for today.
     """
     try:
+        response = httpx.get(
+            url=f"https://{SITE_NAME}.{domain}/", 
+            headers={'User-Agent': get_headers()}, 
+            timeout=max_timeout
+        )
+        response.raise_for_status()
 
         # Parse request to site
-        soup = BeautifulSoup(text, "html.parser")
+        soup = BeautifulSoup(response.text, "html.parser")
 
         # Extract version
         version = json.loads(soup.find("div", {"id": "app"}).get("data-page"))['version']
@@ -72,22 +77,17 @@ def get_version_and_domain():
     """
 
     # Find new domain if prev dont work
-    domain_to_use, base_url = search_domain(SITE_NAME, f"https://{SITE_NAME}")
+    domain_to_use = DOMAIN_NOW
+
+    if not disable_searchDomain:
+        domain_to_use, base_url = search_domain(SITE_NAME, f"https://{SITE_NAME}.{DOMAIN_NOW}")
 
-    # Extract version from the response
     try:
-        version = get_version(
-            httpx.get(
-                url=base_url, 
-                headers={'User-Agent': get_headers()}, 
-                timeout=max_timeout
-            ).text
-        )
-        
+        version = get_version(domain_to_use)
     except:
         console.print("[green]Auto generate version ...")
         version = secrets.token_hex(32 // 2)
-
+            
     return version, domain_to_use
 
 
@@ -116,16 +116,20 @@ def title_search(title_search: str, domain: str) -> int:
     except Exception as e:
         console.print(f"Site: {SITE_NAME}, request search error: {e}")
 
-    # Add found titles to media search manager
     for dict_title in response.json()['data']:
-        media_search_manager.add_media({
-            'id': dict_title.get('id'),
-            'slug': dict_title.get('slug'),
-            'name': dict_title.get('name'),
-            'type': dict_title.get('type'),
-            'date': dict_title.get('last_air_date'),
-            'score': dict_title.get('score')
-        })
+        try:
+
+            media_search_manager.add_media({
+                'id': dict_title.get('id'),
+                'slug': dict_title.get('slug'),
+                'name': dict_title.get('name'),
+                'type': dict_title.get('type'),
+                'date': dict_title.get('last_air_date'),
+                'score': dict_title.get('score')
+            })
+
+        except Exception as e:
+            print(f"Error parsing a film entry: {e}")
 
     # Return the number of titles found
     return media_search_manager.get_length()

StreamingCommunity/Api/Site/streamingcommunity/util/ScrapeSerie.py

@@ -1,10 +1,12 @@
 # 01.03.24
 
+import json
 import logging
 
 
 # External libraries
 import httpx
+from bs4 import BeautifulSoup
 
 
 # Internal utilities
@@ -56,33 +58,33 @@ class ScrapeSerie:
         Raises:
             Exception: If there's an error fetching season information
         """
-        self.headers = {
-            'user-agent': get_headers(),
-            'x-inertia': 'true', 
-            'x-inertia-version': self.version,
-        }
-
         try:
-
             response = httpx.get(
-                url=f"https://{self.base_name}.{self.domain}/titles/{self.media_id}-{self.series_name}", 
-                headers=self.headers, 
+                url=f"https://{self.base_name}.{self.domain}/titles/{self.media_id}-{self.series_name}",
+                headers=self.headers,
                 timeout=max_timeout
             )
             response.raise_for_status()
 
             # Extract seasons from JSON response
-            json_response = response.json().get('props')
+            soup = BeautifulSoup(response.text, "html.parser")
+            json_response = json.loads(soup.find("div", {"id": "app"}).get("data-page"))
+                  
+            """
+            response = httpx.post(
+                url=f'https://{self.base_name}.{self.domain}/api/titles/preview/{self.media_id}', 
+                headers={'User-Agent': get_headers()}
+            )
+            response.raise_for_status()
+            
+
+            # Extract seasons from JSON response
+            json_response = response.json()
+            """
 
             # Collect info about season
-            self.season_manager = Season(json_response.get('title'))
-            self.season_manager.collect_images(self.base_name, self.domain)
+            self.season_manager = Season(json_response.get("props").get("title"))
 
-            # Collect first episode info
-            for i, ep in enumerate(json_response.get('loadedSeason').get('episodes')):
-                self.season_manager.episodes.add(ep)
-                self.season_manager.episodes.get(i).collect_image(self.base_name, self.domain)
-            
         except Exception as e:
             logging.error(f"Error collecting season info: {e}")
             raise
@@ -97,16 +99,14 @@ class ScrapeSerie:
         Raises:
             Exception: If there's an error fetching episode information
         """
-        self.headers = {
-            'user-agent': get_headers(),
-            'x-inertia': 'true', 
-            'x-inertia-version': self.version,
-        }
-
         try:
             response = httpx.get(
                 url=f'https://{self.base_name}.{self.domain}/titles/{self.media_id}-{self.series_name}/stagione-{number_season}', 
-                headers=self.headers, 
+                headers={
+                    'User-Agent': get_headers(),
+                    'x-inertia': 'true', 
+                    'x-inertia-version': self.version,
+                },
                 timeout=max_timeout
             )
             response.raise_for_status()