Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Dont check for OpenSSL we require it on install
by Philipp Hörist 23 Apr '18

23 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 986898f6 by Philipp Hörist at 2018-04-23T23:47:17+02:00 Dont check for OpenSSL we require it on install - - - - - 3 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -200,17 +200,6 @@ else: if not test_gpg(binary='gpg'): HAVE_GPG = False -HAVE_PYOPENSSL = True -try: - import OpenSSL.SSL - import OpenSSL.crypto - ver = OpenSSL.__version__ - ver_l = [int(i) for i in ver.split('.')] - if ver_l < [0, 12]: - raise ImportError -except Exception: - HAVE_PYOPENSSL = False - HAVE_FARSTREAM = True try: if os.name == 'nt': ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -42,7 +42,9 @@ import locale import hmac import hashlib import json +import logging from functools import partial +from string import Template try: randomsource = random.SystemRandom() @@ -54,29 +56,23 @@ import signal if os.name != 'nt': signal.signal(signal.SIGPIPE, signal.SIG_DFL) +if os.name == 'nt': + import certifi +import OpenSSL.crypto import nbxmpp +from nbxmpp import Smacks + from gajim import common from gajim.common import helpers from gajim.common import app from gajim.common import gpg from gajim.common import passwords -from gajim.common import exceptions from gajim.common import check_X509 from gajim.common.connection_handlers import * -from gajim.common.helpers import version_condition from gajim.common.contacts import GC_Contact - from gajim.gtkgui_helpers import get_action -if app.HAVE_PYOPENSSL: - import OpenSSL.crypto -if os.name == 'nt': - import certifi - -from nbxmpp import Smacks -from string import Template -import logging log = logging.getLogger('gajim.c.connection') ssl_error = { ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -30,8 +30,10 @@ import sys import os from time import time as time_time +import OpenSSL.crypto import nbxmpp from nbxmpp.protocol import NS_CHATSTATES + from gajim.common import atom from gajim.common import nec from gajim.common import helpers @@ -45,8 +47,6 @@ from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp from gajim.common.nec import NetworkEvent -if app.HAVE_PYOPENSSL: - import OpenSSL.crypto log = logging.getLogger('gajim.c.connection_handlers_events') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/986898f69d2ad87d09cbb9ae889ca480fb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/986898f69d2ad87d09cbb9ae889ca480fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove accidentally commited file
by Philipp Hörist 23 Apr '18

23 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 872c68b3 by Philipp Hörist at 2018-04-23T21:35:24+02:00 Remove accidentally commited file - - - - - 1 changed file: - − Logs.db Changes: ===================================== Logs.db deleted ===================================== --- a/Logs.db +++ /dev/null View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/872c68b368b21dcabf387551204a864d6d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/872c68b368b21dcabf387551204a864d6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor database migration
by Philipp Hörist 23 Apr '18

23 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ee45b86 by Philipp Hörist at 2018-04-23T21:27:01+02:00 Refactor database migration - Move database migration to the logger module - Dont depend on Gajim version for migration use PRAGMA user_version - Refactoring of some methods in the logger module - Dont use cursor object, if there is no reason - Make some attributes and methods private - - - - - 3 changed files: - + Logs.db - gajim/common/logger.py - gajim/common/optparser.py Changes: ===================================== Logs.db ===================================== --- /dev/null +++ b/Logs.db ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1,5 +1,5 @@ # -*- coding:utf-8 -*- -## src/common/logger.py +## gajim/common/logger.py ## ## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> @@ -8,6 +8,7 @@ ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> ## ## This file is part of Gajim. ## @@ -34,11 +35,12 @@ import time import datetime import calendar import json +import logging +import sqlite3 as sqlite from collections import namedtuple from gzip import GzipFile from io import BytesIO from gi.repository import GLib -from enum import IntEnum, unique from gajim.common import exceptions from gajim.common import app @@ -47,152 +49,206 @@ from gajim.common.const import ( JIDConstant, KindConstant, ShowConstant, TypeConstant, SubscriptionConstant) -import sqlite3 as sqlite - LOG_DB_PATH = configpaths.get('LOG_DB') LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH) CACHE_DB_PATH = configpaths.get('CACHE_DB') -import logging +LOGS_SQL_STATEMENT = ''' + 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); + CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); + PRAGMA user_version=1; + ''' + +CACHE_SQL_STATEMENT = ''' + 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 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 roster_group( + account_jid_id INTEGER, + jid_id INTEGER, + group_name TEXT, + PRIMARY KEY (account_jid_id, jid_id, group_name) + ); + PRAGMA user_version=1; + ''' + log = logging.getLogger('gajim.c.logger') class Logger: def __init__(self): self._jid_ids = {} - self.con = None - self.commit_timout_id = None + self._con = None + self._commit_timout_id = None + + self._create_databases() + self._migrate_databases() + self._connect_databases() + self._get_jid_ids_from_db() + def _create_databases(self): 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')) + log.error(_('%s is a directory but should be a file'), + LOG_DB_PATH) 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')) + log.error(_('%s is a directory but should be a file'), + CACHE_DB_PATH) sys.exit() if not os.path.exists(LOG_DB_PATH): if os.path.exists(CACHE_DB_PATH): os.remove(CACHE_DB_PATH) - self.create_log_db() + self._create(LOGS_SQL_STATEMENT, LOG_DB_PATH) - self.init_vars() if not os.path.exists(CACHE_DB_PATH): - 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); - - CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); - - ''' - ) + self._create(CACHE_SQL_STATEMENT, CACHE_DB_PATH) - con.commit() - con.close() + @staticmethod + def _create(statement, path): + log.info(_('Creating %s'), path) + con = sqlite.connect(path) + os.chmod(path, 0o600) - 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) - ); - ''' - ) + try: + con.executescript(statement) + except Exception as error: + log.exception('Error') + con.close() + os.remove(path) + sys.exit() con.commit() con.close() @staticmethod + def _get_user_version(con) -> int: + """ Return the value of PRAGMA user_version. """ + return con.execute('PRAGMA user_version').fetchone()[0] + + def _migrate_databases(self): + try: + con = sqlite.connect(LOG_DB_PATH) + self._migrate_logs(con) + con.close() + + con = sqlite.connect(CACHE_DB_PATH) + self._migrate_cache(con) + con.close() + except Exception: + log.exception('Error') + sys.exit() + + def _migrate_logs(self, con): + if self._get_user_version(con) == 0: + # All migrations from 0.16.9 until 1.0.0 + statements = [ + 'ALTER TABLE logs ADD COLUMN "account_id" INTEGER', + 'ALTER TABLE logs ADD COLUMN "stanza_id" TEXT', + 'ALTER TABLE logs ADD COLUMN "encryption" TEXT', + 'ALTER TABLE logs ADD COLUMN "encryption_state" TEXT', + 'ALTER TABLE logs ADD COLUMN "marker" INTEGER', + 'ALTER TABLE logs ADD COLUMN "additional_data" TEXT', + '''CREATE TABLE IF NOT EXISTS last_archive_message( + jid_id INTEGER PRIMARY KEY UNIQUE, + last_mam_id TEXT, + oldest_mam_timestamp TEXT, + last_muc_timestamp TEXT + )''', + + '''CREATE INDEX IF NOT EXISTS idx_logs_stanza_id + ON logs(stanza_id)''', + 'PRAGMA user_version=1' + ] + + self._execute_multiple(con, statements) + + if self._get_user_version(con) < 2: + pass + + def _migrate_cache(self, con): + if self._get_user_version(con) == 0: + # All migrations from 0.16.9 until 1.0.0 + statements = [ + 'ALTER TABLE roster_entry ADD COLUMN "avatar_sha" TEXT', + 'PRAGMA user_version=1' + ] + self._execute_multiple(con, statements) + + if self._get_user_version(con) < 2: + pass + + @staticmethod + def _execute_multiple(con, statements): + """ + Execute mutliple statements with the option to fail on duplicates + but still continue + """ + for sql in statements: + try: + con.execute(sql) + con.commit() + except sqlite.OperationalError as error: + if str(error).startswith('duplicate column name:'): + log.info(error) + else: + log.exception('Error') + sys.exit() + + @staticmethod def namedtuple_factory(cursor, row): """ Usage: @@ -209,55 +265,33 @@ class Logger: def dispatch(self, event, error): app.ged.raise_event(event, None, str(error)) - def close_db(self): - if self.con: - self.con.close() - self.con = None - self.cur = None - - def open_db(self): - self.close_db() + def _connect_databases(self): + self._con = sqlite.connect( + LOG_DB_PATH, timeout=20.0, isolation_level='IMMEDIATE') - # FIXME: sqlite3_open wants UTF8 strings. So a path with - # non-ascii chars doesn't work. See #2812 and - # http://lists.initd.org/pipermail/pysqlite/2005-August/000134.html - back = os.getcwd() - os.chdir(LOG_DB_FOLDER) - - # if locked, wait up to 20 sec to unlock - # before raise (hopefully should be enough) - - self.con = sqlite.connect(LOG_DB_FILE, timeout=20.0, - isolation_level='IMMEDIATE') - os.chdir(back) - self.con.row_factory = self.namedtuple_factory + self._con.row_factory = self.namedtuple_factory # DB functions - self.con.create_function("like", 1, self._like) - self.con.create_function("get_timeout", 0, self._get_timeout) + self._con.create_function("like", 1, self._like) + self._con.create_function("get_timeout", 0, self._get_timeout) - self.cur = self.con.cursor() - self.set_synchronous(False) - - def attach_cache_database(self): + self._set_synchronous(False) try: - self.cur.execute("ATTACH DATABASE '%s' AS cache" % \ - CACHE_DB_PATH.replace("'", "''")) - except sqlite.Error as e: - log.debug("Failed to attach cache database: %s" % str(e)) + self._con.execute("ATTACH DATABASE '%s' AS cache" % + CACHE_DB_PATH.replace("'", "''")) + except Exception as error: + log.exception('Error') + self._con.close() + sys.exit() - def set_synchronous(self, sync): + def _set_synchronous(self, sync): try: if sync: - self.cur.execute("PRAGMA synchronous = NORMAL") + self._con.execute("PRAGMA synchronous = NORMAL") else: - self.cur.execute("PRAGMA synchronous = OFF") + self._con.execute("PRAGMA synchronous = OFF") except sqlite.Error as e: - log.debug("Failed to set_synchronous(%s): %s" % (sync, str(e))) - - def init_vars(self): - self.open_db() - self.get_jid_ids_from_db() + log.exception('Error') @staticmethod def _get_timeout(): @@ -277,29 +311,29 @@ class Logger: def commit(self): try: - self.con.commit() + self._con.commit() except sqlite.OperationalError as e: print(str(e), file=sys.stderr) - self.commit_timout_id = None + self._commit_timout_id = None return False def _timeout_commit(self): - if self.commit_timout_id: + if self._commit_timout_id: return - self.commit_timout_id = GLib.timeout_add(500, self.commit) + self._commit_timout_id = GLib.timeout_add(500, self.commit) def simple_commit(self, sql_to_commit): """ Helper to commit """ - self.cur.execute(sql_to_commit) + self._con.execute(sql_to_commit) self._timeout_commit() - def get_jid_ids_from_db(self): + def _get_jid_ids_from_db(self): """ Load all jid/jid_id tuples into a dict for faster access """ - rows = self.con.execute( + rows = self._con.execute( 'SELECT jid_id, jid, type FROM jids').fetchall() for row in rows: self._jid_ids[row.jid] = row @@ -327,8 +361,8 @@ class Logger: """ Return True if it's a room jid, False if it's not, None if we don't know """ - self.cur.execute('SELECT type FROM jids WHERE jid=?', (jid,)) - row = self.cur.fetchone() + row = self._con.execute( + 'SELECT type FROM jids WHERE jid=?', (jid,)).fetchone() if row is None: return None else: @@ -380,7 +414,7 @@ class Logger: return result.jid_id sql = 'SELECT jid_id, jid, type FROM jids WHERE jid = ?' - row = self.con.execute(sql, [jid]).fetchone() + row = self._con.execute(sql, [jid]).fetchone() if row is not None: self._jid_ids[jid] = row return row.jid_id @@ -390,7 +424,7 @@ class Logger: 'Unable to insert new JID because type is missing') sql = 'INSERT INTO jids (jid, type) VALUES (?, ?)' - lastrowid = self.con.execute(sql, (jid, type_)).lastrowid + lastrowid = self._con.execute(sql, (jid, type_)).lastrowid Row = namedtuple('Row', 'jid_id jid type') self._jid_ids[jid] = Row(lastrowid, jid, type_) self._timeout_commit() @@ -576,9 +610,8 @@ class Logger: """ all_messages = [] try: - self.cur.execute( - 'SELECT message_id, shown from unread_messages') - unread_results = self.cur.fetchall() + unread_results = self._con.execute( + 'SELECT message_id, shown from unread_messages').fetchall() except Exception: unread_results = [] for message in unread_results: @@ -587,20 +620,19 @@ class Logger: # here we get infos for that message, and related jid from jids table # do NOT change order of SELECTed things, unless you change function(s) # that called this function - self.cur.execute(''' + result = self._con.execute(''' SELECT logs.log_line_id, logs.message, logs.time, logs.subject, jids.jid, logs.additional_data FROM logs, jids WHERE logs.log_line_id = %d AND logs.jid_id = jids.jid_id ''' % msg_log_id - ) - results = self.cur.fetchone() - if results is None: + ).fetchone() + if result is None: # Log line is no more in logs table. remove it from unread_messages self.set_read_messages([msg_log_id]) continue - all_messages.append((results, shown)) + all_messages.append((result, shown)) return all_messages def get_last_conversation_lines(self, account, jid, pending): @@ -644,7 +676,7 @@ class Logger: kinds=', '.join(kinds)) try: - messages = self.con.execute( + messages = self._con.execute( sql, tuple(jids) + (restore, pending)).fetchall() except sqlite.DatabaseError: self.dispatch('DB_ERROR', @@ -691,7 +723,7 @@ class Logger: ORDER BY time, log_line_id '''.format(jids=', '.join('?' * len(jids))) - return self.con.execute(sql, tuple(jids) + + return self._con.execute(sql, tuple(jids) + (date.timestamp(), (date + delta).timestamp())).fetchall() @@ -734,7 +766,7 @@ class Logger: '''.format(jids=', '.join('?' * len(jids)), date_search=between if date else '') - return self.con.execute(sql, tuple(jids) + (query,)).fetchall() + return self._con.execute(sql, tuple(jids) + (query,)).fetchall() def get_days_with_logs(self, account, jid, year, month): """ @@ -772,7 +804,7 @@ class Logger: """.format(jids=', '.join('?' * len(jids)), kinds=', '.join(kinds)) - return self.con.execute(sql, tuple(jids) + + return self._con.execute(sql, tuple(jids) + (date.timestamp(), (date + delta).timestamp())).fetchall() @@ -800,7 +832,7 @@ class Logger: # fetchone() returns always at least one Row with all # attributes set to None because of the MAX() function - return self.con.execute(sql, tuple(jids)).fetchone().time + return self._con.execute(sql, tuple(jids)).fetchone().time def get_first_date_that_has_logs(self, account, jid): """ @@ -826,7 +858,7 @@ class Logger: # fetchone() returns always at least one Row with all # attributes set to None because of the MIN() function - return self.con.execute(sql, tuple(jids)).fetchone().time + return self._con.execute(sql, tuple(jids)).fetchone().time def get_date_has_logs(self, account, jid, date): """ @@ -856,7 +888,7 @@ class Logger: AND time BETWEEN ? AND ? '''.format(jids=', '.join('?' * len(jids))) - return self.con.execute(sql, tuple(jids) + + return self._con.execute(sql, tuple(jids) + (date.timestamp(), (date + delta).timestamp())).fetchone() @@ -875,7 +907,7 @@ class Logger: NATURAL JOIN jids WHERE jid = ? ''' - row = self.con.execute(sql, (jid,)).fetchone() + row = self._con.execute(sql, (jid,)).fetchone() if not row: return self.get_last_date_that_has_logs(account, jid) return row.time @@ -896,7 +928,7 @@ class Logger: (SELECT time FROM rooms_last_message_time WHERE jid_id = :jid_id AND time >= :time), :time))''' - self.con.execute(sql, {"jid_id": jid_id, "time": timestamp}) + self._con.execute(sql, {"jid_id": jid_id, "time": timestamp}) self._timeout_commit() def save_transport_type(self, jid, type_): @@ -907,11 +939,10 @@ class Logger: if not type_id: # unknown type return - self.cur.execute( - 'SELECT type from transports_cache WHERE transport = "%s"' % jid) - results = self.cur.fetchone() - if results: - if results.type == type_id: + result = self._con.execute( + 'SELECT type from transports_cache WHERE transport = "%s"' % jid).fetchone() + if result: + if result.type == type_id: return sql = 'UPDATE transports_cache SET type = %d WHERE transport = "%s"' %\ (type_id, jid) @@ -924,9 +955,7 @@ class Logger: """ Return all the type of the transports in DB """ - self.cur.execute( - 'SELECT * from transports_cache') - results = self.cur.fetchall() + results = self._con.execute('SELECT * from transports_cache').fetchall() if not results: return {} answer = {} @@ -954,7 +983,7 @@ class Logger: # the data field contains binary object (gzipped data), this is a hack # to get that data without trying to convert it to unicode try: - self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;') + rows = self._con.execute('SELECT hash_method, hash, data FROM caps_cache;') except sqlite.OperationalError: # might happen when there's no caps_cache table yet # -- there's no data to read anyway then @@ -962,7 +991,7 @@ class Logger: # list of corrupted entries that will be removed to_be_removed = [] - for row in self.cur: + for row in rows: # for each row: unpack the data field # (format: (category, type, name, category, type, name, ... # ..., 'FEAT', feature1, feature2, ...).join(' ')) @@ -1013,7 +1042,7 @@ class Logger: gzip.write(data.encode('utf-8')) gzip.close() data = string.getvalue() - self.cur.execute(''' + self._con.execute(''' INSERT INTO caps_cache ( hash_method, hash, data, last_seen ) VALUES (?, ?, ?, ?); ''', (hash_method, hash_, memoryview(data), int(time.time()))) @@ -1076,10 +1105,10 @@ class Logger: jid_id = self.get_jid_id(jid) except exceptions.PysqliteOperationalError as e: raise exceptions.PysqliteOperationalError(str(e)) - self.cur.execute( + self._con.execute( 'DELETE FROM roster_group WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) - self.cur.execute( + self._con.execute( 'DELETE FROM roster_entry WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) self._timeout_commit() @@ -1101,18 +1130,18 @@ class Logger: # Update groups information # First we delete all previous groups information - self.cur.execute( + self._con.execute( 'DELETE FROM roster_group WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) # Then we add all new groups information for group in groups: - self.cur.execute('INSERT INTO roster_group VALUES(?, ?, ?)', + self._con.execute('INSERT INTO roster_group VALUES(?, ?, ?)', (account_jid_id, jid_id, group)) if name is None: name = '' - self.cur.execute(''' + self._con.execute(''' REPLACE INTO roster_entry (account_jid_id, jid_id, name, subscription, ask) VALUES(?, ?, ?, ?, ?)''', ( @@ -1130,11 +1159,11 @@ class Logger: account_jid_id = self.get_jid_id(account_jid, type_=JIDConstant.NORMAL_TYPE) # First we fill data with roster_entry informations - self.cur.execute(''' + rows = self._con.execute(''' SELECT j.jid, re.jid_id, re.name, re.subscription, re.ask, re.avatar_sha FROM roster_entry re, jids j WHERE re.account_jid_id=? AND j.jid_id=re.jid_id''', (account_jid_id,)) - for row in self.cur: + for row in rows: #jid, jid_id, name, subscription, ask jid = row.jid name = row.name @@ -1157,11 +1186,11 @@ class Logger: # Then we add group for roster entries for jid in data: - self.cur.execute(''' + rows = self._con.execute(''' SELECT group_name FROM roster_group WHERE account_jid_id=? AND jid_id=?''', (account_jid_id, data[jid]['id'])) - for row in self.cur: + for row in rows: group_name = row.group_name data[jid]['groups'].append(group_name) del data[jid]['id'] @@ -1186,7 +1215,7 @@ class Logger: DELETE FROM roster_group WHERE account_jid_id = {jid_id}; '''.format(jid_id=jid_id) - self.con.executescript(sql) + self._con.executescript(sql) self._timeout_commit() def search_for_duplicate(self, account, jid, timestamp, msg): @@ -1216,7 +1245,7 @@ class Logger: AND time BETWEEN ? AND ? ''' - result = self.con.execute( + result = self._con.execute( sql, (jid, msg, account_id, start_time, end_time)).fetchone() if result is not None: @@ -1263,14 +1292,14 @@ class Logger: WHERE stanza_id IN ({values}) AND jid_id = ? AND account_id = ? LIMIT 1 '''.format(values=', '.join('?' * len(ids))) - result = self.con.execute( + result = self._con.execute( sql, tuple(ids) + (archive_id, account_id)).fetchone() else: sql = ''' SELECT stanza_id FROM logs WHERE stanza_id IN ({values}) AND account_id = ? AND kind != ? LIMIT 1 '''.format(values=', '.join('?' * len(ids))) - result = self.con.execute( + result = self._con.execute( sql, tuple(ids) + (account_id, KindConstant.GC_MSG)).fetchone() if result is not None: @@ -1324,7 +1353,7 @@ class Logger: '''.format(columns=', '.join(kwargs.keys()), values=', '.join('?' * len(kwargs))) - lastrowid = self.con.execute( + lastrowid = self._con.execute( sql, (account_id, jid_id, time_, kind) + tuple(kwargs.values())).lastrowid log.info('Insert into DB: jid: %s, time: %s, kind: %s, stanza_id: %s', @@ -1333,7 +1362,7 @@ class Logger: if unread and kind == KindConstant.CHAT_MSG_RECV: sql = '''INSERT INTO unread_messages (message_id, jid_id) VALUES (?, (SELECT jid_id FROM jids WHERE jid = ?))''' - self.con.execute(sql, (lastrowid, jid)) + self._con.execute(sql, (lastrowid, jid)) self._timeout_commit() @@ -1358,7 +1387,7 @@ class Logger: UPDATE roster_entry SET avatar_sha = ? WHERE account_jid_id = ? AND jid_id = ? ''' - self.con.execute(sql, (sha, account_jid_id, jid_id)) + self._con.execute(sql, (sha, account_jid_id, jid_id)) self._timeout_commit() def get_archive_timestamp(self, jid, type_=None): @@ -1370,7 +1399,7 @@ class Logger: """ jid_id = self.get_jid_id(jid, type_=type_) sql = '''SELECT * FROM last_archive_message WHERE jid_id = ?''' - return self.con.execute(sql, (jid_id,)).fetchone() + return self._con.execute(sql, (jid_id,)).fetchone() def set_archive_timestamp(self, jid, **kwargs): """ @@ -1391,7 +1420,7 @@ class Logger: exists = self.get_archive_timestamp(jid) if not exists: sql = '''INSERT INTO last_archive_message VALUES (?, ?, ?, ?)''' - self.con.execute(sql, (jid_id, + self._con.execute(sql, (jid_id, kwargs.get('last_mam_id', None), kwargs.get('oldest_mam_timestamp', None), kwargs.get('last_muc_timestamp', None))) @@ -1399,6 +1428,6 @@ class Logger: args = ' = ?, '.join(kwargs.keys()) + ' = ?' sql = '''UPDATE last_archive_message SET {} WHERE jid_id = ?'''.format(args) - self.con.execute(sql, tuple(kwargs.values()) + (jid_id,)) + self._con.execute(sql, tuple(kwargs.values()) + (jid_id,)) log.info('Save archive timestamps: %s', kwargs) self._timeout_commit() ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -1,5 +1,5 @@ # -*- coding:utf-8 -*- -## src/common/optparser.py +## gajim/common/optparser.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> @@ -10,6 +10,7 @@ ## Brendan Taylor <whateley AT gmail.com> ## Tomasz Melcer <liori AT exroot.org> ## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> ## ## This file is part of Gajim. ## @@ -29,17 +30,15 @@ import os import sys import re -from time import time +import logging + from gajim.common import app -from gajim.common import helpers from gajim.common import caps_cache -import sqlite3 as sqlite -from gajim.common import logger -import logging log = logging.getLogger('gajim.c.optparser') + class OptionsParser: def __init__(self, filename): self.__filename = os.path.realpath(filename) @@ -150,25 +149,13 @@ class OptionsParser: self.update_config_to_016101() if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: self.update_config_to_016102() - if old < [0, 16, 10, 3] and new >= [0, 16, 10, 3]: - self.update_config_to_016103() if old < [0, 16, 10, 4] and new >= [0, 16, 10, 4]: self.update_config_to_016104() if old < [0, 16, 10, 5] and new >= [0, 16, 10, 5]: self.update_config_to_016105() - if old < [0, 16, 11, 1] and new >= [0, 16, 11, 1]: - self.update_config_to_016111() - if old < [0, 16, 11, 2] and new >= [0, 16, 11, 2]: - self.update_config_to_016112() - if old < [0, 98, 2] and new >= [0, 98, 2]: - self.update_config_to_0982() if old < [0, 98, 3] and new >= [0, 98, 3]: self.update_config_to_0983() - if old < [0, 99, 2] and new >= [0, 99, 2]: - self.update_config_to_0992() - app.logger.init_vars() - app.logger.attach_cache_database() app.config.set('version', new_version) caps_cache.capscache.initialize_from_db() @@ -193,20 +180,6 @@ class OptionsParser: app.config.set_per('accounts', account, 'file_transfer_proxies', proxies_str) - @staticmethod - def call_sql(db_path, sql): - con = sqlite.connect(db_path) - cur = con.cursor() - try: - cur.executescript(sql) - con.commit() - except sqlite.OperationalError as e: - if str(e).startswith('duplicate column name:'): - log.info(str(e)) - else: - log.exception('Error') - con.close() - def update_config_to_01401(self): if 'autodetect_browser_mailer' not in self.old_values or 'openwith' \ not in self.old_values or \ @@ -253,22 +226,8 @@ class OptionsParser: for account in self.old_values['accounts'].keys(): app.config.del_per('accounts', account, 'minimized_gc') - self.call_sql(logger.LOG_DB_PATH, - '''ALTER TABLE logs - ADD COLUMN 'additional_data' TEXT;''' - ) app.config.set('version', '0.16.10.2') - def update_config_to_016103(self): - self.call_sql(logger.LOG_DB_PATH, - '''ALTER TABLE logs ADD COLUMN 'stanza_id' TEXT; - ALTER TABLE logs ADD COLUMN 'encryption' TEXT; - ALTER TABLE logs ADD COLUMN 'encryption_state' TEXT; - ALTER TABLE logs ADD COLUMN 'marker' INTEGER; - ''' - ) - app.config.set('version', '0.16.10.3') - def update_config_to_016104(self): app.config.set('emoticons_theme', 'noto-emoticons') app.config.set('version', '0.16.10.4') @@ -278,37 +237,6 @@ class OptionsParser: app.config.set('restore_timeout', -1) app.config.set('version', '0.16.10.5') - def update_config_to_016111(self): - self.call_sql(logger.CACHE_DB_PATH, - '''ALTER TABLE roster_entry ADD COLUMN 'avatar_sha' TEXT; - ''' - ) - app.config.set('version', '0.16.11.1') - - def update_config_to_016112(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE TABLE IF NOT EXISTS last_archive_message( - jid_id INTEGER PRIMARY KEY UNIQUE, - last_mam_id TEXT, - oldest_mam_timestamp TEXT, - last_muc_timestamp TEXT - ); - ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; - ''' - ) - app.config.set('version', '0.16.11.2') - - def update_config_to_0982(self): - # This fixes a typo in update_config_to_016112() - self.call_sql(logger.LOG_DB_PATH, - ''' - ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; - ALTER TABLE logs ADD COLUMN 'additional_data' TEXT; - ''' - ) - app.config.set('version', '0.98.2') - def update_config_to_0983(self): for account in self.old_values['accounts'].keys(): password = self.old_values['accounts'][account]['password'] @@ -317,12 +245,3 @@ class OptionsParser: elif password == "libsecret:": app.config.set_per('accounts', account, 'password', '') app.config.set('version', '0.98.3') - - def update_config_to_0992(self): - self.call_sql(logger.LOG_DB_PATH, - ''' - CREATE INDEX IF NOT EXISTS - idx_logs_stanza_id ON logs (stanza_id); - ''' - ) - app.config.set('version', '0.99.2') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ee45b86e90f8e0818d2e3f47010106a08… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ee45b86e90f8e0818d2e3f47010106a08… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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