initialized configuration from console

Haschtl · Jan 7, 2019 · 4b6b0f1 · 4b6b0f1
1 parent 2cc9aaa
commit 4b6b0f1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/RTOC/RTOC.py b/RTOC/RTOC.py
@@ -732,22 +732,22 @@ def setLanguage(app):
 
 
 def main():
-    opts, args = getopt.getopt(sys.argv[1:], "hspr:", ["remote="])
+    opts, args = getopt.getopt(sys.argv[1:], "hs:p:r:c:", ["server=","remote=","port=",'config='])
     if len(opts) == 0:
         startRTOC()
     else:
         for opt, arg in opts:
-            if opt == '-p':
+            if opt in ('-p', '--port'):
                 port = int(arg)
                 break
             else:
                 port = 5050
         for opt, arg in opts:
             if opt == '-h':
                 print(
-                    'RTOC.py [-h, -s] [-r <Remoteadress>]\n -h: Hilfe\n-s: TCP-Server ohne GUI\n-r <Remoteadresse>: TCP-Client zu RTOC-Server\n-p: Starte TCP-Server auf anderem Port (Standart: 5050)')
-                sys.exit()
-            elif opt == '-s':
+                    'RTOC.py [-h, -s] [-r <Remoteadress>]\n -h: Hilfe\n-s (--server) [COMMAND]: TCP-Server ohne GUI\n\t- start: Starts the RTOC-daemon\n\t- stop: Stops the RTOC-daemon\n\t- restart: Restarts the RTOC-daemon\n-r (--remote) <Remoteadresse>: TCP-Client zu RTOC-Server\n-p (--port): Starte TCP-Server auf anderem Port (Standart: 5050)\n-c (--config): Configure RTOC')
+                sys.exit(0)
+            elif opt in ('-s','--server'):
                 # logger = RTLogger.RTLogger(True, port)
                 # #runInBackground()
                 # while logger.run:
@@ -763,19 +763,25 @@ def main():
                     daemon.start()
                 else:
                     print('Unknown server command: '+str(command)+'\nUse "start", "stop" or "restart"')
+                    sys.exit(1)
             elif opt in ("-r", "--remote"):
                 remotepath = arg
                 startRemoteRTOC(remotepath)
                 sys.exit(0)
-        startRTOC(None, port)
+            elif opt in ('-c','--config'):
+                configureRTOC(arg)
+        #startRTOC(None, port)
 
 
-def runInBackground():
-    app = QtWidgets.QApplication(sys.argv)
-    myapp = RTOC_TCP()
-    app, myapp = setStyleSheet(app, myapp)
+def configureRTOC(arg):
+    pass
 
-    app.exec_()
+# def runInBackground():
+#     app = QtWidgets.QApplication(sys.argv)
+#     myapp = RTOC_TCP()
+#     app, myapp = setStyleSheet(app, myapp)
+#
+#     app.exec_()
 
 
 def startRemoteRTOC(remotepath):

diff --git a/RTOC/__main__.py b/RTOC/__main__.py
@@ -28,7 +28,7 @@ def run(self):
 
 
 def main():
-    opts, args = getopt.getopt(sys.argv[1:], "hsp:r:", ["remote=","port="])
+    opts, args = getopt.getopt(sys.argv[1:], "hs:p:r:c:", ["server=","remote=","port=",'config='])
     if len(opts) == 0:
         startRTOC()
     else:
@@ -41,9 +41,9 @@ def main():
         for opt, arg in opts:
             if opt == '-h':
                 print(
-                    'RTOC.py [-h, -s] [-r <Remoteadress>]\n -h: Hilfe\n-s: TCP-Server ohne GUI\n-r <Remoteadresse>: TCP-Client zu RTOC-Server\n-p: Starte TCP-Server auf anderem Port (Standart: 5050)')
-                sys.exit()
-            elif opt == '-s':
+                    'RTOC.py [-h, -s] [-r <Remoteadress>]\n -h: Hilfe\n-s (--server) [COMMAND]: TCP-Server ohne GUI\n\t- start: Starts the RTOC-daemon\n\t- stop: Stops the RTOC-daemon\n\t- restart: Restarts the RTOC-daemon\n-r (--remote) <Remoteadresse>: TCP-Client zu RTOC-Server\n-p (--port): Starte TCP-Server auf anderem Port (Standart: 5050)\n-c (--config): Configure RTOC')
+                sys.exit(0)
+            elif opt in ('-s','--server'):
                 command = arg
                 daemon = RTOCDaemon('/tmp/RTOCDaemon.pid')
                 if command == 'stop':
@@ -54,13 +54,17 @@ def main():
                     daemon.start()
                 else:
                     print('Unknown server command: '+str(command)+'\nUse "start", "stop" or "restart"')
-
+                    sys.exit(1)
+            elif opt in ('-c','--config'):
+                configureRTOC(arg)
             elif opt in ("-r", "--remote"):
                 remotepath = arg
                 startRemoteRTOC(remotepath)
                 sys.exit(0)
-        startRTOC(None, port)
+        #startRTOC(None, port)
 
+def configureRTOC(arg):
+    pass
 
 def setStyleSheet(app, myapp):
     if os.name == 'posix':
@@ -138,12 +142,12 @@ def setLanguage(app):
     # compile translationfile: % lrelease-qt5 lang/de_de.ts
     # use self.tr("TEXT TO TRANSLATE") in the code
 
-def runInBackground():
-    app = QtWidgets.QApplication(sys.argv)
-    myapp = RTOC_TCP()
-    app, myapp = setStyleSheet(app, myapp)
-
-    app.exec_()
+# def runInBackground():
+#     app = QtWidgets.QApplication(sys.argv)
+#     myapp = RTOC_TCP()
+#     app, myapp = setStyleSheet(app, myapp)
+#
+#     app.exec_()
 
 
 def startRemoteRTOC(remotepath):