hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Switch to PARSE_COLNAMES

Browse Source
This commit is contained in:
Philipp Hörist
2019-02-21 21:52:31 +01:00
parent 335fcf30ca
commit 16234036aa
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
omemo/backend/liteaxolotlstore.py
View File

@@ -43,13 +43,13 @@ def _convert_to_string(text):
return text.decode() return text.decode()
sqlite3.register_converter('TEXT', _convert_to_string) sqlite3.register_converter('jid', _convert_to_string)
class LiteAxolotlStore(AxolotlStore): class LiteAxolotlStore(AxolotlStore):
def __init__(self, db_path): def __init__(self, db_path):
self._con = sqlite3.connect(db_path, self._con = sqlite3.connect(db_path,
detect_types=sqlite3.PARSE_DECLTYPES) detect_types=sqlite3.PARSE_COLNAMES)
self._con.text_factory = bytes self._con.text_factory = bytes
self._con.row_factory = self._namedtuple_factory self._con.row_factory = self._namedtuple_factory
self.createDb() self.createDb()
@@ -275,12 +275,14 @@ class LiteAxolotlStore(AxolotlStore):
return SessionRecord(serialized=result.record) return SessionRecord(serialized=result.record)
def getJidFromDevice(self, device_id): def getJidFromDevice(self, device_id):
query = 'SELECT recipient_id from sessions WHERE device_id = ?' query = '''SELECT recipient_id as "recipient_id [jid]"
FROM sessions WHERE device_id = ?'''
result = self._con.execute(query, (device_id, )).fetchone() result = self._con.execute(query, (device_id, )).fetchone()
return result.recipient_id if result is not None else None return result.recipient_id if result is not None else None
def getActiveDeviceTuples(self): def getActiveDeviceTuples(self):
query = 'SELECT recipient_id, device_id FROM sessions WHERE active = 1' query = '''SELECT recipient_id as "recipient_id [jid]", device_id
FROM sessions WHERE active = 1'''
return self._con.execute(query).fetchall() return self._con.execute(query).fetchall()
def storeSession(self, recipientId, deviceId, sessionRecord): def storeSession(self, recipientId, deviceId, sessionRecord):
@@ -310,12 +312,14 @@ class LiteAxolotlStore(AxolotlStore):
self._con.commit() self._con.commit()
def getSessionsFromJid(self, recipientId): def getSessionsFromJid(self, recipientId):
query = '''SELECT _id, recipient_id, device_id, record, active query = '''SELECT _id, recipient_id as "recipient_id [jid]",
device_id, record, active
from sessions WHERE recipient_id = ?''' from sessions WHERE recipient_id = ?'''
return self._con.execute(query, (recipientId,)).fetchall() return self._con.execute(query, (recipientId,)).fetchall()
def getSessionsFromJids(self, recipientIds): def getSessionsFromJids(self, recipientIds):
query = '''SELECT _id, recipient_id, device_id, record, active from sessions query = '''SELECT _id, recipient_id as "recipient_id [jid]",
device_id, record, active from sessions
WHERE recipient_id IN ({})'''.format( WHERE recipient_id IN ({})'''.format(
', '.join(['?'] * len(recipientIds))) ', '.join(['?'] * len(recipientIds)))
return self._con.execute(query, recipientIds).fetchall() return self._con.execute(query, recipientIds).fetchall()
@@ -454,13 +458,9 @@ class LiteAxolotlStore(AxolotlStore):
result = self._con.execute(query, (recipientId, public_key)).fetchone() result = self._con.execute(query, (recipientId, public_key)).fetchone()
return result.trust if result is not None else None return result.trust if result is not None else None
def getAllFingerprints(self):
query = '''SELECT _id, recipient_id, public_key, trust FROM identities
WHERE recipient_id != -1 ORDER BY recipient_id ASC'''
return self._con.execute(query).fetchall()
def getFingerprints(self, jid): def getFingerprints(self, jid):
query = '''SELECT _id, recipient_id, public_key, trust FROM identities query = '''SELECT _id, recipient_id as "recipient_id [jid]",
public_key, trust FROM identities
WHERE recipient_id =? ORDER BY trust ASC''' WHERE recipient_id =? ORDER BY trust ASC'''
return self._con.execute(query, (jid,)).fetchall() return self._con.execute(query, (jid,)).fetchall()