From 71b6404b04f64a8973ef0b9f8bba4c7aca3106a1 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 9 Jun 2013 03:47:16 +0200 Subject: Adopt the mcabber log format (Fix #2311) --- src/logger.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/logger.py') diff --git a/src/logger.py b/src/logger.py index ba848593..b26393da 100644 --- a/src/logger.py +++ b/src/logger.py @@ -103,10 +103,13 @@ class Logger(object): logs = reads[-nb:] return logs - def log_message(self, jid, nick, msg, date=None): + def log_message(self, jid, nick, msg, date=None, typ=1): """ log the message in the appropriate jid's file + type: 1 = Message + 2 = Status/whatever """ + jid = str(jid).replace('/', '\\') if config.get_by_tabname('use_log', 'false', jid) != 'true': return True if jid in self.fds.keys(): @@ -118,13 +121,20 @@ class Logger(object): try: msg = clean_text(msg) if date is None: - str_time = datetime.now().strftime('%d-%m-%y [%H:%M:%S] ') + str_time = datetime.now().strftime('%Y%m%dT%H%M%SZ') else: - str_time = date.strftime('%d-%m-%y [%H:%M:%S] ') + str_time = date.strftime('%Y%m%dT%H%M%SZ') + if typ == 1: + prefix = 'MR' + else: + prefix = 'MI' + lines = msg.count('\n') + lines = str(lines).zfill(3) if nick: - fd.write(''.join((str_time, nick, ': ', msg, '\n'))) + nick = '<' + nick + '>' + fd.write(' '.join((prefix, str_time, lines, nick, msg, '\n'))) else: - fd.write(''.join((str_time, '* ', msg, '\n'))) + fd.write(' '.join((prefix, str_time, lines, msg, '\n'))) except: return False else: -- cgit v1.2.3