Always run the GCodeAnalyser, even if the slicer provided analysis

The analysis from the Slicer or other sources is sent to the GCodeAnalyser, which can use it or ignore it.

This fixes OctoPrint#2445 (comment)
This fixes eyal0/OctoPrint-PrintTimeGenius#13

Author: eyal0

.editorconfig

@@ -11,6 +11,7 @@ trim_trailing_whitespace = true
 
 [**.py]
 indent_style = tab
+indent_size = 4
 
 [src/octoprint/static/js/app/**.js]
 indent_style = space

src/octoprint/filemanager/__init__.py

@@ -256,7 +256,7 @@ def _determine_analysis_backlog(self, storage_type, storage_manager, root=None,
 			file_name = storage_manager.split_path(path)
 
 			# we'll use the default printer profile for the backlog since we don't know better
-			queue_entry = QueueEntry(file_name, entry, file_type, storage_type, path, self._printer_profile_manager.get_default())
+			queue_entry = QueueEntry(file_name, entry, file_type, storage_type, path, self._printer_profile_manager.get_default(), None)
 			if self._analysis_queue.enqueue(queue_entry, high_priority=high_priority):
 				counter += 1
 
@@ -476,12 +476,9 @@ def add_file(self, destination, path, file_object, links=None, allow_overwrite=F
 
 		path_in_storage = self._storage(destination).add_file(path, file_object, links=links, printer_profile=printer_profile, allow_overwrite=allow_overwrite, display=display)
 
-		if analysis is None:
-			queue_entry = self._analysis_queue_entry(destination, path_in_storage, printer_profile=printer_profile)
-			if queue_entry:
-				self._analysis_queue.enqueue(queue_entry, high_priority=True)
-		else:
-			self._add_analysis_result(destination, path, analysis)
+		queue_entry = self._analysis_queue_entry(destination, path_in_storage, printer_profile=printer_profile, analysis=analysis)
+		if queue_entry:
+			self._analysis_queue.enqueue(queue_entry, high_priority=True)
 
 		_, name = self._storage(destination).split_path(path_in_storage)
 		eventManager().fire(Events.FILE_ADDED, dict(storage=destination,
@@ -700,7 +697,7 @@ def _add_analysis_result(self, destination, path, result):
 	def _on_analysis_finished(self, entry, result):
 		self._add_analysis_result(entry.location, entry.path, result)
 
-	def _analysis_queue_entry(self, destination, path, printer_profile=None):
+	def _analysis_queue_entry(self, destination, path, printer_profile=None, analysis=None):
 		if printer_profile is None:
 			printer_profile = self._printer_profile_manager.get_current_or_default()
 
@@ -709,6 +706,6 @@ def _analysis_queue_entry(self, destination, path, printer_profile=None):
 		file_type = get_file_type(absolute_path)
 
 		if file_type:
-			return QueueEntry(file_name, path, file_type[-1], destination, absolute_path, printer_profile)
+			return QueueEntry(file_name, path, file_type[-1], destination, absolute_path, printer_profile, analysis)
 		else:
 			return None

src/octoprint/filemanager/analysis.py

@@ -20,7 +20,7 @@
 from octoprint.settings import settings
 
 
-class QueueEntry(collections.namedtuple("QueueEntry", "name, path, type, location, absolute_path, printer_profile")):
+class QueueEntry(collections.namedtuple("QueueEntry", "name, path, type, location, absolute_path, printer_profile, analysis")):
 	"""
 	A :class:`QueueEntry` for processing through the :class:`AnalysisQueue`. Wraps the entry's properties necessary
 	for processing.
@@ -33,6 +33,7 @@ class QueueEntry(collections.namedtuple("QueueEntry", "name, path, type, locatio
 	    location (str): Location the file is located on.
 	    absolute_path (str): Absolute path on disk through which to access the file.
 	    printer_profile (PrinterProfile): :class:`PrinterProfile` which to use for analysis.
+	    analysis (dict): :class:`GcodeAnalysisQueue` results from prior analysis, or ``None`` if there is none.
 	"""
 
 	def __str__(self):
@@ -341,6 +342,8 @@ def _do_analysis(self, high_priority=False):
 		import sys
 		import yaml
 
+		if self._current.analysis:
+			return self._current.analysis
 		try:
 			throttle = settings().getFloat(["gcodeAnalysis", "throttle_highprio"]) if high_priority \
 				else settings().getFloat(["gcodeAnalysis", "throttle_normalprio"])