Merge pull request #39 from makermelissa/main

Fix non-standard port usage and Run Code import bugs

Author: tannewt

assets/css/style.css

@@ -102,10 +102,11 @@ class WebWorkflow extends Workflow {
             } else {
                 return Error("You are connected with localhost, but didn't supply the device hostname.");
             }
-        } else if (isMdns()) {
-            this.host = location.hostname;
-        } else if (isIp()) {
+        } else if (isMdns() || isIp()) {
             this.host = location.hostname;
+            if (location.port != 80) {
+                this.host += ":" + location.port;
+            }
         }
 
         if (this.host != null) {

assets/css/style.css.map

@@ -205,22 +205,24 @@ class Workflow {
 
         if (path == "/code.py") {
             await this.serialTransmit(CHAR_CTRL_D);
-        }
+        } else {
 
-        let extension = path.split('.').pop();
-        if (extension === null) {
-            console.log("Extension not found");
-            return false;
-        }
-        if (String(extension).toLowerCase() != "py") {
-            console.log("Extension not py, twas " + String(extension).toLowerCase());
-            return false;
-        }
-        path = path.slice(0, -3);
-        path = path.replace(/\//g, ".");
+            let extension = path.split('.').pop();
+            if (extension === null) {
+                console.log("Extension not found");
+                return false;
+            }
+            if (String(extension).toLowerCase() != "py") {
+                console.log("Extension not py, it was " + String(extension).toLowerCase());
+                return false;
+            }
 
+            path = path.slice(1, -3);
+            path = path.replace(/\//g, ".");
+
+            await this.serialTransmit(CHAR_CTRL_C + "import " + path + CHAR_CRLF);
+        }
         await this._changeMode(MODE_SERIAL);
-        await this.serialTransmit(CHAR_CTRL_C + "import " + path + CHAR_CRLF);
     }
 
     async checkSaved() {