Add graceful exit and output of version num in log.

cyberdrop_dl/__init__.py

@@ -1 +1 @@
-__version__ = "5.0.4"
+__version__ = "5.0.5"

cyberdrop_dl/main.py

@@ -2,6 +2,7 @@
 import contextlib
 import logging
 import os
+import signal
 import sys
 
 import aiorun
@@ -96,13 +97,24 @@ async def director(manager: Manager) -> None:
     asyncio.get_event_loop().stop()
 
 
+class GracefulExit:
+    def __enter__(self):
+        signal.signal(signal.SIGINT, self.exit_gracefully)
+        return self
+
+    @staticmethod
+    def exit_gracefully(signum, frame):
+        exit(0)
+
+
 def main():
     manager = startup()
 
     with contextlib.suppress(RuntimeError, asyncio.CancelledError):
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
-        aiorun.run(director(manager), stop_on_unhandled_errors=True)
+        with GracefulExit():
+            aiorun.run(director(manager), stop_on_unhandled_errors=True)
         sys.exit(0)
 
 

cyberdrop_dl/managers/manager.py

@@ -3,6 +3,7 @@
 from dataclasses import field
 from pathlib import Path
 
+from cyberdrop_dl import __version__
 from cyberdrop_dl.managers.args_manager import ArgsManager
 from cyberdrop_dl.managers.client_manager import ClientManager
 from cyberdrop_dl.managers.db_manager import DBManager
@@ -162,6 +163,7 @@ async def args_logging(self) -> None:
         print_settings['Sorting']['sort_folder'] = str(print_settings['Sorting']['sort_folder'])
 
         await log(f"Starting Cyberdrop-DL Process for {self.config_manager.loaded_config} Config")
+        await log(f"Running version {__version__}")
         await log(f"Using Authentication: \n{json.dumps(auth_provided, indent=4, sort_keys=True)}")
         await log(f"Using Settings: \n{json.dumps(print_settings, indent=4, sort_keys=True)}")
         await log(f"Using Global Settings: \n{json.dumps(self.config_manager.global_settings_data, indent=4, sort_keys=True)}")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cyberdrop-dl"
-version = "5.0.4"
+version = "5.0.5"
 description = "Bulk downloader for multiple file hosts"
 authors = ["Jules Winnfield <[email protected]>"]
 readme = "README.md"