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

improve speed of plugin_installer plugin

Browse Source
This commit is contained in:
Yann Leboulanger
2012-08-16 14:08:59 +02:00
parent 5608d5d975
commit 17bae26657
2 changed files with 15 additions and 21 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.9.2 version: 0.9.3
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>

34
plugin_installer/plugin_installer.py
View File

@@ -29,6 +29,7 @@ import ConfigParser
import os import os
import fnmatch import fnmatch
import sys import sys
import zipfile
from common import gajim from common import gajim
from plugins import GajimPlugin from plugins import GajimPlugin
@@ -96,15 +97,11 @@ class PluginInstaller(GajimPlugin):
to_update = [] to_update = []
con = self.ftp_connect() con = self.ftp_connect()
con.cwd('plugins') con.cwd('plugins')
plugins_dirs = con.nlst() self.ftp.retrbinary('RETR manifests.zip', ftp.handleDownload)
for dir_ in plugins_dirs: zip_file = zipfile.ZipFile(ftp.buffer_)
try: manifest_list = zip_file.namelist()
con.retrbinary('RETR %s/manifest.ini' % dir_, for filename in manifest_list:
ftp.handleDownload) ftp.config.readfp(zip_file.open(filename))
except Exception, error:
if str(error).startswith('550'):
continue
ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue()))
local_version = ftp.get_plugin_version(ftp.config.get( local_version = ftp.get_plugin_version(ftp.config.get(
'info', 'name')) 'info', 'name'))
if local_version: if local_version:
@@ -427,22 +424,20 @@ class Ftp(threading.Thread):
self.ftp = self.plugin.ftp_connect() self.ftp = self.plugin.ftp_connect()
self.ftp.cwd('plugins') self.ftp.cwd('plugins')
if not self.remote_dirs: if not self.remote_dirs:
self.plugins_dirs = self.ftp.nlst()
progress_step = 1.0 / len(self.plugins_dirs)
gobject.idle_add(self.progressbar.set_text, gobject.idle_add(self.progressbar.set_text,
_('Scan files on the server')) _('Scan files on the server'))
for dir_ in self.plugins_dirs: self.ftp.retrbinary('RETR manifests.zip', self.handleDownload)
zip_file = zipfile.ZipFile(self.buffer_)
manifest_list = zip_file.namelist()
progress_step = 1.0 / len(manifest_list)
for filename in manifest_list:
dir_ = filename.split('/')[0]
fract = self.progressbar.get_fraction() + progress_step fract = self.progressbar.get_fraction() + progress_step
gobject.idle_add(self.progressbar.set_fraction, fract) gobject.idle_add(self.progressbar.set_fraction, fract)
gobject.idle_add(self.progressbar.set_text, gobject.idle_add(self.progressbar.set_text,
_('Reading "%s"') % dir_) _('Reading "%s"') % dir_)
try:
self.ftp.retrbinary('RETR %s/manifest.ini' % dir_, self.config.readfp(zip_file.open(filename))
self.handleDownload)
except Exception, error:
if str(error).startswith('550'):
continue
self.config.readfp(io.BytesIO(self.buffer_.getvalue()))
local_version = self.get_plugin_version( local_version = self.get_plugin_version(
self.config.get('info', 'name')) self.config.get('info', 'name'))
upgrade = False upgrade = False
@@ -461,7 +456,6 @@ class Ftp(threading.Thread):
self.config.get('info', 'description'), self.config.get('info', 'description'),
self.config.get('info', 'authors'), self.config.get('info', 'authors'),
self.config.get('info', 'homepage'), ]) self.config.get('info', 'homepage'), ])
self.plugins_dirs = None
self.ftp.quit() self.ftp.quit()
gobject.idle_add(self.progressbar.set_fraction, 0) gobject.idle_add(self.progressbar.set_fraction, 0)
if self.remote_dirs: if self.remote_dirs: