Merge remote-tracking branch 'upstream/master'

CHANGELOG.md

@@ -2,9 +2,17 @@
 
 ## 1.1.1 (Unreleased)
 
+### Improvements
+
+* The API is now enabled by default and the API key -- if not yet set -- will be automatically generated on first
+  server start and written back into ``config.yaml``
+* Event subscriptions are now enabled by default (it was an accident that they weren't)
+
 ### Bug Fixes
 
 * [#580](https://github.com/foosel/OctoPrint/issues/580) - Properly unset job data when instructed so by callers
+* [#604](https://github.com/foosel/OctoPrint/issues/604) - Properly initialize settings basedir on server startup
+* [IRC] Also allow downloading .g files via Tornado
 
 ## 1.1.0 (2014-09-03)
 
@@ -78,4 +86,4 @@
 
 ## 1.0.0 (2014-06-22)
 
-First release with new versioning scheme.
+First release with new versioning scheme.

CONTRIBUTING.md

@@ -1,11 +1,16 @@
 Issues, Tickets, however you may call them
 ------------------------------------------
 
-- If you want to report a bug, **READ [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!** Tickets will be automatically checked if they comply with the requirements outlined in that wiki node! Other then what's written in there you don't have to do anything special with your ticket.
+Read the following short instructions **fully** and **follow them** if you want your ticket to be taken care of and not closed again directly!
+
+- Always create **one ticket for one purpose**. So don't mix two or more feature requests, support requests, bugs etc into one ticket. If you do, your ticket will be treated as if only describing the first purpose, the others will be ignored!
+- If you want to report a bug, **READ AND FOLLOW [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!** Tickets will be automatically checked if they comply with the requirements outlined in that wiki node! Other then what's written in there (**and really EVERYTHING that is written in there!**) you don't have to do anything special with your ticket.
 - If you want to post a **request** of any kind (feature request, documentation request, ...), **add [Request] to your issue's title!**
-- If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work), **add [Support] to your issue's title!**
-- If you have a general **question**, **add [Question] to your issue's title!**
-- If you have another reason for creating a ticket that doesn't fit any of the above categories, **add [Misc] to your issue's title!**
+- If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work), **add [Support] to your issue's title!**. Note that for problems like these, the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) will probably get you help faster!
+- If you have a general **question**, **add [Question] to your issue's title!**. Note that for problems like these, the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) will probably get you help faster!
+- If you have another reason for creating a ticket that doesn't fit any of the above categories, think hard if it might not be something better suited for the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741). If you are sure it needs to be reported here, **add [Misc] to your issue's title!**
+
+Following these guidelines (**especially EVERYTHING mentioned in ["How to file a bug report"](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)**) is necessary so the tickets stay manageable - you are not the only one with an open issue, so please respect that you have to **play by the rules** so that your problem can be taken care of. Tickets not playing by the rules **will be closed without further investigation!**.
 
 Pull Requests
 -------------

src/octoprint/settings.py

@@ -125,12 +125,12 @@ def settings(init=False, configfile=None, basedir=None):
 		"config": "/default/path/to/your/cura/config.ini"
 	},
 	"events": {
-		"enabled": False,
+		"enabled": True,
 		"subscriptions": []
 	},
 	"api": {
-		"enabled": False,
-		"key": ''.join('%02X' % ord(z) for z in uuid.uuid4().bytes)
+		"enabled": True,
+		"key": None
 	},
 	"terminalFilters": [
 		{ "name": "Suppress M105 requests/responses", "regex": "(Send: M105)|(Recv: ok T\d*:)" },
@@ -171,12 +171,19 @@ def __init__(self, configfile=None, basedir=None):
 			self._configfile = os.path.join(self.settings_dir, "config.yaml")
 		self.load(migrate=True)
 
+		if self.get(["api", "key"]) is None:
+			self.set(["api", "key"], ''.join('%02X' % ord(z) for z in uuid.uuid4().bytes))
+			self.save(force=True)
+
 	def _init_settings_dir(self, basedir):
 		if basedir is not None:
 			self.settings_dir = basedir
 		else:
 			self.settings_dir = _resolveSettingsDir(APPNAME)
 
+		if not os.path.isdir(self.settings_dir):
+			os.makedirs(self.settings_dir)
+
 	def _getDefaultFolder(self, type):
 		folder = default_settings["folder"][type]
 		if folder is None: