Commits April 2018

commits@gajim.org

1 participants
95 discussions

[Git][gajim/gajim][master] Fix const imports
by Philipp Hörist 23 Apr '18

23 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4c1bfda4 by Philipp Hörist at 2018-04-23T18:32:01+02:00 Fix const imports - - - - - 8 changed files: - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/message_archiving.py - gajim/history_manager.py - gajim/history_window.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -44,13 +44,12 @@ from gajim.common import ged from gajim.common import i18n from gajim.common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from gajim.common.contacts import GC_Contact -from gajim.common.logger import KindConstant from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 from nbxmpp.protocol import NS_CHATSTATES from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.const import AvatarSize +from gajim.common.const import AvatarSize, KindConstant from gajim.command_system.implementation.hosts import ChatCommands from gajim.chat_control_base import ChatControlBase ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -24,7 +24,7 @@ from gajim import dialogs from gajim.common import app from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException -from gajim.common.logger import KindConstant +from gajim.common.const import KindConstant from gajim.command_system.errors import CommandError from gajim.command_system.framework import CommandContainer, command, doc ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -60,6 +60,7 @@ from gajim.common.connection_handlers_events import * from gajim.common import ged from gajim.common import nec from gajim.common.nec import NetworkEvent +from gajim.common.const import KindConstant from gajim.common.jingle import ConnectionJingle ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -39,7 +39,7 @@ from gajim.common import app from gajim.common import i18n from gajim.common import dataforms from gajim.common.zeroconf.zeroconf import Constant -from gajim.common.logger import KindConstant +from gajim.common.const import KindConstant from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -26,8 +26,7 @@ import nbxmpp from gajim.common import app from gajim.common import ged from gajim.common import helpers -from gajim.common.logger import KindConstant, JIDConstant -from gajim.common.const import ArchiveState +from gajim.common.const import ArchiveState, JIDConstant from gajim.common.caps_cache import muc_caps_cache import gajim.common.connection_handlers_events as ev ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -87,7 +87,8 @@ if is_standalone(): from gajim.common import app from gajim import gtkgui_helpers -from gajim.common.logger import LOG_DB_PATH, JIDConstant, KindConstant +from gajim.common.logger import LOG_DB_PATH +from gajim.common.const import JIDConstant, KindConstant from gajim.common import helpers from gajim import dialogs ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -41,7 +41,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import exceptions -from gajim.common.logger import ShowConstant, KindConstant +from gajim.common.const import ShowConstant, KindConstant @unique class InfoColumn(IntEnum): ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -30,7 +30,7 @@ from gajim.common import contacts from gajim.common import ged from gajim.common.connection_handlers_events import ChatstateReceivedEvent, \ InformationEvent -from gajim.common.logger import KindConstant +from gajim.common.const import KindConstant from gajim import message_control from gajim import notify from gajim import dialogs View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c1bfda48df396765e1e046b7b6b22d0fb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4c1bfda48df396765e1e046b7b6b22d0fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move constants into const module
by Philipp Hörist 23 Apr '18

23 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f2033fa by Philipp Hörist at 2018-04-23T18:23:57+02:00 Move constants into const module - - - - - 2 changed files: - gajim/common/const.py - gajim/common/logger.py Changes: ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -53,6 +53,59 @@ class PathType(IntEnum): FOLDER = 1 FOLDER_OPTIONAL = 2 +@unique +class KindConstant(IntEnum): + STATUS = 0 + GCSTATUS = 1 + GC_MSG = 2 + SINGLE_MSG_RECV = 3 + CHAT_MSG_RECV = 4 + SINGLE_MSG_SENT = 5 + CHAT_MSG_SENT = 6 + ERROR = 7 + + def __str__(self): + return str(self.value) + +@unique +class ShowConstant(IntEnum): + ONLINE = 0 + CHAT = 1 + AWAY = 2 + XA = 3 + DND = 4 + OFFLINE = 5 + +@unique +class TypeConstant(IntEnum): + AIM = 0 + GG = 1 + HTTP_WS = 2 + ICQ = 3 + MSN = 4 + QQ = 5 + SMS = 6 + SMTP = 7 + TLEN = 8 + YAHOO = 9 + NEWMAIL = 10 + RSS = 11 + WEATHER = 12 + MRIM = 13 + NO_TRANSPORT = 14 + +@unique +class SubscriptionConstant(IntEnum): + NONE = 0 + TO = 1 + FROM = 2 + BOTH = 3 + +@unique +class JIDConstant(IntEnum): + NORMAL_TYPE = 0 + ROOM_TYPE = 1 + THANKS = u"""\ Alexander Futász ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -43,6 +43,9 @@ from enum import IntEnum, unique from gajim.common import exceptions from gajim.common import app from gajim.common import configpaths +from gajim.common.const import ( + JIDConstant, KindConstant, ShowConstant, TypeConstant, + SubscriptionConstant) import sqlite3 as sqlite @@ -53,58 +56,6 @@ CACHE_DB_PATH = configpaths.get('CACHE_DB') import logging log = logging.getLogger('gajim.c.logger') -@unique -class JIDConstant(IntEnum): - NORMAL_TYPE = 0 - ROOM_TYPE = 1 - -@unique -class KindConstant(IntEnum): - STATUS = 0 - GCSTATUS = 1 - GC_MSG = 2 - SINGLE_MSG_RECV = 3 - CHAT_MSG_RECV = 4 - SINGLE_MSG_SENT = 5 - CHAT_MSG_SENT = 6 - ERROR = 7 - - def __str__(self): - return str(self.value) - -@unique -class ShowConstant(IntEnum): - ONLINE = 0 - CHAT = 1 - AWAY = 2 - XA = 3 - DND = 4 - OFFLINE = 5 - -@unique -class TypeConstant(IntEnum): - AIM = 0 - GG = 1 - HTTP_WS = 2 - ICQ = 3 - MSN = 4 - QQ = 5 - SMS = 6 - SMTP = 7 - TLEN = 8 - YAHOO = 9 - NEWMAIL = 10 - RSS = 11 - WEATHER = 12 - MRIM = 13 - NO_TRANSPORT = 14 - -@unique -class SubscriptionConstant(IntEnum): - NONE = 0 - TO = 1 - FROM = 2 - BOTH = 3 class Logger: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f2033faff968a28f64ee98241638e17be… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f2033faff968a28f64ee98241638e17be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove old unused migration method
by Philipp Hörist 23 Apr '18

23 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86bfc81a by Philipp Hörist at 2018-04-23T17:34:14+02:00 Remove old unused migration method - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -174,31 +174,6 @@ class OptionsParser: caps_cache.capscache.initialize_from_db() @staticmethod - def assert_unread_msgs_table_exists(): - """ - Create table unread_messages if there is no such table - """ - back = os.getcwd() - os.chdir(logger.LOG_DB_FOLDER) - con = sqlite.connect(logger.LOG_DB_FILE) - os.chdir(back) - cur = con.cursor() - try: - cur.executescript( - ''' - CREATE TABLE IF NOT EXISTS unread_messages ( - message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER - ); - ''' - ) - con.commit() - app.logger.init_vars() - except sqlite.OperationalError: - pass - con.close() - - @staticmethod def update_ft_proxies(to_remove=None, to_add=None): if to_remove is None: to_remove = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/86bfc81ad3cf05a68dc137e8d5cf835cc3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/86bfc81ad3cf05a68dc137e8d5cf835cc3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add stanza_id index also when we create the DB
by Philipp Hörist 22 Apr '18

22 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3efa731f by Philipp Hörist at 2018-04-23T00:10:35+02:00 Add stanza_id index also when we create the DB - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -187,6 +187,9 @@ class Logger: ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); + + CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); + ''' ) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3efa731fbf89e199aee110019745923e7f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3efa731fbf89e199aee110019745923e7f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Move DB creating into logger module
by Philipp Hörist 22 Apr '18

22 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 188fb85b by Philipp Hörist at 2018-04-22T22:16:17+02:00 Move DB creating into logger module - - - - - 124e501f by Philipp Hörist at 2018-04-22T22:34:27+02:00 Make ExceptionDialog easier to test - - - - - 8306f076 by Philipp Hörist at 2018-04-22T23:12:34+02:00 Move path creation into configpaths module - - - - - 6 changed files: - − gajim/common/check_paths.py - gajim/common/configpaths.py - gajim/common/logger.py - gajim/gajim.py - gajim/gtkexcepthook.py - gajim/htmltextview.py Changes: ===================================== gajim/common/check_paths.py deleted ===================================== --- a/gajim/common/check_paths.py +++ /dev/null @@ -1,179 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/check_paths.py -## -## Copyright (C) 2005-2006 Travis Shirk <travis AT pobox.com> -## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import os -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 - - -def create_log_db(): - print(_('creating logs database')) - con = sqlite3.connect(logger.LOG_DB_PATH) - os.chmod(logger.LOG_DB_PATH, 0o600) # rw only for us - cur = con.cursor() - # create the tables - # kind can be - # status, gcstatus, gc_msg, (we only recv for those 3), - # single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent - # to meet all our needs - # logs.jid_id --> jids.jid_id but Sqlite doesn't do FK etc so it's done in python code - # jids.jid text column will be JID if TC-related, room_jid if GC-related, - # ROOM_JID/nick if pm-related. - # also check optparser.py, which updates databases on gajim updates - cur.executescript( - ''' - CREATE TABLE jids( - jid_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid TEXT UNIQUE, - type INTEGER - ); - - CREATE TABLE unread_messages( - message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER, - shown BOOLEAN default 0 - ); - - CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); - - CREATE TABLE logs( - log_line_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - account_id INTEGER, - jid_id INTEGER, - contact_name TEXT, - time INTEGER, - kind INTEGER, - show INTEGER, - message TEXT, - subject TEXT, - additional_data TEXT, - stanza_id TEXT, - encryption TEXT, - encryption_state TEXT, - marker INTEGER - ); - - CREATE TABLE last_archive_message( - jid_id INTEGER PRIMARY KEY UNIQUE, - last_mam_id TEXT, - oldest_mam_timestamp TEXT, - last_muc_timestamp TEXT - ); - - CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); - ''' - ) - - con.commit() - con.close() - -def create_cache_db(): - print(_('creating cache database')) - con = sqlite3.connect(logger.CACHE_DB_PATH) - os.chmod(logger.CACHE_DB_PATH, 0o600) # rw only for us - cur = con.cursor() - cur.executescript( - ''' - CREATE TABLE transports_cache ( - transport TEXT UNIQUE, - type INTEGER - ); - - CREATE TABLE caps_cache ( - hash_method TEXT, - hash TEXT, - data BLOB, - last_seen INTEGER); - - CREATE TABLE rooms_last_message_time( - jid_id INTEGER PRIMARY KEY UNIQUE, - time INTEGER - ); - - CREATE TABLE IF NOT EXISTS roster_entry( - account_jid_id INTEGER, - jid_id INTEGER, - name TEXT, - subscription INTEGER, - ask BOOLEAN, - avatar_sha TEXT, - PRIMARY KEY (account_jid_id, jid_id) - ); - - CREATE TABLE IF NOT EXISTS roster_group( - account_jid_id INTEGER, - jid_id INTEGER, - group_name TEXT, - PRIMARY KEY (account_jid_id, jid_id, group_name) - ); - ''' - ) - - con.commit() - con.close() - -def check_and_possibly_create_paths(): - LOG_DB_PATH = configpaths.get('LOG_DB') - CACHE_DB_PATH = configpaths.get('CACHE_DB') - - 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_PATH): - if os.path.exists(CACHE_DB_PATH): - os.remove(CACHE_DB_PATH) - create_log_db() - app.logger.init_vars() - elif os.path.isdir(LOG_DB_PATH): - print(_('%s is a directory but should be a file') % LOG_DB_PATH) - print(_('Gajim will now exit')) - sys.exit() - - if not os.path.exists(CACHE_DB_PATH): - create_cache_db() - app.logger.attach_cache_database() - elif os.path.isdir(CACHE_DB_PATH): - print(_('%s is a directory but should be a file') % CACHE_DB_PATH) - print(_('Gajim will now exit')) - sys.exit() - -def create_path(directory): - head, tail = os.path.split(directory) - if not os.path.exists(head): - create_path(head) - if os.path.exists(directory): - return - print(('creating %s directory') % directory) - os.mkdir(directory, 0o700) ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -24,7 +24,9 @@ ## import os +import sys import tempfile +from pathlib import Path from gajim.common.const import PathType, PathLocation @@ -57,6 +59,28 @@ def init(): _paths.init() +def create_paths(): + for path in get_paths(PathType.FOLDER): + if not isinstance(path, Path): + path = Path(path) + + if path.is_file(): + print(_('%s is a file but it should be a directory') % path) + print(_('Gajim will now exit')) + sys.exit() + + if not path.exists(): + for parent_path in reversed(path.parents): + # Create all parent folders + # dont use mkdir(parent=True), as it ignores `mode` + # when creating the parents + if not parent_path.exists(): + print(('creating %s directory') % parent_path) + parent_path.mkdir(mode=0o700) + print(('creating %s directory') % path) + path.mkdir(mode=0o700) + + class ConfigPaths: def __init__(self): self._paths = {} ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -112,17 +112,132 @@ class Logger: self.con = None self.commit_timout_id = None + if os.path.isdir(LOG_DB_PATH): + print(_('%s is a directory but should be a file') % LOG_DB_PATH) + print(_('Gajim will now exit')) + sys.exit() + + if os.path.isdir(CACHE_DB_PATH): + print(_('%s or %s is a directory but should be a file') % CACHE_DB_PATH) + print(_('Gajim will now exit')) + sys.exit() + if not os.path.exists(LOG_DB_PATH): - # this can happen only the first time (the time we create the db) - # db is not created here but in src/common/checks_paths.py - return + if os.path.exists(CACHE_DB_PATH): + os.remove(CACHE_DB_PATH) + self.create_log_db() + self.init_vars() if not os.path.exists(CACHE_DB_PATH): - # this can happen cache database is not present when gajim is launched - # db will be created in src/common/checks_paths.py - return + self.create_cache_db() self.attach_cache_database() + def create_log_db(self): + print(_('creating logs database')) + con = sqlite.connect(LOG_DB_PATH) + os.chmod(LOG_DB_PATH, 0o600) # rw only for us + cur = con.cursor() + # create the tables + # kind can be + # status, gcstatus, gc_msg, (we only recv for those 3), + # single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent + # to meet all our needs + # logs.jid_id --> jids.jid_id but Sqlite doesn't do FK etc so it's done in python code + # jids.jid text column will be JID if TC-related, room_jid if GC-related, + # ROOM_JID/nick if pm-related. + # also check optparser.py, which updates databases on gajim updates + cur.executescript( + ''' + CREATE TABLE jids( + jid_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, + jid TEXT UNIQUE, + type INTEGER + ); + + CREATE TABLE unread_messages( + message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, + jid_id INTEGER, + shown BOOLEAN default 0 + ); + + CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); + + CREATE TABLE logs( + log_line_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, + account_id INTEGER, + jid_id INTEGER, + contact_name TEXT, + time INTEGER, + kind INTEGER, + show INTEGER, + message TEXT, + subject TEXT, + additional_data TEXT, + stanza_id TEXT, + encryption TEXT, + encryption_state TEXT, + marker INTEGER + ); + + CREATE TABLE last_archive_message( + jid_id INTEGER PRIMARY KEY UNIQUE, + last_mam_id TEXT, + oldest_mam_timestamp TEXT, + last_muc_timestamp TEXT + ); + + CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); + ''' + ) + + con.commit() + con.close() + + def create_cache_db(self): + print(_('creating cache database')) + con = sqlite.connect(CACHE_DB_PATH) + os.chmod(CACHE_DB_PATH, 0o600) # rw only for us + cur = con.cursor() + cur.executescript( + ''' + CREATE TABLE transports_cache ( + transport TEXT UNIQUE, + type INTEGER + ); + + CREATE TABLE caps_cache ( + hash_method TEXT, + hash TEXT, + data BLOB, + last_seen INTEGER); + + CREATE TABLE rooms_last_message_time( + jid_id INTEGER PRIMARY KEY UNIQUE, + time INTEGER + ); + + CREATE TABLE IF NOT EXISTS roster_entry( + account_jid_id INTEGER, + jid_id INTEGER, + name TEXT, + subscription INTEGER, + ask BOOLEAN, + avatar_sha TEXT, + PRIMARY KEY (account_jid_id, jid_id) + ); + + CREATE TABLE IF NOT EXISTS roster_group( + account_jid_id INTEGER, + jid_id INTEGER, + group_name TEXT, + PRIMARY KEY (account_jid_id, jid_id, group_name) + ); + ''' + ) + + con.commit() + con.close() + @staticmethod def namedtuple_factory(cursor, row): """ ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -156,14 +156,13 @@ class GajimApplication(Gtk.Application): # Create and initialize Application Paths & Databases from gajim.common import app - from gajim.common import check_paths + configpaths.create_paths() from gajim.common import exceptions from gajim.common import logger from gajim.common import caps_cache try: app.logger = logger.Logger() caps_cache.initialize(app.logger) - check_paths.check_and_possibly_create_paths() except exceptions.DatabaseMalformed as error: dlg = Gtk.MessageDialog( None, ===================================== gajim/gtkexcepthook.py ===================================== --- a/gajim/gtkexcepthook.py +++ b/gajim/gtkexcepthook.py @@ -31,11 +31,17 @@ from io import StringIO from urllib.parse import urlencode import nbxmpp -import gajim import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GObject +try: + import gajim + gajim_version = gajim.__version__ +except ImportError: + # For standalone testing + gajim_version = 'Package not installed' + if __name__ == '__main__': glade_file = os.path.join('data', 'gui', 'exception_dialog.ui') else: @@ -59,6 +65,7 @@ ISSUE_TEXT = '''## Versions ## Steps to reproduce the problem ...''' + def _hook(type_, value, tb): if not _exception_in_progress.acquire(False): # Exceptions have piled up, so we use the default exception @@ -83,8 +90,11 @@ class ExceptionDialog(): traceback.print_exception(type_, value, tb, None, trace) self.text = self.get_issue_text(trace.getvalue()) buffer_.set_text(self.text) + print(self.text) self.exception_view.set_editable(False) self.dialog.show() + if __name__ == '__main__': + self.dialog.connect('delete-event', self._on_delete_event) def on_report_clicked(self, *args): issue_url = 'https://dev.gajim.org/gajim/gajim/issues/new' @@ -94,6 +104,11 @@ class ExceptionDialog(): def on_close_clicked(self, *args): self.dialog.destroy() + if __name__ == '__main__': + Gtk.main_quit() + + def _on_delete_event(self, *args): + Gtk.main_quit() def get_issue_text(self, traceback_text): gtk_ver = '%i.%i.%i' % ( @@ -106,7 +121,7 @@ class ExceptionDialog(): gtk_ver, gobject_ver, nbxmpp.__version__, - gajim.__version__, + gajim_version, traceback_text) @@ -126,6 +141,7 @@ def get_os_info(): return platform.system() return '' + # this is just to assist testing (python3 gtkexcepthook.py) if __name__ == '__main__': init() ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -1084,8 +1084,10 @@ if __name__ == '__main__': from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface from gajim.common import app, logger, caps_cache - app.logger = logger.Logger() - caps_cache.initialize(app.logger) + # TODO: dont call Logger() it will create the DB + # maybe mock this object for tests + # app.logger = logger.Logger() + # caps_cache.initialize(app.logger) Interface() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/efd2ca50c60d8047796f8be79f933df91… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/efd2ca50c60d8047796f8be79f933df91… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused old migration method
by Philipp Hörist 22 Apr '18

22 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: efd2ca50 by Philipp Hörist at 2018-04-22T02:30:34+02:00 Remove unused old migration method - - - - - 1 changed file: - gajim/common/check_paths.py Changes: ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -139,44 +139,6 @@ def create_cache_db(): con.commit() con.close() -def split_db(): - print('spliting database') - 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') - - tmp = logger.CACHE_DB_PATH - logger.CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db') - create_cache_db() - back = os.getcwd() - os.chdir(OLD_LOG_DB_FOLDER) - con = sqlite3.connect('logs.db') - os.chdir(back) - cur = con.cursor() - cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''') - tables = cur.fetchall() # we get [('jids',), ('unread_messages',), ... - tables = [t[0] for t in tables] - cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH) - for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry', - 'roster_group', 'transports_cache'): - if table not in tables: - continue - try: - cur.executescript( - 'INSERT INTO cache.%s SELECT * FROM %s;' % (table, table)) - con.commit() - cur.executescript('DROP TABLE %s;' % table) - con.commit() - 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_create_paths(): LOG_DB_PATH = configpaths.get('LOG_DB') CACHE_DB_PATH = configpaths.get('CACHE_DB') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/efd2ca50c60d8047796f8be79f933df911… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/efd2ca50c60d8047796f8be79f933df911… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make sure all config dirs get created
by Philipp Hörist 22 Apr '18

22 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3ad539cb by Philipp Hörist at 2018-04-22T02:30:08+02:00 Make sure all config dirs get created LOG_DB_FOLDER and CACHE_DB_FOLDER are equal to MY_DATA and MY_CACHE - - - - - 2 changed files: - gajim/common/check_paths.py - gajim/common/configpaths.py Changes: ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -178,11 +178,8 @@ def split_db(): logger.CACHE_DB_PATH = tmp 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) - - CACHE_DB_PATH = logger.CACHE_DB_PATH - CACHE_DB_FOLDER, CACHE_DB_FILE = os.path.split(CACHE_DB_PATH) + LOG_DB_PATH = configpaths.get('LOG_DB') + CACHE_DB_PATH = configpaths.get('CACHE_DB') for path in configpaths.get_paths(PathType.FOLDER): if not os.path.exists(path): @@ -192,20 +189,6 @@ def check_and_possibly_create_paths(): print(_('Gajim will now exit')) sys.exit() - if not os.path.exists(LOG_DB_FOLDER): - create_path(LOG_DB_FOLDER) - elif os.path.isfile(LOG_DB_FOLDER): - print(_('%s is a file but it should be a directory') % LOG_DB_FOLDER) - 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): - print(_('%s is a file but it should be a directory') % CACHE_DB_FOLDER) - print(_('Gajim will now exit')) - sys.exit() - if not os.path.exists(LOG_DB_PATH): if os.path.exists(CACHE_DB_PATH): os.remove(CACHE_DB_PATH) ===================================== gajim/common/configpaths.py ===================================== --- a/gajim/common/configpaths.py +++ b/gajim/common/configpaths.py @@ -124,7 +124,7 @@ class ConfigPaths: return path def _add(self, name, path, location=None, path_type=None, unique=False): - if location is not None: + if path and location is not None: path = self._prepare(path, unique) self._paths[name] = (location, path, path_type) @@ -135,9 +135,9 @@ class ConfigPaths: user_dir_paths = [ ('TMP', tempfile.gettempdir()), - ('MY_CONFIG', self.config_root), - ('MY_CACHE', self.cache_root), - ('MY_DATA', self.data_root), + ('MY_CONFIG', '', PathLocation.CONFIG, PathType.FOLDER), + ('MY_CACHE', '', PathLocation.CACHE, PathType.FOLDER), + ('MY_DATA', '', PathLocation.DATA, PathType.FOLDER), ] for path in user_dir_paths: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3ad539cbf266d1515df2e5e066d206e521… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3ad539cbf266d1515df2e5e066d206e521… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2018