copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add conversion from account_id to account jid 

To use this alias `account_id` with `account`

Example: SELECT account_id as account FROM logs
This commit is contained in:
Philipp Hörist 2018-05-08 19:20:11 +02:00
parent 8b9eb59ee4
commit 2bb5d55c03
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gajim/common/logger.py
View File

@ -127,6 +127,7 @@ log = logging.getLogger('gajim.c.logger')
class Logger: class Logger:
def __init__(self): def __init__(self):
self._jid_ids = {} self._jid_ids = {}
self._jid_ids_reversed = {}
self._con = None self._con = None
self._commit_timout_id = None self._commit_timout_id = None
self._log_db_path = configpaths.get('LOG_DB') self._log_db_path = configpaths.get('LOG_DB')
@ -247,8 +248,7 @@ class Logger:
log.exception('Error') log.exception('Error')
sys.exit() sys.exit()
@staticmethod def namedtuple_factory(self, cursor, row):
def namedtuple_factory(cursor, row):
""" """
Usage: Usage:
con.row_factory = namedtuple_factory con.row_factory = namedtuple_factory
@ -259,6 +259,13 @@ class Logger:
if 'additional_data' in fields: if 'additional_data' in fields:
named_row = named_row._replace( named_row = named_row._replace(
additional_data=json.loads(named_row.additional_data or '{}')) additional_data=json.loads(named_row.additional_data or '{}'))
# if an alias `account` for the field `account_id` is used for the
# query, the account_id is converted to the account jid
if 'account' in fields:
if named_row.account:
jid = self._jid_ids_reversed[named_row.account].jid
named_row = named_row._replace(account=jid)
return named_row return named_row
def dispatch(self, event, error): def dispatch(self, event, error):
@ -336,6 +343,7 @@ class Logger:
'SELECT jid_id, jid, type FROM jids').fetchall() 'SELECT jid_id, jid, type FROM jids').fetchall()
for row in rows: for row in rows:
self._jid_ids[row.jid] = row self._jid_ids[row.jid] = row
self._jid_ids_reversed[row.jid_id] = row
def get_jids_in_db(self): def get_jids_in_db(self):
return self._jid_ids.keys() return self._jid_ids.keys()