GH-49: Fix the progress logging

Author: ArtyomVancyan

src/thumbnails/generator.py

@@ -12,6 +12,7 @@
 from .constants import DEFAULT_SKIP
 from .pathtools import listdir
 from .pathtools import metadata_path
+from .progress import Progress
 from .thumbnail import ThumbnailExistsError
 from .thumbnail import ThumbnailFactory
 from .video import Video
@@ -46,6 +47,8 @@ def worker(video, fmt, base, skip, output):
         thumbnail.generate()
 
     def generate(self):
+        Progress.stop()
+
         self.inputs = [file for file in self.inputs if re.match(r"^.*\.(?:(?!png|vtt|json).)+$", file)]
         self.inputs = dict(zip(map(lambda i: metadata_path(i, self.output, self.format), self.inputs), self.inputs))
 
@@ -70,3 +73,5 @@ def generate(self):
                 ),
                 videos,
             )
+
+        Progress.stop()

src/thumbnails/progress.py

@@ -1,21 +1,28 @@
-from rich.live import Live
-from rich.status import Status
+from rich.progress import Progress as RichProgress
+from rich.progress import SpinnerColumn
+from rich.progress import TextColumn
 
 
 class Progress:
-    def __init__(self, status, done="Process completed"):
-        self.status = Status(status)
-        self.live = Live(self.status)
+    _instance = RichProgress(SpinnerColumn(), TextColumn("[white]{task.description}{task.fields[status]}"))
+
+    def __init__(self, description, done="Process completed"):
+        self.task = self._instance.add_task(description, status=" ... [yellow]processing")
         self.done = done
 
-    def update(self, status):
-        self.status.update(status)
-        self.live.update(self.status)
+    def update(self, description, status=" ... [yellow]processing"):
+        self._instance.update(self.task, description=description, status=status, refresh=True)
+
+    @classmethod
+    def start(cls):
+        cls._instance.start()
+
+    @classmethod
+    def stop(cls):
+        cls._instance.stop()
 
     def __enter__(self):
-        self.live.start()
         return self
 
     def __exit__(self, *_):
-        self.live.update("[white]%s ... [/white][green]done[/green]" % self.done)
-        self.live.stop()
+        self.update(self.done, status=" ... [green]done")

src/thumbnails/thumbnail.py

@@ -47,7 +47,7 @@ def __init__(self, video, base, skip, output):
         self.metadata_path = self._get_metadata_path()
         self._perform_skip()
 
-        with Progress("Extracting frames ...", "Frames have been extracted"):
+        with Progress("Extracting frames", "Frames have been extracted"):
             self.extract_frames()
 
     def _get_metadata_path(self):
@@ -103,7 +103,7 @@ def prepare_frames(self):
         master = Image.new(mode="RGBA", size=next(thumbnails))
         master_path = os.path.join(self.thumbnail_dir, extract_name(self.filepath) + ".png")
 
-        with Progress("Processing frames ...", "Frames have been merged into one") as progress:
+        with Progress("Processing frames", "Frames have been merged into one") as progress:
             for frame, *_, x, y in thumbnails:
                 progress.update("Processing '%s'" % frame)
                 with Image.open(frame) as image:
@@ -123,7 +123,7 @@ def format_time(secs):
         route = os.path.join(prefix, extract_name(self.filepath) + ".png")
         route = pathlib.Path(route).as_posix()
 
-        with Progress("Generating thumbnail metadata ...", "Thumbnail metadata has been generated") as progress:
+        with Progress("Generating thumbnail metadata", "Thumbnail metadata has been generated") as progress:
             for _, start, end, x, y in self.thumbnails():
                 progress.update("Generating metadata for '%s'" % route)
                 thumbnail_data = "%s --> %s\n%s#xywh=%d,%d,%d,%d\n\n" % (