From 152e8592c1d7216ff622f01f2826374ab99ff029 Mon Sep 17 00:00:00 2001
From: Florian Vahl <git@flova.de>
Date: Tue, 19 Nov 2024 14:14:47 +0100
Subject: [PATCH] Move confusing main.py to cli.py

---
 ddlitlab2024/dataset/cli.py  | 57 ++++++++++++++++++++++++++++++++++-
 ddlitlab2024/dataset/main.py | 58 ------------------------------------
 pyproject.toml               |  2 +-
 3 files changed, 57 insertions(+), 60 deletions(-)
 delete mode 100755 ddlitlab2024/dataset/main.py

diff --git a/ddlitlab2024/dataset/cli.py b/ddlitlab2024/dataset/cli.py
index ff9b056..dbc8d6a 100644
--- a/ddlitlab2024/dataset/cli.py
+++ b/ddlitlab2024/dataset/cli.py
@@ -1,8 +1,24 @@
+#!/usr/bin/env python
+
 import argparse
+import typing
 from enum import Enum
 from pathlib import Path
 
-from ddlitlab2024 import DB_PATH
+if typing.TYPE_CHECKING:
+    from argparse import Namespace
+
+import os
+import sys
+
+from rich.console import Console
+from sqlalchemy.orm import Session
+
+from ddlitlab2024 import DB_PATH, __version__
+from ddlitlab2024.dataset import logger
+from ddlitlab2024.dataset.db import Database
+
+err_console = Console(stderr=True)
 
 
 class ImportType(str, Enum):
@@ -47,3 +63,42 @@ def __init__(self):
 
     def parse_args(self) -> argparse.Namespace:
         return self.parser.parse_args()
+
+
+def main():
+    debug_mode = os.getenv("LOGLEVEL") == "DEBUG"
+
+    try:
+        logger.debug("Parsing CLI args...")
+        args: Namespace = CLIArgs().parse_args()
+        logger.debug(f"CLI args: {args}")
+
+        if args.version:
+            logger.info(f"running ddlitlab2024 CLI v{__version__}")
+            sys.exit(0)
+
+        if args.command == CLICommand.DB:
+            create_schema = args.db_command == "create-schema" or args.db_command == "dummy-data"
+            db: Session = Database(args.db_path).create_session(create_schema=create_schema)
+            logger.debug("Database session created")
+
+            match args.db_command:
+                case "recording2mcap":
+                    from ddlitlab2024.dataset.recording2mcap import recording2mcap
+
+                    recording2mcap(db, args.recording, args.output_dir)
+
+                case "dummy-data":
+                    from ddlitlab2024.dataset.dummy_data import insert_dummy_data
+
+                    insert_dummy_data(db, args.num_recordings, args.num_samples_per_rec, args.image_step)
+
+        sys.exit(0)
+    except Exception as e:
+        logger.error(e)
+        err_console.print_exception(show_locals=debug_mode)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ddlitlab2024/dataset/main.py b/ddlitlab2024/dataset/main.py
deleted file mode 100755
index f46ea12..0000000
--- a/ddlitlab2024/dataset/main.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-
-import typing
-
-if typing.TYPE_CHECKING:
-    from argparse import Namespace
-
-import os
-import sys
-
-from rich.console import Console
-from sqlalchemy.orm import Session
-
-from ddlitlab2024 import __version__
-from ddlitlab2024.dataset import logger
-from ddlitlab2024.dataset.cli import CLIArgs, CLICommand
-from ddlitlab2024.dataset.db import Database
-
-err_console = Console(stderr=True)
-
-
-def main():
-    debug_mode = os.getenv("LOGLEVEL") == "DEBUG"
-
-    try:
-        logger.debug("Parsing CLI args...")
-        args: Namespace = CLIArgs().parse_args()
-        logger.debug(f"CLI args: {args}")
-
-        if args.version:
-            logger.info(f"running ddlitlab2024 CLI v{__version__}")
-            sys.exit(0)
-
-        if args.command == CLICommand.DB:
-            create_schema = args.db_command == "create-schema" or args.db_command == "dummy-data"
-            db: Session = Database(args.db_path).create_session(create_schema=create_schema)
-            logger.debug("Database session created")
-
-            match args.db_command:
-                case "recording2mcap":
-                    from ddlitlab2024.dataset.recording2mcap import recording2mcap
-
-                    recording2mcap(db, args.recording, args.output_dir)
-
-                case "dummy-data":
-                    from ddlitlab2024.dataset.dummy_data import insert_dummy_data
-
-                    insert_dummy_data(db, args.num_recordings, args.num_samples_per_rec, args.image_step)
-
-        sys.exit(0)
-    except Exception as e:
-        logger.error(e)
-        err_console.print_exception(show_locals=debug_mode)
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/pyproject.toml b/pyproject.toml
index f00ddab..4eec731 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,4 +48,4 @@ line-length = 120
 select = ["F", "E", "B", "W", "I", "N", "UP"]
 
 [tool.poetry.scripts]
-cli = "ddlitlab2024.dataset.main:main"
+cli = "ddlitlab2024.dataset.cli:main"