From 5364afc3df80bb42c870299cb162178d5d72c45e Mon Sep 17 00:00:00 2001
From: tmolitor <thilo@eightysoft.de>
Date: Sun, 4 Sep 2016 23:56:22 +0200
Subject: [PATCH] Make plugin_installer more robust to filepath layout changes
---
plugin_installer/manifest.ini | 2 +-
plugin_installer/plugin_installer.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugin_installer/manifest.ini b/plugin_installer/manifest.ini
index 6056cc09..4dbd1152 100644
--- a/plugin_installer/manifest.ini
+++ b/plugin_installer/manifest.ini
@@ -1,7 +1,7 @@
[info]
name: Plugin Installer
short_name: plugin_installer
-version: 0.13.1
+version: 0.14
description: Install and upgrade plugins from ftp
authors: Denis Fomin <fominde@gmail.com>
Yann Leboulanger <asterix@lagaule.org>
diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py
index ee63627a..96d187dc 100644
--- a/plugin_installer/plugin_installer.py
+++ b/plugin_installer/plugin_installer.py
@@ -602,7 +602,7 @@ class Ftp(threading.Thread):
# downloading zip file
GLib.idle_add(self.progressbar.set_text,
_('Downloading "%s"') % filename)
- full_filename = os.path.join(local_dir, 'plugins', filename)
+ full_filename = os.path.join(user_dir, filename)
self.buffer_ = io.BytesIO()
try:
self.ftp.retrbinary('RETR %s' % filename, self.handleDownload)
@@ -610,7 +610,7 @@ class Ftp(threading.Thread):
print (str(e))
with zipfile.ZipFile(self.buffer_) as zip_file:
- zip_file.extractall(os.path.join(local_dir, 'plugins'))
+ zip_file.extractall(os.path.join(user_dir))
self.ftp.quit()
GLib.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs)
--
GitLab