I04_1-168: program can be launched with config file as argument

Author: IsabellaRey

.gitignore

@@ -5,6 +5,7 @@ test-output
 demo-resources
 *.pyc
 config.ini
+launch_barcode.bat
 
 build
 dist

build.bat

@@ -8,4 +8,6 @@ pyinstaller --onefile --windowed main.py
 move dist\main.exe ..\bin\barcode.exe
 rd /S /Q build
 rd /S /Q dist
-del main.spec
+del main.spec
+
+@echo start barcode.exe --config_file .\config.ini>"..\bin\launch_barcode.bat"

dls_barcode/main.py

@@ -9,18 +9,19 @@
 
 from PyQt4 import QtGui
 from gui import DiamondBarcodeMainWindow
+import argparse
 
 # Detect if the program is running from source or has been bundled
 IS_BUNDLED = getattr(sys, 'frozen', False)
 if IS_BUNDLED:
-    CONFIG_FILE = "./config.ini"
+    DEFAULT_CONFIG_FILE = "./config.ini"
 else:
-    CONFIG_FILE = "../config.ini"
+    DEFAULT_CONFIG_FILE = "../config.ini"
 
 
-def main():
+def main(config_file):
     app = QtGui.QApplication(sys.argv)
-    ex = DiamondBarcodeMainWindow(CONFIG_FILE)
+    ex = DiamondBarcodeMainWindow(config_file)
     sys.exit(app.exec_())
 
 
@@ -30,4 +31,10 @@ def main():
         import multiprocessing
         multiprocessing.freeze_support()
 
-    main()
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-cf", "--config_file", type=str, default=DEFAULT_CONFIG_FILE,
+                        help="The path of the configuration file (default=" + DEFAULT_CONFIG_FILE + ")")
+    args = parser.parse_args()
+    print("CONFIG: " + args.config_file)
+
+    main(args.config_file)

tests/system_tests/system_tests.py

@@ -36,7 +36,7 @@
 
 CONFIG_FILE = "../config.ini"
 # TODO: restore the four commented lines below
-# OPTIONS = BarcodeConfig(CONFIG_FILE)
+# OPTIONS = BarcodeConfig(DEFAULT_CONFIG_FILE)
 
 # STORE = Store(OPTIONS.store_directory.value(), OPTIONS)