Changeset 10354

Timestamp:

08/30/08 03:31:25 (3 months ago)

Author:

bct

Message:

move most of is_loggable out of the session object. fixes #4103

Location:

trunk/src

Files:

• chat_control.py (modified) (2 diffs)
• common/config.py (modified) (1 diff)
• common/connection_handlers.py (modified) (4 diffs)
• common/connection.py (modified) (2 diffs)
• common/stanza_session.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -1531 +1531 @@
                                 'status', '', None)
 
+                        loggable = gajim.config.get('log_encrypted_sessions')
+
                         if self.session:
-                                self.session.loggable = gajim.config.get(
-                                        'log_encrypted_sessions');
-                        if self.session and not self.session.is_loggable():
+                                self.session.loggable = loggable
+
+                                loggable = self.session.is_loggable()
+                        else:
+                                loggable = loggable and gajim.config.should_log(self.account,
+                                        self.contact.jid)
+
+                        if loggable:
+                                msg = _('Session WILL be logged')
+                        else:
                                 msg = _('Session WILL NOT be logged')
-                        else:
-                                msg = _('Session WILL be logged')
+
                         ChatControlBase.print_conversation_line(self, msg,
                                 'status', '', None)
@@ -1549 +1557 @@
 
                 self._show_lock_image(self.gpg_is_active, 'GPG',
-                        self.gpg_is_active,
-                        self.session and self.session.is_loggable(), True)
+                        self.gpg_is_active, loggable, True)
 
         def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False, authenticated = False):

trunk/src/common/config.py

@@ -643 +643 @@
                 return False
 
+        def should_log(self, account, jid):
+                '''should conversations between a local account and a remote jid be
+                logged?'''
+                no_log_for = self.get_per('accounts', account, 'no_log_for')
+
+                if not no_log_for:
+                        no_log_for = ''
+
+                no_log_for = no_log_for.split()
+
+                return (account not in no_log_for) and (jid not in no_log_for)
+
         def __init__(self):
                 #init default values

trunk/src/common/connection_handlers.py

@@ -1842 +1842 @@
                         statusCode))
 
-                no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for') 
-
-                if not no_log_for: 
-                        no_log_for = '' 
-
-                no_log_for = no_log_for.split()
                 tim_int = int(float(mktime(tim)))
-
-                if self.name not in no_log_for and jid not in no_log_for and not \
+                if gajim.config.should_log(self.name, jid) and not \
                 tim_int <= self.last_history_time[jid] and msgtxt and frm.find('/') >= 0:
                         # if frm.find('/') < 0, it means message comes from room itself
@@ -1964 +1957 @@
                                         transport_auto_auth = True
 
-                no_log_for = gajim.config.get_per('accounts', self.name,
-                        'no_log_for').split()
                 status = prs.getStatus() or ''
                 show = prs.getShow()
@@ -2021 +2012 @@
                                                 errmsg, errcode))
                         if not ptype or ptype == 'unavailable':
-                                if gajim.config.get('log_contact_status_changes') and self.name\
-                                not in no_log_for and jid_stripped not in no_log_for:
+                                if gajim.config.get('log_contact_status_changes') and \
+                                gajim.config.should_log(self.name, jid_stripped):
                                         gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped,
                                                 resource)
@@ -2150 +2141 @@
                                 self.request_vcard(jid_stripped)
                 if not ptype or ptype == 'unavailable':
-                        if gajim.config.get('log_contact_status_changes') and self.name \
-                        not in no_log_for and jid_stripped not in no_log_for:
+                        if gajim.config.get('log_contact_status_changes') and \
+                        gajim.config.should_log(self.name, jid_stripped):
                                 try:
                                         gajim.logger.write('status', jid_stripped, status, show)

trunk/src/common/connection.py

@@ -1183 +1183 @@
                 msg_id = self.connection.send(msg_iq)
                 if not forward_from and session and session.is_loggable():
-                        no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')\
-                                .split()
                         ji = gajim.get_jid_without_resource(jid)
-                        if self.name not in no_log_for and ji not in no_log_for:
+                        if gajim.config.should_log(self.name, ji):
                                 log_msg = msg
                                 if original_message != None:
@@ -1516 +1514 @@
                 if not self.last_history_time.has_key(room_jid):
                         # Not in memory, get it from DB
-                        no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')\
-                                .split()
                         last_log = None
                         # Do not check if we are not logging for this room
-                        if self.name not in no_log_for and room_jid not in no_log_for:
+                        if gajim.config.should_log(self.name, room_jid):
                                 # Check time first in the FAST table
                                 last_log = gajim.logger.get_room_last_message_time(room_jid)

trunk/src/common/stanza_session.py

@@ -67 +67 @@
 
         def is_loggable(self):
-                account = self.conn.name
-                no_log_for = gajim.config.get_per('accounts', account, 'no_log_for')
-
-                if not no_log_for:
-                        no_log_for = ''
-
-                no_log_for = no_log_for.split()
-
-                return self.loggable and account not in no_log_for and self.jid not in no_log_for
+                return self.loggable and gajim.config.should_log(self.conn.name, self.jid)
 
         # remove events associated with this session from the queue