pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pip result parsing version numbers and extra lines

Browse source 
Some pip invocations return extra info after the Successfully installed
(like "Cleaning up...").  Also, not all packages include a version
number in their package names.
This commit is contained in:
Mark Walker 2015-06-02 23:31:03 -07:00
parent b04be6d194
commit 35f2c6d788
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/octoprint/plugins/pluginmanager/__init__.py
View file

@ -174,6 +174,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
all_plugins_before = self._plugin_manager.find_plugins()
success_string = "Successfully installed "
try:
returncode, stdout, stderr = self._call_pip(pip_args)
except:
@ -189,13 +190,13 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
return make_response("Could not install plugin from url, see the log for more details", 500)
try:
last_line = filter(lambda x: x.strip() != "", stdout)[-1]
last_line = filter(lambda x: x.startswith(success_string) or x.startswith("Could not install"), stdout)[-1]
except IndexError:
result = dict(result=False, reason="Could not parse output from pip")
self._send_result_notification("install", result)
return jsonify(result)
# The last line of a pip install command looks something like this:
# The success line of a pip install command looks something like this:
#
# Successfully installed OctoPrint-Plugin-1.0 Dependency-One-0.1 Dependency-Two-9.3
#
@ -204,12 +205,18 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
# the list of installed packages from our pip install run, we'll find the plugin that was installed.
last_line = last_line.strip()
if not last_line.startswith("Successfully installed "):
if not last_line.startswith(success_string):
result = dict(result=False, reason="Pip did not report successful installation")
self._send_result_notification("install", result)
return jsonify(result)
installed = map(lambda x: x.strip().rsplit("-", 1)[0], last_line[len("Successfully installed "):].split(" "))
def strip_version(s):
l = s.strip().split("-")
if len(l) > 0 and s[-1][:1].isdigit():
del l[-1]
return "-".join(l)
installed = map(strip_version, last_line[len(success_string):].split(" "))
all_plugins_after = self._plugin_manager.find_plugins(existing=dict(), ignore_uninstalled=False)
for key, plugin in all_plugins_after.items():
if plugin.origin is None or plugin.origin[0] != "entry_point":