StreamingCommunity 3.0.5__tar.gz → 3.0.6__tar.gz

{streamingcommunity-3.0.5/StreamingCommunity.egg-info → streamingcommunity-3.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.5
+Version: 3.0.6
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -71,7 +71,7 @@ Dynamic: requires-python
 <summary>📦 Installation</summary>
 
 - 🔄 [Update Domains](#update-domains)
-- 🌐 [Available Sites](https://arrowar.github.io/StreamingDirectory/)
+- 🌐 [Available Sites](https://arrowar.github.io/StreamingCommunity/)
 - 🛠️ [Installation](#installation)
     - 📦 [PyPI Installation](#1-pypi-installation)
     - 🔄 [Automatic Installation](#2-automatic-installation)

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/README.md

@@ -35,7 +35,7 @@
 <summary>📦 Installation</summary>
 
 - 🔄 [Update Domains](#update-domains)
-- 🌐 [Available Sites](https://arrowar.github.io/StreamingDirectory/)
+- 🌐 [Available Sites](https://arrowar.github.io/StreamingCommunity/)
 - 🛠️ [Installation](#installation)
     - 📦 [PyPI Installation](#1-pypi-installation)
     - 🔄 [Automatic Installation](#2-automatic-installation)
@@ -799,4 +799,4 @@ Tool per guardare o scaricare film dalla piattaforma StreamingCommunity.
 
 # Disclaimer
 
-This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software.
+This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software.

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/1337xx/__init__.py

@@ -21,9 +21,9 @@ from .title import download_title
 
 # Variable
 indice = 3
-_useFor = "film_serie"
+_useFor = "Torrent"
 _priority = 0
-_engineDownload = "tor"
+_engineDownload = "Torrent"
 _deprecate = False
 
 console = Console()

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/altadefinizione/__init__.py

@@ -24,7 +24,7 @@ from .series import download_series
 
 # Variable
 indice = 2
-_useFor = "film_serie"
+_useFor = "Film_&_Serie"
 _priority = 0
 _engineDownload = "hls"
 _deprecate = True

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/animeunity/__init__.py

@@ -24,7 +24,7 @@ from .serie import download_series
 
 # Variable
 indice = 1
-_useFor = "anime"
+_useFor = "Anime"
 _priority = 0
 _engineDownload = "mp4"
 _deprecate = False

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/animeworld/__init__.py

@@ -18,8 +18,8 @@ from .film import download_film
 
 
 # Variable
-indice = 8
-_useFor = "anime"
+indice = 6
+_useFor = "Anime"
 _priority = 0
 _engineDownload = "mp4"
 _deprecate = False

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/guardaserie/__init__.py

@@ -20,8 +20,8 @@ from .series import download_series
 
 
 # Variable
-indice = 5
-_useFor = "serie"
+indice = 4
+_useFor = "Serie"
 _priority = 0
 _engineDownload = "hls"
 _deprecate = False

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/raiplay/__init__.py

@@ -19,8 +19,8 @@ from .film import download_film
 
 
 # Variable
-indice = 8
-_useFor = "film_serie"
+indice = 5
+_useFor = "Film_&_Serie"
 _priority = 1                # NOTE: Site search need the use of tmbd obj
 _engineDownload = "hls"
 _deprecate = False

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -25,7 +25,7 @@ from .series import download_series
 
 # Variable
 indice = 0
-_useFor = "film_serie"
+_useFor = "Film_&_Serie"
 _priority = 0
 _engineDownload = "hls"
 _deprecate = False
@@ -97,7 +97,21 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
         return
 
     if string_to_search is None:
-        string_to_search = msg.ask(f"\n[purple]Insert a word to search in [green]{site_constant.SITE_NAME}").strip()
+        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()
 
     # Search on database
     len_database = title_search(string_to_search)

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -55,7 +55,7 @@ def download_film(select_title: MediaItem) -> str:
     console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{select_title.name}[/cyan] \n")
 
     # Init class
-    video_source = VideoSource(site_constant.FULL_URL, False, select_title.id)
+    video_source = VideoSource(f"{site_constant.FULL_URL}/it", False, select_title.id)
 
     # Retrieve scws and if available master playlist
     video_source.get_iframe(select_title.id)

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -154,8 +154,8 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
     start_message()
 
     # Init class
-    video_source = VideoSource(site_constant.FULL_URL, True, select_season.id)
-    scrape_serie = GetSerieInfo(site_constant.FULL_URL, select_season.id, select_season.slug)
+    video_source = VideoSource(f"{site_constant.FULL_URL}/it", True, select_season.id)
+    scrape_serie = GetSerieInfo(f"{site_constant.FULL_URL}/it", select_season.id, select_season.slug)
 
     # Collect information about season
     scrape_serie.getNumberSeason()

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -46,7 +46,7 @@ def title_search(query: str) -> int:
 
     try:
         response = httpx.get(
-            site_constant.FULL_URL, 
+            f"{site_constant.FULL_URL}/it", 
             headers={'user-agent': get_userAgent()}, 
             timeout=max_timeout
         )
@@ -59,7 +59,7 @@ def title_search(query: str) -> int:
         console.print(f"[red]Site: {site_constant.SITE_NAME} version, request error: {e}")
         return 0
 
-    search_url = f"{site_constant.FULL_URL}/search?q={query}"
+    search_url = f"{site_constant.FULL_URL}/it/search?q={query}"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     try:

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Api/Site/streamingwatch/__init__.py

@@ -19,8 +19,8 @@ from .series import download_series
 
 
 # Variable
-indice = 8
-_useFor = "film_serie"
+indice = 7
+_useFor = "Film_&_Serie"
 _priority = 10          # !!! MOLTO LENTO
 _engineDownload = "hls"
 _deprecate = False

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Upload/version.py

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

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/Util/config_json.py

@@ -36,8 +36,13 @@ class ConfigManager:
             base_path = os.path.dirname(sys.executable)
 
         else:
-            # Use the current directory where the script is executed
-            base_path = os.getcwd()
+          
+            # Get the actual path of the module file
+            current_file_path = os.path.abspath(__file__)
+            # Navigate upwards to find the project root
+            # Assuming this file is in a package structure like StreamingCommunity/Util/config_json.py
+            # We need to go up 2 levels to reach the project root
+            base_path = os.path.dirname(os.path.dirname(os.path.dirname(current_file_path)))
             
         # Initialize file paths
         self.file_path = os.path.join(base_path, file_name)

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/StreamingCommunity/run.py

@@ -193,6 +193,13 @@ def force_exit():
 
 def main(script_id = 0):
 
+    color_map = {
+        "anime": "red",
+        "film_&_serie": "yellow",
+        "serie": "blue",
+        "torrent": "white"
+    }
+
     if TELEGRAM_BOT:
         bot = get_bot_instance()
         bot.send_message(f"Avviato script {script_id}", None)
@@ -256,18 +263,6 @@ def main(script_id = 0):
     )
 
     # Add arguments for search functions
-    color_map = {
-        "anime": "red",
-        "film_serie": "yellow",
-        "film": "blue",
-        "serie": "green",
-        "other": "white"
-    }
-
-    # Add numeric arguments for each search module
-    for idx, (alias, (_, use_for)) in enumerate(search_functions.items()):
-        parser.add_argument(f'--{idx}', action='store_true', help=f'Search using {alias.split("_")[0]} ({use_for})')
-
     parser.add_argument('-s', '--search', default=None, help='Search terms')
     
     # Parse command-line arguments
@@ -302,44 +297,41 @@ def main(script_id = 0):
         global_search(search_terms)
         return
 
-    # Check for numeric arguments
-    search_functions_list = list(search_functions.items())
-    for i in range(len(search_functions_list)):
-        if getattr(args, str(i)):
-            alias, (func, _) = search_functions_list[i]
-            run_function(func, search_terms=search_terms)
-            return
-
-    # Mapping user input to functions
-    input_to_function = {str(i): func for i, (alias, (func, _)) in enumerate(search_functions.items())}
-
-    # Create dynamic prompt message and choices
-    choice_labels = {str(i): (alias.split("_")[0].capitalize(), use_for) for i, (alias, (_, use_for)) in enumerate(search_functions.items())}
+    # Create mappings using module indice
+    input_to_function = {}
+    choice_labels = {}
+    
+    for alias, (func, use_for) in search_functions.items():
+        module_name = alias.split("_")[0]
+        try:
+            mod = importlib.import_module(f'StreamingCommunity.Api.Site.{module_name}')
+            site_index = str(getattr(mod, 'indice'))
+            input_to_function[site_index] = func
+            choice_labels[site_index] = (module_name.capitalize(), use_for.lower())
+        except Exception as e:
+            console.print(f"[red]Error mapping module {module_name}: {str(e)}")
 
-    # Display the category legend in a single line
+    # Display the category legend
     legend_text = " | ".join([f"[{color}]{category.capitalize()}[/{color}]" for category, color in color_map.items()])
     console.print(f"\n[bold green]Category Legend:[/bold green] {legend_text}")
 
-    # Construct the prompt message with color-coded site names and aliases
+    # Construct prompt with proper color mapping
     prompt_message = "[green]Insert category [white](" + ", ".join(
-        [f"{key}: [{color_map.get(label[1], 'white')}]{label[0]}" 
+        [f"[{color_map.get(label[1], 'white')}]{key}: {label[0]}[/{color_map.get(label[1], 'white')}]" 
          for key, label in choice_labels.items()]
     ) + "[white])"
 
     if TELEGRAM_BOT:
-        # Display the category legend in a single line
         category_legend_str = "Categorie: \n" + " | ".join([
             f"{category.capitalize()}" for category in color_map.keys()
         ])
 
-        # Build message with aliases
         prompt_message = "Inserisci il sito:\n" + "\n".join(
             [f"{key}: {label[0]}" for key, label in choice_labels.items()]
         )
 
         console.print(f"\n{prompt_message}")
 
-        # Chiedi la scelta all'utente con il bot Telegram
         category = bot.ask(
             "select_provider",
             f"{category_legend_str}\n\n{prompt_message}",
@@ -351,13 +343,6 @@ def main(script_id = 0):
 
     # Run the corresponding function based on user input
     if category in input_to_function:
-        """if category == global_search_key:
-            # Run global search
-            run_function(input_to_function[category], search_terms=search_terms)
-        
-        else:"""
-        
-        # Run normal site-specific search
         run_function(input_to_function[category], search_terms=search_terms)
         
     else:

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6/StreamingCommunity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StreamingCommunity
-Version: 3.0.5
+Version: 3.0.6
 Home-page: https://github.com/Lovi-0/StreamingCommunity
 Author: Lovi-0
 Project-URL: Bug Reports, https://github.com/Lovi-0/StreamingCommunity/issues
@@ -71,7 +71,7 @@ Dynamic: requires-python
 <summary>📦 Installation</summary>
 
 - 🔄 [Update Domains](#update-domains)
-- 🌐 [Available Sites](https://arrowar.github.io/StreamingDirectory/)
+- 🌐 [Available Sites](https://arrowar.github.io/StreamingCommunity/)
 - 🛠️ [Installation](#installation)
     - 📦 [PyPI Installation](#1-pypi-installation)
     - 🔄 [Automatic Installation](#2-automatic-installation)

{streamingcommunity-3.0.5 → streamingcommunity-3.0.6}/setup.py

@@ -10,7 +10,7 @@ with open(os.path.join(os.path.dirname(__file__), "requirements.txt"), "r", enco
 
 setup(
     name="StreamingCommunity",
-    version="3.0.5",
+    version="3.0.6",
     long_description=read_readme(),
     long_description_content_type="text/markdown",
     author="Lovi-0",