New Version 1.14.0

- E #21, #59, #94, #124 reprint feature, if gcode is still available in local file-system
- E disabling of filemanttracking is now possible
- E grab all informations from SpoolManager-Plugin 1.4+
- E reduce plugin zip-size

- B #146, #139 CSV Import fix and ignoring empty lines
- B #123 strip M117 camera-expression

Author: OllisGit

.travis.yml

@@ -5,7 +5,7 @@
 script:
 # debug  - echo 'Hello World'
   - export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)
-  - zip -r master *
+  - zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
 # debug  - ls -al
 
 ## see "Fix travis automatic build and deploy"

octoprint_PrintJobHistory/__init__.py

@@ -19,10 +19,14 @@
 
 from werkzeug.datastructures import Headers
 
+from octoprint.filemanager import FileDestinations
+
 from octoprint_PrintJobHistory import PrintJobModel, TemperatureModel, FilamentModel
 from octoprint_PrintJobHistory.api import TransformPrintJob2JSON, TransformSlicerSettings2JSON
 
 from octoprint_PrintJobHistory.common import StringUtils
+from octoprint_PrintJobHistory.common import PrintJobUtils
+
 from octoprint_PrintJobHistory.common.SettingsKeys import SettingsKeys
 
 from octoprint_PrintJobHistory.CameraManager import CameraManager
@@ -164,6 +168,14 @@ def _createSamplePrintModel(self):
 ################################################### APIs
 
 
+	#######################################################################################   CONFIRM MESSAGE
+	@octoprint.plugin.BlueprintPlugin.route("/confirmMessageDialog", methods=["PUT"])
+	def put_confirmMessageDialog(self):
+		self._settings.set([SettingsKeys.SETTINGS_KEY_MESSAGE_CONFIRM_DATA], None)
+		self._settings.save()
+
+		return flask.jsonify([])
+
 	#######################################################################################   DEACTIVATE PLUGIN CHECK
 	@octoprint.plugin.BlueprintPlugin.route("/deactivatePluginCheck", methods=["PUT"])
 	def put_pluginDependencyCheck(self):
@@ -172,7 +184,6 @@ def put_pluginDependencyCheck(self):
 
 		return flask.jsonify([])
 
-
 	#######################################################################################   LOAD STATISTIC BY QUERY
 	@octoprint.plugin.BlueprintPlugin.route("/loadStatisticByQuery", methods=["GET"])
 	def get_statisticByQuery(self):
@@ -182,7 +193,6 @@ def get_statisticByQuery(self):
 
 		return flask.jsonify(statistic)
 
-
 	#######################################################################################   COMPARE Slicer Settings
 	@octoprint.plugin.BlueprintPlugin.route("/compareSlicerSettings/", methods=["GET"])
 	def get_compareSlicerSettings(self):
@@ -212,23 +222,53 @@ def get_compareSlicerSettings(self):
 
 		return flask.jsonify()
 
-
-
 	#######################################################################################   LOAD ALL JOBS BY QUERY
 	@octoprint.plugin.BlueprintPlugin.route("/loadPrintJobHistoryByQuery", methods=["GET"])
 	def get_printjobhistoryByQuery(self):
 
 		tableQuery = flask.request.values
 		allJobsModels = self._databaseManager.loadPrintJobsByQuery(tableQuery)
 		# allJobsAsDict = self._convertPrintJobHistoryModelsToDict(allJobsModels)
-		allJobsAsDict = TransformPrintJob2JSON.transformAllPrintJobModels(allJobsModels)
+		# selectedFile = self._file_manager.path_on_disk(fileLocation, selectedFilename)
+		allJobsAsDict = TransformPrintJob2JSON.transformAllPrintJobModels(allJobsModels, self._file_manager)
 
 		totalItemCount = self._databaseManager.countPrintJobsByQuery(tableQuery)
 		return flask.jsonify({
 								"totalItemCount": totalItemCount,
 								"allPrintJobs": allJobsAsDict
 							})
 
+	#######################################################################################   SELECT JOB FOR PRINTING
+	@octoprint.plugin.BlueprintPlugin.route("/selectPrintJobForPrint/<int:databaseId>", methods=["PUT"])
+	def put_select_printjob(self, databaseId):
+
+		printJobModel = self._databaseManager.loadPrintJob(databaseId);
+		if (printJobModel == None):
+			# PrintJob was deleted
+			message = "PrintJob not in database anymore! Selection not possible."
+			self._logger.error(message)
+			self._sendDataToClient(dict(action="errorPopUp",
+										title="Print selection not possible",
+										message=message))
+			return flask.jsonify()
+
+		printJobPrintable = PrintJobUtils.isPrintJobReprintable(self._file_manager,
+																printJobModel.fileOrigin,
+																printJobModel.filePathName,
+																printJobModel.fileName)
+		fullFileLocation = printJobPrintable["fullFileLocation"]
+		if (printJobPrintable["isRePrintable"] == False):
+			message = "PrintJob not found in: " +fullFileLocation
+			self._logger.error(message)
+			self._sendDataToClient(dict(action="errorPopUp",
+										title="Print selection not possible",
+										message=message))
+			return flask.jsonify()
+		sd = False if (printJobModel.fileOrigin != None and printJobModel.fileOrigin == "local") else True
+		self._printer.select_file(fullFileLocation, sd)
+
+		return flask.jsonify()
+
 	#######################################################################################   DELETE JOB
 	@octoprint.plugin.BlueprintPlugin.route("/removePrintJob/<int:databaseId>", methods=["DELETE"])
 	def delete_printjob(self, databaseId):
@@ -369,7 +409,7 @@ def delete_snapshot(self, snapshotFilename):
 
 	#######################################################################################   DOWNLOAD DATABASE-FILE
 	@octoprint.plugin.BlueprintPlugin.route("/downloadDatabase", methods=["GET"])
-	def download_database(self):
+	def get_download_database(self):
 		return send_file(self._databaseManager.getDatabaseFileLocation(),
 						 mimetype='application/octet-stream',
 						 attachment_filename='printJobHistory.db',
@@ -388,7 +428,7 @@ def delete_database(self):
 
 	#######################################################################################   EXPORT DATABASE as CSV
 	@octoprint.plugin.BlueprintPlugin.route("/exportPrintJobHistory/<string:exportType>", methods=["GET"])
-	def exportPrintJobHistoryData(self, exportType):
+	def get_exportPrintJobHistoryData(self, exportType):
 
 		if exportType == "CSV":
 			if "databaseIds" in flask.request.values:

octoprint_PrintJobHistory/api/PrintJobHistoryAPI.py

@@ -1,12 +1,14 @@
 # coding=utf-8
 from __future__ import absolute_import
 
+
 from octoprint_PrintJobHistory.CameraManager import CameraManager
 from octoprint_PrintJobHistory.common import StringUtils
+from octoprint_PrintJobHistory.common import PrintJobUtils
 
 
 
-def transformPrintJobModel(job):
+def transformPrintJobModel(job, fileManager):
 	jobAsDict = job.__data__
 
 	jobAsDict["printStartDateTimeFormatted"] = job.printStartDateTime.strftime('%d.%m.%Y %H:%M')
@@ -55,13 +57,19 @@ def transformPrintJobModel(job):
 	del jobAsDict["printEndDateTime"]
 	del jobAsDict["created"]
 
+	# not the best approach to check this value here
+	printJobReprintable = PrintJobUtils.isPrintJobReprintable(fileManager, job.fileOrigin, job.filePathName, job.fileName)
+
+	jobAsDict["isRePrintable"] = printJobReprintable["isRePrintable"]
+	jobAsDict["fullFileLocation"] = printJobReprintable["fullFileLocation"]
+
 	return jobAsDict
 
-def transformAllPrintJobModels(allJobsModels):
+def transformAllPrintJobModels(allJobsModels, fileManager):
 
 	result = []
 	for job in allJobsModels:
-		jobAsDict = transformPrintJobModel(job)
+		jobAsDict = transformPrintJobModel(job, fileManager)
 		result.append(jobAsDict)
 
 	return result

octoprint_PrintJobHistory/api/TransformPrintJob2JSON.py

@@ -270,44 +270,43 @@ def parseAndAssignFieldValue(self, fieldLabel, fieldName, fieldValue, printJobMo
 			# check if mandatory
 			return
 
-		filemanentModel = None
-		allFilemanentModel  = printJobModel.getFilamentModels()
-		if (allFilemanentModel != None and len(allFilemanentModel) > 0):
-			filemanentModel = allFilemanentModel[0]
-		else:
-			filemanentModel  = FilamentModel()
-			filemanentModel.toolId = "total"
-			printJobModel.addFilamentModel(filemanentModel)
+		# allFilemanentModel  = printJobModel.getFilamentModels()
+		filamanentModel = printJobModel.getFilamentModelByToolId("total")
+
+		if (filamanentModel == None):
+			filamanentModel  = FilamentModel()
+			filamanentModel.toolId = "total"
+			printJobModel.addFilamentModel(filamanentModel)
 
 		if (COLUMN_SPOOL_VENDOR == fieldLabel):
-			filemanentModel.vendor = fieldValue
+			filamanentModel.vendor = fieldValue
 			pass
 		elif (COLUMN_SPOOL_NAME == fieldLabel):
-			filemanentModel.spoolName = fieldValue
+			filamanentModel.spoolName = fieldValue
 			pass
 		elif (COLUMN_MATERIAL == fieldLabel):
-			filemanentModel.material = fieldValue
+			filamanentModel.material = fieldValue
 			pass
 		elif (COLUMN_DIAMETER == fieldLabel):
-			filemanentModel.diameter = float(fieldValue)
+			filamanentModel.diameter = float(fieldValue)
 			pass
 		elif (COLUMN_DENSITY == fieldLabel):
-			filemanentModel.density = float(fieldValue)
+			filamanentModel.density = float(fieldValue)
 			pass
 		elif (COLUMN_USED_LENGTH == fieldLabel):
-			filemanentModel.usedLength = float(fieldValue)
+			filamanentModel.usedLength = float(fieldValue)
 			pass
 		elif (COLUMN_CALCULATED_LENGTH == fieldLabel):
-			filemanentModel.calculatedLength = float(fieldValue)
+			filamanentModel.calculatedLength = float(fieldValue)
 			pass
 		elif (COLUMN_USED_WEIGHT == fieldLabel):
-			filemanentModel.usedWeight = float(fieldValue)
+			filamanentModel.usedWeight = float(fieldValue)
 			pass
 		elif (COLUMN_USED_FILAMENT_COSTS == fieldLabel):
 			costUnit = fieldValue[-1]
 			if (costUnit.isdigit()):
 				# no unit present
-				filemanentModel.usedCost = float(fieldValue)
+				filamanentModel.usedCost = float(fieldValue)
 			else:
 				# Split between cost and unit
 				costValue = ""
@@ -318,8 +317,8 @@ def parseAndAssignFieldValue(self, fieldLabel, fieldName, fieldValue, printJobMo
 					else:
 						costUnit = fieldValue[i:]
 						break
-				filemanentModel.usedCost = float(costValue)
-				filemanentModel.spoolCostUnit = costUnit
+				filamanentModel.usedCost = float(costValue)
+				filamanentModel.spoolCostUnit = costUnit
 
 			pass
 		pass
@@ -463,6 +462,16 @@ def parseCSV(csvFile4Import, updateParsingStatus, errorCollection, logger, delet
 						errorCollection.append("Mandatory column is missing! <br/><b>'" + "".join(mandatoryFieldMissing) + "'</b><br/>")
 						break
 				else:
+					# pre check, do we have values in the line?
+					isEmptyLine = True
+					for columnValue in row:
+						if (StringUtils.isNotEmpty(columnValue)):
+							isEmptyLine = False
+							break
+					if (isEmptyLine == True):
+						# errorCollection.append("CSV Line: "+str(lineNumber)+" without values! <br/>")
+						# just skip this line
+						continue
 					printJobModel = PrintJobModel()
 					# parse line with header defined order
 					columnIndex = 0

octoprint_PrintJobHistory/common/CSVExportImporter.py

@@ -0,0 +1,42 @@
+# coding=utf-8
+from __future__ import absolute_import
+from octoprint.filemanager import FileDestinations
+from octoprint_PrintJobHistory.common import StringUtils
+
+def isPrintJobReprintable(fileManager, fileOrigin, filePathName, fileName):
+	resultPrintJobPrintable = {}
+
+	isRePrintable = False
+	fullFileLocation = ""
+	filePath = filePathName if StringUtils.isNotEmpty(filePathName) else fileName
+
+	if (fileOrigin == None):
+		# could be during csv import, assumption it is local
+		fileOrigin = FileDestinations.LOCAL
+
+	if (fileOrigin == FileDestinations.LOCAL):
+		# local filesystem
+		fullFileLocation = fileManager.path_on_disk(fileOrigin, filePath)
+		isRePrintable = _isFileReadable(fullFileLocation)
+		pass
+	else:
+		# sd-card
+		# - no readable check (positiv thinking)
+		isRePrintable = True
+		fullFileLocation = fileOrigin + ":/" + filePath
+
+	resultPrintJobPrintable["isRePrintable"] = isRePrintable
+	resultPrintJobPrintable["fullFileLocation"] = fullFileLocation
+	return resultPrintJobPrintable
+
+
+
+
+def _isFileReadable(fullFileLocation):
+	result = False
+	try:
+		with open(fullFileLocation) as fp:
+			result = True
+	except IOError as err:
+		print ("Error reading the file {0}: {1}".format(fullFileLocation, err))
+	return result

octoprint_PrintJobHistory/common/PrintJobUtils.py

@@ -21,7 +21,7 @@ class SettingsKeys():
 	SETTINGS_KEY_SELECTED_FILAMENTTRACKER_PLUGIN = "selectedFilamentTrackerPlugin"
 	KEY_SELECTED_SPOOLMANAGER_PLUGIN = "SpoolManager Plugin"	# visible inn plugin-settings
 	KEY_SELECTED_FILAMENTMANAGER_PLUGIN = "FilamentManager Plugin"	# visible inn plugin-settings
-	KEY_SELECTED_NONE_PLUGIN = "no plugin installed/enabled"
+	KEY_SELECTED_NONE_PLUGIN = "none"
 
 	SETTINGS_KEY_SLICERSETTINGS_KEYVALUE_EXPRESSION = "slicerSettingsKeyValueExpression"
 
@@ -50,3 +50,6 @@ class SettingsKeys():
 
 	## Debugging
 	SETTINGS_KEY_SQL_LOGGING_ENABLED = "sqlLoggingEnabled"
+
+	# Other stuff
+	SETTINGS_KEY_MESSAGE_CONFIRM_DATA = "messageConfirmData"

octoprint_PrintJobHistory/common/SettingsKeys.py

@@ -146,6 +146,27 @@ function PrintJobHistoryAPIClient(pluginId, baseUrl) {
         });
     }
 
+    // select PrintJob-Item for printing
+    this.callSelectPrintJobForPrinting = function (databaseId, responseHandler){
+        $.ajax({
+            //url: API_BASEURL + "plugin/"+PLUGIN_ID+"/loadPrintJobHistory",
+            url: this.baseUrl + "plugin/" + this.pluginId + "/selectPrintJobForPrint/" + databaseId,
+            type: "PUT"
+        }).done(function( data ){
+            responseHandler();
+        });
+    }
+
+    // confirm the message dialog
+    this.callConfirmMessageDialog =  function (){
+        $.ajax({
+            url: this.baseUrl + "plugin/"+ this.pluginId +"/confirmMessageDialog",
+            type: "PUT"
+        }).done(function( data ){
+            //responseHandler(data)
+        });
+    }
+
     // deactivate the Plugin/Check
     this.callDeactivatePluginCheck =  function (){
         $.ajax({

octoprint_PrintJobHistory/static/js/PrintJobHistory-APIClient.js

@@ -183,12 +183,10 @@ function PrintJobHistoryEditDialog(){
         });
     }
 
-
     this.closeSlicerSettingsDialog = function(){
         self.slicerSettingsDialog.modal('hide');
     }
 
-
     this.isInitialized = function() {
         return self.apiClient != null;
     }
@@ -265,6 +263,11 @@ function PrintJobHistoryEditDialog(){
             calcDuration();
         });
 
+        self.printJobItemForEdit.isRePrintable.subscribe(function(newValue){
+            self.tooltipForSelection(self._buildTooltipForSelection());
+        });
+        // trigger
+        self.printJobItemForEdit.isRePrintable.valueHasMutated();
 
         self.editPrintJobItemDialog.modal({
             //minHeight: function() { return Math.max($.fn.modal.defaults.maxHeight() - 80, 250); }
@@ -353,6 +356,29 @@ function PrintJobHistoryEditDialog(){
         }
     }
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////// SELECT PRINT JOB
+    self.tooltipForSelection = ko.observable("");
+
+    this.selectForPrinting = function(){
+        self.apiClient.callSelectPrintJobForPrinting(self.printJobItemForEdit.databaseId(), function(responseData) {
+            self.editPrintJobItemDialog.modal('hide');
+            self.closeDialogHandler(true);
+        });
+    }
+
+    this._buildTooltipForSelection = function(){
+        var toolTip = "";
+        if (self.printJobItemForEdit != null ){
+            var fullPath = self.printJobItemForEdit.fullFileLocation();
+            if (self.printJobItemForEdit.isRePrintable() == true){
+                toolTip = "Print file: " + fullPath;
+            } else {
+                toolTip = "Selecting not possible! File not found in " + fullPath;
+            }
+        }
+        return toolTip;
+    };
+
     /////////////////////////////////////////////////////////////////////////////////////////////////// DELETE IMAGE
     this.deleteImage  = function(){