From e64975c85c2d0d367c1b47e54ac8b4dd86320247 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:45 +0200
Subject: [PATCH] PMGR: Debug output in frontend to indicate venv

---
 src/octoprint/plugins/pluginmanager/__init__.py           | 1 +
 .../plugins/pluginmanager/static/js/pluginmanager.js      | 8 +++++++-
 .../pluginmanager/templates/pluginmanager_settings.jinja2 | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index 125c6be3..091f4a97 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -203,6 +203,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		                   install_dir=self._pip_caller.install_dir,
 		                   use_sudo=self._pip_caller.use_sudo,
 		                   use_user=self._pip_caller.use_user,
+		                   virtual_env=self._pip_caller.virtual_env,
 		                   additional_args=self._settings.get(["pip_args"])
 		               ))
 
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 5e3612a6..3ab09119 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -86,6 +86,7 @@ $(function() {
         self.pipInstallDir = ko.observable();
         self.pipUseUser = ko.observable();
         self.pipUseSudo = ko.observable();
+        self.pipVirtualEnv = ko.observable();
         self.pipAdditionalArgs = ko.observable();
 
         self.pipUseSudoString = ko.computed(function() {
@@ -94,6 +95,9 @@ $(function() {
         self.pipUseUserString = ko.computed(function() {
             return self.pipUseUser() ? "yes" : "no";
         });
+        self.pipVirtualEnvString = ko.computed(function() {
+            return self.pipVirtualEnv() ? "yes" : "no";
+        });
 
         self.working = ko.observable(false);
         self.workingTitle = ko.observable();
@@ -224,13 +228,15 @@ $(function() {
                 self.pipInstallDir(data.install_dir);
                 self.pipUseUser(data.use_user);
                 self.pipUseSudo(data.use_sudo);
+                self.pipVirtualEnv(data.virtual_env);
                 self.pipAdditionalArgs(data.additional_args);
             } else {
                 self.pipCommand(undefined);
                 self.pipVersion(undefined);
                 self.pipInstallDir(undefined);
-                self.pipUseUser(data.use_user);
+                self.pipUseUser(undefined);
                 self.pipUseSudo(undefined);
+                self.pipVirtualEnv(undefined);
                 self.pipAdditionalArgs(undefined);
             }
         };
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index b50b4f41..014d75a4 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -82,6 +82,7 @@
     <div class="hide">
         <small>
             Installation directory: <span data-bind="text: pipInstallDir"></span> ("--user" flag: <span data-bind="text: pipUseUserString"></span>, sudo: <span data-bind="text: pipUseSudoString"></span>)<br />
+            Virtual environment: <span data-bind="text: pipVirtualEnvString"></span><br />
             <span data-bind="visible: pipAdditionalArgs">Additional Arguments: <span data-bind="text: pipAdditionalArgs"></span></span>
         </small>
     </div>