diff --git a/StreamingCommunity/Api/Site/1337xx/title.py b/StreamingCommunity/Api/Site/1337xx/title.py index 1af2b8f..ea84933 100644 --- a/StreamingCommunity/Api/Site/1337xx/title.py +++ b/StreamingCommunity/Api/Site/1337xx/title.py @@ -39,7 +39,7 @@ def download_title(select_title: MediaItem): # Define output path title_name = os_manager.get_sanitize_file(select_title.name) mp4_path = os_manager.get_sanitize_path( - os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, title_name.replace(".mp4", "")) + os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", "")) ) # Create output folder diff --git a/StreamingCommunity/Api/Site/altadefinizione/film.py b/StreamingCommunity/Api/Site/altadefinizione/film.py index 1e4b949..2c38a34 100644 --- a/StreamingCommunity/Api/Site/altadefinizione/film.py +++ b/StreamingCommunity/Api/Site/altadefinizione/film.py @@ -22,7 +22,7 @@ from StreamingCommunity.Api.Player.supervideo import VideoSource # Config -from .costant import ROOT_PATH, SITE_NAME, MOVIE_FOLDER +from .costant import ROOT_PATH, MOVIE_FOLDER def download_film(select_title: MediaItem) -> str: @@ -47,7 +47,7 @@ def download_film(select_title: MediaItem) -> str: # Define output path title_name = os_manager.get_sanitize_file(select_title.name) + ".mp4" mp4_path = os_manager.get_sanitize_path( - os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, title_name.replace(".mp4", "")) + os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", "")) ) # Get m3u8 master playlist diff --git a/StreamingCommunity/Api/Site/altadefinizione/site.py b/StreamingCommunity/Api/Site/altadefinizione/site.py index b9042e3..70fc10f 100644 --- a/StreamingCommunity/Api/Site/altadefinizione/site.py +++ b/StreamingCommunity/Api/Site/altadefinizione/site.py @@ -19,7 +19,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaManager # Variable -from .costant import SITE_NAME, DOMAIN_NOW +from .costant import SITE_NAME media_search_manager = MediaManager() table_show_manager = TVShowManager() diff --git a/StreamingCommunity/Api/Site/animeunity/film_serie.py b/StreamingCommunity/Api/Site/animeunity/film_serie.py index 73d1cfe..a6ddab4 100644 --- a/StreamingCommunity/Api/Site/animeunity/film_serie.py +++ b/StreamingCommunity/Api/Site/animeunity/film_serie.py @@ -54,11 +54,11 @@ def download_episode(index_select: int, scrape_serie: ScrapeSerieAnime, video_so if scrape_serie.is_series: mp4_path = os_manager.get_sanitize_path( - os.path.join(ROOT_PATH, SITE_NAME, SERIES_FOLDER, scrape_serie.series_name) + os.path.join(ROOT_PATH, SERIES_FOLDER, scrape_serie.series_name) ) else: mp4_path = os_manager.get_sanitize_path( - os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, scrape_serie.series_name) + os.path.join(ROOT_PATH, MOVIE_FOLDER, scrape_serie.series_name) ) # Create output folder diff --git a/StreamingCommunity/Api/Site/cb01new/film.py b/StreamingCommunity/Api/Site/cb01new/film.py index 23b1d37..7603582 100644 --- a/StreamingCommunity/Api/Site/cb01new/film.py +++ b/StreamingCommunity/Api/Site/cb01new/film.py @@ -21,7 +21,7 @@ from StreamingCommunity.Api.Player.maxstream import VideoSource # Config -from .costant import ROOT_PATH, SITE_NAME, MOVIE_FOLDER +from .costant import ROOT_PATH, MOVIE_FOLDER def download_film(select_title: MediaItem) -> str: @@ -46,7 +46,7 @@ def download_film(select_title: MediaItem) -> str: # Define output path title_name = os_manager.get_sanitize_file(select_title.name) +".mp4" mp4_path = os_manager.get_sanitize_path( - os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, title_name.replace(".mp4", "")) + os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", "")) ) # Get m3u8 master playlist diff --git a/StreamingCommunity/Api/Site/ddlstreamitaly/series.py b/StreamingCommunity/Api/Site/ddlstreamitaly/series.py index d30cb91..14c4d59 100644 --- a/StreamingCommunity/Api/Site/ddlstreamitaly/series.py +++ b/StreamingCommunity/Api/Site/ddlstreamitaly/series.py @@ -24,7 +24,7 @@ from StreamingCommunity.Api.Player.ddl import VideoSource # Variable -from .costant import ROOT_PATH, SITE_NAME, SERIES_FOLDER +from .costant import ROOT_PATH, SERIES_FOLDER table_show_manager = TVShowManager() @@ -52,7 +52,7 @@ def download_video(index_episode_selected: int, scape_info_serie: GetSerieInfo, title_name = os_manager.get_sanitize_file( f"{map_episode_title(scape_info_serie.tv_name, None, index_episode_selected, obj_episode.get('name'))}.mp4" ) - mp4_path = os.path.join(ROOT_PATH, SITE_NAME, SERIES_FOLDER, scape_info_serie.tv_name) + mp4_path = os.path.join(ROOT_PATH, SERIES_FOLDER, scape_info_serie.tv_name) # Create output folder os_manager.create_path(mp4_path) diff --git a/StreamingCommunity/Api/Site/guardaserie/series.py b/StreamingCommunity/Api/Site/guardaserie/series.py index 6f3d6e9..354b793 100644 --- a/StreamingCommunity/Api/Site/guardaserie/series.py +++ b/StreamingCommunity/Api/Site/guardaserie/series.py @@ -24,7 +24,7 @@ from StreamingCommunity.Api.Player.supervideo import VideoSource # Variable -from .costant import ROOT_PATH, SITE_NAME, SERIES_FOLDER +from .costant import ROOT_PATH, SERIES_FOLDER table_show_manager = TVShowManager() @@ -51,7 +51,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scap # Define filename and path for the downloaded video mp4_name = f"{map_episode_title(scape_info_serie.tv_name, index_season_selected, index_episode_selected, obj_episode.get('name'))}.mp4" - mp4_path = os.path.join(ROOT_PATH, SITE_NAME, SERIES_FOLDER, scape_info_serie.tv_name, f"S{index_season_selected}") + mp4_path = os.path.join(ROOT_PATH, SERIES_FOLDER, scape_info_serie.tv_name, f"S{index_season_selected}") # Setup video source video_source = VideoSource(obj_episode.get('url')) diff --git a/StreamingCommunity/Api/Site/ilcorsaronero/title.py b/StreamingCommunity/Api/Site/ilcorsaronero/title.py index 9eea1ab..322e5fa 100644 --- a/StreamingCommunity/Api/Site/ilcorsaronero/title.py +++ b/StreamingCommunity/Api/Site/ilcorsaronero/title.py @@ -15,7 +15,7 @@ from StreamingCommunity.Api.Template.Class.SearchType import MediaItem # Config -from .costant import ROOT_PATH, SITE_NAME, MOVIE_FOLDER +from .costant import ROOT_PATH, MOVIE_FOLDER def download_title(select_title: MediaItem): @@ -33,7 +33,7 @@ def download_title(select_title: MediaItem): # Define output path title_name = os_manager.get_sanitize_file(select_title.name) mp4_path = os_manager.get_sanitize_path( - os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, title_name.replace(".mp4", "")) + os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", "")) ) # Create output folder diff --git a/StreamingCommunity/Api/Site/mostraguarda/film.py b/StreamingCommunity/Api/Site/mostraguarda/film.py index fc4d60e..224069c 100644 --- a/StreamingCommunity/Api/Site/mostraguarda/film.py +++ b/StreamingCommunity/Api/Site/mostraguarda/film.py @@ -73,7 +73,7 @@ def download_film(movie_details: Json_film) -> str: # Define output path title_name = os_manager.get_sanitize_file(movie_details.title) + ".mp4" - mp4_path = os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, title_name.replace(".mp4", "")) + mp4_path = os.path.join(ROOT_PATH, MOVIE_FOLDER, title_name.replace(".mp4", "")) # Get m3u8 master playlist master_playlist = video_source.get_playlist() diff --git a/StreamingCommunity/Api/Site/streamingcommunity/film.py b/StreamingCommunity/Api/Site/streamingcommunity/film.py index 8dec240..54625c0 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/film.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/film.py @@ -52,7 +52,7 @@ def download_film(select_title: MediaItem) -> str: # Define the filename and path for the downloaded film title_name = os_manager.get_sanitize_file(select_title.slug) + ".mp4" - mp4_path = os.path.join(ROOT_PATH, SITE_NAME, MOVIE_FOLDER, select_title.slug) + mp4_path = os.path.join(ROOT_PATH, MOVIE_FOLDER, select_title.slug) # Download the film using the m3u8 playlist, and output filename r_proc = HLS_Downloader( diff --git a/StreamingCommunity/Api/Site/streamingcommunity/series.py b/StreamingCommunity/Api/Site/streamingcommunity/series.py index 155bca4..2996b08 100644 --- a/StreamingCommunity/Api/Site/streamingcommunity/series.py +++ b/StreamingCommunity/Api/Site/streamingcommunity/series.py @@ -49,7 +49,7 @@ def download_video(index_season_selected: int, index_episode_selected: int, scra # 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" - mp4_path = os.path.join(ROOT_PATH, SITE_NAME, SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}") + mp4_path = os.path.join(ROOT_PATH, SERIES_FOLDER, scrape_serie.series_name, f"S{index_season_selected}") # Retrieve scws and if available master playlist video_source.get_iframe(obj_episode.id) diff --git a/StreamingCommunity/Lib/Downloader/HLS/segments.py b/StreamingCommunity/Lib/Downloader/HLS/segments.py index 1063eac..9238c53 100644 --- a/StreamingCommunity/Lib/Downloader/HLS/segments.py +++ b/StreamingCommunity/Lib/Downloader/HLS/segments.py @@ -257,7 +257,7 @@ class M3U8_Segments: with httpx.Client(proxies=proxy, verify=REQUEST_VERIFY) as client: if 'key_base_url' in self.__dict__: - response = client.get( + response = client.get( url=ts_url, headers=random_headers(self.key_base_url), timeout=max_timeout, diff --git a/config.json b/config.json index ac1090b..3ebfb0b 100644 --- a/config.json +++ b/config.json @@ -5,7 +5,7 @@ "log_to_file": true, "show_message": true, "clean_console": true, - "root_path": "Video", + "root_path": "D:\\StreamingDownload\\Downloads", "movie_folder_name": "Movie", "serie_folder_name": "TV", "map_episode_name": "%(tv_name)_S%(season)E%(episode)_%(episode_name)",