From 4a97864e0117d889966991f137bf578203ac1eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:36:00 +0200
Subject: [PATCH] PMGR: Added option to force use of --user flag

---
 src/octoprint/plugins/pluginmanager/__init__.py  |  5 ++++-
 .../pluginmanager/static/js/pluginmanager.js     |  5 ++++-
 .../templates/pluginmanager_settings.jinja2      | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index d724f8e5..125c6be3 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -52,7 +52,8 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		self._repository_cache_path = os.path.join(self.get_plugin_data_folder(), "plugins.json")
 		self._repository_cache_ttl = self._settings.get_int(["repository_ttl"]) * 60
 
-		self._pip_caller = PipCaller(configured=self._settings.get(["pip"]))
+		self._pip_caller = PipCaller(configured=self._settings.get(["pip"]),
+		                             force_user=self._settings.get_boolean(["pip_force_user"]))
 		self._pip_caller.on_log_call = self._log_call
 		self._pip_caller.on_log_stdout = self._log_stdout
 		self._pip_caller.on_log_stderr = self._log_stderr
@@ -84,6 +85,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 			repository_ttl=24*60,
 			pip=None,
 			pip_args=None,
+			pip_force_user=False,
 			dependency_links=False,
 			hidden=[]
 		)
@@ -94,6 +96,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		new_pip = self._settings.get(["pip"])
 
 		self._repository_cache_ttl = self._settings.get_int(["repository_ttl"]) * 60
+		self._pip_caller.force_user = self._settings.get_boolean(["pip_force_user"])
 		if old_pip != new_pip:
 			self._pip_caller.configured = new_pip
 			try:
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 0f61a927..5e3612a6 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -10,6 +10,7 @@ $(function() {
         self.config_repositoryTtl = ko.observable();
         self.config_pipCommand = ko.observable();
         self.config_pipAdditionalArgs = ko.observable();
+        self.config_pipForceUser = ko.observable();
 
         self.configurationDialog = $("#settings_plugin_pluginmanager_configurationdialog");
 
@@ -423,7 +424,8 @@ $(function() {
                         repository: repository,
                         repository_ttl: repositoryTtl,
                         pip: pipCommand,
-                        pip_args: pipArgs
+                        pip_args: pipArgs,
+                        pip_force_user: self.config_pipForceUser()
                     }
                 }
             };
@@ -439,6 +441,7 @@ $(function() {
             self.config_repositoryTtl(self.settingsViewModel.settings.plugins.pluginmanager.repository_ttl());
             self.config_pipCommand(self.settingsViewModel.settings.plugins.pluginmanager.pip());
             self.config_pipAdditionalArgs(self.settingsViewModel.settings.plugins.pluginmanager.pip_args());
+            self.config_pipForceUser(self.settingsViewModel.settings.plugins.pluginmanager.pip_force_user());
         };
 
         self.installed = function(data) {
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index 9c55fac0..b50b4f41 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -217,19 +217,31 @@
     </div>
     <div class="modal-body">
         <form class="form-horizontal">
+            <legend>{{ _('pip configuration') }}</legend>
+
             <div class="control-group" title="{{ _('pip command to use for managing plugins. You might have to configure this if auto detection fails.') }}">
-                <label class="control-label">{{ _('pip command') }}</label>
+                <label class="control-label">{{ _('Command') }}</label>
                 <div class="controls">
                     <input type="text" class="input-block-level" data-bind="value: config_pipCommand" placeholder="{{ _('Autodetect') }}">
                     <span class="help-inline">{{ _('<strong>Only</strong> set this if OctoPrint cannot autodetect the path to <code>pip</code> to use for managing plugins.') }}</span>
                 </div>
             </div>
             <div class="control-group" title="{{ _('Additional arguments for pip command. You should normally not have to change this.') }}">
-                <label class="control-label">{{ _('Additional pip arguments') }}</label>
+                <label class="control-label">{{ _('Additional arguments') }}</label>
                 <div class="controls">
                     <input type="text" class="input-block-level" data-bind="value: config_pipAdditionalArgs">
                 </div>
             </div>
+            <div class="control-group">
+                <div class="controls">
+                    <label class="checkbox">
+                        <input type="checkbox" data-bind="checked: config_pipForceUser"> {{ _('Force the user of the <code>--user</code> flag with <code>pip install</code>') }}
+                    </label>
+                </div>
+            </div>
+
+            <legend>{{ _('Plugin repository configuration') }}</legend>
+
             <div class="control-group" title="{{ _('URL of the Plugin Repository to use. You should normally not have to change this.') }}">
                 <label class="control-label">{{ _('Repository URL') }}</label>
                 <div class="controls">