StreamingCommunity 3.4.0__tar.gz → 3.4.2__tar.gz

{streamingcommunity-3.4.0/StreamingCommunity.egg-info → streamingcommunity-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.4.0
+Version: 3.4.2
 Home-page: https://github.com/Arrowar/StreamingCommunity
 Author: Arrowar
 Project-URL: Bug Reports, https://github.com/Arrowar/StreamingCommunity/issues

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/film.py

@@ -30,7 +30,6 @@ from StreamingCommunity.Api.Player.supervideo import VideoSource
 
 # Variable
 console = Console()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/series.py

@@ -21,7 +21,8 @@ from StreamingCommunity.Api.Template.Util import (
     map_episode_title,
     validate_selection, 
     validate_episode_selection, 
-    display_episodes_list
+    display_episodes_list,
+    display_seasons_list
 )
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
@@ -151,16 +152,11 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         - episode_selection (str, optional): Pre-defined episode selection that bypasses manual input
     """
     scrape_serie = GetSerieInfo(select_season.url)
-
-    # Get total number of seasons 
     seasons_count = scrape_serie.getNumberSeason()
     
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
 
-    # Prompt user for season selection and download episodes
-    console.print(f"\n[green]Seasons found: [red]{seasons_count}")
-
     # If season_selection is provided, use it instead of asking for input
     if season_selection is None:
         if site_constant.TELEGRAM_BOT:
@@ -180,10 +176,7 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
             )
 
         else:
-            index_season_selected = msg.ask(
-                "\n[cyan]Insert season number [yellow](e.g., 1), [red]* [cyan]to download all seasons, "
-                "[yellow](e.g., 1-2) [cyan]for a range of seasons, or [yellow](e.g., 3-*) [cyan]to download from a specific season to the end"
-            )
+            index_season_selected = display_seasons_list(scrape_serie.seasons_manager)
     else:
         index_season_selected = season_selection
         console.print(f"\n[cyan]Using provided season selection: [yellow]{season_selection}")
@@ -195,10 +188,8 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     # Loop through the selected seasons and download episodes
     for i_season in list_season_select:
         if len(list_season_select) > 1 or index_season_selected == "*":
-            # Download all episodes if multiple seasons are selected or if '*' is used
             download_episode(i_season, scrape_serie, download_all=True)
         else:
-            # Otherwise, let the user select specific episodes for the single season
             download_episode(i_season, scrape_serie, download_all=False, episode_selection=episode_selection)
 
     if site_constant.TELEGRAM_BOT:

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/altadefinizione/site.py

@@ -7,7 +7,6 @@ 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.http_client import create_client
 from StreamingCommunity.Util.table import TVShowManager
@@ -23,7 +22,6 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 def title_search(query: str) -> int:

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeunity/site.py

@@ -9,7 +9,7 @@ from rich.console import Console
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
-from StreamingCommunity.Util.http_client import create_client, create_client_curl
+from StreamingCommunity.Util.http_client import create_client_curl
 from StreamingCommunity.Util.table import TVShowManager
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -77,7 +77,7 @@ def title_search(query: str) -> int:
 
     # First call: /livesearch
     try:
-        response1 = create_client(headers=headers).post(f'{site_constant.FULL_URL}/livesearch', cookies=cookies, json={'title': query})
+        response1 = create_client_curl(headers=headers).post(f'{site_constant.FULL_URL}/livesearch', cookies=cookies, data={'title': query})
         response1.raise_for_status()
         process_results(response1.json().get('records', []), seen_titles, media_search_manager, choices)
 
@@ -98,7 +98,7 @@ def title_search(query: str) -> int:
             'dubbed': False,
             'season': False
         }
-        response2 = create_client(headers=headers).post(f'{site_constant.FULL_URL}/archivio/get-animes', cookies=cookies, json=json_data)
+        response2 = create_client_curl(headers=headers).post(f'{site_constant.FULL_URL}/archivio/get-animes', cookies=cookies, data=json_data)
         response2.raise_for_status()
         process_results(response2.json().get('records', []), seen_titles, media_search_manager, choices)
 

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/animeunity/util/ScrapeSerie.py

@@ -5,7 +5,7 @@ import logging
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.http_client import create_client
+from StreamingCommunity.Util.http_client import create_client_curl
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import EpisodeManager, Episode
 
 
@@ -52,7 +52,7 @@ class ScrapeSerieAnime:
         """
         try:
             # Get initial episode count
-            response = create_client(headers=self.headers).get(f"{self.url}/info_api/{self.media_id}/")
+            response = create_client_curl(headers=self.headers).get(f"{self.url}/info_api/{self.media_id}/")
             response.raise_for_status()
             initial_count = response.json()["episodes_count"]
             
@@ -68,7 +68,7 @@ class ScrapeSerieAnime:
                     "end_range": end_range
                 }
                 
-                response = create_client(headers=self.headers).get(f"{self.url}/info_api/{self.media_id}/1", params=params)
+                response = create_client_curl(headers=self.headers).get(f"{self.url}/info_api/{self.media_id}/1", params=params)
                 response.raise_for_status()
 
                 chunk_episodes = response.json().get("episodes", [])

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/crunchyroll/series.py

@@ -22,7 +22,8 @@ from StreamingCommunity.Api.Template.Util import (
     map_episode_title,
     validate_selection, 
     validate_episode_selection, 
-    display_episodes_list
+    display_episodes_list,
+    display_seasons_list
 )
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
@@ -160,20 +161,11 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         - episode_selection (str, optional): Pre-defined episode selection that bypasses manual input
     """
     scrape_serie = GetSerieInfo(select_season.url.split("/")[-1])
-
-    # Get total number of seasons 
     seasons_count = scrape_serie.getNumberSeason()
     
-    # Prompt user for season selection and download episodes
-    console.print(f"\n[green]Seasons found: [red]{seasons_count}")
-
     # If season_selection is provided, use it instead of asking for input
     if season_selection is None:
-        index_season_selected = msg.ask(
-            "\n[cyan]Insert season number [yellow](e.g., 1), [red]* [cyan]to download all seasons, "
-            "[yellow](e.g., 1-2) [cyan]for a range of seasons, or [yellow](e.g., 3-*) [cyan]to download from a specific season to the end"
-        )
-
+        index_season_selected = display_seasons_list(scrape_serie.seasons_manager)
     else:
         index_season_selected = season_selection
         console.print(f"\n[cyan]Using provided season selection: [yellow]{season_selection}")
@@ -185,9 +177,6 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     # Loop through the selected seasons and download episodes
     for i_season in list_season_select:
         if len(list_season_select) > 1 or index_season_selected == "*":
-            # Download all episodes if multiple seasons are selected or if '*' is used
             download_episode(i_season, scrape_serie, download_all=True)
-            
         else:
-            # Otherwise, let the user select specific episodes for the single season
             download_episode(i_season, scrape_serie, download_all=False, episode_selection=episode_selection)

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/crunchyroll/site.py

@@ -1,7 +1,5 @@
 # 16.03.25
 
-import sys
-
 
 # External libraries
 from rich.console import Console
@@ -42,13 +40,13 @@ def title_search(query: str) -> int:
     config = config_manager.get_dict("SITE_LOGIN", "crunchyroll")
     if not config.get('device_id') or not config.get('etp_rt'):
         console.print("[bold red] device_id or etp_rt is missing or empty in config.json.[/bold red]")
-        sys.exit(0)
+        raise Exception("device_id or etp_rt is missing or empty in config.json.")
 
     # Initialize Crunchyroll client
     client = CrunchyrollClient()
     if not client.start():
         console.print("[bold red] Failed to authenticate with Crunchyroll.[/bold red]")
-        sys.exit(0)
+        raise Exception("Failed to authenticate with Crunchyroll.")
 
     # Build new Crunchyroll API search URL
     api_url = "https://www.crunchyroll.com/content/v2/discover/search"

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/guardaserie/series.py

@@ -20,7 +20,8 @@ from StreamingCommunity.Api.Template.Util import (
     dynamic_format_number, 
     validate_selection, 
     validate_episode_selection, 
-    display_episodes_list
+    display_episodes_list,
+    display_seasons_list
 )
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
@@ -145,19 +146,11 @@ def download_series(dict_serie: MediaItem, season_selection: str = None, episode
 
     # Create class
     scrape_serie = GetSerieInfo(dict_serie)
-
-    # Get season count
     seasons_count = scrape_serie.get_seasons_number()
-    
-    # Prompt user for season selection and download episodes
-    console.print(f"\n[green]Seasons found: [red]{seasons_count}")
 
     # If season_selection is provided, use it instead of asking for input
     if season_selection is None:
-        index_season_selected = msg.ask(
-            "\n[cyan]Insert season number [yellow](e.g., 1), [red]* [cyan]to download all seasons, "
-            "[yellow](e.g., 1-2) [cyan]for a range of seasons, or [yellow](e.g., 3-*) [cyan]to download from a specific season to the end"
-        )
+        index_season_selected = display_seasons_list(scrape_serie.seasons_manager)
     else:
         index_season_selected = season_selection
         console.print(f"\n[cyan]Using provided season selection: [yellow]{season_selection}")
@@ -169,10 +162,6 @@ def download_series(dict_serie: MediaItem, season_selection: str = None, episode
     # Loop through the selected seasons and download episodes
     for i_season in list_season_select:
         if len(list_season_select) > 1 or index_season_selected == "*":
-
-            # Download all episodes if multiple seasons are selected or if '*' is used
             download_episode(scrape_serie, i_season, download_all=True)
         else:
-
-            # Otherwise, let the user select specific episodes for the single season
             download_episode(scrape_serie, i_season, download_all=False, episode_selection=episode_selection)

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/mediasetinfinity/series.py

@@ -22,7 +22,8 @@ from StreamingCommunity.Api.Template.Util import (
     map_episode_title,
     validate_selection, 
     validate_episode_selection, 
-    display_episodes_list
+    display_episodes_list,
+    display_seasons_list
 )
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
@@ -148,20 +149,11 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         - episode_selection (str, optional): Pre-defined episode selection that bypasses manual input
     """
     scrape_serie = GetSerieInfo(select_season.url)
-
-    # Get total number of seasons 
     seasons_count = scrape_serie.getNumberSeason()
 
-    # Prompt user for season selection and download episodes
-    console.print(f"\n[green]Seasons found: [red]{seasons_count}")
-
     # If season_selection is provided, use it instead of asking for input
     if season_selection is None:
-        index_season_selected = msg.ask(
-            "\n[cyan]Insert season number [yellow](e.g., 1), [red]* [cyan]to download all seasons, "
-            "[yellow](e.g., 1-2) [cyan]for a range of seasons, or [yellow](e.g., 3-*) [cyan]to download from a specific season to the end"
-        )
-
+        index_season_selected = display_seasons_list(scrape_serie.seasons_manager)
     else:
         index_season_selected = season_selection
         console.print(f"\n[cyan]Using provided season selection: [yellow]{season_selection}")
@@ -173,8 +165,6 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     # Loop through the selected seasons and download episodes
     for i_season in list_season_select:
         if len(list_season_select) > 1 or index_season_selected == "*":
-            # Download all episodes if multiple seasons are selected or if '*' is used
             download_episode(i_season, scrape_serie, download_all=True)
         else:
-            # Otherwise, let the user select specific episodes for the single season
             download_episode(i_season, scrape_serie, download_all=False, episode_selection=episode_selection)

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/mediasetinfinity/site.py

@@ -58,33 +58,25 @@ def title_search(query: str) -> int:
 
     # Process items
     for item in items:
-        item_type = "tv" if item.get("__typename") == "SeriesItem" else "film"
-
-        # Bastava un campo data ma no ...
-        date = item.get("year")
+        is_series = (
+            item.get("__typename") == "SeriesItem"
+            or item.get("cardLink", {}).get("referenceType") == "series"
+            or bool(item.get("seasons"))
+        )
+        item_type = "tv" if is_series else "film"
+
+        # Get date
+        date = item.get("year") or ''
         if not date:
-            updated = item.get("updated")
+            updated = item.get("updated") or item.get("r") or ''
             if updated:
                 try:
-                    date = datetime.fromisoformat(updated.replace("Z", "+00:00")).year
+                    date = datetime.fromisoformat(str(updated).replace("Z", "+00:00")).year
                 except Exception:
-                    try:
-                        timestamp_ms = int(updated)
-                        date = datetime.fromtimestamp(timestamp_ms / 1000).year
-                    except Exception:
-                        date = ""
-
-        date = item.get('year', '')
-        if not date and item.get('updated'):
-            try:
-                
-                timestamp_ms = int(item.get('updated', 0))
-                date = datetime.fromtimestamp(timestamp_ms / 1000).year
-            except (ValueError, TypeError):
-                date = ''
+                    date = ''
 
         media_search_manager.add_media({
-            "url": item.get("cardLink", "").get("value", ""),
+            "url": item.get("cardLink", {}).get("value", ""),
             "id": item.get("guid", ""),
             "name": item.get("cardTitle", "No Title"),
             "type": item_type,
@@ -92,4 +84,4 @@ def title_search(query: str) -> int:
             "date": date,
         })
 
-        return media_search_manager.get_length()
+    return media_search_manager.get_length()

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/raiplay/film.py

@@ -78,7 +78,6 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
         # Get final output path and status
         r_proc = dash_process.get_status()
 
-
     if r_proc['error'] is not None:
         try: 
             os.remove(r_proc['path'])

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/raiplay/series.py

@@ -23,7 +23,8 @@ from StreamingCommunity.Api.Template.Util import (
     map_episode_title,
     validate_selection, 
     validate_episode_selection, 
-    display_episodes_list
+    display_episodes_list,
+    display_seasons_list
 )
 from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
@@ -71,17 +72,8 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
             m3u8_url=master_playlist,
             output_path=os.path.join(mp4_path, mp4_name)
         ).start()
-    # Get streaming URL
-    master_playlist = VideoSource.extract_m3u8_url(obj_episode.url)
 
-    # HLS
-    if ".mpd" not in master_playlist:
-        r_proc = HLS_Downloader(
-            m3u8_url=master_playlist,
-            output_path=os.path.join(mp4_path, mp4_name)
-        ).start()
-
-    # MPD
+    # MPD (DASH)
     else:
         full_license_url = generate_license_url(obj_episode.mpd_id)
         license_headers = {
@@ -169,15 +161,10 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     # Get seasons info
     scrape_serie.collect_info_title()
     seasons_count = len(scrape_serie.seasons_manager)
-    console.print(f"\n[green]Seasons found: [red]{seasons_count}")
 
     # If season_selection is provided, use it instead of asking for input
     if season_selection is None:
-        index_season_selected = msg.ask(
-            "\n[cyan]Insert season number [yellow](e.g., 1), [red]* [cyan]to download all seasons, "
-            "[yellow](e.g., 1-2) [cyan]for a range of seasons, or [yellow](e.g., 3-*) [cyan]to download from a specific season to the end"
-        )
-
+        index_season_selected = display_seasons_list(scrape_serie.seasons_manager)
     else:
         index_season_selected = season_selection
         console.print(f"\n[cyan]Using provided season selection: [yellow]{season_selection}")
@@ -191,4 +178,4 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         if len(list_season_select) > 1 or index_season_selected == "*":
             download_episode(season_number, scrape_serie, download_all=True)
         else:
-            download_episode(season_number, scrape_serie, download_all=False, episode_selection=episode_selection)
+            download_episode(season_number, scrape_serie, download_all=False, episode_selection=episode_selection)

{streamingcommunity-3.4.0 → streamingcommunity-3.4.2}/StreamingCommunity/Api/Site/raiplay/site.py

@@ -12,31 +12,12 @@ from StreamingCommunity.Api.Template.config_loader import site_constant
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
 
-# Logic Import
-from .util.ScrapeSerie import GetSerieInfo
-
-
 # Variable
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
 
 
-def determine_media_type(item):
-    """
-    Determine if the item is a film or TV series by checking actual seasons count
-    using GetSerieInfo.
-    """
-    try:
-        scraper = GetSerieInfo(item.get('path_id'))
-        scraper.collect_info_title()
-        return scraper.prog_tipology, scraper.prog_description, scraper.prog_year
-    
-    except Exception as e:
-        console.print(f"[red]Error determining media type: {e}[/red]")
-        return None, None, None
-
-
 def title_search(query: str) -> int:
     """
     Search for titles based on a search query.
@@ -72,24 +53,49 @@ def title_search(query: str) -> int:
         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')[:15]
+    try:
+        response_data = response.json()
+        cards = response_data.get('agg', {}).get('titoli', {}).get('cards', [])
+        
+        # Limit to only 15 results for performance
+        data = cards[:15]
+        console.print(f"[cyan]Found {len(cards)} results, processing first {len(data)}...[/cyan]")
+        
+    except Exception as e:
+        console.print(f"[red]Error parsing search results: {e}[/red]")
+        return 0
     
     # Process each item and add to media manager
-    for item in data:
-        media_type, prog_description, prog_year = determine_media_type(item)
-        if media_type is None:
+    for idx, item in enumerate(data, 1):
+        try:
+            # Get path_id
+            path_id = item.get('path_id', '')
+            if not path_id:
+                console.print("[yellow]Skipping item due to missing path_id[/yellow]")
+                continue
+
+            # Get image URL - handle both relative and absolute URLs
+            image = item.get('immagine', '')
+            if image and not image.startswith('http'):
+                image = f"https://www.raiplay.it{image}"
+            
+            # Get URL - handle both relative and absolute URLs
+            url = item.get('url', '')
+            if url and not url.startswith('http'):
+                url = f"https://www.raiplay.it{url}"
+
+            media_search_manager.add_media({
+                'id': item.get('id', ''),
+                'name': item.get('titolo', 'Unknown'),
+                'type': "tv",
+                'path_id': path_id,
+                'url': url,
+                'image': image,
+                'year': image.split("/")[5]
+            })
+    
+        except Exception as e:
+            console.print(f"[red]Error processing item '{item.get('titolo', 'Unknown')}': {e}[/red]")
             continue
-
-        media_search_manager.add_media({
-            'id': item.get('id', ''),
-            'name': item.get('titolo', ''),
-            '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', '')}",
-            'desc': prog_description,
-            'year': prog_year
-        })
-          
+    
     return media_search_manager.get_length()