0.1.0 (#33)

* fixed scanning recursion

Author: jneilliii

octoprint_prusaslicerthumbnails/__init__.py

@@ -101,8 +101,6 @@ def _process_gcode(self, gcode_file, results=[]):
 			children = gcode_file["children"]
 			for key, file in children.items():
 				self._process_gcode(children[key], results)
-		elif gcode_file.get("type") == "folder" and gcode_file.get("children") == None:
-			results["warning"] = True
 		return results
 
 	def get_api_commands(self):
@@ -117,21 +115,12 @@ def on_api_command(self, command, data):
 
 		if command == "crawl_files":
 			self._logger.debug("Crawling Files")
-			FileList = self._file_manager.list_files()
+			FileList = self._file_manager.list_files(recursive=True)
+			self._logger.info(FileList)
 			LocalFiles = FileList["local"]
 			results = dict(no_thumbnail=[],no_thumbnail_src=[])
 			for key, file in LocalFiles.items():
 				results = self._process_gcode(LocalFiles[key], results)
-				# if LocalFiles[key].get("children") == None:
-					# # self._logger.debug(LocalFiles[key].get("thumbnail"))
-					# if LocalFiles[key].get("thumbnail") == None:
-						# # self._logger.debug("No Thumbnail for %s, attempting extraction" % file["path"])
-						# results["no_thumbnail"].append(file["path"])
-						# self.on_event("FileAdded", dict(path=file["path"],storage="local",type=["gcode"]))
-					# elif "prusaslicerthumbnails" in LocalFiles[key].get("thumbnail") and not LocalFiles[key].get("thumbnail_src"):
-						# # self._logger.debug("No Thumbnail source for %s, adding" % file["path"])
-						# results["no_thumbnail_src"].append(file["path"])
-						# self._file_manager.set_additional_metadata("local", file["path"], "thumbnail_src", self._identifier, overwrite=True)
 			return flask.jsonify(results)
 
 	##~~ Routes hook

octoprint_prusaslicerthumbnails/static/js/prusaslicerthumbnails.js

@@ -17,7 +17,6 @@ $(function() {
 		self.inline_thumbnail = ko.observable();
 		self.crawling_files = ko.observable(false);
 		self.crawl_results = ko.observableArray([]);
-		self.show_crawl_warning = ko.observable(false);
 
 		self.filesViewModel.prusaslicerthumbnails_open_thumbnail = function(data) {
 			if(data.name.indexOf('.gcode') > 0){
@@ -46,15 +45,11 @@ $(function() {
 				}),
 				contentType: "application/json; charset=UTF-8"
 			}).done(function(data){
-				self.show_crawl_warning(false);
 				for (key in data) {
-					if(data[key].length && data[key] !== 'warning'){
+					if(data[key].length){
 						self.crawl_results.push({name: ko.observable(key), files: ko.observableArray(data[key])});
-					} else if(key == 'warning'){
-						self.show_crawl_warning(true);
 					}
 				}
-				console.log(data);
 				if(self.crawl_results().length == 0){
 					self.crawl_results.push({name: ko.observable('No convertible files found'), files: ko.observableArray([])});
 				}

octoprint_prusaslicerthumbnails/templates/prusaslicerthumbnails_settings.jinja2

@@ -44,7 +44,6 @@
 		<div id="crawl_files_results" class="row-fluid" data-bind="if: crawl_results().length > 0">
 			<div class="alert alert-block">
 				<h4>Scan Results</h4>
-				<div class="muted" data-bind="if: show_crawl_warning()"><small><span class="label label-important">Warning: </span> Currently the scan is only able to process the root folder and first level of sub-folders.</small></div>
 				<ul class="unstyled" data-bind="foreach: { data: crawl_results, as: 'category', noChildContext: true }">
 					<!-- ko if:category.files().length == 0 -->
 					<li><span data-bind="text: category.name" class="label label-success"></span></li>

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "PrusaSlicer Thumbnails"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.0.9"
+plugin_version = "0.1.0"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module