diff --git a/.gitignore b/.gitignore index 00c63f5..002ae67 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,13 @@ /aniworld/lib/* /src/__pycache__/* /src/__pycache__/ +/.vs/* +/src/Temp/* +/src/Loaders/__pycache__/* +/src/Loaders/provider/__pycache__/* +/src/Loaders/__pycache__/* +/src/Loaders/__pycache__/AniWorldLoader.cpython-310.pyc +/src/Loaders/__pycache__/Loader.cpython-310.pyc +/src/Loaders/__pycache__/Loaders.cpython-310.pyc +/src/Loaders/__pycache__/Providers.cpython-310.pyc +/src/Loaders/provider/__pycache__/voe.cpython-310.pyc diff --git a/requirements.txt b/requirements.txt index ae9fe84..8b87485 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/src/Main.py b/src/Main.py index f11e689..c2c1bec 100644 --- a/src/Main.py +++ b/src/Main.py @@ -97,12 +97,9 @@ class SeriesApp: func(*args, **kwargs) return True except Exception as e: - print(f"Attempt {attempt} failed: {e}") - if attempt == max_retries: - print("All attempts failed.") - else: - print(f"Retrying in {delay} seconds...\n") - time.sleep(delay) + + print(e) + time.sleep(delay) return False def download_series(self, series): @@ -117,13 +114,13 @@ class SeriesApp: for serie in series: serie_episodes = sum(len(ep) for ep in serie.episodeDict.values()) - self.progress.update(task2, description=f"[green]{serie.name}", total=serie_episodes) + self.progress.update(task2, description=f"[green]{serie.folder}", total=serie_episodes) downloaded = 0 for season, episodes in serie.episodeDict.items(): for episode in episodes: loader = self.Loaders.GetLoader(key="aniworld.to") if loader.IsLanguage(season, episode, serie.key): - self.retry(loader.Download, 3, 1, self.directory_to_search, serie.folder, season, episode, serie.key, self.print_Download_Progress) + self.retry(loader.Download, 3, 1, self.directory_to_search, serie.folder, season, episode, serie.key, "German Dub",self.print_Download_Progress) downloaded += 1 total_downloaded += 1 @@ -182,8 +179,7 @@ class SeriesApp: print("Invalid input. Try again.") def updateFromReinit(self, folder, counter): - if self.bar != None: - self.bar.update(counter) + self.progress.update(self.task1, advance=1) def run(self): """Main function to run the app.""" @@ -196,19 +192,19 @@ class SeriesApp: print("\nRescanning series...\n") - self.bar = progressbar.ProgressBar( - max_value=progressbar.UnknownLength, - widgets=[ - progressbar.Counter(), ' items processed ', - progressbar.AnimatedMarker() - ] - ) + self.progress = Progress() + self.task1 = self.progress.add_task("[red]items processed...", total=300) + self.progress.start() self.SerieScanner.Reinit() self.SerieScanner.Scan(self.updateFromReinit) self.List = SerieList.SerieList(self.directory_to_search) self.__InitList__() + + self.progress.stop() + self.progress = None + elif action == "d": selected_series = self.get_user_selection() if selected_series: