update server start

Author: naman108

TAKfreeServer/TAKLinuxService/beginServerFromLinux.py

@@ -1,6 +1,21 @@
+import argparse
 import sys
 import os
-os.chdir('..')
-path = os.path.dirname(__file__)
-path = str(path)+'server.py'
-os.system('sudo nohup python3 '+path+' &')
+if __name__ == '__main__':
+	parser=argparse.ArgumentParser()
+	parser.add_argument("-p", type=int)
+	parser.add_argument("-ip", type=str)
+	args=parser.parse_args()
+	port_num = args.p
+	ip_addr = args.ip
+	if ip_addr != None and port_num != None:
+		os.chdir('..')
+		path = os.path.dirname(__file__)
+		path = str(path)+'server.py'
+		os.system('sudo nohup python3 '+path+' &')
+	else:
+		print('false')
+		os.chdir('..')
+		path = os.path.dirname(__file__)
+		path = str(path)+'server.py'
+		os.system('sudo nohup python3 '+path+' &')

TAKfreeServer/TAKWinService/beginProgramAsService.py

@@ -8,6 +8,7 @@
 import threading
 import sys
 import os
+import argparse
 PACKAGE_PARENT = '..'
 SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
 sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
@@ -18,6 +19,7 @@ class AppServerSvc (win32serviceutil.ServiceFramework):
     killSwitch = 0
 
     def __init__(self,args):
+        print(args)
         win32serviceutil.ServiceFramework.__init__(self,args)
         self.hWaitStop = win32event.CreateEvent(None,0,0,None)
 
@@ -31,7 +33,7 @@ def SvcDoRun(self):
         self.main()
 
     def main(self):
-        t = threading.Thread(target = ThreadedServer('',8087).listen, args = (), daemon=True)
+        t = threading.Thread(target = ThreadedServer(ip,port).listen, args = (), daemon=True)
         t.start()
         while True:
             if self.killSwitch == 1:
@@ -40,4 +42,9 @@ def main(self):
                 True
 
 if __name__ == '__main__':
-    win32serviceutil.HandleCommandLine(AppServerSvc)
+    if sys.argv[1] == 'start':
+        ip = input('please enter your server IP: ')
+        port = int(input('please enter the port your server should be listening on: '))
+        win32serviceutil.HandleCommandLine(AppServerSvc)
+    else:
+        win32serviceutil.HandleCommandLine(AppServerSvc)