Merge pull request #3 from sot/improvements

Improvements

aperoll/__init__.py

@@ -0,0 +1,3 @@
+import ska_helpers
+
+__version__ = ska_helpers.get_version(__package__)

aperoll/scripts/aperoll_main.py

@@ -3,27 +3,42 @@
 # from PyQt5 import QtCore as QtC, QtWidgets as QtW, QtGui as QtG
 from PyQt5 import QtWidgets as QtW
 
+from aperoll.utils import AperollException, logger
 from aperoll.widgets.main_window import MainWindow
 
 
 def get_parser():
     import argparse
 
     parse = argparse.ArgumentParser()
-    parse.add_argument("--date", default="2021-08-23 00:00:00.000")
-    parse.add_argument("--ra", default="6.45483333")
-    parse.add_argument("--dec", default="-26.03683611")
+    parse.add_argument("file", nargs="?", default=None)
+    parse.add_argument("--obsid", help="Specify the OBSID", type=int)
+    levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+    levels = [lvl.lower() for lvl in levels]
+    parse.add_argument(
+        "--log-level", help="Set the log level", default="INFO", choices=levels
+    )
     return parse
 
 
 def main():
-    args = get_parser().parse_args()
-
-    app = QtW.QApplication([])
-    w = MainWindow(opts=vars(args))
-    w.resize(1500, 1000)
-    w.show()
-    app.exec()
+    parser = get_parser()
+    args = parser.parse_args()
+
+    logger.setLevel(args.log_level)
+
+    try:
+        app = QtW.QApplication([])
+        w = MainWindow(opts=vars(args))
+        w.resize(1500, 1000)
+        w.show()
+        app.exec()
+    except AperollException as e:
+        logger.error(f"Error: {e}")
+        parser.exit(1)
+    except FileNotFoundError as e:
+        logger.error(f"Error: {e}")
+        parser.exit(1)
 
 
 if __name__ == "__main__":

aperoll/utils.py

@@ -0,0 +1,7 @@
+from ska_helpers import logging
+
+logger = logging.basic_logger("aperoll")
+
+
+class AperollException(RuntimeError):
+    pass