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

PluginInstaller. fix install(update)

Browse Source
This commit is contained in:
Denis Fomin
2013-02-05 23:50:02 +04:00
parent 1995f71fb0
commit fc796b9759
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugin_installer/plugin_installer.py
View File

@@ -424,7 +424,8 @@ class PluginInstaller(GajimPlugin):
file_path)) file_path))
# read metadata from manifest.ini # read metadata from manifest.ini
conf.readfp(open(manifest_path, 'r')) with open(manifest_path) as _file:
conf.read_file(_file)
for option in fields: for option in fields:
if conf.get('info', option) is '': if conf.get('info', option) is '':
raise configparser.NoOptionError('field empty') raise configparser.NoOptionError('field empty')
@@ -582,7 +583,7 @@ class Ftp(threading.Thread):
else: else:
files.append(i[1:]) files.append(i[1:])
dirs, files = [], [] dirs, files = [], []
nlstr('/plugins/' + remote_dir) nlstr('/plugins_gtk3/' + remote_dir)
base_dir, user_dir = gajim.PLUGINS_DIRS base_dir, user_dir = gajim.PLUGINS_DIRS
if not os.path.isdir(user_dir): if not os.path.isdir(user_dir):
@@ -605,14 +606,16 @@ class Ftp(threading.Thread):
for filename in files: for filename in files:
GObject.idle_add(self.progressbar.set_text, GObject.idle_add(self.progressbar.set_text,
_('Downloading "%s"') % filename) _('Downloading "%s"') % filename)
full_filename = os.path.join(local_dir, filename) full_filename = os.path.join(local_dir, filename.replace(
'plugins_gtk3', 'plugins'))
try: try:
file_ = open(full_filename, 'wb') file_ = open(full_filename, 'wb')
self.ftp.retrbinary('RETR /%s' % filename, self.ftp.retrbinary('RETR /%s' % filename,
file_.write) file_.write)
file_.close() file_.close()
except ftplib.error_perm: except ftplib.all_errors as e:
print('ERROR: cannot read file "%s"' % filename) print (str(e))
os.unlink(filename) os.unlink(filename)
self.ftp.quit() self.ftp.quit()
GObject.idle_add(self.window.emit, 'plugin_downloaded', GObject.idle_add(self.window.emit, 'plugin_downloaded',