StreamingCommunity 3.3.9__py3-none-any.whl → 3.4.2__py3-none-any.whl

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

@@ -5,18 +5,14 @@ from urllib.parse import urlparse
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 
 
 # Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_headers, get_userAgent
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
 
-# Variable
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
-
 
 class GetSerieInfo:
     def __init__(self, url):
@@ -46,20 +42,14 @@ class GetSerieInfo:
 
     def _get_series_data(self):
         """Get series data through the API"""
-        headers = {'User-Agent': get_userAgent()}
-        params = {'byGuid': self.serie_id}
-
-        with httpx.Client(timeout=max_timeout, follow_redirects=True) as client:
-            response = client.get(
-                f'https://feed.entertainment.tv.theplatform.eu/f/{self.public_id}/mediaset-prod-all-series-v2',
-                params=params,
-                headers=headers
-            )
-
-        if response.status_code == 200:
+        try:
+            params = {'byGuid': self.serie_id}
+            response = create_client(headers=self.headers).get(f'https://feed.entertainment.tv.theplatform.eu/f/{self.public_id}/mediaset-prod-all-series-v2', params=params)
+            response.raise_for_status()
             return response.json()
-        else:
-            logging.error(f"Failed to get series data: {response.status_code}")
+        
+        except Exception as e:
+            logging.error(f"Failed to get series data with error: {e}")
             return None
 
     def _process_available_seasons(self, data):
@@ -106,32 +96,30 @@ class GetSerieInfo:
 
     def _extract_season_sb_ids(self, stagioni_disponibili):
         """Extract sb IDs from season pages"""
-        with httpx.Client(timeout=max_timeout, follow_redirects=True) as client:
-            for season in stagioni_disponibili:
-                response_page = client.get(
-                    season['page_url'],
-                    headers={'User-Agent': get_userAgent()}
-                )
-                
-                print("Response for _extract_season_sb_ids:", response_page.status_code, " season index:", season['tvSeasonNumber'])
-                soup = BeautifulSoup(response_page.text, 'html.parser')
-                
-                # Try first with 'Episodi', then with 'Puntate intere'
-                link = soup.find('a', string='Episodi')
-                if not link:
-                    #print("Using word: Puntate intere")
-                    link = soup.find('a', string='Puntate intere')
-
-                    if link is None:
-                        link = soup.find('a', class_ = 'titleCarousel')
-                
-                if link and link.has_attr('href'):
-                    if not link.string == 'Puntate intere':
-                        print("Using word: Episodi")
-                        
-                    season['sb'] = link['href'].split(',')[-1]
-                else:
-                    logging.warning(f"Link 'Episodi' or 'Puntate intere' not found for season {season['tvSeasonNumber']}")
+        client = create_client()
+        
+        for season in stagioni_disponibili:
+            response_page = client.get(season['page_url'], headers={'User-Agent': get_userAgent()})
+            
+            print("Response for _extract_season_sb_ids:", response_page.status_code, " season index:", season['tvSeasonNumber'])
+            soup = BeautifulSoup(response_page.text, 'html.parser')
+            
+            # Try first with 'Episodi', then with 'Puntate intere'
+            link = soup.find('a', string='Episodi')
+            if not link:
+                #print("Using word: Puntate intere")
+                link = soup.find('a', string='Puntate intere')
+
+                if link is None:
+                    link = soup.find('a', class_ = 'titleCarousel')
+            
+            if link and link.has_attr('href'):
+                if not link.string == 'Puntate intere':
+                    print("Using word: Episodi")
+                    
+                season['sb'] = link['href'].split(',')[-1]
+            else:
+                logging.warning(f"Link 'Episodi' or 'Puntate intere' not found for season {season['tvSeasonNumber']}")
 
     def _get_season_episodes(self, season):
         """Get episodes for a specific season"""
@@ -147,11 +135,11 @@ class GetSerieInfo:
             'range': '0-100',
         }
         episode_url = f"https://feed.entertainment.tv.theplatform.eu/f/{self.public_id}/mediaset-prod-all-programs-v2"
-
-        with httpx.Client(timeout=max_timeout, follow_redirects=True) as client:
-            episode_response = client.get(episode_url, headers=episode_headers, params=params)
         
-        if episode_response.status_code == 200:
+        try:
+            episode_response = create_client(headers=episode_headers).get(episode_url, params=params)
+            episode_response.raise_for_status()
+            
             episode_data = episode_response.json()
             season['episodes'] = []
             
@@ -166,8 +154,9 @@ class GetSerieInfo:
                 season['episodes'].append(episode_info)
             
             print(f"Found {len(season['episodes'])} episodes for season {season['tvSeasonNumber']}")
-        else:
-            logging.error(f"Failed to get episodes for season {season['tvSeasonNumber']}: {episode_response.status_code}")
+
+        except Exception as e:
+            logging.error(f"Failed to get episodes for season {season['tvSeasonNumber']} with error: {e}")
 
     def collect_season(self) -> None:
         """

StreamingCommunity/Api/Site/mediasetinfinity/util/fix_mpd.py

@@ -3,8 +3,8 @@
 from urllib.parse import urlparse, urlunparse
 
 
-# External library
-import httpx
+# Internal utilities
+from StreamingCommunity.Util.http_client import create_client
 
 
 def try_mpd(url, qualities):
@@ -42,7 +42,7 @@ def try_mpd(url, qualities):
         mpd_url = urlunparse(parsed._replace(path=new_path)).strip()
 
         try:
-            r = httpx.head(mpd_url, timeout=5)
+            r = create_client().head(mpd_url)
             if r.status_code == 200:
                 return mpd_url
             

StreamingCommunity/Api/Site/mediasetinfinity/util/get_license.py

@@ -7,19 +7,17 @@ import xml.etree.ElementTree as ET
 
 
 # External library
-import httpx
 from bs4 import BeautifulSoup
 from rich.console import Console
 
 
 # Internal utilities
-from StreamingCommunity.Util.config_json import config_manager
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.headers import get_headers, get_userAgent
 
 
 # Variable
 console = Console()
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
 network_data = []
 class_mediaset_api = None
 
@@ -51,17 +49,13 @@ class MediasetAPI:
             'appName': self.app_name,
             'client_id': self.client_id,
         }
-        response = httpx.post(
-            'https://api-ott-prod-fe.mediaset.net/PROD/play/idm/anonymous/login/v2.0',
-            headers=self.headers,
-            json=json_data,
-        )
+        response = create_client(headers=self.headers).post('https://api-ott-prod-fe.mediaset.net/PROD/play/idm/anonymous/login/v2.0', json=json_data)
         return response.json()['response']['beToken']
 
     def fetch_html(self, timeout=10):
-        r = httpx.get("https://mediasetinfinity.mediaset.it/", timeout=timeout, headers=self.headers)
-        r.raise_for_status()
-        return r.text
+        response = create_client(headers=self.headers).get("https://mediasetinfinity.mediaset.it/")
+        response.raise_for_status()
+        return response.text
 
     def find_relevant_script(self, html):
         soup = BeautifulSoup(html, "html.parser")
@@ -124,13 +118,7 @@ def get_playback_url(CONTENT_ID):
     }
 
     try:
-        response = httpx.post(
-            'https://api-ott-prod-fe.mediaset.net/PROD/play/playback/check/v2.0',
-            headers=headers,
-            json=json_data,
-            follow_redirects=True,
-            timeout=MAX_TIMEOUT
-        )
+        response = create_client(headers=headers).post('https://api-ott-prod-fe.mediaset.net/PROD/play/playback/check/v2.0', json=json_data)
         response.raise_for_status()
         resp_json = response.json()
 
@@ -255,13 +243,7 @@ def get_tracking_info(PLAYBACK_JSON):
         params['publicUrl'] = PLAYBACK_JSON['publicUrl']
 
     try:
-        response = httpx.get(
-            PLAYBACK_JSON['url'],
-            headers={'user-agent': get_userAgent()},
-            params=params,
-            follow_redirects=True,
-            timeout=MAX_TIMEOUT
-        )
+        response = create_client(headers={'user-agent': get_userAgent()}).get(PLAYBACK_JSON['url'], params=params)
         response.raise_for_status()
 
         results = parse_smil_for_media_info(response.text)

StreamingCommunity/Api/Site/raiplay/film.py

@@ -5,17 +5,16 @@ from typing import Tuple
 
 
 # External library
-import httpx
 from rich.console import Console
 
 
 # Internal utilities
 from StreamingCommunity.Util.os import os_manager
+from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.os import get_wvd_path
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.message import start_message
 
-
 # Logic class
 from .util.get_license import generate_license_url
 from StreamingCommunity.Api.Template.config_loader import site_constant
@@ -29,6 +28,7 @@ from StreamingCommunity.Api.Player.mediapolisvod import VideoSource
 
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> Tuple[str, bool]:
@@ -46,13 +46,13 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
     # Extract m3u8 URL from the film's URL
-    response = httpx.get(select_title.url + ".json", headers=get_headers(), timeout=10)
+    response = create_client(headers=get_headers()).get(select_title.url + ".json")
     first_item_path =  "https://www.raiplay.it" + response.json().get("first_item_path")
     master_playlist = VideoSource.extract_m3u8_url(first_item_path)
 
     # Define the filename and path for the downloaded film
-    mp4_name = os_manager.get_sanitize_file(select_title.name) + ".mp4"
-    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, mp4_name.replace(".mp4", ""))
+    mp4_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
+    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, mp4_name.replace(extension_output, ""))
 
     # HLS
     if ".mpd" not in master_playlist:
@@ -66,7 +66,6 @@ def download_film(select_title: MediaItem) -> Tuple[str, bool]:
         license_url = generate_license_url(select_title.mpd_id)
 
         dash_process = DASH_Downloader(
-            cdm_device=get_wvd_path(),
             license_url=license_url,
             mpd_url=master_playlist,
             output_path=os.path.join(mp4_path, mp4_name),
@@ -79,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/Api/Site/raiplay/series.py

@@ -11,7 +11,6 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers, get_userAgent
-from StreamingCommunity.Util.os import get_wvd_path
 from StreamingCommunity.Util.message import start_message
 
 
@@ -24,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
@@ -72,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 = {
@@ -91,7 +82,6 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
         }
 
         dash_process = DASH_Downloader(
-            cdm_device=get_wvd_path(),
             license_url=full_license_url.split("?")[0],
             mpd_url=master_playlist,
             output_path=os.path.join(mp4_path, mp4_name),
@@ -171,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}")
@@ -193,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/Api/Site/raiplay/site.py

@@ -1,42 +1,21 @@
 # 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.headers import get_headers
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.table import TVShowManager
 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()
-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:
-        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:
@@ -67,37 +46,56 @@ 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 = create_client(headers=get_headers()).post(search_url, json=json_data)
         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')[: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()