StreamingCommunity 2.9.4__tar.gz → 2.9.5__tar.gz

{streamingcommunity-2.9.4/StreamingCommunity.egg-info → streamingcommunity-2.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: StreamingCommunity
-Version: 2.9.4
+Version: 2.9.5
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -79,6 +79,7 @@ Dynamic: requires-python
     - 📥 [Download](#m3u8_download-settings)
     - 🔍 [Parser](#m3u8_parser-settings)
 - 📝 [Command](#command)
+- 🔍 [Global search](#global-search)
 - 💻 [Examples of terminal](#examples-of-terminal-usage)
 - 🔧 [Manual domain configuration](#update-domains)
 - 🐳 [Docker](#docker)
@@ -668,19 +669,44 @@ The API-based domain updates are currently deprecated. To use it anyway, set `us
 
 Note: If `use_api` is set to `false` and no `domains.json` file is found, the script will raise an error.
 
-# COMMAND
+#### 💡 Adding a New Site to the Legacy API
+If you want to add a new site to the legacy API, just message me on the Discord server, and I'll add it!
 
-- Download a specific season by entering its number.
-  *  **Example:** `1` will download *Season 1* only.
+# Global Search
 
--  Use the wildcard `*` to download every available season.
-   * **Example:** `*` will download all seasons in the series.
+You can now search across multiple streaming sites at once using the Global Search feature. This allows you to find content more efficiently without having to search each site individually.
 
-- Specify a range of seasons using a hyphen `-`.
-   * **Example:** `1-2` will download *Seasons 1 and 2*.
+## Using Global Search
 
-- Enter a season number followed by `-*` to download from that season to the end.
-  * **Example:** `3-*` will download from *Season 3* to the final season.
+The Global Search feature provides a unified interface to search across all supported sites:
+
+## Search Options
+
+When using Global Search, you have three ways to select which sites to search:
+
+1. **Search all sites** - Searches across all available streaming sites
+2. **Search by category** - Group sites by their categories (movies, series, anime, etc.)
+3. **Select specific sites** - Choose individual sites to include in your search
+
+## Navigation and Selection
+
+After performing a search:
+
+1. Results are displayed in a consolidated table showing:
+   - Title
+   - Media type (movie, TV series, etc.)
+   - Source site
+
+2. Select an item by number to view details or download
+
+3. The system will automatically use the appropriate site's API to handle the download
+
+## Command Line Arguments
+
+The Global Search can be configured from the command line:
+
+- `--global` - Perform a global search across multiple sites.
+- `-s`, `--search` - Specify the search terms.
 
 # Examples of terminal usage
 
@@ -693,6 +719,9 @@ python test_run.py --specific_list_audio ita,eng --specific_list_subtitles eng,s
 
 # Keep console open after download
 python test_run.py --not_close true
+
+# Use global search
+python test_run.py --global -s "cars"
 ```
 
 # Docker

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/README.md

@@ -45,6 +45,7 @@
     - 📥 [Download](#m3u8_download-settings)
     - 🔍 [Parser](#m3u8_parser-settings)
 - 📝 [Command](#command)
+- 🔍 [Global search](#global-search)
 - 💻 [Examples of terminal](#examples-of-terminal-usage)
 - 🔧 [Manual domain configuration](#update-domains)
 - 🐳 [Docker](#docker)
@@ -634,19 +635,44 @@ The API-based domain updates are currently deprecated. To use it anyway, set `us
 
 Note: If `use_api` is set to `false` and no `domains.json` file is found, the script will raise an error.
 
-# COMMAND
+#### 💡 Adding a New Site to the Legacy API
+If you want to add a new site to the legacy API, just message me on the Discord server, and I'll add it!
 
-- Download a specific season by entering its number.
-  *  **Example:** `1` will download *Season 1* only.
+# Global Search
 
--  Use the wildcard `*` to download every available season.
-   * **Example:** `*` will download all seasons in the series.
+You can now search across multiple streaming sites at once using the Global Search feature. This allows you to find content more efficiently without having to search each site individually.
 
-- Specify a range of seasons using a hyphen `-`.
-   * **Example:** `1-2` will download *Seasons 1 and 2*.
+## Using Global Search
 
-- Enter a season number followed by `-*` to download from that season to the end.
-  * **Example:** `3-*` will download from *Season 3* to the final season.
+The Global Search feature provides a unified interface to search across all supported sites:
+
+## Search Options
+
+When using Global Search, you have three ways to select which sites to search:
+
+1. **Search all sites** - Searches across all available streaming sites
+2. **Search by category** - Group sites by their categories (movies, series, anime, etc.)
+3. **Select specific sites** - Choose individual sites to include in your search
+
+## Navigation and Selection
+
+After performing a search:
+
+1. Results are displayed in a consolidated table showing:
+   - Title
+   - Media type (movie, TV series, etc.)
+   - Source site
+
+2. Select an item by number to view details or download
+
+3. The system will automatically use the appropriate site's API to handle the download
+
+## Command Line Arguments
+
+The Global Search can be configured from the command line:
+
+- `--global` - Perform a global search across multiple sites.
+- `-s`, `--search` - Specify the search terms.
 
 # Examples of terminal usage
 
@@ -659,6 +685,9 @@ python test_run.py --specific_list_audio ita,eng --specific_list_subtitles eng,s
 
 # Keep console open after download
 python test_run.py --not_close true
+
+# Use global search
+python test_run.py --global -s "cars"
 ```
 
 # Docker

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/StreamingCommunity/Api/Site/1337xx/__init__.py

@@ -10,10 +10,11 @@ from rich.prompt import Prompt
 
 # Internal utilities
 from StreamingCommunity.Api.Template import get_select_title
+from StreamingCommunity.Api.Template.config_loader import site_constant
+from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Logic class
-from StreamingCommunity.Api.Template.config_loader import site_constant
 from .site import title_search, media_search_manager, table_show_manager
 from .title import download_title
 
@@ -29,30 +30,43 @@ console = Console()
 msg = Prompt()
 
 
-def search(string_to_search: str = None, get_onylDatabase: bool = False):
+
+def process_search_result(select_title):
+    """
+    Handles the search result and initiates the download for either a film or series.
+    """
+    download_title(select_title)
+
+def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None):
     """
-    Main function of the application for film and series.
+    Main function of the application for search film, series and anime.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onylDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
     """
+    if direct_item:
+        select_title = MediaItem(**direct_item)
+        process_search_result(select_title)
+        return
+
     if string_to_search is None:
         string_to_search = msg.ask(f"\n[purple]Insert word to search in [green]{site_constant.SITE_NAME}").strip()
 
-    # Search on database
+    # Perform the database search
     len_database = title_search(quote_plus(string_to_search))
 
-    # Return list of elements
-    if get_onylDatabase:
+    # If only the database is needed, return the manager
+    if get_onlyDatabase:
         return media_search_manager
 
     if len_database > 0:
-
-        # Select title from list
         select_title = get_select_title(table_show_manager, media_search_manager)
-
-        # Download title
         download_title(select_title)
 
     else:
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
 
-        # Retry
+        # If no results are found, ask again
+        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
         search()

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/StreamingCommunity/Api/Site/1337xx/site.py

@@ -62,7 +62,8 @@ def title_search(word_to_search: str) -> int:
                 'seader': tr.find_all("td")[-5].get_text(strip=True),
                 'leacher': tr.find_all("td")[-4].get_text(strip=True),
                 'date': tr.find_all("td")[-3].get_text(strip=True).replace("'", ""),
-                'size': tr.find_all("td")[-2].get_text(strip=True)
+                'size': tr.find_all("td")[-2].get_text(strip=True),
+                'type': 'torrent'
             }
             media_search_manager.add_media(title_info)
 

streamingcommunity-2.9.5/StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -0,0 +1,108 @@
+# 16.03.25
+
+import sys
+import subprocess
+from urllib.parse import quote_plus
+
+
+# External library
+from rich.console import Console
+from rich.prompt import Prompt
+
+
+# Internal utilities
+from StreamingCommunity.Api.Template import get_select_title
+from StreamingCommunity.Api.Template.config_loader import site_constant
+from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
+
+
+# Logic class
+from .site import title_search, table_show_manager, media_search_manager
+from .film import download_film
+from .series import download_series
+
+# Variable
+indice = 2
+_useFor = "film_serie"
+_deprecate = False
+_priority = 1
+_engineDownload = "hls"
+
+msg = Prompt()
+console = Console()
+
+
+def get_user_input(string_to_search: str = None):
+    """
+    Asks the user to input a search term.
+    Handles both Telegram bot input and direct input.
+    """
+    if string_to_search is None:
+        if site_constant.TELEGRAM_BOT:
+            bot = get_bot_instance()
+            string_to_search = bot.ask(
+                "key_search",
+                f"Enter the search term\nor type 'back' to return to the menu: ",
+                None
+            )
+
+            if string_to_search == 'back':
+
+                # Restart the script
+                subprocess.Popen([sys.executable] + sys.argv)
+                sys.exit()
+        else:
+            string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
+
+    return string_to_search
+
+def process_search_result(select_title):
+    """
+    Handles the search result and initiates the download for either a film or series.
+    """
+    if select_title.type == 'tv':
+        download_series(select_title)
+    else:
+        download_film(select_title)
+
+def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_item: dict = None):
+    """
+    Main function of the application for search film, series and anime.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onylDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
+    """
+    if direct_item:
+        select_title = MediaItem(**direct_item)
+        process_search_result(select_title)
+        return
+    
+    # Get the user input for the search term
+    string_to_search = get_user_input(string_to_search)
+    
+    # Perform the database search
+    len_database = title_search(quote_plus(string_to_search))
+
+    # If only the database is needed, return the manager
+    if get_onlyDatabase:
+        return media_search_manager
+    
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+        
+    if len_database > 0:
+        select_title = get_select_title(table_show_manager, media_search_manager)
+        process_search_result(select_title)
+    
+    else:
+        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
+
+        if site_constant.TELEGRAM_BOT:
+            bot.send_message(f"No results found, please try again", None)
+
+        # If no results are found, ask again
+        string_to_search = get_user_input()
+        search()

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/StreamingCommunity/Api/Site/altadefinizione/film.py

@@ -1,4 +1,4 @@
-# 3.12.23
+# 16.03.25
 
 import os
 
@@ -15,6 +15,7 @@ from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Util.headers import get_headers
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Lib.Downloader import HLS_Downloader
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
 
 
 # Logic class
@@ -41,6 +42,19 @@ def download_film(select_title: MediaItem) -> str:
     Return:
         - str: output path if successful, otherwise None
     """
+
+    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()
     console.print(f"[yellow]Download: [red]{select_title.name} \n")
 
@@ -51,6 +65,9 @@ def download_film(select_title: MediaItem) -> str:
 
     except Exception as e:
         console.print(f"[red]Error fetching the page: {e}")
+
+        if site_constant.TELEGRAM_BOT:
+            bot.send_message(f"ERRORE\n\nErrore durante il recupero della pagina.\n\n{e}", None)
         return None
     
     # Create mostraguarda url
@@ -59,6 +76,8 @@ def download_film(select_title: MediaItem) -> str:
     url_mostraGuarda = iframe_tag[0].get('data-src')
     if not url_mostraGuarda:
         console.print("Error: data-src attribute not found in iframe.")
+        if site_constant.TELEGRAM_BOT:
+            bot.send_message(f"ERRORE\n\nErrore: attributo data-src non trovato nell'iframe", None)
 
     # Extract supervideo URL
     try:
@@ -67,6 +86,10 @@ def download_film(select_title: MediaItem) -> str:
 
     except Exception as e:
         console.print(f"[red]Error fetching mostraguarda link: {e}")
+        console.print("[yellow]Missing access credentials. This part of the code is still under development.")
+        if site_constant.TELEGRAM_BOT:
+            bot.send_message(f"ERRORE\n\nErrore durante il recupero del link mostra/guarda.\n\n{e}", None)
+            bot.send_message(f"ERRORE\n\nCredenziali di accesso mancanti.\nQuesta parte del codice è ancora in fase di sviluppo.", None)
         return None
 
     # Create supervio URL
@@ -91,6 +114,13 @@ def download_film(select_title: MediaItem) -> str:
         output_path=os.path.join(mp4_path, title_name)
     ).start()
 
+    if site_constant.TELEGRAM_BOT:
+
+        # Delete script_id
+        script_id = TelegramSession.get_session()
+        if script_id != "unknown":
+            TelegramSession.deleteScriptId(script_id)
+
     if r_proc['error'] is not None:
         try: os.remove(r_proc['path'])
         except: pass

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/StreamingCommunity/Api/Site/altadefinizione/series.py

@@ -1,4 +1,4 @@
-# 3.12.23
+# 16.03.25
 
 import os
 from typing import Tuple
@@ -12,6 +12,8 @@ from rich.prompt import Prompt
 # Internal utilities
 from StreamingCommunity.Util.message import start_message
 from StreamingCommunity.Lib.Downloader import HLS_Downloader
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance, TelegramSession
+
 
 # Logic class
 from .util.ScrapeSerie import GetSerieInfo
@@ -56,9 +58,23 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     console.print(f"[yellow]Download: [red]{index_season_selected}:{index_episode_selected} {obj_episode.name}")
     print()
 
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+
+        # Invio a telegram
+        bot.send_message(
+            f"Download in corso\nSerie: {scrape_serie.series_name}\nStagione: {index_season_selected}\nEpisodio: {index_episode_selected}\nTitolo: {obj_episode.name}",
+            None
+        )
+
+    # Get script_id and update it
+    script_id = TelegramSession.get_session()
+    if script_id != "unknown":
+        TelegramSession.updateScriptId(script_id, f"{scrape_serie.series_name} - S{index_season_selected} - E{index_episode_selected} - {obj_episode.name}")
+
     # Define filename and path for the downloaded video
-    mp4_name = f"{map_episode_title(scrape_serie.serie_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
-    mp4_path = os.path.join(site_constant.SERIES_FOLDER, scrape_serie.serie_name, f"S{index_season_selected}")
+    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(site_constant.SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}")
 
     # Retrieve scws and if available master playlist
     video_source = VideoSource(obj_episode.url)
@@ -127,6 +143,9 @@ def download_series(select_season: MediaItem) -> None:
     Parameters:
         - select_season (MediaItem): Selected media item (TV series).
     """
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+
     start_message()
 
     # Init class
@@ -138,10 +157,28 @@ def download_series(select_season: MediaItem) -> None:
 
     # Prompt user for season selection and download episodes
     console.print(f"\n[green]Seasons found: [red]{seasons_count}")
-    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"
-    )
+
+    if site_constant.TELEGRAM_BOT:
+        console.print("\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")
+
+        bot.send_message(f"Stagioni trovate: {seasons_count}", None)
+
+        index_season_selected = bot.ask(
+            "select_title_episode",
+            "Menu di selezione delle stagioni\n\n"
+            "- Inserisci il numero della stagione (ad esempio, 1)\n"
+            "- Inserisci * per scaricare tutte le stagioni\n"
+            "- Inserisci un intervallo di stagioni (ad esempio, 1-2) per scaricare da una stagione all'altra\n"
+            "- Inserisci (ad esempio, 3-*) per scaricare dalla stagione specificata fino alla fine della serie",
+            None
+        )
+
+    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"
+        )
 
     # Manage and validate the selection
     list_season_select = manage_selection(index_season_selected, seasons_count)
@@ -161,4 +198,12 @@ def download_series(select_season: MediaItem) -> None:
         else:
 
             # Otherwise, let the user select specific episodes for the single season
-            download_episode(i_season, scrape_serie, download_all=False)
+            download_episode(i_season, scrape_serie, download_all=False)
+
+    if site_constant.TELEGRAM_BOT:
+        bot.send_message(f"Finito di scaricare tutte le serie e episodi", None)
+
+        # Get script_id
+        script_id = TelegramSession.get_session()
+        if script_id != "unknown":
+            TelegramSession.deleteScriptId(script_id)

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/StreamingCommunity/Api/Site/altadefinizione/site.py

@@ -1,4 +1,4 @@
-# 10.12.23
+# 16.03.25
 
 
 # External libraries
@@ -11,6 +11,7 @@ from rich.console import Console
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Util.headers import get_userAgent
 from StreamingCommunity.Util.table import TVShowManager
+from StreamingCommunity.TelegramHelp.telegram_bot import get_bot_instance
 
 
 # Logic class
@@ -35,6 +36,9 @@ def title_search(title_search: str) -> int:
     Returns:
         int: The number of titles found.
     """
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+
     media_search_manager.clear()
     table_show_manager.clear()
 
@@ -47,14 +51,20 @@ def title_search(title_search: str) -> int:
 
     except Exception as e:
         console.print(f"Site: {site_constant.SITE_NAME}, request search error: {e}")
+        if site_constant.TELEGRAM_BOT:
+            bot.send_message(f"ERRORE\n\nErrore nella richiesta di ricerca:\n\n{e}", None)
         return 0
-    
+
+    # Prepara le scelte per l'utente
+    if site_constant.TELEGRAM_BOT:
+        choices = []
+
     # Create soup istance
     soup = BeautifulSoup(response.text, "html.parser")
 
     # Collect data from soup
-    for movie_div in soup.find_all("div", class_="movie"):
-        
+    for i, movie_div in enumerate(soup.find_all("div", class_="movie")):
+
         title_tag = movie_div.find("h2", class_="movie-title")
         title = title_tag.find("a").get_text(strip=True)
         url = title_tag.find("a").get("href")
@@ -70,6 +80,14 @@ def title_search(title_search: str) -> int:
             'name': title,
             'type': tipo
         })
+
+        if site_constant.TELEGRAM_BOT:
+            choice_text = f"{i} - {title} ({tipo})"
+            choices.append(choice_text)
+
+    if site_constant.TELEGRAM_BOT:
+        if choices:
+            bot.send_message(f"Lista dei risultati:", choices)
 	
     # Return the number of titles found
     return media_search_manager.get_length()

{streamingcommunity-2.9.4 → streamingcommunity-2.9.5}/StreamingCommunity/Api/Site/altadefinizione/util/ScrapeSerie.py

@@ -1,4 +1,4 @@
-# 01.03.24
+# 16.03.25
 
 # External libraries
 import httpx
@@ -34,7 +34,7 @@ class GetSerieInfo:
         """
         response = httpx.get(self.url, headers=self.headers)
         soup = BeautifulSoup(response.text, "html.parser")
-        self.serie_name = soup.find("title").get_text(strip=True).split(" - ")[0]
+        self.series_name = soup.find("title").get_text(strip=True).split(" - ")[0]
 
         # Process all seasons
         season_items = soup.find_all('div', class_='accordion-item')