StreamingCommunity 3.3.8__py3-none-any.whl → 3.4.0__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")
@@ -79,7 +73,7 @@ class MediasetAPI:
         html = self.fetch_html()
         scripts = self.find_relevant_script(html)[0:1]
         pairs = self.extract_pairs_from_scripts(scripts)
-        return next((h for h, k in pairs.items() if k == "$2a"), None)
+        return list(pairs.keys())[-5]
 
     def generate_request_headers(self):
         return {
@@ -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),

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
 
 
@@ -91,7 +90,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),
@@ -166,16 +164,7 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
         - episode_selection (str, optional): Pre-defined episode selection that bypasses manual input
     """
     start_message()
-
-    # Extract program name from path_id
-    program_name = None
-    if select_season.path_id:
-        parts = select_season.path_id.strip('/').split('/')
-        if len(parts) >= 2:
-            program_name = parts[-1].split('.')[0]
-
-    # Init scraper
-    scrape_serie = GetSerieInfo(program_name)
+    scrape_serie = GetSerieInfo(select_season.path_id)
 
     # Get seasons info
     scrape_serie.collect_info_title()

StreamingCommunity/Api/Site/raiplay/site.py

@@ -1,13 +1,12 @@
 # 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
@@ -21,7 +20,6 @@ from .util.ScrapeSerie import GetSerieInfo
 console = Console()
 media_search_manager = MediaManager()
 table_show_manager = TVShowManager()
-max_timeout = config_manager.get_int("REQUESTS", "timeout")
 
 
 def determine_media_type(item):
@@ -30,24 +28,13 @@ def determine_media_type(item):
     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"
-
-        # Dio stranamente guarda che giro bisogna fare per avere il tipo di media.
-        scraper = GetSerieInfo(program_name)
+        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 "film"
+        return None, None, None
 
 
 def title_search(query: str) -> int:
@@ -78,13 +65,7 @@ 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:
@@ -97,6 +78,9 @@ def title_search(query: str) -> int:
     # 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:
+            continue
+
         media_search_manager.add_media({
             'id': item.get('id', ''),
             'name': item.get('titolo', ''),

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

@@ -3,27 +3,20 @@
 import logging
 
 
-# External libraries
-import httpx
-
-
 # Internal utilities
 from StreamingCommunity.Util.headers import get_headers
-from StreamingCommunity.Util.config_json import config_manager
+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, program_name: str):
+    def __init__(self, path_id: str):
         """Initialize the GetSerieInfo class."""
         self.base_url = "https://www.raiplay.it"
-        self.program_name = program_name
-        self.series_name = program_name
-        self.prog_tipology = None
+        self.path_id = path_id
+        self.series_name = None
+        self.prog_tipology = "film"
         self.prog_description = None
         self.prog_year = None
         self.seasons_manager = SeasonManager()
@@ -31,24 +24,21 @@ class GetSerieInfo:
     def collect_info_title(self) -> None:
         """Get series info including seasons."""
         try:
-            program_url = f"{self.base_url}/programmi/{self.program_name}.json"
-            response = httpx.get(url=program_url, headers=get_headers(), timeout=max_timeout)
+            program_url = f"{self.base_url}/{self.path_id}"
+            response = create_client(headers=get_headers()).get(program_url)
             
             # If 404, content is not yet available
             if response.status_code == 404:
-                logging.info(f"Content not yet available: {self.program_name}")
+                logging.info(f"Content not yet available: {program_url}")
                 return
                 
             response.raise_for_status()
             json_data = response.json()
 
-            # Dio santissimo ma chi ha fatto le cose cosi di merda.
-            type_check_1 = "tv" if json_data.get('program_info', {}).get('layout', 'single') == 'multi' else "film"
-            #type_check_2 = "tv" if "tv" in json_data.get('track_info', {}).get('typology', '') else "film"
-
-            self.prog_tipology = type_check_1
+            # Get basic program info
             self.prog_description = json_data.get('program_info', '').get('vanity', '')
             self.prog_year = json_data.get('program_info', '').get('year', '')
+            self.series_name = json_data.get('program_info', '').get('title', '')
             
             # Look for seasons in the 'blocks' property
             for block in json_data.get('blocks', []):
@@ -60,11 +50,14 @@ class GetSerieInfo:
 
                         # Extract seasons from sets array
                         for season_set in block.get('sets', []):
+                            self.prog_tipology = "tv"
+
                             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')
+                        self.prog_tipology = "tv"
 
                         # Extract season directly from block's sets
                         for season_set in block.get('sets', []):
@@ -88,8 +81,8 @@ class GetSerieInfo:
             season = self.seasons_manager.get_season_by_number(number_season)
 
             # Se stai leggendo questo codice spieami perche hai fatto cosi.
-            url = f"{self.base_url}/programmi/{self.program_name}/{self.publishing_block_id}/{season.id}/episodes.json"
-            response = httpx.get(url=url, headers=get_headers(), timeout=max_timeout)
+            url = f"{self.base_url}/{self.path_id.replace('.json', '')}/{self.publishing_block_id}/{season.id}/episodes.json"
+            response = create_client(headers=get_headers()).get(url)
             response.raise_for_status()
             
             episodes_data = response.json()

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

@@ -1,20 +1,11 @@
 # 16.03.25
 
 
-# External library
-import httpx
-
-
 # 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
 
 
-# Variable
-MAX_TIMEOUT = config_manager.get_int("REQUESTS", "timeout")
-
-
-
 def generate_license_url(mpd_id: str):
     """
     Generates the URL to obtain the Widevine license.
@@ -29,8 +20,8 @@ def generate_license_url(mpd_id: str):
         'cont': mpd_id,
         'output': '62',
     }
-
-    response = httpx.get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params, headers=get_headers(), timeout=MAX_TIMEOUT)
+    
+    response = create_client(headers=get_headers()).get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params)
     response.raise_for_status() 
 
     # Extract the license URL from the response in two lines

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -9,8 +9,9 @@ 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.message import start_message
-from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession, get_bot_instance
+from StreamingCommunity.TelegramHelp.telegram_bot import TelegramSession
 
 
 # Logic class
@@ -25,6 +26,7 @@ from StreamingCommunity.Api.Player.vixcloud import VideoSource
 
 # Variable
 console = Console()
+extension_output = config_manager.get("M3U8_CONVERSION", "extension")
 
 
 def download_film(select_title: MediaItem) -> str:
@@ -38,19 +40,6 @@ def download_film(select_title: MediaItem) -> str:
     Return:
         - str: output path
     """
-    if site_constant.TELEGRAM_BOT:
-        bot = get_bot_instance()
-        bot.send_message(f"Download in corso:\n{select_title.name}", None)
-
-        # Viene usato per lo screen
-        console.print(f"## Download: [red]{select_title.name} ##")
-
-        # Get script_id
-        script_id = TelegramSession.get_session()
-        if script_id != "unknown":
-            TelegramSession.updateScriptId(script_id, select_title.name)
-
-    # Start message and display film information
     start_message()
     console.print(f"\n[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
@@ -67,8 +56,8 @@ def download_film(select_title: MediaItem) -> str:
         return None
 
     # Define the filename and path for the downloaded film
-    title_name = os_manager.get_sanitize_file(select_title.name) + ".mp4"
-    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(".mp4", ""))
+    title_name = os_manager.get_sanitize_file(select_title.name, select_title.date) + extension_output
+    mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(extension_output, ""))
 
     # Download the film using the m3u8 playlist, and output filename
     hls_process = HLS_Downloader(

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -4,14 +4,13 @@ import json
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 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
 from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
@@ -25,8 +24,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")
-ssl_verify = config_manager.get_bool("REQUESTS", "verify")
 
 
 def title_search(query: str) -> int:
@@ -46,13 +43,7 @@ def title_search(query: str) -> int:
     table_show_manager.clear()
 
     try:
-        response = httpx.get(
-            f"{site_constant.FULL_URL}/it", 
-            headers={'user-agent': get_userAgent()}, 
-            timeout=max_timeout,
-            verify=ssl_verify,
-	    follow_redirects=True
-        )
+        response = create_client(headers={'user-agent': get_userAgent()}).get(f"{site_constant.FULL_URL}/it")
         response.raise_for_status()
 
         soup = BeautifulSoup(response.text, 'html.parser')
@@ -66,17 +57,7 @@ def title_search(query: str) -> int:
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
-        response = httpx.get(
-            search_url, 
-            headers = {
-                'referer': site_constant.FULL_URL,
-                'user-agent': get_userAgent(),
-                'x-inertia': 'true',
-                'x-inertia-version': version
-            },
-            timeout=max_timeout,
-            verify=ssl_verify
-        )
+        response = create_client(headers={'user-agent': get_userAgent(), 'x-inertia': 'true', 'x-inertia-version': version}).get(search_url)
         response.raise_for_status()
 
     except Exception as e: