Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Create some folders only on demand
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 220bf358 by Philipp Hörist at 2018-04-22T00:55:48+02:00 Create some folders only on demand - - - - - 2 changed files: - gajim/common/configpaths.py - gajim/common/const.py Changes: ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -130,7 +130,8 @@ class ConfigPaths: def init(self): if self.custom_config_root: - self.cache_root = self.data_root = self.config_root = self.custom_config_root + self.config_root = self.custom_config_root + self.cache_root = self.data_root = self.custom_config_root user_dir_paths = [ ('TMP', tempfile.gettempdir()), @@ -150,7 +151,8 @@ class ConfigPaths: # Config paths ('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE), - ('PLUGINS_CONFIG_DIR', 'pluginsconfig', PathLocation.CONFIG, PathType.FOLDER), + ('PLUGINS_CONFIG_DIR', + 'pluginsconfig', PathLocation.CONFIG, PathType.FOLDER), ('MY_CERT', 'localcerts', PathLocation.CONFIG, PathType.FOLDER), ] @@ -163,11 +165,15 @@ class ConfigPaths: # Data paths ('LOG_DB', 'logs.db', PathLocation.DATA, PathType.FILE), ('MY_CACERTS', 'cacerts.pem', PathLocation.DATA, PathType.FILE), - ('MY_EMOTS', 'emoticons', PathLocation.DATA, PathType.FOLDER), - ('MY_ICONSETS', 'iconsets', PathLocation.DATA, PathType.FOLDER), - ('MY_MOOD_ICONSETS', 'moods', PathLocation.DATA, PathType.FOLDER), - ('MY_ACTIVITY_ICONSETS', 'activities', PathLocation.DATA, PathType.FOLDER), ('PLUGINS_USER', 'plugins', PathLocation.DATA, PathType.FOLDER), + ('MY_EMOTS', + 'emoticons', PathLocation.DATA, PathType.FOLDER_OPTIONAL), + ('MY_ICONSETS', + 'iconsets', PathLocation.DATA, PathType.FOLDER_OPTIONAL), + ('MY_MOOD_ICONSETS', + 'moods', PathLocation.DATA, PathType.FOLDER_OPTIONAL), + ('MY_ACTIVITY_ICONSETS', + 'activities', PathLocation.DATA, PathType.FOLDER_OPTIONAL), # Cache paths ('CACHE_DB', 'cache.db', PathLocation.CACHE, PathType.FILE), ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -51,6 +51,7 @@ class PathLocation(IntEnum): class PathType(IntEnum): FILE = 0 FOLDER = 1 + FOLDER_OPTIONAL = 2 THANKS = u"""\ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/220bf35827942173eb7f4c36850760f190… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/220bf35827942173eb7f4c36850760f190… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont change path names because plugins use them
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0c16dbf by Philipp Hörist at 2018-04-21T21:28:19+02:00 Dont change path names because plugins use them - - - - - 2 changed files: - gajim/common/configpaths.py - gajim/common/helpers.py Changes: ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -134,9 +134,9 @@ class ConfigPaths: user_dir_paths = [ ('TMP', tempfile.gettempdir()), - ('CONFIG_ROOT', self.config_root), - ('CACHE_ROOT', self.cache_root), - ('DATA_ROOT', self.data_root), + ('MY_CONFIG', self.config_root), + ('MY_CACHE', self.cache_root), + ('MY_DATA', self.data_root), ] for path in user_dir_paths: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -863,7 +863,7 @@ def check_soundfile_path(file_, dirs=None): :return the path to file or None if it doesn't exists. """ if dirs is None: - dirs = [app.configpaths.get('DATA_ROOT'), + dirs = [app.configpaths.get('MY_DATA'), app.DATA_DIR] if not file_: @@ -891,7 +891,7 @@ def strip_soundfile_path(file_, dirs=None, abs=True): return None if dirs is None: - dirs = [app.configpaths.get('DATA_ROOT'), + dirs = [app.configpaths.get('MY_DATA'), app.DATA_DIR] name = os.path.basename(file_) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0c16dbf94ee30d76cf076c2f9c26f34eb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0c16dbf94ee30d76cf076c2f9c26f34eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] More refactoring around paths
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 848c5cbd by Philipp Hörist at 2018-04-21T21:19:32+02:00 More refactoring around paths - Remove old config dir migration - Remove some unused config paths - Rewrite configpaths.init() - Simplify creating paths in check_paths - - - - - 4 changed files: - gajim/common/app.py - gajim/common/check_paths.py - gajim/common/configpaths.py - gajim/common/const.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -66,7 +66,6 @@ logger = None # some plugins use that gajimpaths = configpaths.gajimpaths -VCARD_PATH = configpaths.get('VCARD') AVATAR_PATH = configpaths.get('AVATAR') MY_EMOTS_PATH = configpaths.get('MY_EMOTS') MY_ICONSETS_PATH = configpaths.get('MY_ICONSETS') @@ -74,7 +73,6 @@ MY_MOOD_ICONSETS_PATH = configpaths.get('MY_MOOD_ICONSETS') MY_ACTIVITY_ICONSETS_PATH = configpaths.get('MY_ACTIVITY_ICONSETS') MY_CACERTS = configpaths.get('MY_CACERTS') MY_PEER_CERTS_PATH = configpaths.get('MY_PEER_CERTS') -TMP = configpaths.get('TMP') DATA_DIR = configpaths.get('DATA') ICONS_DIR = configpaths.get('ICONS') HOME_DIR = configpaths.get('HOME') ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -24,18 +24,18 @@ ## import os -import shutil import sys +import sqlite3 from gajim.common import app from gajim.common import logger +from gajim.common import configpaths +from gajim.common.const import PathType -# DO NOT MOVE ABOVE OF import gajim -import sqlite3 as sqlite def create_log_db(): print(_('creating logs database')) - con = sqlite.connect(logger.LOG_DB_PATH) + con = sqlite3.connect(logger.LOG_DB_PATH) os.chmod(logger.LOG_DB_PATH, 0o600) # rw only for us cur = con.cursor() # create the tables @@ -96,7 +96,7 @@ def create_log_db(): def create_cache_db(): print(_('creating cache database')) - con = sqlite.connect(logger.CACHE_DB_PATH) + con = sqlite3.connect(logger.CACHE_DB_PATH) os.chmod(logger.CACHE_DB_PATH, 0o600) # rw only for us cur = con.cursor() cur.executescript( @@ -154,7 +154,7 @@ def split_db(): create_cache_db() back = os.getcwd() os.chdir(OLD_LOG_DB_FOLDER) - con = sqlite.connect('logs.db') + con = sqlite3.connect('logs.db') os.chdir(back) cur = con.cursor() cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''') @@ -171,97 +171,12 @@ def split_db(): con.commit() cur.executescript('DROP TABLE %s;' % table) con.commit() - except sqlite.OperationalError as e: + except sqlite3.OperationalError as e: print('error moving table %s to cache.db: %s' % (table, str(e)), file=sys.stderr) con.close() logger.CACHE_DB_PATH = tmp -def check_and_possibly_move_config(): - LOG_DB_PATH = logger.LOG_DB_PATH - CACHE_DB_PATH = logger.CACHE_DB_PATH - vars = {} - vars['VCARD_PATH'] = app.VCARD_PATH - vars['AVATAR_PATH'] = app.AVATAR_PATH - vars['MY_EMOTS_PATH'] = app.MY_EMOTS_PATH - vars['MY_ICONSETS_PATH'] = app.MY_ICONSETS_PATH - vars['MY_MOOD_ICONSETS_PATH'] = app.MY_MOOD_ICONSETS_PATH - vars['MY_ACTIVITY_ICONSETS_PATH'] = app.MY_ACTIVITY_ICONSETS_PATH - from gajim.common import configpaths - MY_DATA = configpaths.get('MY_DATA') - MY_CONFIG = configpaths.get('MY_CONFIG') - - if os.path.exists(LOG_DB_PATH): - # File already exists - return - - if os.name == 'nt': - try: - OLD_LOG_DB_FOLDER = os.path.join(os.environ['appdata'], 'Gajim') - except KeyError: - OLD_LOG_DB_FOLDER = '.' - else: - OLD_LOG_DB_FOLDER = os.path.expanduser('~/.gajim') - if not os.path.exists(OLD_LOG_DB_FOLDER): - return - OLD_LOG_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'logs.db') - OLD_CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db') - vars['OLD_VCARD_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'vcards') - vars['OLD_AVATAR_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'avatars') - vars['OLD_MY_EMOTS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'emoticons') - vars['OLD_MY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'iconsets') - vars['OLD_MY_MOOD_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'moods') - vars['OLD_MY_ACTIVITY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, - 'activities') - OLD_CONFIG_FILES = [] - OLD_DATA_FILES = [] - for f in os.listdir(OLD_LOG_DB_FOLDER): - if f == 'config' or f.startswith('config.'): - OLD_CONFIG_FILES.append(f) - if f == 'secrets' or f.startswith('secrets.'): - OLD_DATA_FILES.append(f) - if f == 'cacerts.pem': - OLD_DATA_FILES.append(f) - - if not os.path.exists(OLD_LOG_DB_PATH): - return - - if not os.path.exists(OLD_CACHE_DB_PATH): - # split database - split_db() - - to_move = {} - to_move[OLD_LOG_DB_PATH] = LOG_DB_PATH - to_move[OLD_CACHE_DB_PATH] = CACHE_DB_PATH - - for folder in ('VCARD_PATH', 'AVATAR_PATH', 'MY_EMOTS_PATH', - 'MY_ICONSETS_PATH', 'MY_MOOD_ICONSETS_PATH', 'MY_ACTIVITY_ICONSETS_PATH'): - src = vars['OLD_' + folder] - dst = vars[folder] - to_move[src] = dst - - # move config files - for f in OLD_CONFIG_FILES: - src = os.path.join(OLD_LOG_DB_FOLDER, f) - dst = os.path.join(MY_CONFIG, f) - to_move[src] = dst - - # Move data files (secrets, cacert.pem) - for f in OLD_DATA_FILES: - src = os.path.join(OLD_LOG_DB_FOLDER, f) - dst = os.path.join(MY_DATA, f) - to_move[src] = dst - - for src, dst in to_move.items(): - if os.path.exists(dst): - continue - if not os.path.exists(src): - continue - print(_('moving %(src)s to %(dst)s') % {'src': src, 'dst': dst}) - shutil.move(src, dst) - app.logger.init_vars() - app.logger.attach_cache_database() - def check_and_possibly_create_paths(): LOG_DB_PATH = logger.LOG_DB_PATH LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) @@ -269,51 +184,13 @@ def check_and_possibly_create_paths(): CACHE_DB_PATH = logger.CACHE_DB_PATH CACHE_DB_FOLDER, CACHE_DB_FILE = os.path.split(CACHE_DB_PATH) - VCARD_PATH = app.VCARD_PATH - AVATAR_PATH = app.AVATAR_PATH - from gajim.common import configpaths - MY_DATA = configpaths.get('MY_DATA') - MY_CONFIG = configpaths.get('MY_CONFIG') - MY_CACHE = configpaths.get('MY_CACHE') - XTLS_CERTS = configpaths.get('MY_PEER_CERTS') - LOCAL_XTLS_CERTS = configpaths.get('MY_CERT') - - PLUGINS_CONFIG_PATH = app.PLUGINS_CONFIG_DIR - - if not os.path.exists(MY_DATA): - create_path(MY_DATA) - elif os.path.isfile(MY_DATA): - print(_('%s is a file but it should be a directory') % MY_DATA) - print(_('Gajim will now exit')) - sys.exit() - - if not os.path.exists(MY_CONFIG): - create_path(MY_CONFIG) - elif os.path.isfile(MY_CONFIG): - print(_('%s is a file but it should be a directory') % MY_CONFIG) - print(_('Gajim will now exit')) - sys.exit() - - if not os.path.exists(MY_CACHE): - create_path(MY_CACHE) - elif os.path.isfile(MY_CACHE): - print(_('%s is a file but it should be a directory') % MY_CACHE) - print(_('Gajim will now exit')) - sys.exit() - - if not os.path.exists(VCARD_PATH): - create_path(VCARD_PATH) - elif os.path.isfile(VCARD_PATH): - print(_('%s is a file but it should be a directory') % VCARD_PATH) - print(_('Gajim will now exit')) - sys.exit() - - if not os.path.exists(AVATAR_PATH): - create_path(AVATAR_PATH) - elif os.path.isfile(AVATAR_PATH): - print(_('%s is a file but it should be a directory') % AVATAR_PATH) - print(_('Gajim will now exit')) - sys.exit() + for path in configpaths.get_paths(PathType.FOLDER): + if not os.path.exists(path): + create_path(path) + elif os.path.isfile(path): + print(_('%s is a file but it should be a directory') % path) + print(_('Gajim will now exit')) + sys.exit() if not os.path.exists(LOG_DB_FOLDER): create_path(LOG_DB_FOLDER) @@ -322,13 +199,6 @@ def check_and_possibly_create_paths(): print(_('Gajim will now exit')) sys.exit() - if not os.path.exists(PLUGINS_CONFIG_PATH): - create_path(PLUGINS_CONFIG_PATH) - elif os.path.isfile(PLUGINS_CONFIG_PATH): - print(_('%s is a file but it should be a directory') % PLUGINS_CONFIG_PATH) - print(_('Gajim will now exit')) - sys.exit() - if not os.path.exists(CACHE_DB_FOLDER): create_path(CACHE_DB_FOLDER) elif os.path.isfile(CACHE_DB_FOLDER): @@ -336,8 +206,6 @@ def check_and_possibly_create_paths(): print(_('Gajim will now exit')) sys.exit() - check_and_possibly_move_config() - if not os.path.exists(LOG_DB_PATH): if os.path.exists(CACHE_DB_PATH): os.remove(CACHE_DB_PATH) @@ -356,11 +224,6 @@ def check_and_possibly_create_paths(): print(_('Gajim will now exit')) sys.exit() - if not os.path.exists(XTLS_CERTS): - create_path(XTLS_CERTS) - if not os.path.exists(LOCAL_XTLS_CERTS): - create_path(LOCAL_XTLS_CERTS) - def create_path(directory): head, tail = os.path.split(directory) if not os.path.exists(head): ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -6,6 +6,7 @@ ## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> ## ## This file is part of Gajim. ## @@ -23,28 +24,23 @@ ## import os -import sys import tempfile -from enum import Enum, unique - -@unique -class Type(Enum): - CONFIG = 0 - CACHE = 1 - DATA = 2 - - -def windowsify(s): - if os.name == 'nt': - return s.capitalize() - return s +from gajim.common.const import PathType, PathLocation def get(key): return _paths[key] +def get_paths(type_): + for key, value in _paths.items(): + location, path, path_type = value + if type_ != path_type: + continue + yield _paths[key] + + def set_separation(active: bool): _paths.profile_separation = active @@ -63,7 +59,7 @@ def init(): class ConfigPaths: def __init__(self): - self.paths = {} + self._paths = {} self.profile = '' self.profile_separation = False self.custom_config_root = None @@ -93,104 +89,93 @@ class ConfigPaths: import pkg_resources basedir = pkg_resources.resource_filename("gajim", ".") - self.add('DATA', None, os.path.join(basedir, 'data')) - self.add('GUI', None, os.path.join(basedir, 'data', 'gui')) - self.add('ICONS', None, os.path.join(basedir, 'data', 'icons')) - self.add('HOME', None, os.path.expanduser('~')) - self.add('PLUGINS_BASE', None, os.path.join(basedir, 'data', 'plugins')) - def add(self, name, type_, path): - self.paths[name] = (type_, path) + source_paths = [ + ('DATA', os.path.join(basedir, 'data')), + ('GUI', os.path.join(basedir, 'data', 'gui')), + ('ICONS', os.path.join(basedir, 'data', 'icons')), + ('HOME', os.path.expanduser('~')), + ('PLUGINS_BASE', os.path.join(basedir, 'data', 'plugins')), + ] + + for path in source_paths: + self._add(*path) def __getitem__(self, key): - type_, path = self.paths[key] - if type_ == Type.CONFIG: + location, path, _ = self._paths[key] + if location == PathLocation.CONFIG: return os.path.join(self.config_root, path) - elif type_ == Type.CACHE: + elif location == PathLocation.CACHE: return os.path.join(self.cache_root, path) - elif type_ == Type.DATA: + elif location == PathLocation.DATA: return os.path.join(self.data_root, path) return path - def get(self, key, default=None): - try: - return self[key] - except KeyError: - return default - def items(self): - for key in self.paths.keys(): - yield (key, self[key]) + for key, value in self._paths.items(): + yield (key, value) + + def _prepare(self, path, unique): + if os.name == 'nt': + path = path.capitalize() + if self.profile: + if unique or self.profile_separation: + return '%s.%s' % (path, self.profile) + return path + + def _add(self, name, path, location=None, path_type=None, unique=False): + if location is not None: + path = self._prepare(path, unique) + self._paths[name] = (location, path, path_type) def init(self): if self.custom_config_root: self.cache_root = self.data_root = self.config_root = self.custom_config_root - self.add('CONFIG_ROOT', None, self.config_root) - self.add('CACHE_ROOT', None, self.cache_root) - self.add('DATA_ROOT', None, self.data_root) - - self.init_profile(self.profile) - - if len(self.profile) > 0 and self.profile_separation: - self.profile = u'.' + self.profile - else: - self.profile = '' - - d = {'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', - 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', - 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', - 'PLUGINS_USER': 'plugins'} - for name in d: - d[name] += self.profile - self.add(name, Type.DATA, windowsify(d[name])) - if len(self.profile): - self.add('MY_DATA', Type.DATA, 'data.dir') - else: - self.add('MY_DATA', Type.DATA, '') - - d = {'CACHE_DB': 'cache.db', - 'VCARD': 'vcards', - 'AVATAR': 'avatars'} - for name in d: - d[name] += self.profile - self.add(name, Type.CACHE, windowsify(d[name])) - if len(self.profile): - self.add('MY_CACHE', Type.CACHE, 'cache.dir') - else: - self.add('MY_CACHE', Type.CACHE, '') - - if len(self.profile): - self.add('MY_CONFIG', Type.CONFIG, 'config.dir') - else: - self.add('MY_CONFIG', Type.CONFIG, '') - - try: - self.add('TMP', None, tempfile.gettempdir()) - except IOError as e: - print('Error opening tmp folder: %s\nUsing %s' % ( - str(e), os.path.expanduser('~')), file=sys.stderr) - self.add('TMP', None, os.path.expanduser('~')) - - def init_profile(self, profile): - conffile = windowsify('config') - secretsfile = windowsify('secrets') - pluginsconfdir = windowsify('pluginsconfig') - certsdir = windowsify(u'certs') - localcertsdir = windowsify(u'localcerts') - - if len(profile) > 0: - conffile += '.' + profile - secretsfile += '.' + profile - pluginsconfdir += '.' + profile - certsdir += u'.' + profile - localcertsdir += u'.' + profile - - self.add('SECRETS_FILE', Type.DATA, secretsfile) - self.add('MY_PEER_CERTS', Type.DATA, certsdir) - self.add('CONFIG_FILE', Type.CONFIG, conffile) - self.add('PLUGINS_CONFIG_DIR', Type.CONFIG, pluginsconfdir) - self.add('MY_CERT', Type.CONFIG, localcertsdir) + user_dir_paths = [ + ('TMP', tempfile.gettempdir()), + ('CONFIG_ROOT', self.config_root), + ('CACHE_ROOT', self.cache_root), + ('DATA_ROOT', self.data_root), + ] + + for path in user_dir_paths: + self._add(*path) + + # These paths are unique per profile + unique_profile_paths = [ + # Data paths + ('SECRETS_FILE', 'secrets', PathLocation.DATA, PathType.FILE), + ('MY_PEER_CERTS', 'certs', PathLocation.DATA, PathType.FOLDER), + + # Config paths + ('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE), + ('PLUGINS_CONFIG_DIR', 'pluginsconfig', PathLocation.CONFIG, PathType.FOLDER), + ('MY_CERT', 'localcerts', PathLocation.CONFIG, PathType.FOLDER), + ] + + for path in unique_profile_paths: + self._add(*path, unique=True) + + # These paths are only unique per profile if the commandline arg + # `separate` is passed + paths = [ + # Data paths + ('LOG_DB', 'logs.db', PathLocation.DATA, PathType.FILE), + ('MY_CACERTS', 'cacerts.pem', PathLocation.DATA, PathType.FILE), + ('MY_EMOTS', 'emoticons', PathLocation.DATA, PathType.FOLDER), + ('MY_ICONSETS', 'iconsets', PathLocation.DATA, PathType.FOLDER), + ('MY_MOOD_ICONSETS', 'moods', PathLocation.DATA, PathType.FOLDER), + ('MY_ACTIVITY_ICONSETS', 'activities', PathLocation.DATA, PathType.FOLDER), + ('PLUGINS_USER', 'plugins', PathLocation.DATA, PathType.FOLDER), + + # Cache paths + ('CACHE_DB', 'cache.db', PathLocation.CACHE, PathType.FILE), + ('AVATAR', 'avatars', PathLocation.CACHE, PathType.FOLDER), + ] + + for path in paths: + self._add(*path) _paths = ConfigPaths() ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -41,6 +41,17 @@ class ArchiveState(IntEnum): NEVER = 0 ALL = 1 +@unique +class PathLocation(IntEnum): + CONFIG = 0 + CACHE = 1 + DATA = 2 + +@unique +class PathType(IntEnum): + FILE = 0 + FOLDER = 1 + THANKS = u"""\ Alexander Futász View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/848c5cbdd00bebeda284bedd410a4d9f26… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/848c5cbdd00bebeda284bedd410a4d9f26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix setting custom config root
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 72e69a59 by Philipp Hörist at 2018-04-21T14:47:47+02:00 Fix setting custom config root - - - - - 1 changed file: - gajim/common/configpaths.py Changes: ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -54,7 +54,7 @@ def set_profile(profile: str): def set_config_root(config_root: str): - _paths.config_root = config_root + _paths.custom_config_root = config_root def init(): @@ -66,7 +66,7 @@ class ConfigPaths: self.paths = {} self.profile = '' self.profile_separation = False - self.config_root = None + self.custom_config_root = None if os.name == 'nt': try: @@ -123,8 +123,8 @@ class ConfigPaths: yield (key, self[key]) def init(self): - if self.config_root is not None: - self.cache_root = self.data_root = self.config_root + if self.custom_config_root: + self.cache_root = self.data_root = self.config_root = self.custom_config_root self.add('CONFIG_ROOT', None, self.config_root) self.add('CACHE_ROOT', None, self.cache_root) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/72e69a59af45868afb3a29bb8325a1181f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/72e69a59af45868afb3a29bb8325a1181f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: HistoryManager: Init configpaths only in standalone mode
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0739eb9d by Philipp Hörist at 2018-04-21T13:59:20+02:00 HistoryManager: Init configpaths only in standalone mode - - - - - b0fce17c by Philipp Hörist at 2018-04-21T13:59:30+02:00 HistoryManager: Open window centered - - - - - 3 changed files: - gajim/data/gui/history_manager.ui - gajim/history_manager.py - + launch-history-manager.py Changes: ===================================== gajim/data/gui/history_manager.ui ===================================== --- a/gajim/data/gui/history_manager.ui +++ b/gajim/data/gui/history_manager.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="context_menu"> @@ -94,7 +94,7 @@ <object class="GtkWindow" id="history_manager_window"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Gajim History Logs Manager</property> + <property name="window_position">center</property> <property name="default_width">650</property> <property name="default_height">500</property> <signal name="delete-event" handler="on_history_manager_window_delete_event" swapped="no"/> @@ -306,7 +306,7 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> </object> </child> - <child type="titlebar"> + <child> <placeholder/> </child> </object> ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -7,6 +7,7 @@ ## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> ## ## This file is part of Gajim. ## @@ -30,18 +31,37 @@ import os import sys +import time +import getopt +import sqlite3 +from enum import IntEnum, unique + import gi gi.require_version('Gtk', '3.0') +gi.require_version('GLib', '2.0') +gi.require_version('Gdk', '3.0') +gi.require_version('Gio', '2.0') from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -import time +from gi.repository import Gio -import getopt from gajim.common import i18n -def parseOpts(): - config_path = None + +def is_standalone(): + # Determine if we are in standalone mode + if Gio.Application.get_default() is None: + return True + if __name__ == '__main__': + return True + return False + + +if is_standalone(): + # Standalone Mode + # Must be done before importing app + from gajim.common import configpaths try: shortargs = 'hvsc:l:p:' @@ -61,23 +81,16 @@ def parseOpts(): '\n -c, --config-path ' + _('Choose folder for logfile') + '\n') sys.exit() elif o in ('-c', '--config-path'): - config_path = a - return config_path + configpaths.set_config_root(a) -config_path = parseOpts() -del parseOpts + configpaths.init() -from gajim.common import configpaths -configpaths.set_config_root(config_path) -configpaths.init() -del config_path from gajim.common import app from gajim import gtkgui_helpers from gajim.common.logger import LOG_DB_PATH, JIDConstant, KindConstant from gajim.common import helpers from gajim import dialogs -from enum import IntEnum, unique @unique class Column(IntEnum): @@ -87,9 +100,6 @@ class Column(IntEnum): NICKNAME = 5 -import sqlite3 as sqlite - - class HistoryManager: def __init__(self): pixs = [] @@ -120,7 +130,7 @@ class HistoryManager: self.jids_already_in = [] # holds jids that we already have in DB self.AT_LEAST_ONE_DELETION_DONE = False - self.con = sqlite.connect(LOG_DB_PATH, timeout=20.0, + self.con = sqlite3.connect(LOG_DB_PATH, timeout=20.0, isolation_level='IMMEDIATE') self.cur = self.con.cursor() @@ -226,18 +236,18 @@ class HistoryManager: def on_history_manager_window_delete_event(self, widget, event): if not self.AT_LEAST_ONE_DELETION_DONE: - if __name__ == '__main__': + if is_standalone(): Gtk.main_quit() return def on_yes(clicked): self.cur.execute('VACUUM') self.con.commit() - if __name__ == '__main__': + if is_standalone(): Gtk.main_quit() def on_no(): - if __name__ == '__main__': + if is_standalone(): Gtk.main_quit() dialog = dialogs.YesNoDialog( ===================================== launch-history-manager.py ===================================== --- /dev/null +++ b/launch-history-manager.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 + +from gajim import history_manager +history_manager.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a26ecb12cec0c689a4f95db91d5d2002… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4a26ecb12cec0c689a4f95db91d5d2002… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor configpaths
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a26ecb1 by Philipp Hörist at 2018-04-21T12:48:57+02:00 Refactor configpaths - init configpaths earlier so logging can access it to store debug logs - First step for more consistency across Gajim when looking up paths Recommended usage for the future: app.configpaths.get() configpaths.get() - - - - - 13 changed files: - gajim/common/app.py - gajim/common/check_paths.py - gajim/common/configpaths.py - gajim/common/helpers.py - gajim/common/jingle_ft.py - gajim/common/logger.py - gajim/gajim.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/htmltextview.py - gajim/secrets.py - test/lib/__init__.py - test/test_pluginmanager.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -36,7 +36,6 @@ from distutils.version import LooseVersion as V from collections import namedtuple import gi import nbxmpp -import hashlib from gi.repository import GLib @@ -63,24 +62,26 @@ glog = logging.getLogger('gajim') logger = None +# For backwards compatibility needed +# some plugins use that gajimpaths = configpaths.gajimpaths -VCARD_PATH = gajimpaths['VCARD'] -AVATAR_PATH = gajimpaths['AVATAR'] -MY_EMOTS_PATH = gajimpaths['MY_EMOTS'] -MY_ICONSETS_PATH = gajimpaths['MY_ICONSETS'] -MY_MOOD_ICONSETS_PATH = gajimpaths['MY_MOOD_ICONSETS'] -MY_ACTIVITY_ICONSETS_PATH = gajimpaths['MY_ACTIVITY_ICONSETS'] -MY_CACERTS = gajimpaths['MY_CACERTS'] -MY_PEER_CERTS_PATH = gajimpaths['MY_PEER_CERTS'] -TMP = gajimpaths['TMP'] -DATA_DIR = gajimpaths['DATA'] -ICONS_DIR = gajimpaths['ICONS'] -HOME_DIR = gajimpaths['HOME'] -PLUGINS_DIRS = [gajimpaths['PLUGINS_BASE'], - gajimpaths['PLUGINS_USER']] -PLUGINS_CONFIG_DIR = gajimpaths['PLUGINS_CONFIG_DIR'] -MY_CERT_DIR = gajimpaths['MY_CERT'] +VCARD_PATH = configpaths.get('VCARD') +AVATAR_PATH = configpaths.get('AVATAR') +MY_EMOTS_PATH = configpaths.get('MY_EMOTS') +MY_ICONSETS_PATH = configpaths.get('MY_ICONSETS') +MY_MOOD_ICONSETS_PATH = configpaths.get('MY_MOOD_ICONSETS') +MY_ACTIVITY_ICONSETS_PATH = configpaths.get('MY_ACTIVITY_ICONSETS') +MY_CACERTS = configpaths.get('MY_CACERTS') +MY_PEER_CERTS_PATH = configpaths.get('MY_PEER_CERTS') +TMP = configpaths.get('TMP') +DATA_DIR = configpaths.get('DATA') +ICONS_DIR = configpaths.get('ICONS') +HOME_DIR = configpaths.get('HOME') +PLUGINS_DIRS = [configpaths.get('PLUGINS_BASE'), + configpaths.get('PLUGINS_USER')] +PLUGINS_CONFIG_DIR = configpaths.get('PLUGINS_CONFIG_DIR') +MY_CERT_DIR = configpaths.get('MY_CERT') RecentGroupchat = namedtuple('RecentGroupchat', ['room', 'server', 'nickname']) ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -188,9 +188,8 @@ def check_and_possibly_move_config(): vars['MY_MOOD_ICONSETS_PATH'] = app.MY_MOOD_ICONSETS_PATH vars['MY_ACTIVITY_ICONSETS_PATH'] = app.MY_ACTIVITY_ICONSETS_PATH from gajim.common import configpaths - MY_DATA = configpaths.gajimpaths['MY_DATA'] - MY_CONFIG = configpaths.gajimpaths['MY_CONFIG'] - MY_CACHE = configpaths.gajimpaths['MY_CACHE'] + MY_DATA = configpaths.get('MY_DATA') + MY_CONFIG = configpaths.get('MY_CONFIG') if os.path.exists(LOG_DB_PATH): # File already exists @@ -273,11 +272,11 @@ def check_and_possibly_create_paths(): VCARD_PATH = app.VCARD_PATH AVATAR_PATH = app.AVATAR_PATH from gajim.common import configpaths - MY_DATA = configpaths.gajimpaths['MY_DATA'] - MY_CONFIG = configpaths.gajimpaths['MY_CONFIG'] - MY_CACHE = configpaths.gajimpaths['MY_CACHE'] - XTLS_CERTS = configpaths.gajimpaths['MY_PEER_CERTS'] - LOCAL_XTLS_CERTS = configpaths.gajimpaths['MY_CERT'] + MY_DATA = configpaths.get('MY_DATA') + MY_CONFIG = configpaths.get('MY_CONFIG') + MY_CACHE = configpaths.get('MY_CACHE') + XTLS_CERTS = configpaths.get('MY_PEER_CERTS') + LOCAL_XTLS_CERTS = configpaths.get('MY_CERT') PLUGINS_CONFIG_PATH = app.PLUGINS_CONFIG_DIR ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -27,31 +27,13 @@ import sys import tempfile from enum import Enum, unique + @unique class Type(Enum): CONFIG = 0 CACHE = 1 DATA = 2 -# Note on path and filename encodings: -# -# In general it is very difficult to do this correctly. -# We may pull information from environment variables, and what encoding that is -# in is anyone's guess. Any information we request directly from the file -# system will be in filesystemencoding, and (parts of) paths that we write in -# this source code will be in whatever encoding the source is in. (I hereby -# declare this file to be UTF-8 encoded.) -# -# To make things more complicated, modern Windows filesystems use UTF-16, but -# the API tends to hide this from us. -# -# I tried to minimize problems by passing Unicode strings to OS functions as -# much as possible. Hopefully this makes the function return an Unicode string -# as well. If not, we get an 8-bit string in filesystemencoding, which we can -# happily pass to functions that operate on files and directories, so we can -# just leave it as is. Since these paths are meant to be internal to Gajim and -# not displayed to the user, Unicode is not really necessary here. - def windowsify(s): if os.name == 'nt': @@ -60,29 +42,41 @@ def windowsify(s): def get(key): - return gajimpaths[key] + return _paths[key] + + +def set_separation(active: bool): + _paths.profile_separation = active + + +def set_profile(profile: str): + _paths.profile = profile + + +def set_config_root(config_root: str): + _paths.config_root = config_root + + +def init(): + _paths.init() class ConfigPaths: def __init__(self): - # {'name': (type, path), } type can be Type.CONFIG, Type.CACHE, Type.DATA - # or None self.paths = {} + self.profile = '' + self.profile_separation = False + self.config_root = None if os.name == 'nt': try: # Documents and Settings\[User Name]\Application Data\Gajim - - # How are we supposed to know what encoding the environment - # variable 'appdata' is in? Assuming it to be in filesystem - # encoding. self.config_root = self.cache_root = self.data_root = \ os.path.join(os.environ['appdata'], 'Gajim') except KeyError: # win9x, in cwd self.config_root = self.cache_root = self.data_root = '.' - else: # Unices - # Pass in an Unicode string, and hopefully get one back. + else: expand = os.path.expanduser base = os.getenv('XDG_CONFIG_HOME') if base is None or base[0] != '/': @@ -128,40 +122,45 @@ class ConfigPaths: for key in self.paths.keys(): yield (key, self[key]) - def init(self, root=None, profile='', profile_separation=False): - if root is not None: - self.config_root = self.cache_root = self.data_root = root + def init(self): + if self.config_root is not None: + self.cache_root = self.data_root = self.config_root - self.init_profile(profile) + self.add('CONFIG_ROOT', None, self.config_root) + self.add('CACHE_ROOT', None, self.cache_root) + self.add('DATA_ROOT', None, self.data_root) - if len(profile) > 0 and profile_separation: - profile = u'.' + profile + self.init_profile(self.profile) + + if len(self.profile) > 0 and self.profile_separation: + self.profile = u'.' + self.profile else: - profile = '' + self.profile = '' d = {'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', - 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', - 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', - 'PLUGINS_USER': 'plugins'} + 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', + 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', + 'PLUGINS_USER': 'plugins'} for name in d: - d[name] += profile + d[name] += self.profile self.add(name, Type.DATA, windowsify(d[name])) - if len(profile): + if len(self.profile): self.add('MY_DATA', Type.DATA, 'data.dir') else: self.add('MY_DATA', Type.DATA, '') - d = {'CACHE_DB': 'cache.db', 'VCARD': 'vcards', - 'AVATAR': 'avatars'} + d = {'CACHE_DB': 'cache.db', + 'VCARD': 'vcards', + 'AVATAR': 'avatars'} for name in d: - d[name] += profile + d[name] += self.profile self.add(name, Type.CACHE, windowsify(d[name])) - if len(profile): + if len(self.profile): self.add('MY_CACHE', Type.CACHE, 'cache.dir') else: self.add('MY_CACHE', Type.CACHE, '') - if len(profile): + if len(self.profile): self.add('MY_CONFIG', Type.CONFIG, 'config.dir') else: self.add('MY_CONFIG', Type.CONFIG, '') @@ -169,8 +168,8 @@ class ConfigPaths: try: self.add('TMP', None, tempfile.gettempdir()) except IOError as e: - print('Error opening tmp folder: %s\nUsing %s' % (str(e), - os.path.expanduser('~')), file=sys.stderr) + print('Error opening tmp folder: %s\nUsing %s' % ( + str(e), os.path.expanduser('~')), file=sys.stderr) self.add('TMP', None, os.path.expanduser('~')) def init_profile(self, profile): @@ -193,4 +192,9 @@ class ConfigPaths: self.add('PLUGINS_CONFIG_DIR', Type.CONFIG, pluginsconfdir) self.add('MY_CERT', Type.CONFIG, localcertsdir) -gajimpaths = ConfigPaths() + +_paths = ConfigPaths() + +# For backwards compatibility needed +# some plugins use that +gajimpaths = _paths ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -853,8 +853,7 @@ def play_sound(event): path_to_soundfile = app.config.get_per('soundevents', event, 'path') play_sound_file(path_to_soundfile) -def check_soundfile_path(file_, dirs=(app.gajimpaths.data_root, -app.DATA_DIR)): +def check_soundfile_path(file_, dirs=None): """ Check if the sound file exists @@ -863,6 +862,10 @@ app.DATA_DIR)): (eg: ~/.gajim/sounds/, DATADIR/sounds...). :return the path to file or None if it doesn't exists. """ + if dirs is None: + dirs = [app.configpaths.get('DATA_ROOT'), + app.DATA_DIR] + if not file_: return None elif os.path.exists(file_): @@ -874,8 +877,7 @@ app.DATA_DIR)): return d return None -def strip_soundfile_path(file_, dirs=(app.gajimpaths.data_root, -app.DATA_DIR), abs=True): +def strip_soundfile_path(file_, dirs=None, abs=True): """ Remove knowns paths from a sound file @@ -888,6 +890,10 @@ app.DATA_DIR), abs=True): if not file_: return None + if dirs is None: + dirs = [app.configpaths.get('DATA_ROOT'), + app.DATA_DIR] + name = os.path.basename(file_) for d in dirs: d = os.path.join(d, 'sounds', name) ===================================== gajim/common/jingle_ft.py ===================================== --- a/gajim/common/jingle_ft.py +++ b/gajim/common/jingle_ft.py @@ -120,7 +120,7 @@ class JingleFileTransfer(JingleContent): } if jingle_xtls.PYOPENSSL_PRESENT: - cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], + cert_name = os.path.join(configpaths.get('MY_CERT'), jingle_xtls.SELF_SIGNED_CERTIFICATE) if not (os.path.exists(cert_name + '.cert') and os.path.exists(cert_name + '.pkey')): ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -42,12 +42,13 @@ from enum import IntEnum, unique from gajim.common import exceptions from gajim.common import app +from gajim.common import configpaths import sqlite3 as sqlite -LOG_DB_PATH = app.gajimpaths['LOG_DB'] +LOG_DB_PATH = configpaths.get('LOG_DB') LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) -CACHE_DB_PATH = app.gajimpaths['CACHE_DB'] +CACHE_DB_PATH = configpaths.get('CACHE_DB') import logging log = logging.getLogger('gajim.c.logger') ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -53,6 +53,7 @@ gi.require_version('Pango', '1.0') from gi.repository import GLib, Gio, Gtk from gajim.common import i18n +from gajim.common import configpaths from gajim.common import logging_helpers MIN_NBXMPP_VER = "0.6.4" @@ -112,9 +113,6 @@ class GajimApplication(Gtk.Application): self.connect('startup', self._startup) self.connect('activate', self._activate) - self.profile = '' - self.config_path = None - self.profile_separation = False self.interface = None GLib.set_prgname('gajim') @@ -157,10 +155,6 @@ class GajimApplication(Gtk.Application): sys.exit(1) # Create and initialize Application Paths & Databases - from gajim.common import configpaths - configpaths.gajimpaths.init( - self.config_path, self.profile, self.profile_separation) - from gajim.common import app from gajim.common import check_paths from gajim.common import exceptions @@ -209,7 +203,7 @@ class GajimApplication(Gtk.Application): # libintl = ctypes.cdll.LoadLibrary(libintl_path) # libintl.bindtextdomain(APP, DIR) # libintl.bind_textdomain_codeset(APP, 'UTF-8') - # plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[ + # plugins_locale_dir = os.path.join(common.configpaths[ # 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) # libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) # libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') @@ -345,23 +339,22 @@ class GajimApplication(Gtk.Application): def _handle_local_options(self, application, options: GLib.VariantDict) -> int: # Parse all options that have to be executed before ::startup - logging_helpers.init() - if options.contains('profile'): # Incorporate profile name into application id # to have a single app instance for each profile. profile = options.lookup_value('profile').get_string() app_id = '%s.%s' % (self.get_application_id(), profile) self.set_application_id(app_id) - self.profile = profile + configpaths.set_profile(profile) if options.contains('separate'): - self.profile_separation = True + configpaths.set_separation(True) if options.contains('config-path'): - self.config_path = options.lookup_value('config-path').get_string() - if options.contains('version'): - from gajim import __version__ - print(__version__) - return 0 + path = options.lookup_value('config-path').get_string() + configpaths.set_config_root(path) + + configpaths.init() + logging_helpers.init() + if options.contains('quiet'): logging_helpers.set_quiet() if options.contains('verbose'): ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -107,11 +107,10 @@ from threading import Thread from gajim.common import ged from gajim.common.caps_cache import muc_caps_cache -from gajim.common.configpaths import gajimpaths -config_filename = gajimpaths['CONFIG_FILE'] +from gajim.common import configpaths from gajim.common import optparser -parser = optparser.OptionsParser(config_filename) +parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) import logging log = logging.getLogger('gajim.interface') ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -67,8 +67,9 @@ def parseOpts(): config_path = parseOpts() del parseOpts -import gajim.common.configpaths -gajim.common.configpaths.gajimpaths.init(config_path) +from gajim.common import configpaths +configpaths.set_config_root(config_path) +configpaths.init() del config_path from gajim.common import app from gajim import gtkgui_helpers ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -48,8 +48,8 @@ import urllib if __name__ == '__main__': from gajim.common import i18n - import gajim.common.configpaths - gajim.common.configpaths.gajimpaths.init(None) + from gajim.common import configpaths + configpaths.init() from gajim.common import app from gajim import gtkgui_helpers from gajim.gtkgui_helpers import get_icon_pixmap ===================================== gajim/secrets.py ===================================== --- a/gajim/secrets.py +++ b/gajim/secrets.py @@ -19,7 +19,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from gajim.common.configpaths import gajimpaths +from gajim.common import configpaths import Crypto from gajim.common import crypto @@ -28,9 +28,10 @@ from gajim.common import exceptions import os import pickle -secrets_filename = gajimpaths['SECRETS_FILE'] +secrets_filename = configpaths.get('SECRETS_FILE') secrets_cache = None + class Secrets(): def __init__(self, filename): self.filename = filename ===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -37,8 +37,9 @@ def setup_env(): os.mkdir(configdir) os.mkdir(pluginsconfigdir) - import gajim.common.configpaths - gajim.common.configpaths.gajimpaths.init(configdir) + from gajim.common import configpaths + configpaths.set_config_root(configdir) + configpaths.init() # for some reason gajim.common.app needs to be imported before xmpppy? from gajim.common import app ===================================== test/test_pluginmanager.py ===================================== --- a/test/test_pluginmanager.py +++ b/test/test_pluginmanager.py @@ -49,8 +49,9 @@ if os.path.isdir(configdir): os.mkdir(configdir) -import gajim.common.configpaths -gajim.common.configpaths.gajimpaths.init(configdir) +from gajim.common import configpaths +configpaths.set_config_root(configdir) +configpaths.init() # for some reason common.app needs to be imported before xmpppy? from gajim.common import app View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4a26ecb12cec0c689a4f95db91d5d2002c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4a26ecb12cec0c689a4f95db91d5d2002c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Support http:upload:0
by Philipp Hörist 21 Apr '18

21 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e9c040a by philipp at 2018-04-20T08:35:40-04:00 Support http:upload:0 - - - - - 2 changed files: - gajim/common/httpupload.py - gajim/server_info.py Changes: ===================================== gajim/common/httpupload.py ===================================== --- a/gajim/common/httpupload.py +++ b/gajim/common/httpupload.py @@ -40,6 +40,7 @@ if os.name == 'nt': log = logging.getLogger('gajim.c.httpupload') +NS_HTTPUPLOAD_0 = NS_HTTPUPLOAD + ':0' class ConnectionHTTPUpload: """ @@ -50,6 +51,8 @@ class ConnectionHTTPUpload: self.httpupload = False self.encrypted_upload = False self.component = None + self.httpupload_namespace = None + self._allowed_headers = ['Authorization', 'Cookie', 'Expires'] self.max_file_size = None # maximum file size in bytes app.ged.register_event_handler('agent-info-received', @@ -76,22 +79,28 @@ class ConnectionHTTPUpload: self.handle_outgoing_stanza) def handle_agent_info_received(self, event): - if (NS_HTTPUPLOAD not in event.features or not - app.jid_is_transport(event.jid)): + account = event.conn.name + if account != self.name: + return + + if not app.jid_is_transport(event.jid): return if not event.id_.startswith('Gajim_'): return - account = event.conn.name - if account != self.name: + if NS_HTTPUPLOAD_0 in event.features: + self.httpupload_namespace = NS_HTTPUPLOAD_0 + elif NS_HTTPUPLOAD in event.features: + self.httpupload_namespace = NS_HTTPUPLOAD + else: return self.component = event.jid for form in event.data: form_dict = form.asDict() - if form_dict.get('FORM_TYPE', None) != NS_HTTPUPLOAD: + if form_dict.get('FORM_TYPE', None) != self.httpupload_namespace: continue size = form_dict.get('max-file-size', None) if size is not None: @@ -183,17 +192,30 @@ class ConnectionHTTPUpload: def request_slot(self, file): GLib.idle_add(self.raise_progress_event, 'request', file) - iq = nbxmpp.Iq(typ='get', to=self.component) - id_ = app.get_an_id() - iq.setID(id_) - request = iq.setTag(name="request", namespace=NS_HTTPUPLOAD) - request.addChild('filename', payload=quote(os.path.basename(file.path))) - request.addChild('size', payload=file.size) - request.addChild('content-type', payload=file.mime) - + iq = self._build_request(file) log.info("Sending request for slot") app.connections[self.name].connection.SendAndCallForResponse( iq, self.received_slot, {'file': file}) + + def _build_request(self, file): + iq = nbxmpp.Iq(typ='get', to=self.component) + id_ = app.get_an_id() + iq.setID(id_) + if self.httpupload_namespace == NS_HTTPUPLOAD: + # experimental namespace + request = iq.setTag(name="request", + namespace=self.httpupload_namespace) + request.addChild('filename', payload=os.path.basename(file.path)) + request.addChild('size', payload=file.size) + request.addChild('content-type', payload=file.mime) + else: + attr = {'filename': os.path.basename(file.path), + 'size': file.size, + 'content-type': file.mime} + iq.setTag(name="request", + namespace=self.httpupload_namespace, + attrs=attr) + return iq @staticmethod def get_slot_error_message(stanza): @@ -217,10 +239,23 @@ class ConnectionHTTPUpload: return try: - file.put = stanza.getTag("slot").getTag("put").getData() - file.get = stanza.getTag("slot").getTag("get").getData() + if self.httpupload_namespace == NS_HTTPUPLOAD: + file.put = stanza.getTag('slot').getTag('put').getData() + file.get = stanza.getTag('slot').getTag('get').getData() + else: + slot = stanza.getTag('slot') + file.put = slot.getTagAttr('put', 'url') + file.get = slot.getTagAttr('get', 'url') + for header in slot.getTag('put').getTags('header'): + name = header.getAttr('name') + if name not in self._allowed_headers: + raise ValueError('Not allowed header') + data = header.getData() + if '\n' in data: + raise ValueError('Newline in header data') + file.headers[name] = data except Exception: - log.error("Got unexpected stanza: %s", stanza) + log.error("Got invalid stanza: %s", stanza) log.exception('Error') self.raise_progress_event('close', file) self.raise_information_event('request-upload-slot-error2') @@ -250,12 +285,12 @@ class ConnectionHTTPUpload: def upload_file(self, file): GLib.idle_add(self.raise_progress_event, 'upload', file) try: - headers = {'User-Agent': 'Gajim %s' % app.version, - 'Content-Type': file.mime, - 'Content-Length': file.size} + file.headers['User-Agent'] = 'Gajim %s' % app.version + file.headers['Content-Type'] = file.mime + file.headers['Content-Length'] = file.size request = Request( - file.put, data=file.stream, headers=headers, method='PUT') + file.put, data=file.stream, headers=file.headers, method='PUT') log.info("Opening Urllib upload request...") if not app.config.get_per('accounts', self.name, 'httpupload_verify'): @@ -345,6 +380,7 @@ class File: self.data = None self.user_data = None self.size = None + self.headers = {} self.event = threading.Event() self.load_data() ===================================== gajim/server_info.py ===================================== --- a/gajim/server_info.py +++ b/gajim/server_info.py @@ -176,7 +176,7 @@ class ServerInfoDialog(Gtk.Dialog): con.archiving_namespace, con.archiving_namespace, mam_enabled), Feature('XEP-0363: HTTP File Upload', - con.httpupload, nbxmpp.NS_HTTPUPLOAD, None)] + con.httpupload, con.httpupload_namespace, None)] def add_info(self, info): self.info_listbox.add(ServerInfoItem(info)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e9c040acf97782045119c76fc0273f31d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e9c040acf97782045119c76fc0273f31d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix tests
by Philipp Hörist 19 Apr '18

19 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dadc85bb by Philipp Hörist at 2018-04-19T22:22:04+02:00 Fix tests - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -29,7 +29,6 @@ ## try: - from gajim.common import app from gajim.common import caps_cache from gajim.common.account import Account from gajim import common @@ -523,9 +522,6 @@ class Contacts(): def get_groupchat_contact(self, jid): if jid in self._contacts: contacts = self._contacts[jid] - if len(contacts) > 1: - app.log('contacts').warning( - 'Groupchat Contact found more than once') if contacts[0].is_groupchat(): return contacts[0] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dadc85bb522544c35d445c811d1e79036f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dadc85bb522544c35d445c811d1e79036f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add support for Room Avatars
by Philipp Hörist 19 Apr '18

19 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 290e761f by Philipp Hörist at 2018-04-19T22:11:41+02:00 Add support for Room Avatars - Groupchats promote a vcard hash with presence Refactoring: - Dont delete groupchat contacts if they are maximized from the roster - Roster and GroupchatControl use the same contact object - - - - - 6 changed files: - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -291,6 +291,8 @@ class ConnectionVcard: self._vcard_presence_received) app.ged.register_event_handler('gc-presence-received', ged.GUI2, self._vcard_gc_presence_received) + app.ged.register_event_handler('room-avatar-received', ged.GUI2, + self._vcard_presence_received) def _vcard_presence_received(self, obj): if obj.conn.name != self.name: @@ -300,6 +302,10 @@ class ConnectionVcard: # No Avatar is advertised return + room_avatar = False + if isinstance(obj, RoomAvatarReceivedEvent): + room_avatar = True + if self.get_own_jid().bareMatch(obj.jid): app.log('avatar').info('Update (vCard): %s %s', obj.jid, obj.avatar_sha) @@ -324,16 +330,33 @@ class ConnectionVcard: app.log('avatar').debug('Remove: %s', obj.jid) app.contacts.set_avatar(self.name, obj.jid, None) own_jid = self.get_own_jid().getStripped() - app.logger.set_avatar_sha(own_jid, obj.jid, None) - app.interface.update_avatar(self.name, obj.jid) + if not room_avatar: + app.logger.set_avatar_sha(own_jid, obj.jid, None) + app.interface.update_avatar( + self.name, obj.jid, room_avatar=room_avatar) else: app.log('avatar').info( 'Update (vCard): %s %s', obj.jid, obj.avatar_sha) current_sha = app.contacts.get_avatar_sha(self.name, obj.jid) + if obj.avatar_sha != current_sha: - app.log('avatar').info( - 'Request (vCard): %s', obj.jid) - self.request_vcard(self._on_avatar_received, obj.jid) + if room_avatar: + # We dont save the room avatar hash in our DB, so check + # if we previously downloaded it + if app.interface.avatar_exists(obj.avatar_sha): + app.contacts.set_avatar(self.name, obj.jid, obj.avatar_sha) + app.interface.update_avatar( + self.name, obj.jid, room_avatar=room_avatar) + else: + app.log('avatar').info( + 'Request (vCard): %s', obj.jid) + self.request_vcard(self._on_room_avatar_received, obj.jid) + + else: + app.log('avatar').info( + 'Request (vCard): %s', obj.jid) + self.request_vcard(self._on_avatar_received, obj.jid) + else: app.log('avatar').info( 'Avatar already known (vCard): %s %s', @@ -568,6 +591,14 @@ class ConnectionVcard: self.send_avatar_presence() self.avatar_presence_sent = True + def _on_room_avatar_received(self, jid, resource, room, vcard): + avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) + app.interface.save_avatar(photo_decoded) + + app.log('avatar').info('Received (vCard): %s %s', jid, avatar_sha) + app.contacts.set_avatar(self.name, jid, avatar_sha) + app.interface.update_avatar(self.name, jid, room_avatar=True) + def _on_avatar_received(self, jid, resource, room, vcard): """ Called when we receive a vCard Parse the vCard and trigger Events ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -797,6 +797,17 @@ PresenceHelperEvent): time_str = idle_tag.getAttr('since') tim = helpers.datetime_tuple(time_str) self.idle_time = timegm(tim) + + # Check if presence is from the room itself, used when the room + # sends a avatar hash + contact = app.contacts.get_groupchat_contact(self.conn.name, self.fjid) + if contact: + app.nec.push_incoming_event( + RoomAvatarReceivedEvent( + None, conn=self.conn, stanza=self.stanza, + contact=contact, jid=self.jid)) + return + xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() @@ -2229,6 +2240,25 @@ class UpdateRosterAvatarEvent(nec.NetworkIncomingEvent): def generate(self): return True +class UpdateRoomAvatarEvent(nec.NetworkIncomingEvent): + name = 'update-room-avatar' + base_network_events = [] + + def generate(self): + return True + +class RoomAvatarReceivedEvent(nec.NetworkIncomingEvent): + name = 'room-avatar-received' + base_network_events = [] + + def generate(self): + vcard = self.stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) + if vcard is None: + log.warning('Invalid room self presence:\n%s', self.stanza) + return + self.avatar_sha = vcard.getTagData('photo') + return True + class PEPConfigReceivedEvent(nec.NetworkIncomingEvent): name = 'pep-config-received' base_network_events = [] ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -29,6 +29,7 @@ ## try: + from gajim.common import app from gajim.common import caps_cache from gajim.common.account import Account from gajim import common @@ -92,7 +93,7 @@ class Contact(CommonContact): """ def __init__(self, jid, account, name='', groups=None, show='', status='', sub='', ask='', resource='', priority=0, keyID='', client_caps=None, - our_chatstate=None, chatstate=None, idle_time=None, avatar_sha=None): + our_chatstate=None, chatstate=None, idle_time=None, avatar_sha=None, groupchat=False): if not isinstance(jid, str): print('no str') if groups is None: @@ -104,6 +105,7 @@ class Contact(CommonContact): self.contact_name = '' # nick choosen by contact self.groups = [i if i else _('General') for i in set(groups)] # filter duplicate values self.avatar_sha = avatar_sha + self._is_groupchat = groupchat self.sub = sub self.ask = ask @@ -164,10 +166,7 @@ class Contact(CommonContact): return is_observer def is_groupchat(self): - for account in common.app.gc_connected: - if self.jid in common.app.gc_connected[account]: - return True - return False + return self._is_groupchat def is_transport(self): # if not '@' or '@' starts the jid then contact is transport @@ -249,7 +248,7 @@ class LegacyContactsAPI: def create_contact(self, jid, account, name='', groups=None, show='', status='', sub='', ask='', resource='', priority=0, keyID='', client_caps=None, our_chatstate=None, chatstate=None, idle_time=None, - avatar_sha=None): + avatar_sha=None, groupchat=False): if groups is None: groups = [] # Use Account object if available @@ -258,7 +257,7 @@ class LegacyContactsAPI: show=show, status=status, sub=sub, ask=ask, resource=resource, priority=priority, keyID=keyID, client_caps=client_caps, our_chatstate=our_chatstate, chatstate=chatstate, - idle_time=idle_time, avatar_sha=avatar_sha) + idle_time=idle_time, avatar_sha=avatar_sha, groupchat=groupchat) def create_self_contact(self, jid, account, resource, show, status, priority, name='', keyID=''): @@ -304,6 +303,9 @@ class LegacyContactsAPI: if remove_meta: self._metacontact_manager.remove_metacontact(account, jid) + def get_groupchat_contact(self, account, jid): + return self._accounts[account].contacts.get_groupchat_contact(jid) + def get_contacts(self, account, jid): return self._accounts[account].contacts.get_contacts(jid) @@ -518,6 +520,15 @@ class Contacts(): if c.resource == resource: return c + def get_groupchat_contact(self, jid): + if jid in self._contacts: + contacts = self._contacts[jid] + if len(contacts) > 1: + app.log('contacts').warning( + 'Groupchat Contact found more than once') + if contacts[0].is_groupchat(): + return contacts[0] + def get_avatar(self, jid, size=None, scale=None): if jid not in self._contacts: return None ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -301,7 +301,7 @@ class GroupchatControl(ChatControlBase): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, parent_win, contact, acct, is_continued=False): + def __init__(self, parent_win, contact, nick, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, 'groupchat_control', contact, acct) @@ -362,7 +362,7 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = widget self.room_jid = self.contact.jid - self.nick = contact.name + self.nick = nick self.new_nick = '' self.name = '' for bm in app.connections[self.account].bookmarks: @@ -371,6 +371,7 @@ class GroupchatControl(ChatControlBase): break if not self.name: self.name = self.room_jid.split('@')[0] + self.contact.name = self.name self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) @@ -519,6 +520,8 @@ class GroupchatControl(ChatControlBase): self._nec_vcard_published) app.ged.register_event_handler('update-gc-avatar', ged.GUI1, self._nec_update_avatar) + app.ged.register_event_handler('update-room-avatar', ged.GUI1, + self._nec_update_room_avatar) app.ged.register_event_handler('gc-subject-received', ged.GUI1, self._nec_gc_subject_received) app.ged.register_event_handler('gc-config-changed-received', ged.GUI1, @@ -1091,6 +1094,12 @@ class GroupchatControl(ChatControlBase): banner_status_img = self.xml.get_object('gc_banner_status_image') if self.room_jid in app.gc_connected[self.account] and \ app.gc_connected[self.account][self.room_jid]: + if self.contact.avatar_sha: + surface = app.interface.get_avatar(self.contact.avatar_sha, + AvatarSize.ROSTER, + self.scale_factor) + banner_status_img.set_from_surface(surface) + return icon = gtkgui_helpers.get_iconset_name_for('muc-active') else: icon = gtkgui_helpers.get_iconset_name_for('muc-inactive') @@ -1147,6 +1156,11 @@ class GroupchatControl(ChatControlBase): obj.contact.name, obj.contact.avatar_sha) self.draw_avatar(obj.contact) + def _nec_update_room_avatar(self, obj): + if obj.jid != self.room_jid: + return + self._update_banner_state_image() + def _nec_mam_decrypted_message_received(self, obj): if not obj.groupchat: return @@ -2161,8 +2175,8 @@ class GroupchatControl(ChatControlBase): ctrl.parent_win = None self.send_chatstate('inactive', self.contact) - app.interface.roster.add_groupchat(self.contact.jid, self.account, - status = self.subject) + app.interface.roster.minimize_groupchat( + self.account, self.contact.jid, status=self.subject) del win._controls[self.account][self.contact.jid] @@ -2233,6 +2247,8 @@ class GroupchatControl(ChatControlBase): self._nec_vcard_published) app.ged.remove_event_handler('update-gc-avatar', ged.GUI1, self._nec_update_avatar) + app.ged.remove_event_handler('update-room-avatar', ged.GUI1, + self._nec_update_room_avatar) app.ged.remove_event_handler('gc-subject-received', ged.GUI1, self._nec_gc_subject_received) app.ged.remove_event_handler('gc-config-changed-received', ged.GUI1, ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -92,7 +92,8 @@ from gajim.common import passwords from gajim.common import logging_helpers from gajim.common.connection_handlers_events import ( OurShowEvent, FileRequestErrorEvent, FileTransferCompletedEvent, - UpdateRosterAvatarEvent, UpdateGCAvatarEvent, HTTPUploadProgressEvent) + UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent, + HTTPUploadProgressEvent) from gajim.common.connection import Connection from gajim.common.file_props import FilesProp from gajim.common import pep @@ -2071,8 +2072,10 @@ class Interface: if minimize: # GCMIN contact = app.contacts.create_contact(jid=room_jid, - account=account, name=nick) - gc_control = GroupchatControl(None, contact, account) + account=account, groups=[_('Groupchats')], sub='none', + groupchat=True) + app.contacts.add_contact(account, contact) + gc_control = GroupchatControl(None, contact, nick, account) app.interface.minimized_controls[account][room_jid] = \ gc_control self.roster.add_groupchat(room_jid, account) @@ -2094,12 +2097,13 @@ class Interface: # Get target window, create a control, and associate it with the window # GCMIN contact = app.contacts.create_contact(jid=room_jid, account=account, - name=nick) + groups=[_('Groupchats')], sub='none', groupchat=True) + app.contacts.add_contact(account, contact) mw = self.msg_win_mgr.get_window(contact.jid, account) if not mw: mw = self.msg_win_mgr.create_window(contact, account, GroupchatControl.TYPE_ID) - gc_control = GroupchatControl(mw, contact, account, + gc_control = GroupchatControl(mw, contact, nick, account, is_continued=is_continued) mw.new_tab(gc_control) mw.set_active_tab(gc_control) @@ -2421,8 +2425,11 @@ class Interface: sys.exit() @staticmethod - def update_avatar(account=None, jid=None, contact=None): - if contact is None: + def update_avatar(account=None, jid=None, contact=None, room_avatar=False): + if room_avatar: + app.nec.push_incoming_event( + UpdateRoomAvatarEvent(None, account=account, jid=jid)) + elif contact is None: app.nec.push_incoming_event( UpdateRosterAvatarEvent(None, account=account, jid=jid)) else: @@ -2524,6 +2531,13 @@ class Interface: return pixbuf return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + @staticmethod + def avatar_exists(filename): + path = os.path.join(app.AVATAR_PATH, filename) + if not os.path.isfile(path): + return False + return True + def auto_join_bookmarks(self, account): """ Autojoin bookmarked GCs that have 'auto join' on for this account @@ -2538,12 +2552,6 @@ class Interface: minimize = bm['minimize'] in ('1', 'true') self.join_gc_room(account, jid, bm['nick'], bm['password'], minimize = minimize) - elif jid in self.minimized_controls[account]: - # more or less a hack: - # On disconnect the minimized gc contact instances - # were set to offline. Reconnect them to show up in the - # roster. - self.roster.add_groupchat(jid, account) def add_gc_bookmark(self, account, name, jid, autojoin, minimize, password, nick): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -743,7 +743,7 @@ class RosterWindow: return contacts[0][0] # it's contact/big brother with highest priority - def remove_contact(self, jid, account, force=False, backend=False): + def remove_contact(self, jid, account, force=False, backend=False, maximize=False): """ Remove contact from roster @@ -785,7 +785,9 @@ class RosterWindow: # If a window is still opened: don't remove contact instance # Remove contact before redrawing, otherwise the old # numbers will still be show - app.contacts.remove_jid(account, jid, remove_meta=True) + if not maximize: + # Dont remove contact when we maximize a room + app.contacts.remove_jid(account, jid, remove_meta=True) if iters: rest_of_family = [data for data in family if account != data['account'] or jid != data['jid']] @@ -829,49 +831,26 @@ class RosterWindow: self.model[self_iter][Column.JID] = new_jid self.draw_contact(new_jid, account) - def add_groupchat(self, jid, account, status=''): + def minimize_groupchat(self, account, jid, status=''): + gc_control = app.interface.msg_win_mgr.get_gc_control(jid, account) + app.interface.minimized_controls[account][jid] = gc_control + self.add_groupchat(jid, account) + + def add_groupchat(self, jid, account): """ Add groupchat to roster and draw it. Return the added contact instance """ - contact = app.contacts.get_contact_with_highest_priority(account, jid) - # Do not show gc if we are disconnected and minimize it + contact = app.contacts.get_groupchat_contact(account, jid) + show = 'offline' if app.account_is_connected(account): show = 'online' - else: - show = 'offline' - status = '' - if contact is None: - gc_control = app.interface.msg_win_mgr.get_gc_control(jid, - account) - if gc_control: - # there is a window that we can minimize - app.interface.minimized_controls[account][jid] = gc_control - name = gc_control.name - elif jid in app.interface.minimized_controls[account]: - name = app.interface.minimized_controls[account][jid].name - else: - name = jid.split('@')[0] - # New groupchat - contact = app.contacts.create_contact(jid=jid, account=account, - name=name, groups=[_('Groupchats')], show=show, status=status, - sub='none') - app.contacts.add_contact(account, contact) - self.add_contact(jid, account) - else: - if jid not in app.interface.minimized_controls[account]: - # there is a window that we can minimize - gc_control = app.interface.msg_win_mgr.get_gc_control(jid, - account) - app.interface.minimized_controls[account][jid] = gc_control - contact.show = show - contact.status = status - self.adjust_and_draw_contact_context(jid, account) + contact.show = show + self.add_contact(jid, account) return contact - - def remove_groupchat(self, jid, account): + def remove_groupchat(self, jid, account, maximize=False): """ Remove groupchat from roster and redraw account and group """ @@ -879,7 +858,7 @@ class RosterWindow: if contact.is_groupchat(): if jid in app.interface.minimized_controls[account]: del app.interface.minimized_controls[account][jid] - self.remove_contact(jid, account, force=True, backend=True) + self.remove_contact(jid, account, force=True, backend=True, maximize=maximize) return True else: return False @@ -3137,7 +3116,7 @@ class RosterWindow: ctrl.on_groupchat_maximize() mw.new_tab(ctrl) mw.set_active_tab(ctrl) - self.remove_groupchat(jid, account) + self.remove_groupchat(jid, account, maximize=True) def on_edit_account(self, widget, account): if 'accounts' in app.interface.instances: @@ -5912,6 +5891,8 @@ class RosterWindow: self._nec_pep_received) app.ged.register_event_handler('update-roster-avatar', ged.GUI1, self._nec_update_avatar) + app.ged.register_event_handler('update-room-avatar', ged.GUI1, + self._nec_update_avatar) app.ged.register_event_handler('gc-subject-received', ged.GUI1, self._nec_gc_subject_received) app.ged.register_event_handler('metacontacts-received', ged.GUI2, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/290e761f8887db1779f11ca965855ab846… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/290e761f8887db1779f11ca965855ab846… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont be lenient with namespace
by Philipp Hörist 19 Apr '18

19 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 70a7000d by Philipp Hörist at 2018-04-19T17:59:17+02:00 Dont be lenient with namespace - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -800,7 +800,7 @@ PresenceHelperEvent): xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() - if namespace.startswith(nbxmpp.NS_MUC): + if namespace == nbxmpp.NS_MUC_USER: self.is_gc = True elif namespace == nbxmpp.NS_SIGNED: sig_tag = x View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/70a7000d440281e23d827170809c06f3d7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/70a7000d440281e23d827170809c06f3d7… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits