Merge remote-tracking branch 'upstream/master'

Booli · Sep 23, 2014 · bf28b8d · bf28b8d
2 parents fe7056e + ce9c9be
commit bf28b8d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # OctoPrint Changelog
 
-## 1.1.0
+## 1.1.1 (Unreleased)
+
+### Bug Fixes
+
+* [#580](https://github.com/foosel/OctoPrint/issues/580) - Properly unset job data when instructed so by callers
+
+## 1.1.0 (2014-09-03)
 
 ### New Features
 
@@ -70,6 +76,6 @@
 
 ([Commits](https://github.com/foosel/OctoPrint/compare/1.0.0...1.1.0))
 
-## 1.0.0
+## 1.0.0 (2014-06-22)
 
 First release with new versioning scheme.
diff --git a/src/octoprint/printer.py b/src/octoprint/printer.py
@@ -388,6 +388,17 @@ def _setJobData(self, filename, filesize, sd):
 			}
 		else:
 			self._selectedFile = None
+			self._stateMonitor.setJobData({
+				"file": {
+					"name": None,
+					"origin": None,
+					"size": None,
+					"date": None
+				},
+				"estimatedPrintTime": None,
+				"filament": None,
+			})
+			return
 
 		estimatedPrintTime = None
 		date = None

diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
@@ -193,7 +193,7 @@ def admin_access_validation(request):
 
 		self._tornado_app = Application(self._router.urls + [
 			(r"/downloads/timelapse/([^/]*\.mpg)", LargeResponseHandler, {"path": settings().getBaseFolder("timelapse"), "as_attachment": True}),
-			(r"/downloads/files/local/([^/]*\.(gco|gcode))", LargeResponseHandler, {"path": settings().getBaseFolder("uploads"), "as_attachment": True}),
+			(r"/downloads/files/local/([^/]*\.(gco|gcode|g))", LargeResponseHandler, {"path": settings().getBaseFolder("uploads"), "as_attachment": True}),
 			(r"/downloads/logs/([^/]*)", LargeResponseHandler, {"path": settings().getBaseFolder("logs"), "as_attachment": True, "access_validation": admin_access_validation}),
 			(r".*", FallbackHandler, {"fallback": WSGIContainer(app.wsgi_app)})
 		])