StreamingCommunity 2.9.3__py3-none-any.whl → 2.9.4__py3-none-any.whl

StreamingCommunity/Api/Site/cb01new/site.py

@@ -17,7 +17,6 @@ from StreamingCommunity.Util.table import TVShowManager
 
 # Logic class
 from StreamingCommunity.Api.Template.config_loader import site_constant
-from StreamingCommunity.Api.Template.Util import search_domain
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
 
@@ -41,15 +40,7 @@ def title_search(word_to_search: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
-
-    if domain_to_use is None or base_url is None:
-        console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")
-        console.print("[yellow]The service might be temporarily unavailable or the domain may have changed.[/yellow]")
-        sys.exit(1)
-
-    search_url = f"{site_constant.FULL_URL}/?s={word_to_search}"
+    search_url = f"{site_constant.FULL_URL}/?story={word_to_search}&do=search&subaction=search"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:
@@ -58,20 +49,18 @@ def title_search(word_to_search: str) -> int:
 
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
+        return 0
 
     # Create soup and find table
     soup = BeautifulSoup(response.text, "html.parser")
 
-    for div in soup.find_all("div", class_ = "card-content"):
+    for div in soup.find_all("div", class_ = "short-main"):
         try:
-
-            url = div.find("h3").find("a").get("href")
-            title = div.find("h3").find("a").get_text(strip=True)
-            desc = div.find("p").find("strong").text
+            url = div.find("a").get("href")
+            title = div.find("a").get_text(strip=True)
 
             title_info = {
                 'name': title,
-                'desc': desc,
                 'url': url
             }
 

StreamingCommunity/Api/Site/ddlstreamitaly/site.py

@@ -18,7 +18,6 @@ from StreamingCommunity.Util.table import TVShowManager
 
 # Logic class
 from StreamingCommunity.Api.Template.config_loader import site_constant
-from StreamingCommunity.Api.Template.Util import search_domain
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
 
@@ -42,14 +41,6 @@ def title_search(word_to_search: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
-
-    if domain_to_use is None or base_url is None:
-        console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")
-        console.print("[yellow]The service might be temporarily unavailable or the domain may have changed.[/yellow]")
-        sys.exit(1)
-
     search_url = f"{site_constant.FULL_URL}/search/?&q={word_to_search}&quick=1&type=videobox_video&nodes=11"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
@@ -59,6 +50,7 @@ def title_search(word_to_search: str) -> int:
 
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
+        return 0
 
     # Create soup and find table
     soup = BeautifulSoup(response.text, "html.parser")

StreamingCommunity/Api/Site/guardaserie/site.py

@@ -16,7 +16,6 @@ from StreamingCommunity.Util.table import TVShowManager
 
 # Logic class
 from StreamingCommunity.Api.Template.config_loader import site_constant
-from StreamingCommunity.Api.Template.Util import search_domain
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
 
@@ -41,14 +40,6 @@ def title_search(word_to_search: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    # Check if domain is working
-    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
-
-    if domain_to_use is None or base_url is None:
-        console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")
-        console.print("[yellow]The service might be temporarily unavailable or the domain may have changed.[/yellow]")
-        sys.exit(1)
-
     search_url = f"{site_constant.FULL_URL}/?story={word_to_search}&do=search&subaction=search"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
@@ -58,6 +49,7 @@ def title_search(word_to_search: str) -> int:
     
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
+        return 0
 
     # Create soup and find table
     soup = BeautifulSoup(response.text, "html.parser")

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -52,8 +52,15 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     start_message()
     index_season_selected = dynamic_format_number(str(index_season_selected))
 
+    # SPECIAL: Get season number
+    season = None
+    for s in scrape_serie.seasons_manager.seasons:
+        if s.number == int(index_season_selected):
+            season = s
+            break
+
     # Get info about episode
-    obj_episode = scrape_serie.episode_manager.get(index_episode_selected - 1)
+    obj_episode = season.episodes.get(index_episode_selected - 1)
     console.print(f"[yellow]Download: [red]{index_season_selected}:{index_episode_selected} {obj_episode.name}")
     print()
 
@@ -100,14 +107,16 @@ def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, vid
         - index_season_selected (int): Index of the selected season.
         - download_all (bool): Download all episodes in the season.
     """
-
-    # Clean memory of all episodes and get the number of the season
-    scrape_serie.episode_manager.clear()
-
-    # Start message and collect information about episodes
     start_message()
     scrape_serie.collect_info_season(index_season_selected)
-    episodes_count = scrape_serie.episode_manager.length()
+    
+    # SPECIAL: Get season number
+    season = None
+    for s in scrape_serie.seasons_manager.seasons:
+        if s.number == index_season_selected:
+            season = s
+            break
+    episodes_count = len(season.episodes.episodes)
 
     if download_all:
 
@@ -123,7 +132,7 @@ def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, vid
     else:
 
         # Display episodes list and manage user selection
-        last_command = display_episodes_list(scrape_serie.episode_manager.episodes)
+        last_command = display_episodes_list(season.episodes.episodes)
         list_episode_select = manage_selection(last_command, episodes_count)
 
         try:
@@ -163,7 +172,7 @@ def download_series(select_season: MediaItem) -> None:
 
     # Collect information about seasons
     scrape_serie.collect_info_title()
-    seasons_count = scrape_serie.season_manager.seasons_count
+    seasons_count = len(scrape_serie.seasons_manager)
 
     # Prompt user for season selection and download episodes
     console.print(f"\n[green]Seasons found: [red]{seasons_count}")
@@ -197,14 +206,23 @@ def download_series(select_season: MediaItem) -> None:
 
     # Loop through the selected seasons and download episodes
     for i_season in list_season_select:
+
+        # SPECIAL: Get season number
+        season = None
+        for s in scrape_serie.seasons_manager.seasons:
+            if s.number == i_season:
+                season = s
+                break
+        season_number = season.number
+
         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.season_manager.seasonsData.get_season_by_number(i_season-1).number, scrape_serie, video_source, download_all=True)
+            download_episode(season_number, scrape_serie, video_source, download_all=True)
         else:
 
             # Otherwise, let the user select specific episodes for the single season
-            download_episode(scrape_serie.season_manager.seasonsData.get_season_by_number(i_season-1).number, scrape_serie, video_source, download_all=False)
+            download_episode(season_number, scrape_serie, video_source, download_all=False)
 
     if site_constant.TELEGRAM_BOT:
         bot.send_message(f"Finito di scaricare tutte le serie e episodi", None)

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -17,7 +17,6 @@ from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
 # Logic class
 from StreamingCommunity.Api.Template.config_loader import site_constant
-from StreamingCommunity.Api.Template.Util import search_domain
 from StreamingCommunity.Api.Template.Class.SearchType import MediaManager
 
 
@@ -38,13 +37,6 @@ def title_search(title_search: str) -> int:
     Returns:
         int: The number of titles found.
     """
-    domain_to_use, base_url = search_domain(site_constant.FULL_URL)
-
-    if domain_to_use is None or base_url is None:
-        console.print("[bold red]Error: Unable to determine valid domain or base URL.[/bold red]")
-        console.print("[yellow]The service might be temporarily unavailable or the domain may have changed.[/yellow]")
-        sys.exit(1)
-
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
 
@@ -60,12 +52,20 @@ def title_search(title_search: str) -> int:
 
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
+        return 0
 
     # Prepara le scelte per l'utente
     if site_constant.TELEGRAM_BOT:
         choices = []
-          
-    for i, dict_title in enumerate(response.json()['data']):
+
+    # Collect json data
+    try:
+        data = response.json().get('data', [])
+    except Exception as e:
+        console.log(f"Error parsing JSON response: {e}")
+        return 0
+
+    for i, dict_title in enumerate(data):
         try:
             media_search_manager.add_media({
                 'id': dict_title.get('id'),

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

@@ -12,7 +12,7 @@ from bs4 import BeautifulSoup
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.config_json import config_manager
-from StreamingCommunity.Api.Player.Helper.Vixcloud.util import Season, EpisodeManager
+from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
 
 
 # Variable
@@ -22,7 +22,7 @@ max_timeout = config_manager.get_int("REQUESTS", "timeout")
 class GetSerieInfo:
     def __init__(self, url):
         """
-        Initialize the ScrapeSerie class for scraping TV series information.
+        Initialize the GetSerieInfo class for scraping TV series information.
         
         Args:
             - url (str): The URL of the streaming site.
@@ -31,6 +31,9 @@ class GetSerieInfo:
         self.headers = {'user-agent': get_userAgent()}
         self.url = url
 
+        # Initialize the SeasonManager
+        self.seasons_manager = SeasonManager()
+
     def setup(self, media_id: int = None, series_name: str = None):
         """
         Set up the scraper with specific media details.
@@ -41,19 +44,17 @@ class GetSerieInfo:
         """
         self.media_id = media_id
 
-        # If series name is provided, initialize series-specific managers
+        # If series name is provided, initialize series-specific properties
         if series_name is not None:
             self.is_series = True
             self.series_name = series_name
-            self.season_manager = None
-            self.episode_manager: EpisodeManager = EpisodeManager()
 
     def collect_info_title(self) -> None:
         """
-        Retrieve season information for a TV series from the streaming site.
+        Retrieve general information about the TV series from the streaming site.
         
         Raises:
-            Exception: If there's an error fetching season information
+            Exception: If there's an error fetching series information
         """
         try:
             response = httpx.get(
@@ -63,16 +64,30 @@ class GetSerieInfo:
             )
             response.raise_for_status()
 
-            # Extract seasons from JSON response
+            # Extract series info from JSON response
             soup = BeautifulSoup(response.text, "html.parser")
             json_response = json.loads(soup.find("div", {"id": "app"}).get("data-page"))
             self.version = json_response['version']
-
-            # Collect info about season
-            self.season_manager = Season(json_response.get("props").get("title"))
+            
+            # Extract information about available seasons
+            title_data = json_response.get("props", {}).get("title", {})
+            
+            # Save general series information
+            self.title_info = title_data
+            
+            # Extract available seasons and add them to SeasonManager
+            seasons_data = title_data.get("seasons", [])
+            for season_data in seasons_data:
+                self.seasons_manager.add_season({
+                    'id': season_data.get('id', 0),
+                    'number': season_data.get('number', 0),
+                    'name': f"Season {season_data.get('number', 0)}",
+                    'slug': season_data.get('slug', ''),
+                    'type': title_data.get('type', '')
+                })
 
         except Exception as e:
-            logging.error(f"Error collecting season info: {e}")
+            logging.error(f"Error collecting series info: {e}")
             raise
 
     def collect_info_season(self, number_season: int) -> None:
@@ -86,6 +101,12 @@ class GetSerieInfo:
             Exception: If there's an error fetching episode information
         """
         try:
+            # Get the season object from SeasonManager
+            season = self.seasons_manager.get_season_by_number(number_season)
+            if not season:
+                logging.error(f"Season {number_season} not found")
+                return
+    
             response = httpx.get(
                 url=f'{self.url}/titles/{self.media_id}-{self.series_name}/stagione-{number_season}', 
                 headers={
@@ -98,12 +119,12 @@ class GetSerieInfo:
             response.raise_for_status()
 
             # Extract episodes from JSON response
-            json_response = response.json().get('props').get('loadedSeason').get('episodes')
+            json_response = response.json().get('props', {}).get('loadedSeason', {}).get('episodes', [])
                 
-            # Add each episode to the episode manager
+            # Add each episode to the corresponding season's episode manager
             for dict_episode in json_response:
-                self.episode_manager.add(dict_episode)
+                season.episodes.add(dict_episode)
 
         except Exception as e:
-            logging.error(f"Error collecting title season info: {e}")
-            raise
+            logging.error(f"Error collecting episodes for season {number_season}: {e}")
+            raise

StreamingCommunity/Api/Template/Class/SearchType.py

@@ -98,4 +98,4 @@ class MediaManager:
         self.media_list.clear()
 
     def __str__(self):
-        return f"MediaManager(num_media={len(self.media_list)})"
+        return f"MediaManager(num_media={len(self.media_list)})"

StreamingCommunity/Api/Template/Util/__init__.py

@@ -1,6 +1,5 @@
 # 23.11.24
 
-from .get_domain import search_domain
 from .manage_ep import (
     manage_selection, 
     map_episode_title, 

StreamingCommunity/Api/Template/Util/manage_ep.py

@@ -218,6 +218,7 @@ def validate_episode_selection(list_episode_select: List[int], episodes_count: i
             input_episodes = input(f"Enter valid episode numbers (1-{episodes_count}): ")
             list_episode_select = list(map(int, input_episodes.split(',')))
 
+
 def display_episodes_list(episodes_manager) -> str:
     """
     Display episodes list and handle user input.

StreamingCommunity/Api/Template/config_loader.py

@@ -31,10 +31,6 @@ class SiteConstant:
     def ROOT_PATH(self):
         return config_manager.get('OUT_FOLDER', 'root_path')
     
-    @property
-    def DOMAIN_NOW(self):
-        return config_manager.get_site(self.SITE_NAME, 'domain')
-    
     @property
     def FULL_URL(self):
         return config_manager.get_site(self.SITE_NAME, 'full_url').rstrip('/')

StreamingCommunity/Lib/Downloader/HLS/downloader.py

@@ -438,13 +438,13 @@ class HLS_Downloader:
                 return response
             
             if GET_ONLY_LINK:
-                console.print(f"URL: {self.m3u8_url}[/bold red]")
+                console.print(f"URL: [bold red]{self.m3u8_url}[/bold red]")
                 return {
                     'path': None,
                     'url': self.m3u8_url,
                     'is_master': getattr(self.m3u8_manager, 'is_master', None),
                     'msg': None,
-                    'error': error_msg,
+                    'error': None,
                     'stopped': True
                 }
 

StreamingCommunity/Lib/Downloader/MP4/downloader.py

@@ -30,7 +30,8 @@ from ...FFmpeg import print_duration_table
 
 
 # Config
-REQUEST_VERIFY = config_manager.get_int('REQUESTS', 'verify')
+REQUEST_VERIFY = config_manager.get_bool('REQUESTS', 'verify')
+REQUEST_HTTP2 = config_manager.get_bool('REQUESTS', 'http2')
 GET_ONLY_LINK = config_manager.get_bool('M3U8_PARSER', 'get_only_link')
 REQUEST_TIMEOUT = config_manager.get_float('REQUESTS', 'timeout')
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
@@ -111,7 +112,7 @@ def MP4_downloader(url: str, path: str, referer: str = None, headers_: dict = No
     original_handler = signal.signal(signal.SIGINT, partial(signal_handler, interrupt_handler=interrupt_handler, original_handler=signal.getsignal(signal.SIGINT)))
 
     try:
-        transport = httpx.HTTPTransport(verify=REQUEST_VERIFY, http2=True)
+        transport = httpx.HTTPTransport(verify=REQUEST_VERIFY, http2=REQUEST_HTTP2)
         
         with httpx.Client(transport=transport, timeout=httpx.Timeout(60)) as client:
             with client.stream("GET", url, headers=headers, timeout=REQUEST_TIMEOUT) as response:

StreamingCommunity/Lib/M3U8/estimator.py

@@ -119,15 +119,15 @@ class M3U8_Ts_Estimator:
                 
                 retry_count = self.segments_instance.active_retries if self.segments_instance else 0
                 progress_str = (
-                    f"{Colors.GREEN}{number_file_total_size} {Colors.WHITE}< {Colors.RED}{units_file_total_size}"
-                    f"{Colors.WHITE} {Colors.CYAN}{average_internet_speed} {Colors.RED}{average_internet_unit}"
+                    f"{Colors.GREEN}{number_file_total_size} {Colors.RED}{units_file_total_size}"
+                    f"{Colors.WHITE}, {Colors.CYAN}{average_internet_speed} {Colors.RED}{average_internet_unit}"
                     f"{Colors.WHITE}, {Colors.GREEN}CRR {Colors.RED}{retry_count} "
                 )
                 
             else:
                 retry_count = self.segments_instance.active_retries if self.segments_instance else 0
                 progress_str = (
-                    f"{Colors.GREEN}{number_file_total_size} {Colors.WHITE}< {Colors.RED}{units_file_total_size}"
+                    f"{Colors.GREEN}{number_file_total_size} {Colors.RED}{units_file_total_size}"
                     f"{Colors.WHITE}, {Colors.GREEN}CRR {Colors.RED}{retry_count} "
                 )
             

StreamingCommunity/Upload/version.py

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

StreamingCommunity/Util/config_json.py

@@ -421,9 +421,6 @@ class ConfigManager:
 config_manager = ConfigManager()
 config_manager.read_config()
 
-
-import sys
-
 def get_use_large_bar():
     """
     Determines whether the large bar feature should be enabled.

StreamingCommunity/__init__.py

@@ -0,0 +1,6 @@
+# 11.03.25
+
+from .run import main
+from .Lib.Downloader.HLS.downloader import HLS_Downloader
+from .Lib.Downloader.MP4.downloader import MP4_downloader
+from .Lib.Downloader.TOR.downloader import TOR_downloader

{StreamingCommunity-2.9.3.dist-info → streamingcommunity-2.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: StreamingCommunity
-Version: 2.9.3
+Version: 2.9.4
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -23,6 +23,14 @@ Requires-Dist: pycryptodomex
 Requires-Dist: ua-generator
 Requires-Dist: qbittorrent-api
 Requires-Dist: pyTelegramBotAPI
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
 
 <p align="center">
   <img src="https://i.ibb.co/v6RnT0wY/s2.jpg" alt="Project Logo" width="700"/>
@@ -105,9 +113,15 @@ Install directly from PyPI:
 pip install StreamingCommunity
 ```
 
-### Creating a Run Script
+Update to the latest version:
 
-Create `run_streaming.py`:
+```bash
+pip install --upgrade StreamingCommunity
+```
+
+## Quick Start
+
+Create a simple script (`run_streaming.py`) to launch the main application:
 
 ```python
 from StreamingCommunity.run import main
@@ -117,16 +131,85 @@ if __name__ == "__main__":
 ```
 
 Run the script:
+
 ```bash
 python run_streaming.py
 ```
 
-### Updating via PyPI
+## Modules
 
-```bash
-pip install --upgrade StreamingCommunity
+### HLS Downloader
+
+Download HTTP Live Streaming (HLS) content from m3u8 URLs.
+
+```python
+from StreamingCommunity.Download import HLS_Downloader
+
+# Initialize with m3u8 URL and optional output path
+downloader = HLS_Downloader(
+    m3u8_url="https://example.com/stream.m3u8",
+    output_path="/downloads/video.mp4"  # Optional
+)
+
+# Start the download
+downloader.download()
 ```
 
+See [HLS example](./Test/Download/HLS.py) for complete usage.
+
+### MP4 Downloader
+
+Direct MP4 file downloader with support for custom headers and referrer.
+
+```python
+from StreamingCommunity.Download import MP4_downloader
+
+# Basic usage
+downloader = MP4_downloader(
+    url="https://example.com/video.mp4",
+    path="/downloads/saved_video.mp4"
+)
+
+# Advanced usage with custom headers and referrer
+headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+}
+downloader = MP4_downloader(
+    url="https://example.com/video.mp4",
+    path="/downloads/saved_video.mp4",
+    referer="https://example.com",
+    headers_=headers
+)
+
+# Start download
+downloader.download()
+```
+
+See [MP4 example](./Test/Download/MP4.py) for complete usage.
+
+### Torrent Client
+
+Download content via torrent magnet links.
+
+```python
+from StreamingCommunity.Download import TOR_downloader
+
+# Initialize torrent client
+client = TOR_downloader()
+
+# Add magnet link
+client.add_magnet_link("magnet:?xt=urn:btih:example_hash&dn=example_name")
+
+# Start download
+client.start_download()
+
+# Move downloaded files to specific location
+client.move_downloaded_files("/downloads/torrents/")
+```
+
+See [Torrent example](./Test/Download/TOR.py) for complete usage.
+
+
 ## 2. Automatic Installation
 
 ### Supported Operating Systems 💿