pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dopt-basics"
-version = "0.2.4"
+version = "0.2.2"
 description = "basic cross-project tools for Python-based d-opt projects"
 authors = [
     {name = "Florian Förster", email = "f.foerster@d-opt.com"},
@@ -69,7 +69,7 @@ directory = "reports/coverage"
 
 
 [tool.bumpversion]
-current_version = "0.2.4"
+current_version = "0.2.2"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

src/dopt_basics/cli.py

@@ -24,7 +24,6 @@ class LoadingAnimation:
         self.ending_text = ending_text
         self.timeout = timeout
         self.done: bool = False
-        self.keyboard_interrupt: bool = False
 
         self._isatty = sys.stdout.isatty()
         self._do_animation = bool(sys.stdout.isatty())
@@ -54,15 +53,16 @@ class LoadingAnimation:
         exc_type: type[Exception],
         exc_value,
         tb,
-    ) -> None:
+    ) -> bool:
         if exc_type is not None:
             self.stop(interrupt=True)
             if exc_type is KeyboardInterrupt:
-                self.keyboard_interrupt = True
                 print("Operation cancelled by user. (KeyboardInterrupt)", flush=True)
-            return
+                return True
+            return False
 
         self.stop()
+        return False
 
     def _animation(self) -> None:
         for frame in cycle(self.frames):
@@ -81,9 +81,6 @@ class LoadingAnimation:
         self,
         interrupt: bool = False,
     ) -> None:
-        if self.done:
-            return
-
         self.done = True
         if self._do_animation:
             self._thread.join()
@@ -103,6 +100,6 @@ def default_loading(func: Callable[P, T]) -> Callable[P, T]:
         with LoadingAnimation(loading_txt, ending_text):
             res = func(*args, **kwargs)
 
-        return res
+        return res  # type: ignore
 
     return wrapper