Make port reassignable

Author: madgrizzle

WebPageProcessor/webPageProcessor.py

@@ -16,11 +16,6 @@ class WebPageProcessor:
 
     def __init__(self, data):
         self.data = data
-        print("opening browser")
-        webbrowser.open_new_tab("http://localhost:5000")
-        host_name = socket.gethostname()
-        host_ip = socket.gethostbyname(host_name)
-        self.data.hostAddress = host_ip+":5000"
 
     def createWebPage(self, pageID, isMobile, args):
         # returns a page and a bool specifying whether the user has to click close to exit modal

config/config.py

@@ -102,6 +102,23 @@ def __init__(self):
                     self.settings, outfile, sort_keys=True, indent=4, ensure_ascii=False
                 )
 
+    def checkForTouchedPort(self):
+        home = self.home
+        path = home+"/.WebControl/webcontrol-*.port"
+        print(path)
+        try:
+            for filename in glob.glob(path):
+                print(filename)
+                port = filename.split("-")
+                port = port[1].split(".port")
+                print(port[0])
+                self.data.config.setValue("WebControl Settings", "webPort", port[0])
+                os.remove(filename)
+        except Exception as e:
+            print(e)
+            return False
+        return True
+
     def getHome(self):
         return self.home
 

defaultwebcontrol.json

@@ -982,6 +982,15 @@
             "title": "Enable 3D Display",
             "type": "bool",
             "value": "0"
+        },
+        {
+            "default": 5000,
+            "desc": "Web interface Port Number used to access WebControl from browser.  Requires restart to change.\ndefault setting: 5000",
+            "key": "webPort",
+            "section": "WebControl Settings",
+            "title": "Web Port Number",
+            "type": "int",
+            "value": 5000
         }
     ],
     "Camera Settings": [

main.py

@@ -2,6 +2,7 @@
 from app import app, socketio
 from gevent import monkey
 import webbrowser
+import socket
 
 monkey.patch_all()
 
@@ -617,5 +618,25 @@ def default_error_handler(e):
 if __name__ == "__main__":
     app.debug = False
     app.config["SECRET_KEY"] = "secret!"
-    socketio.run(app, use_reloader=False, host="0.0.0.0")
+    #look for touched file
+    app.data.config.checkForTouchedPort()
+    webPort = app.data.config.getValue("WebControl Settings", "webPort")
+    webPortInt = 5000
+    try:
+        webPortInt = int(webPort)
+        if webPortInt < 0 or webPortInt > 65535:
+            webPortInt = 5000
+    except Exception as e:
+        app.data.console_queue.put(e)
+        app.data.console_queue.put("Invalid port assignment found in webcontrol.json")
+
+    print("opening browser")
+    webPortStr = str(webPortInt)
+    webbrowser.open_new_tab("http://localhost:"+webPortStr)
+    host_name = socket.gethostname()
+    host_ip = socket.gethostbyname(host_name)
+    app.data.hostAddress = host_ip + ":" + webPortStr
+
+    socketio.run(app, use_reloader=False, host="0.0.0.0", port=webPortInt)
     # socketio.run(app, host='0.0.0.0')
+