Clean up Actions/actions.py

Background/UIProcessor.py

@@ -522,8 +522,8 @@ def processMessage(self, _message):
             elif msg["message"] == "distToMoveUpdateZ":
                 self.distToMoveUpdateZ()
             elif msg["message"] == "updateTimer":
-                # Todo: clean this up .. edit: sendCalibrationMessage got deleted somewhere.
-                #self.sendCalibrationMessage("updateTimer", json.loads(msg["data"]))
+                # TODO: clean this up .. edit: sendCalibrationMessage got deleted somewhere.
+                # self.sendCalibrationMessage("updateTimer", json.loads(msg["data"]))
                 pass
             elif msg["message"] == "updateCamera":
                 self.sendCameraMessage("updateCamera", json.loads(msg["data"]))

DataStructures/logger.py

@@ -155,23 +155,20 @@ def deleteLogFiles(self):
         """
         Delete log files
         """
+
         success1 = False
-        for x in range(0, 1000):
-            try:
-                os.remove(self.home+"/.WebControl/"+"log.txt")
-                success1 = True
-                break
-            except:
-                success1 = False
+        try:
+            os.remove(self.home+"/.WebControl/"+"log.txt")
+            success1 = True
+        except:
+            success1 = False
 
         success2 = False
-        for x in range(0, 1000):
-            try:
-                os.remove(self.home+"/.WebControl/"+"alog.txt")
-                success2 = True
-                break
-            except:
-                success2 = False
+        try:
+            os.remove(self.home+"/.WebControl/"+"alog.txt")
+            success2 = True
+        except:
+            success2 = False
 
         if success1 and success2:
             return True

WebPageProcessor/webPageProcessor.py

@@ -13,6 +13,7 @@
 import socket
 from github import Github
 import markdown
+import mimetypes
 
 
 class WebPageProcessor:
@@ -226,15 +227,15 @@ def createWebPage(self, pageID, isMobile, args):
             return page, "Upload GCode", False, "medium", "content", "footerSubmit"
         elif pageID == "importGCini":
             url = "importFile"
-            page = render_template("importFile.html", url=url)
+            page = render_template("importFile.html", url=url, mimetypes=".ini")
             return page, "Import groundcontrol.ini", False, "medium", "content", False
         elif pageID == "importWCJSON":
             url = "importFileWCJSON"
-            page = render_template("importFile.html", url=url)
-            return page, "Import webcontrol.json", False, "medium", "content", False
+            page = render_template("importFile.html", url=url, mimetypes=".json")
+            return page, "Import WebControl.json", False, "medium", "content", False
         elif pageID == "restoreWebControl":
             url = "importRestoreWebControl"
-            page = render_template("importFile.html", url=url)
+            page = render_template("importFile.html", url=url, mimetypes=".zip")
             return page, "Restore WebControl", False, "medium", "content", False
         elif pageID == "actions":
             if self.data.controllerFirmwareVersion < 100:

main.py

@@ -533,14 +533,12 @@ def backupWebControl():
     if request.method == "GET":
         returnVal = app.data.actions.backupWebControl()
         if returnVal != False:
-            print(returnVal)
-            return send_file(returnVal)
+            return send_file(returnVal, as_attachment=True)
         else:
             resp = jsonify("failed")
             resp.status_code = 500
             return resp
 
-
 @app.route("/editBoard", methods=["POST"])
 def editBoard():
     app.data.logger.resetIdler()

static/scripts/baseSocket.js

@@ -252,26 +252,19 @@ function setListeners(){
 
 }
 
-function action(command, arg, arg1){
-    if (arg==null)
-      arg = "";
-    if (arg1==null)
-      arg1 = "";
-    console.log("action="+command);
-    socket.emit('action',{data:{command:command,arg:arg, arg1:arg1}});
+function action() {
+  var msg = {"command": arguments[0]};
+  if (arguments.length > 1 ) {
+    var args = new Array()
+    for (var i=1; i < arguments.length; i++) {
+      args[i-1] = arguments[i];
+    }
+    msg["args"] = args;
+  }
+  console.log("action=" + arguments[0]);
+  socket.emit('action', msg);
 }
 
-function move(direction){
-  distToMove = $("#distToMove").val();
-  console.log(distToMove)
-  socket.emit('move',{data:{direction:direction,distToMove:distToMove}});
-}
-
-function moveZ(direction){
-  distToMoveZ = $("#distToMoveZ").val();
-  console.log(distToMoveZ)
-  socket.emit('moveZ',{data:{direction:direction,distToMoveZ:distToMoveZ}});
-}
 
 function settingRequest(section,setting){
   console.log("requesting..")

templates/actions.html

@@ -30,7 +30,7 @@ <h4 class="card-title">Diagnostics/Maintenance</h4>
 			<div class="card-body">
 				<h4 class="card-title">Calibration/Setup</h4>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('importGCini');$('#contentModal').modal('hide');">Import groundcontrol.ini File</button>
-				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('importWCJSON');$('#contentModal').modal('hide');">Import webcontrol.json File</button>
+				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('importWCJSON');$('#contentModal').modal('hide');">Import WebControl.json File</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('quickConfigure');$('#contentModal').modal('hide');">Quick Configure</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('setSprockets');$('#contentModal').modal('hide');">Set Sprockets & Chains</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('resetChains');$('#contentModal').modal('hide');">Reset Chains</button>

templates/importFile.html

@@ -4,7 +4,7 @@
   <form id="importForm" method="post" enctype=multipart/form-data>
     <div class="form-group">
       <label for="importFile">Import File</label>
-      <input type="file" class="form-control-file" name="file" id="importFile">
+      <input type="file" class="form-control-file" name="file" id="importFile" {{ 'accept=' ~ mimetypes + '' if mimetypes is defined }}>
     </div>
     <button type="submit" class="btn btn-primary">Submit</button>
   </form>