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

Logger: Get rid of old jids list

Browse source 
Use _jid_ids dict instead
This commit is contained in:
Philipp Hörist 2017-10-22 19:00:39 +02:00
parent 1c7369229e
commit accef11c93
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gajim/common/logger.py
View file

@ -107,7 +107,6 @@ class SubscriptionConstant(IntEnum):
class Logger: class Logger:
def __init__(self): def __init__(self):
self.jids_already_in = [] # holds jids that we already have in DB
self._jid_ids = {} self._jid_ids = {}
self.con = None self.con = None
self.commit_timout_id = None self.commit_timout_id = None
@ -189,7 +188,6 @@ class Logger:
def init_vars(self): def init_vars(self):
self.open_db() self.open_db()
self.get_jids_already_in_db()
self.get_jid_ids_from_db() self.get_jid_ids_from_db()
@staticmethod @staticmethod
@ -237,22 +235,8 @@ class Logger:
for row in rows: for row in rows:
self._jid_ids[row.jid] = row self._jid_ids[row.jid] = row
def get_jids_already_in_db(self):
try:
self.cur.execute('SELECT jid FROM jids')
rows = self.cur.fetchall()
except sqlite.DatabaseError:
raise exceptions.DatabaseMalformed(LOG_DB_PATH)
self.jids_already_in = []
for row in rows:
if not row.jid:
# malformed jid, ignore line
pass
else:
self.jids_already_in.append(row.jid)
def get_jids_in_db(self): def get_jids_in_db(self):
return self.jids_already_in return self._jid_ids.keys()
def jid_is_from_pm(self, jid): def jid_is_from_pm(self, jid):
""" """
@ -1102,13 +1086,12 @@ class Logger:
:param type_: A JIDConstant :param type_: A JIDConstant
""" """
if jid in self.jids_already_in: if jid in self._jid_ids:
return return
if kind in (KindConstant.GC_MSG, KindConstant.GCSTATUS): if kind in (KindConstant.GC_MSG, KindConstant.GCSTATUS):
type_ = JIDConstant.ROOM_TYPE type_ = JIDConstant.ROOM_TYPE
sql = 'INSERT OR IGNORE INTO jids (jid, type) VALUES (?, ?)' sql = 'INSERT OR IGNORE INTO jids (jid, type) VALUES (?, ?)'
self.con.execute(sql, (jid, type_)) self.con.execute(sql, (jid, type_))
self.jids_already_in.append(jid)
self._timeout_commit() self._timeout_commit()
def insert_into_logs(self, jid, time_, kind, unread=True, **kwargs): def insert_into_logs(self, jid, time_, kind, unread=True, **kwargs):