hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make plugin_installer more robust to filepath layout changes

Browse Source
This commit is contained in:
tmolitor
2016-09-04 23:56:22 +02:00
parent 92a05deb37
commit 5364afc3df
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin_installer/manifest.ini
View File

@@ -1,7 +1,7 @@
[info] [info]
name: Plugin Installer name: Plugin Installer
short_name: plugin_installer short_name: plugin_installer
version: 0.13.1 version: 0.14
description: Install and upgrade plugins from ftp description: Install and upgrade plugins from ftp
authors: Denis Fomin <fominde@gmail.com> authors: Denis Fomin <fominde@gmail.com>
Yann Leboulanger <asterix@lagaule.org> Yann Leboulanger <asterix@lagaule.org>

4
plugin_installer/plugin_installer.py
View File

@@ -602,7 +602,7 @@ class Ftp(threading.Thread):
# downloading zip file # downloading zip file
GLib.idle_add(self.progressbar.set_text, GLib.idle_add(self.progressbar.set_text,
_('Downloading "%s"') % filename) _('Downloading "%s"') % filename)
full_filename = os.path.join(local_dir, 'plugins', filename) full_filename = os.path.join(user_dir, filename)
self.buffer_ = io.BytesIO() self.buffer_ = io.BytesIO()
try: try:
self.ftp.retrbinary('RETR %s' % filename, self.handleDownload) self.ftp.retrbinary('RETR %s' % filename, self.handleDownload)
@@ -610,7 +610,7 @@ class Ftp(threading.Thread):
print (str(e)) print (str(e))
with zipfile.ZipFile(self.buffer_) as zip_file: 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() self.ftp.quit()
GLib.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs) GLib.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs)