From 60ac14e1515ba8ff50a7037c87819ac4d919f678 Mon Sep 17 00:00:00 2001
From: Lukas Pupka-Lipinski <lukas.pupkalipinski@lpl-mind.de>
Date: Sat, 27 Sep 2025 20:21:05 +0200
Subject: [PATCH] added better progressbar

---
 .gitignore       |  10 ++++++++++
 requirements.txt | Bin 42 -> 1280 bytes
 src/Main.py      |  30 +++++++++++++-----------------
 3 files changed, 23 insertions(+), 17 deletions(-)

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 ae9fe8436aea833e1c13c03c7bf5e394183c0ed8..8b87485ec71c483ae29640696ea42625c55018ed 100644
GIT binary patch
literal 1280
zcmYk6U2fYz421a{phuArDSz!lE)bwVfgYf+CEInPNLxv%-5$Q}eB^Ew7?xylI2;bS
z{`+TZgUxob)<!)&>QmdsKH4W;ukC|f+0OR1wKrRYI_TaDKkA<B*73JO)^?-oUB>sy
znDyCP_n)zG-oiNN+-tA0vBoo7WlXuw$uk>iXvB-6jcTB$weQk1IsamnRFC@gs&~B<
z{&o)fKoQzX)~Gnhtz$t@9mKu!cFLYreG;npu)5IcEgmHyO76XKL-|3hFREP07y72k
zQTHLE8%GvLPx56DqNuF1(@#<`*s~(dyI9fp?9q!@S6AsVJf;6h8qj$bOC>b!B>UxD
z^cimB;pdEIieL475NlBbD!O_V+nZQ>kMW+}h}huFvpkuUOQ+<=E`W?(NaAj#3ODHO
z=%|=z=uUc{q!X5(dfrPtOjKICONx)m2E}IWTz|MkO*W+Pfn4+*#FyNO);9yzGKX6H
z_<%c=6ejhFzJv0>#oP<$7om>YnwaP82$*Weg&#02+Dz)Q1)LU63T*TN<65&I**W%>
z-U^alVrS|0hq&l@$z0UE@jk-gNer9_vg_=B(apKO<OtOtlp8LU6AS|1WBPDExG#(9
zcIp_`I3eVQ{zaWKHKzGZnHOop8Mx>^dX7z4=MsCw3EfFQyi{A`XLWH_v~w4U#~xBO
j+#ovS{hoblaB|w#i9}T<%QPyXdufeo@Bc}fyv6?jD?7O_

literal 42
xcmXR)Ei6qfE-B_pN=+;+$xJKFDb6n~FyYFn$j#v@s4U6I&(lrGFG<ZS0{~<35OV+k

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: