Commits October 2018

commits@gajim.org

1 participants
107 discussions

[Git][gajim/gajim][master] Allow to load multiple widgets with get_builder()
by Philipp Hörist 12 Oct '18

12 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c43c0f4 by Philipp Hörist at 2018-10-12T22:33:33Z Allow to load multiple widgets with get_builder() - - - - - 2 changed files: - gajim/gtk/util.py - gajim/plugins/helpers.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -12,8 +12,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Tuple from typing import Any +from typing import List +from typing import Tuple + import os import sys @@ -38,7 +40,7 @@ log = logging.getLogger('gajim.gtk.util') class Builder: def __init__(self, filename: str, - widget: str = None, + widgets: List[str] = None, domain: str = None, gettext_: Any = None) -> None: self._builder = Gtk.Builder() @@ -63,16 +65,16 @@ class Builder: encoding='unicode', method='xml') - if widget is not None: - self._builder.add_objects_from_string(xml_text, [widget]) + if widgets is not None: + self._builder.add_objects_from_string(xml_text, widgets) else: # Workaround # https://gitlab.gnome.org/GNOME/pygobject/issues/255 Gtk.Builder.__mro__[1].add_from_string( self._builder, xml_text, len(xml_text.encode("utf-8"))) else: - if widget is not None: - self._builder.add_objects_from_file(file_path, [widget]) + if widgets is not None: + self._builder.add_objects_from_file(file_path, widgets) else: self._builder.add_from_file(file_path) @@ -83,8 +85,8 @@ class Builder: return self._builder.get_object(name) -def get_builder(file_name: str, widget: str = None) -> Builder: - return Builder(file_name, widget) +def get_builder(file_name: str, widgets: List[str] = None) -> Builder: + return Builder(file_name, widgets) def load_icon(icon_name, widget, size=16, pixbuf=False, ===================================== gajim/plugins/helpers.py ===================================== @@ -23,6 +23,8 @@ Helper code related to plug-ins management system. __all__ = ['log', 'log_calls', 'Singleton'] +from typing import List + import logging import functools @@ -135,8 +137,8 @@ class Singleton(type): return cls.instance -def get_builder(file_name: str, widget: str = None) -> Builder: +def get_builder(file_name: str, widgets: List[str] = None) -> Builder: return Builder(file_name, - widget, + widgets, domain=plugins_i18n.DOMAIN, gettext_=plugins_i18n._) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c43c0f40844576859a0018c46ce5e1a43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c43c0f40844576859a0018c46ce5e1a43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add get_builder() for plugins
by Philipp Hörist 12 Oct '18

12 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e5fe30cb by Philipp Hörist at 2018-10-12T21:42:38Z Add get_builder() for plugins - - - - - c43714e4 by Philipp Hörist at 2018-10-12T21:42:38Z Dont monkey patch _() into plugins Plugins can import _() from plugins_i18n - - - - - 3 changed files: - gajim/gtk/util.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Tuple +from typing import Any import os import sys @@ -35,9 +36,19 @@ log = logging.getLogger('gajim.gtk.util') class Builder: - def __init__(self, filename: str, widget: str = None) -> None: + def __init__(self, + filename: str, + widget: str = None, + domain: str = None, + gettext_: Any = None) -> None: self._builder = Gtk.Builder() - self._builder.set_translation_domain(i18n.DOMAIN) + + if domain is None: + domain = i18n.DOMAIN + self._builder.set_translation_domain(domain) + + if gettext_ is None: + gettext_ = _ file_path = os.path.join(configpaths.get('GUI'), filename) @@ -46,7 +57,8 @@ class Builder: tree = ET.parse(file_path) for node in tree.iter(): if 'translatable' in node.attrib and node.text is not None: - node.text = _(node.text) + node.text = gettext_(node.text) + xml_text = ET.tostring(tree.getroot(), encoding='unicode', method='xml') ===================================== gajim/plugins/helpers.py ===================================== @@ -26,6 +26,9 @@ __all__ = ['log', 'log_calls', 'Singleton'] import logging import functools +from gajim.plugins import plugins_i18n +from gajim.gtk.util import Builder + log = logging.getLogger('gajim.plugin_system') ''' Logger for code related to plug-in system. @@ -130,3 +133,10 @@ class Singleton(type): #'classname' : cls.__name__}) return cls.instance + + +def get_builder(file_name: str, widget: str = None) -> Builder: + return Builder(file_name, + widget, + domain=plugins_i18n.DOMAIN, + gettext_=plugins_i18n._) ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -694,11 +694,7 @@ class PluginManager(metaclass=Singleton): plugins_found.append(module_attr) except TypeError: - # set plugin localization - try: - module_attr._ = plugins_i18n._ - except AttributeError: - pass + pass except configparser.NoOptionError: # all fields are required log.debug( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/00c8e5c01dd92f54505fef6e96117e571… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/00c8e5c01dd92f54505fef6e96117e571… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Ability to update plugins on startup from a download folder
by Philipp Hörist 12 Oct '18

12 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 00c8e5c0 by Yann Leboulanger at 2018-10-12T20:17:34Z Ability to update plugins on startup from a download folder - - - - - 2 changed files: - gajim/common/configpaths.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -214,6 +214,7 @@ class ConfigPaths: # Data paths ('LOG_DB', 'logs.db', PathLocation.DATA, PathType.FILE), ('MY_CACERTS', 'cacerts.pem', PathLocation.DATA, PathType.FILE), + ('PLUGINS_DOWNLOAD', 'plugins_download', PathLocation.CACHE, PathType.FOLDER), ('PLUGINS_USER', 'plugins', PathLocation.DATA, PathType.FOLDER), ('MY_EMOTS', 'emoticons', PathLocation.DATA, PathType.FOLDER_OPTIONAL), ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -27,7 +27,7 @@ import os import sys import fnmatch import zipfile -from shutil import rmtree +from shutil import rmtree, move import configparser from pkg_resources import parse_version @@ -109,6 +109,8 @@ class PluginManager(metaclass=Singleton): Registered names with instances of encryption Plugins. ''' + self.update_plugins() + for path in reversed(configpaths.get_plugin_dirs()): pc = self.scan_dir_for_plugins(path) self.add_plugins(pc) @@ -126,6 +128,47 @@ class PluginManager(metaclass=Singleton): def _remove_plugin_entry_in_global_config(self, plugin): app.config.del_per('plugins', plugin.short_name) + @log_calls('PluginManager') + def update_plugins(self, replace=True, activate=False, plugin_name=None): + ''' + Move plugins from the downloaded folder to the user plugin folder + + :param replace: replace plugin files if they already exist. + :type replace: boolean + :param activate: load and activate the plugin + :type activate: boolean + :param plugin_name: if provided, update only this plugin + :type plugin_name: str + :return: list of updated plugins (files have been installed) + :rtype: [] of str + ''' + updated_plugins = [] + user_dir = configpaths.get('PLUGINS_USER') + dl_dir = configpaths.get('PLUGINS_DOWNLOAD') + to_update = [plugin_name] if plugin_name else next(os.walk(dl_dir))[1] + for directory in to_update: + src_dir = os.path.join(dl_dir, directory) + dst_dir = os.path.join(user_dir, directory) + try: + if os.path.exists(dst_dir): + if not replace: + continue + self.delete_plugin_files(dst_dir) + move(src_dir, dst_dir) + except Exception: + log.exception('Upgrade of plugin %s failed. Impossible to move ' + 'files from "%s" to "%s"', directory, src_dir, dst_dir) + continue + updated_plugins.append(directory) + if activate: + pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, + package=True) + self.add_plugin(pc[0]) + plugin = self.plugins[-1] + self.activate_plugin(plugin) + return updated_plugins + + @log_calls('PluginManager') def init_plugins(self): self._activate_all_plugins_from_global_config() @@ -725,10 +768,7 @@ class PluginManager(metaclass=Singleton): plugin = self.plugins[-1] return plugin - def uninstall_plugin(self, plugin): - ''' - Deactivate and remove plugin from `plugins` list - ''' + def delete_plugin_files(self, plugin_path): def on_error(func, path, error): if func == os.path.islink: # if symlink @@ -737,9 +777,15 @@ class PluginManager(metaclass=Singleton): # access is denied or other raise PluginsystemError(error[1][1]) + rmtree(plugin_path, False, on_error) + + def uninstall_plugin(self, plugin): + ''' + Deactivate and remove plugin from `plugins` list + ''' if plugin: self.remove_plugin(plugin) - rmtree(plugin.__path__, False, on_error) + self.delete_plugin_files(plugin.__path__) if self._plugin_has_entry_in_global_config(plugin): self._remove_plugin_entry_in_global_config(plugin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/00c8e5c01dd92f54505fef6e96117e5710… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/00c8e5c01dd92f54505fef6e96117e5710… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Add correct plugin_installer
by Philipp Hörist 12 Oct '18

12 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff0e0268 by Philipp Hörist at 2018-10-12T18:17:10Z Windows: Add correct plugin_installer - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -138,7 +138,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install plugin installer - curl -o "${BUILD_ROOT}"/plugin_installer.zip https://ftp.gajim.org/plugins_1/plugin_installer.zip + curl -o "${BUILD_ROOT}"/plugin_installer.zip https://ftp.gajim.org/plugins_master_zip/plugin_installer.zip mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff0e02685aedfcd66d23b6351ada51d0d6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff0e02685aedfcd66d23b6351ada51d0d6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise Gajim version
by Philipp Hörist 12 Oct '18

12 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 528f7582 by Philipp Hörist at 2018-10-12T15:38:32Z Raise Gajim version - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.99" +__version__ = "1.1.91" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/528f75828798edac7e81ea67e4d16a0c0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/528f75828798edac7e81ea67e4d16a0c0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Fix missing UI translations on flatpak
by Philipp Hörist 11 Oct '18

11 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 90a44f61 by André Apitzsch at 2018-10-11T22:02:37Z Fix missing UI translations on flatpak - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -152,6 +152,8 @@ for dir_ in iter_locale_dirs(): try: _translation = gettext.translation(DOMAIN, dir_) _ = _translation.gettext + if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, dir_) # type: ignore except OSError: continue else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/90a44f61e906f819b4114b2220420c39ce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/90a44f61e906f819b4114b2220420c39ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Add correct plugin_installer
by Philipp Hörist 11 Oct '18

11 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 588e5ede by Philipp Hörist at 2018-10-11T22:01:44Z Windows: Add correct plugin_installer - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -138,7 +138,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install plugin installer - curl -o "${BUILD_ROOT}"/plugin_installer.zip https://ftp.gajim.org/plugins_1/plugin_installer.zip + curl -o "${BUILD_ROOT}"/plugin_installer.zip https://ftp.gajim.org/plugins_1.1_zip/plugin_installer.zip mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/588e5eded749fc884d7e532f18f00e0f3b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/588e5eded749fc884d7e532f18f00e0f3b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing UI translations on flatpak
by Philipp Hörist 11 Oct '18

11 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a0ed4af by André Apitzsch at 2018-10-11T21:21:46Z Fix missing UI translations on flatpak - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -152,6 +152,8 @@ for dir_ in iter_locale_dirs(): try: _translation = gettext.translation(DOMAIN, dir_) _ = _translation.gettext + if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, dir_) # type: ignore except OSError: continue else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a0ed4af5bd4ba98cb468a1db5cdba7b74… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a0ed4af5bd4ba98cb468a1db5cdba7b74… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise nbxmpp version
by Philipp Hörist 11 Oct '18

11 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f5337c68 by Philipp Hörist at 2018-10-11T19:11:06Z Raise nbxmpp version - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -285,7 +285,7 @@ setup( data_files=data_files, install_requires=[ 'keyring', - 'nbxmpp>=0.6.7', + 'nbxmpp>=0.6.8', 'pyOpenSSL>=0.12', 'cssutils>=1.0.2' ] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f5337c6890b119fe03c50881ea889bec57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f5337c6890b119fe03c50881ea889bec57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Raise nbxmpp version
by Philipp Hörist 11 Oct '18

11 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 7d507434 by Philipp Hörist at 2018-10-11T19:10:46Z Raise nbxmpp version - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -285,7 +285,7 @@ setup( data_files=data_files, install_requires=[ 'keyring', - 'nbxmpp>=0.6.7', + 'nbxmpp>=0.6.8', 'pyOpenSSL>=0.12', 'cssutils>=1.0.2' ] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d5074347b15b1f1328b169fb9322e9bf9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d5074347b15b1f1328b169fb9322e9bf9… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2018