From b78bb9e970c8b4fbfb874856123c4885bb4a329e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 19 Aug 2014 15:55:52 +0200
Subject: [PATCH] Make watched folder configurable via UI

---
 src/octoprint/server/api/settings.py               | 4 +++-
 src/octoprint/static/js/app/viewmodels/settings.js | 4 +++-
 src/octoprint/templates/settings.jinja2            | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
index 94aa489f..2b53f2f0 100644
--- a/src/octoprint/server/api/settings.py
+++ b/src/octoprint/server/api/settings.py
@@ -86,7 +86,8 @@ def getSettings():
 			"uploads": s.getBaseFolder("uploads"),
 			"timelapse": s.getBaseFolder("timelapse"),
 			"timelapseTmp": s.getBaseFolder("timelapse_tmp"),
-			"logs": s.getBaseFolder("logs")
+			"logs": s.getBaseFolder("logs"),
+			"watched": s.getBaseFolder("watched")
 		},
 		"temperature": {
 			"profiles": s.get(["temperature", "profiles"])
@@ -177,6 +178,7 @@ def setSettings():
 			if "timelapse" in data["folder"].keys(): s.setBaseFolder("timelapse", data["folder"]["timelapse"])
 			if "timelapseTmp" in data["folder"].keys(): s.setBaseFolder("timelapse_tmp", data["folder"]["timelapseTmp"])
 			if "logs" in data["folder"].keys(): s.setBaseFolder("logs", data["folder"]["logs"])
+			if "watched" in data["folder"].keys(): s.setBaseFolder("watched", data["folder"]["watched"])
 
 		if "temperature" in data.keys():
 			if "profiles" in data["temperature"].keys(): s.set(["temperature", "profiles"], data["temperature"]["profiles"])
diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
index f6bb0088..4fe986f1 100644
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -239,6 +239,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
         self.folder_timelapse(response.folder.timelapse);
         self.folder_timelapseTmp(response.folder.timelapseTmp);
         self.folder_logs(response.folder.logs);
+        self.folder_watched(response.folder.watched);
 
         self.cura_enabled(response.cura.enabled);
         self.cura_path(response.cura.path);
@@ -307,7 +308,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
                 "uploads": self.folder_uploads(),
                 "timelapse": self.folder_timelapse(),
                 "timelapseTmp": self.folder_timelapseTmp(),
-                "logs": self.folder_logs()
+                "logs": self.folder_logs(),
+                "watched": self.folder_watched()
             },
             "temperature": {
                 "profiles": self.temperature_profiles()
diff --git a/src/octoprint/templates/settings.jinja2 b/src/octoprint/templates/settings.jinja2
index d21038f2..97573b7c 100644
--- a/src/octoprint/templates/settings.jinja2
+++ b/src/octoprint/templates/settings.jinja2
@@ -332,6 +332,12 @@
                                 <input type="text" class="input-block-level" data-bind="value: folder_logs" id="settings-folderLogs">
                             </div>
                         </div>
+                        <div class="control-group">
+                            <label class="control-label" for="settings-watchedLogs">Watched Folder</label>
+                            <div class="controls">
+                                <input type="text" class="input-block-level" data-bind="value: folder_watched" id="settings-folderWatched">
+                            </div>
+                        </div>
                     </form>
                 </div>
                 <div class="tab-pane" id="settings_temperature">