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

Use the same named tuple for related methods for conversation loading

Browse source 
Both methods get_conversation_for_date and search_log in the logger
module are related to the loading of conversations and both return a
list of messages from the log. Therefore, it makes sense that both of
them have the same return type.

Remove the named tuple type specific to search_log and convert the
method to return tuples of type Message instead. As a side effect of
this change, search_log now also returns values from the additional_data
column in the log database.
This commit is contained in:
Markus Böhme 2017-03-30 22:19:40 +02:00
parent e735bfe7ab
commit 21d15dec29
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/common/logger.py
View file

@ -679,10 +679,6 @@ class Logger:
return results return results
SearchResult = namedtuple('SearchResult',
['contact_name', 'time', 'kind', 'show', 'message', 'subject',
'log_line_id'])
def search_log(self, jid, query, account, year=None, month=None, day=None): def search_log(self, jid, query, account, year=None, month=None, day=None):
""" """
Search the conversation log for messages containing the `query` string. Search the conversation log for messages containing the `query` string.
@ -692,8 +688,8 @@ class Logger:
`day`, where `month` and `day` are 1-based. `day`, where `month` and `day` are 1-based.
All messages matching the specified criteria will be returned in a list All messages matching the specified criteria will be returned in a list
containing tuples of type `Logger.SearchResult`. If no messages match containing tuples of type `Logger.Message`. If no messages match the
the criteria, an empty list will be returned. criteria, an empty list will be returned.
""" """
try: try:
self.get_jid_id(jid) self.get_jid_id(jid)
@ -708,7 +704,9 @@ class Logger:
seconds_in_a_day = 86400 # 60 * 60 * 24 seconds_in_a_day = 86400 # 60 * 60 * 24
last_second_of_day = start_of_day + seconds_in_a_day - 1 last_second_of_day = start_of_day + seconds_in_a_day - 1
self.cur.execute(''' self.cur.execute('''
SELECT contact_name, time, kind, show, message, subject, log_line_id FROM logs SELECT contact_name, time, kind, show, message, subject,
additional_data, log_line_id
FROM logs
WHERE (%s) AND message LIKE '%s' WHERE (%s) AND message LIKE '%s'
AND time BETWEEN %d AND %d AND time BETWEEN %d AND %d
ORDER BY time ORDER BY time
@ -716,12 +714,18 @@ class Logger:
jid_tuple) jid_tuple)
else: else:
self.cur.execute(''' self.cur.execute('''
SELECT contact_name, time, kind, show, message, subject, log_line_id FROM logs SELECT contact_name, time, kind, show, message, subject,
additional_data, log_line_id
FROM logs
WHERE (%s) AND message LIKE '%s' WHERE (%s) AND message LIKE '%s'
ORDER BY time ORDER BY time
''' % (where_sql, like_sql), jid_tuple) ''' % (where_sql, like_sql), jid_tuple)
return [Logger.SearchResult(*row) for row in self.cur.fetchall()] results = [self.Message(*row) for row in self.cur.fetchall()]
for message in results:
message._replace(additional_data=json.loads(message.additional_data))
return results
def get_days_with_logs(self, jid, year, month, max_day, account): def get_days_with_logs(self, jid, year, month, max_day, account):
""" """