Fixes for allow print code

AstroPrint · Jul 25, 2018 · 840b619 · 840b619
1 parent b3fa174
commit 840b619
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,10 +10,10 @@ dist
 .DS_Store
 *.zip
 
-octoprint_astroprint/stoel2-Ultimaker-2-Go-PLA-draft.gcode
 
-octoprint_astroprint/stoel2-Ultimaker-2-Go-PLA-draft.gcode
 
-octoprint_astroprint/stoel2-Ultimaker-2-Go-PLA-draft.gcode
+octoprint_astroprint/util/AstroprintGCodeAnalyzerLinux
+octoprint_astroprint/util/AstroprintGCodeAnalyzerMac
+
 
 *.gcode
diff --git a/octoprint_astroprint/__init__.py b/octoprint_astroprint/__init__.py
@@ -471,7 +471,7 @@ def getStatus(self):
 				'paused': self._printer.is_paused(),
 				'camera': True, #self.cameraManager.cameraActive,
 				'remotePrint': True,
-				'capabilities': ['remotePrint', 'multiExtruders'] + self.cameraManager.capabilities
+				'capabilities': ['remotePrint', 'multiExtruders', 'allowPrintFile'] + self.cameraManager.capabilities
 			}),
 			mimetype= 'application/json'
 		)

diff --git a/octoprint_astroprint/boxrouter/handlers/requesthandler.py b/octoprint_astroprint/boxrouter/handlers/requesthandler.py
@@ -20,7 +20,8 @@ def __init__(self, wsClient):
 		self._settings = self.plugin.get_settings()
 
 	def initial_state(self, data, clientId, done):
-
+		if not self.astroprintCloud:
+			self.astroprintCloud = self.plugin.astroprintCloud
 		dataProfile = self.wsClient.plugin._printer_profile_manager.get_current_or_default()
 
 		profile = {
@@ -41,7 +42,7 @@ def initial_state(self, data, clientId, done):
 			'camera': True, #self.cameraManager.cameraActive,
 			'printCapture': self.cameraManager.timelapseInfo,
 			'profile': profile,
-			'capabilities': ['remotePrint', 'multiExtruders'],
+			'capabilities': ['remotePrint', 'multiExtruders', 'allowPrintFile'],
 			'tool' : self.plugin.currentTool()
 		}
 

diff --git a/octoprint_astroprint/downloadmanager/__init__.py b/octoprint_astroprint/downloadmanager/__init__.py
@@ -48,7 +48,7 @@ def run(self):
 				substr = ".gcode"
 				idx = fileName.index(substr)
 				fileName = fileName[:idx] + id + fileName[idx:]
-				image = item['design']['images']['square']
+				image = item['design']['images']['square'] if item['design'] else None
 
 
 			self.activeDownload = id