StreamingCommunity 3.2.8__py3-none-any.whl → 3.3.0__py3-none-any.whl

StreamingCommunity/Api/Site/raiplay/series.py

@@ -1,6 +1,7 @@
 # 21.05.24
 
 import os
+import sys
 from typing import Tuple
 
 
@@ -10,11 +11,15 @@ from rich.prompt import Prompt
 
 
 # Internal utilities
+from StreamingCommunity.Util.headers import get_headers
+from StreamingCommunity.Util.os import get_wvd_path
 from StreamingCommunity.Util.message import start_message
 
 
+
 # Logic class
 from .util.ScrapeSerie import GetSerieInfo
+from .util.get_license import generate_license_url
 from StreamingCommunity.Api.Template.Util import (
     manage_selection, 
     map_episode_title,
@@ -27,7 +32,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem
 
 
 # Player
-from StreamingCommunity import HLS_Downloader
+from StreamingCommunity import HLS_Downloader, DASH_Downloader
 from StreamingCommunity.Api.Player.mediapolisvod import VideoSource
 
 
@@ -55,22 +60,59 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     obj_episode = scrape_serie.selectEpisode(index_season_selected, index_episode_selected-1)
     console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
-    # Get streaming URL
-    master_playlist = VideoSource.extract_m3u8_url(obj_episode.url)
-
     # Define filename and path
     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}")
 
-    # Download the episode
-    r_proc = HLS_Downloader(
-        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()
+    # 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
+    else:
+
+        # Check CDM file before usage
+        cdm_device_path = get_wvd_path()
+        if not cdm_device_path or not isinstance(cdm_device_path, (str, bytes, os.PathLike)) or not os.path.isfile(cdm_device_path):
+            console.print(f"[bold red] CDM file not found or invalid path: {cdm_device_path}[/bold red]")
+            sys.exit(0)
+
+        license_url = generate_license_url(obj_episode.mpd_id)
+
+        dash_process = DASH_Downloader(
+            cdm_device=cdm_device_path,
+            license_url=license_url,
+            mpd_url=master_playlist,
+            output_path=os.path.join(mp4_path, mp4_name),
+        )
+        dash_process.parse_manifest(custom_headers=get_headers())
+        
+        if dash_process.download_and_decrypt():
+            dash_process.finalize_output()
+
+        # 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'])
-        except: pass
+        try: 
+            os.remove(r_proc['path'])
+        except Exception: 
+            pass
 
     return r_proc['path'], r_proc['stopped']
 

StreamingCommunity/Api/Site/raiplay/site.py

@@ -11,6 +11,9 @@ from StreamingCommunity.Util.headers import get_userAgent
 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
 
 
@@ -59,7 +62,7 @@ def title_search(query: str) -> int:
     media_search_manager.clear()
     table_show_manager.clear()
 
-    search_url = f"https://www.raiplay.it/atomatic/raiplay-search-service/api/v1/msearch"
+    search_url = "https://www.raiplay.it/atomatic/raiplay-search-service/api/v1/msearch"
     console.print(f"[cyan]Search url: [yellow]{search_url}")
 
     json_data = {

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

@@ -101,7 +101,8 @@ class GetSerieInfo:
                     'number': ep.get('episode', ''),
                     'name': ep.get('episode_title', '') or ep.get('toptitle', ''),
                     'duration': ep.get('duration', ''),
-                    'url': f"{self.base_url}{ep.get('weblink', '')}" if 'weblink' in ep else f"{self.base_url}{ep.get('url', '')}"
+                    'url': f"{self.base_url}{ep.get('weblink', '')}" if 'weblink' in ep else f"{self.base_url}{ep.get('url', '')}",
+                    'mpd_id': ep.get('video_url').split("=")[1].strip()
                 }
                 season.episodes.add(episode)
 

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

@@ -0,0 +1,40 @@
+# 16.03.25
+
+
+# External library
+import httpx
+
+
+# Internal utilities
+from StreamingCommunity.Util.config_json import config_manager
+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.
+
+    Args:
+        mpd_id (str): The ID of the MPD (Media Presentation Description) file.
+
+    Returns:
+        str: The full license URL.
+    """
+    params = {
+        'cont': mpd_id,
+        'output': '62',
+    }
+
+    response = httpx.get('https://mediapolisvod.rai.it/relinker/relinkerServlet.htm', params=params, headers=get_headers(), timeout=MAX_TIMEOUT)
+    response.raise_for_status() 
+
+    # Extract the license URL from the response in two lines
+    json_data = response.json()
+    license_url = json_data.get('licence_server_map').get('drmLicenseUrlValues')[0].get('licenceUrl')
+
+    return license_url

StreamingCommunity/Api/Site/streamingcommunity/__init__.py

@@ -2,7 +2,6 @@
 
 import sys
 import subprocess
-from urllib.parse import quote_plus
 
 
 # External library
@@ -16,7 +15,6 @@ 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
@@ -25,7 +23,7 @@ from .series import download_series
 
 # Variable
 indice = 0
-_useFor = "Film_&_Serie" # "Movies_&_Series"
+_useFor = "Film_&_Serie"
 _priority = 0
 _engineDownload = "hls"
 _deprecate = False
@@ -126,9 +124,9 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
     actual_search_query = get_user_input(string_to_search)
 
     # Handle cases where user input is empty, or 'back' was handled (sys.exit or None return)
-    if not actual_search_query: 
+    if not actual_search_query:
         if bot:
-             if actual_search_query is None: # Specifically for timeout from bot.ask or failed restart
+            if actual_search_query is None: # Specifically for timeout from bot.ask or failed restart
                 bot.send_message("Search term not provided or operation cancelled. Returning.", None)
         return
 
@@ -137,16 +135,15 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
 
     # If only the database object (media_search_manager populated by title_search) is needed
     if get_onlyDatabase:
-        return media_search_manager 
+        return media_search_manager
     
     if len_database > 0:
         select_title = get_select_title(table_show_manager, media_search_manager, len_database)
         process_search_result(select_title, selections)
     
     else:
-        no_results_message = f"No results found for: '{actual_search_query}'"
         if bot:
-            bot.send_message(no_results_message, None)
+            bot.send_message(f"No results found for: '{actual_search_query}'", None)
         else:
             console.print(f"\n[red]Nothing matching was found for[white]: [purple]{actual_search_query}")
         

StreamingCommunity/Api/Site/streamingcommunity/film.py

@@ -71,7 +71,7 @@ def download_film(select_title: MediaItem) -> str:
     mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(".mp4", ""))
 
     # Download the film using the m3u8 playlist, and output filename
-    r_proc = HLS_Downloader(
+    hls_process = HLS_Downloader(
         m3u8_url=master_playlist,
         output_path=os.path.join(mp4_path, title_name)
     ).start()
@@ -83,8 +83,10 @@ def download_film(select_title: MediaItem) -> str:
         if script_id != "unknown":
             TelegramSession.deleteScriptId(script_id)
 
-    if r_proc['error'] is not None:
-        try: os.remove(r_proc['path'])
-        except: pass
+    if hls_process['error'] is not None:
+        try: 
+            os.remove(hls_process['path'])
+        except Exception: 
+            pass
 
-    return r_proc['path']
+    return hls_process['path']

StreamingCommunity/Api/Site/streamingcommunity/series.py

@@ -55,7 +55,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Get episode information
     obj_episode = scrape_serie.selectEpisode(index_season_selected, index_episode_selected-1)
-    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
+    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     if site_constant.TELEGRAM_BOT:
         bot = get_bot_instance()
@@ -81,16 +81,18 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     master_playlist = video_source.get_playlist()
 
     # Download the episode
-    r_proc = HLS_Downloader(
+    hls_process = HLS_Downloader(
         m3u8_url=master_playlist,
         output_path=os.path.join(mp4_path, mp4_name)
     ).start()
 
-    if r_proc['error'] is not None:
-        try: os.remove(r_proc['path'])
-        except: pass
+    if hls_process['error'] is not None:
+        try: 
+            os.remove(hls_process['path'])
+        except Exception: 
+            pass
 
-    return r_proc['path'], r_proc['stopped']
+    return hls_process['path'], hls_process['stopped']
 
 
 def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, video_source: VideoSource, download_all: bool = False, episode_selection: str = None) -> None:
@@ -214,7 +216,7 @@ def download_series(select_season: MediaItem, season_selection: str = None, epis
             download_episode(season_number, scrape_serie, video_source, download_all=False, episode_selection=episode_selection)
 
     if site_constant.TELEGRAM_BOT:
-        bot.send_message(f"Finito di scaricare tutte le serie e episodi", None)
+        bot.send_message("Finito di scaricare tutte le serie e episodi", None)
 
         # Get script_id
         script_id = TelegramSession.get_session()

StreamingCommunity/Api/Site/streamingcommunity/site.py

@@ -26,6 +26,7 @@ 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:
@@ -49,6 +50,7 @@ def title_search(query: str) -> int:
             f"{site_constant.FULL_URL}/it", 
             headers={'user-agent': get_userAgent()}, 
             timeout=max_timeout,
+            verify=ssl_verify,
 	    follow_redirects=True
         )
         response.raise_for_status()
@@ -57,7 +59,9 @@ def title_search(query: str) -> int:
         version = json.loads(soup.find('div', {'id': "app"}).get("data-page"))['version']
 
     except Exception as e:
-        if "WinError" in str(e) or "Errno" in str(e): console.print("\n[bold yellow]Please make sure you have enabled and configured a valid proxy.[/bold yellow]")
+        if "WinError" in str(e) or "Errno" in str(e): 
+            console.print("\n[bold yellow]Please make sure you have enabled and configured a valid proxy.[/bold yellow]")
+            
         console.print(f"[red]Site: {site_constant.SITE_NAME} version, request error: {e}")
         return 0
 
@@ -73,7 +77,8 @@ def title_search(query: str) -> int:
                 'x-inertia': 'true',
                 'x-inertia-version': version
             },
-            timeout=max_timeout
+            timeout=max_timeout,
+            verify=ssl_verify
         )
         response.raise_for_status()
 
@@ -116,7 +121,7 @@ def title_search(query: str) -> int:
 	
     if site_constant.TELEGRAM_BOT:
         if choices:
-            bot.send_message(f"Lista dei risultati:", choices)
+            bot.send_message("Lista dei risultati:", choices)
           
     # Return the number of titles found
     return media_search_manager.get_length()

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

@@ -17,6 +17,7 @@ from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager
 
 # Variable
 max_timeout = config_manager.get_int("REQUESTS", "timeout")
+ssl_verify = config_manager.get_bool("REQUESTS", "verify")
 
 
 class GetSerieInfo:
@@ -50,7 +51,8 @@ class GetSerieInfo:
             response = httpx.get(
                 url=f"{self.url}/titles/{self.media_id}-{self.series_name}",
                 headers=self.headers,
-                timeout=max_timeout
+                timeout=max_timeout,
+                verify=ssl_verify
             )
             response.raise_for_status()
 
@@ -104,7 +106,8 @@ class GetSerieInfo:
                     'x-inertia': 'true',
                     'x-inertia-version': self.version,
                 },
-                timeout=max_timeout
+                timeout=max_timeout,
+                verify=ssl_verify
             )
 
             # Extract episodes from JSON response

StreamingCommunity/Api/Site/streamingwatch/__init__.py

@@ -9,6 +9,7 @@ from rich.prompt import Prompt
 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
@@ -45,6 +46,13 @@ def process_search_result(select_title, selections=None):
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
     """
+    if not select_title:
+        if site_constant.TELEGRAM_BOT:
+            bot = get_bot_instance()
+            bot.send_message("No title selected or selection cancelled.", None)
+        else:
+            console.print("[yellow]No title selected or selection cancelled.")
+        return
     if select_title.type == 'tv':
         season_selection = None
         episode_selection = None
@@ -69,26 +77,52 @@ def search(string_to_search: str = None, get_onlyDatabase: bool = False, direct_
         selections (dict, optional): Dictionary containing selection inputs that bypass manual input
                                     {'season': season_selection, 'episode': episode_selection}
     """
+    """
+    Main function of the application for search.
+
+    Parameters:
+        string_to_search (str, optional): String to search for
+        get_onlyDatabase (bool, optional): If True, return only the database object
+        direct_item (dict, optional): Direct item to process (bypass search)
+        selections (dict, optional): Dictionary containing selection inputs that bypass manual input
+                                    {'season': season_selection, 'episode': episode_selection}
+    """
+    bot = None
+    if site_constant.TELEGRAM_BOT:
+        bot = get_bot_instance()
+    
     if direct_item:
         select_title = MediaItem(**direct_item)
         process_search_result(select_title, selections)
         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()
+    # Get the user input for the search term
+    actual_search_query = get_user_input(string_to_search)
+
+    # Handle cases where user input is empty, or 'back' was handled (sys.exit or None return)
+    if not actual_search_query:
+        if bot:
+            if actual_search_query is None: # Specifically for timeout from bot.ask or failed restart
+                bot.send_message("Search term not provided or operation cancelled. Returning.", None)
+        return
     
-    # Perform search on the database using the obtained query
-    len_database = title_search(string_to_search)
+    # Perform the database search
+    len_database = title_search(actual_search_query)
 
     # If only the database is needed, return the manager
     if get_onlyDatabase:
         return media_search_manager
-    
+
     if len_database > 0:
-        select_title = get_select_title(table_show_manager, media_search_manager,len_database)
+        select_title = get_select_title(table_show_manager, media_search_manager, len_database)
         process_search_result(select_title, selections)
     
     else:
-        # If no results are found, ask again
-        console.print(f"\n[red]Nothing matching was found for[white]: [purple]{string_to_search}")
-        search()
+        if bot:
+            bot.send_message(f"No results found for: '{actual_search_query}'", None)
+        else:
+            console.print(f"\n[red]Nothing matching was found for[white]: [purple]{actual_search_query}")
+
+        # Do not call search() recursively here to avoid infinite loops on no results.
+        # The flow should return to the caller (e.g., main menu in run.py).
+        return

StreamingCommunity/Api/Site/streamingwatch/film.py

@@ -49,13 +49,15 @@ def download_film(select_title: MediaItem) -> str:
     mp4_path = os.path.join(site_constant.MOVIE_FOLDER, title_name.replace(".mp4", ""))
 
     # Download the film using the m3u8 playlist, and output filename
-    r_proc = HLS_Downloader(
+    hls_process = HLS_Downloader(
         m3u8_url=master_playlist,
         output_path=os.path.join(mp4_path, title_name)
     ).start()
 
-    if r_proc['error'] is not None:
-        try: os.remove(r_proc['path'])
-        except: pass
+    if hls_process['error'] is not None:
+        try: 
+            os.remove(hls_process['path'])
+        except Exception: 
+            pass
 
-    return r_proc['path']
+    return hls_process['path']

StreamingCommunity/Api/Site/streamingwatch/series.py

@@ -53,7 +53,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
 
     # Get episode information
     obj_episode = scrape_serie.selectEpisode(index_season_selected, index_episode_selected-1)
-    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
+    console.print(f"[bold yellow]Download:[/bold yellow] [red]{site_constant.SITE_NAME}[/red] → [cyan]{scrape_serie.series_name}[/cyan] \\ [bold magenta]{obj_episode.name}[/bold magenta] ([cyan]S{index_season_selected}E{index_episode_selected}[/cyan]) \n")
 
     # Define filename and path for the downloaded video
     mp4_name = f"{map_episode_title(scrape_serie.series_name, index_season_selected, index_episode_selected, obj_episode.name)}.mp4"
@@ -64,16 +64,18 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra
     master_playlist = video_source.get_m3u8_url(obj_episode.url)
 
     # Download the episode
-    r_proc = HLS_Downloader(
+    hls_process = HLS_Downloader(
         m3u8_url=master_playlist,
         output_path=os.path.join(mp4_path, mp4_name)
     ).start()
 
-    if r_proc['error'] is not None:
-        try: os.remove(r_proc['path'])
-        except: pass
+    if hls_process['error'] is not None:
+        try: 
+            os.remove(hls_process['path'])
+        except Exception: 
+            pass
 
-    return r_proc['path'], r_proc['stopped']
+    return hls_process['path'], hls_process['stopped']
     
 
 def download_episode(index_season_selected: int, scrape_serie: GetSerieInfo, download_all: bool = False, episode_selection: str = None) -> None:

StreamingCommunity/Api/Site/streamingwatch/site.py

@@ -86,7 +86,9 @@ def title_search(query: str) -> int:
         soup = BeautifulSoup(response.text, 'html.parser')
 
     except Exception as e:
-        if "WinError" in str(e) or "Errno" in str(e): console.print("\n[bold yellow]Please make sure you have enabled and configured a valid proxy.[/bold yellow]")
+        if "WinError" in str(e) or "Errno" in str(e): 
+            console.print("\n[bold yellow]Please make sure you have enabled and configured a valid proxy.[/bold yellow]")
+            
         console.print(f"[red]Site: {site_constant.SITE_NAME}, request search error: {e}")
         return 0
 

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

@@ -5,11 +5,12 @@ import logging
 
 
 # External libraries
-import httpx
 from bs4 import BeautifulSoup
 
+
 # Internal utilities
 from StreamingCommunity.Util.headers import get_userAgent
+from StreamingCommunity.Util.http_client import create_client
 from StreamingCommunity.Util.config_json import config_manager
 from StreamingCommunity.Api.Player.Helper.Vixcloud.util import SeasonManager, Episode
 
@@ -24,8 +25,7 @@ class GetSerieInfo:
         self.url = url
         self.seasons_manager = SeasonManager()
         self.series_name = None
-        
-        self.client = httpx.Client(headers=self.headers, timeout=max_timeout)
+        self.client = create_client(headers=self.headers)
 
     def collect_info_season(self) -> None:
         """

StreamingCommunity/Api/Template/Util/__init__.py

@@ -7,4 +7,13 @@ from .manage_ep import (
     validate_selection, 
     dynamic_format_number,
     display_episodes_list
-)
+)
+
+__all__ = [
+    "manage_selection",
+    "map_episode_title",
+    "validate_episode_selection",
+    "validate_selection",
+    "dynamic_format_number",
+    "display_episodes_list"
+]

StreamingCommunity/Api/Template/Util/manage_ep.py

@@ -125,20 +125,20 @@ def map_episode_title(tv_name: str, number_season: int, episode_number: int, epi
     """
     map_episode_temp = MAP_EPISODE
     
-    if tv_name != None:
+    if tv_name is not None:
         map_episode_temp = map_episode_temp.replace("%(tv_name)", os_manager.get_sanitize_file(tv_name))
 
-    if number_season != None:
+    if number_season is not None:
         map_episode_temp = map_episode_temp.replace("%(season)", str(number_season))
     else:
         map_episode_temp = map_episode_temp.replace("%(season)", dynamic_format_number(str(0)))
 
-    if episode_number != None:
+    if episode_number is not None:
         map_episode_temp = map_episode_temp.replace("%(episode)", dynamic_format_number(str(episode_number)))
     else:
         map_episode_temp = map_episode_temp.replace("%(episode)", dynamic_format_number(str(0)))
 
-    if episode_name != None:
+    if episode_name is not None:
         map_episode_temp = map_episode_temp.replace("%(episode_name)", os_manager.get_sanitize_file(episode_name))
 
     logging.info(f"Map episode string return: {map_episode_temp}")

StreamingCommunity/Api/Template/__init__.py

@@ -1,3 +1,7 @@
 # 19.06.24
 
-from .site import get_select_title
+from .site import get_select_title
+
+__all__ = [
+    "get_select_title"
+]

StreamingCommunity/Api/Template/site.py

@@ -1,8 +1,5 @@
 # 19.06.24
 
-import sys
-
-
 # External library
 from rich.console import Console
 
@@ -83,12 +80,19 @@ def get_select_title(table_show_manager, media_search_manager, num_results_avail
 
         color_index = 1
         for key in first_media_item.__dict__.keys():
+
             if key.capitalize() in column_to_hide:
                 continue
+
             if key in ('id', 'type', 'name', 'score'):
-                if key == 'type': column_info["Type"] = {'color': 'yellow'}
-                elif key == 'name': column_info["Name"] = {'color': 'magenta'}
-                elif key == 'score': column_info["Score"] = {'color': 'cyan'}
+                if key == 'type': 
+                    column_info["Type"] = {'color': 'yellow'}
+
+                elif key == 'name': 
+                    column_info["Name"] = {'color': 'magenta'}
+                elif key == 'score': 
+                    column_info["Score"] = {'color': 'cyan'}
+                    
             else:
                 column_info[key.capitalize()] = {'color': available_colors[color_index % len(available_colors)]}
                 color_index += 1