[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.121,1.122

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv26154

Modified Files:
	addin.py 
Log Message:
Include the foldername in many messages, so help track down wierd bugs
from user logs.  Say what we are watching a folder for.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** addin.py	19 Dec 2003 06:27:58 -0000	1.121
--- addin.py	20 Dec 2003 06:25:12 -0000	1.122
***************
*** 124,128 ****
      import train
      subject = msgstore_message.subject
!     print "Training on message '%s' - " % subject,
      if train.train_message(msgstore_message, False, manager.classifier_data):
          print "trained as good"
--- 124,130 ----
      import train
      subject = msgstore_message.subject
!     print "Training on message '%s' in '%s - " % \
!             (subject,
!              msgstore_message.GetFolder().GetFQName()),
      if train.train_message(msgstore_message, False, manager.classifier_data):
          print "trained as good"
***************
*** 140,144 ****
      import train
      subject = msgstore_message.subject
!     print "Training on message '%s' - " % subject,
      if train.train_message(msgstore_message, True, manager.classifier_data):
          print "trained as spam"
--- 142,148 ----
      import train
      subject = msgstore_message.subject
!     print "Training on message '%s' in '%s - " % \
!             (subject,
!              msgstore_message.GetFolder().GetFQName()),
      if train.train_message(msgstore_message, True, manager.classifier_data):
          print "trained as spam"
***************
*** 193,204 ****
          if manager.config.filter.enabled:
              import filter
              disposition = filter.filter_message(msgstore_message, manager)
!             print "Message '%s' had a Spam classification of '%s'" \
!                   % (msgstore_message.GetSubject(), disposition)
          else:
              print "Spam filtering is disabled - ignoring new message"
      except manager.message_store.NotFoundException:
          manager.LogDebug(1, "ProcessMessage had the message moved out from underneath us")
!     manager.LogDebug(2, "ProcessMessage finished for", msgstore_message)
  
  # Button/Menu and other UI event handler classes
--- 197,212 ----
          if manager.config.filter.enabled:
              import filter
+             # get the foldername before the move operation!
+             folder_name = msgstore_message.GetFolder().GetFQName()
              disposition = filter.filter_message(msgstore_message, manager)
!             print "Message '%s' in '%s' had a Spam classification of '%s'" \
!                   % (msgstore_message.GetSubject(),
!                      folder_name,
!                      disposition)
          else:
              print "Spam filtering is disabled - ignoring new message"
      except manager.message_store.NotFoundException:
          manager.LogDebug(1, "ProcessMessage had the message moved out from underneath us")
!     manager.LogDebug(2, "ProcessMessage finished for", msgstore_message.subject)
  
  # Button/Menu and other UI event handler classes
***************
*** 1297,1301 ****
              self._HookFolderEvents(config.watch_folder_ids,
                                     config.watch_include_sub,
!                                    HamFolderItemsEvent)
              )
          # For spam manually moved
--- 1305,1310 ----
              self._HookFolderEvents(config.watch_folder_ids,
                                     config.watch_include_sub,
!                                    HamFolderItemsEvent,
!                                    "filtering")
              )
          # For spam manually moved
***************
*** 1304,1308 ****
                  self._HookFolderEvents([config.spam_folder_id],
                                         False,
!                                        SpamFolderItemsEvent)
                  )
          for k in self.folder_hooks.keys():
--- 1313,1318 ----
                  self._HookFolderEvents([config.spam_folder_id],
                                         False,
!                                        SpamFolderItemsEvent,
!                                        "incremental training")
                  )
          for k in self.folder_hooks.keys():
***************
*** 1318,1322 ****
          return ret
  
!     def _HookFolderEvents(self, folder_ids, include_sub, HandlerClass):
          new_hooks = {}
          for msgstore_folder in self.manager.message_store.GetFolderGenerator(
--- 1328,1332 ----
          return ret
  
!     def _HookFolderEvents(self, folder_ids, include_sub, HandlerClass, what):
          new_hooks = {}
          for msgstore_folder in self.manager.message_store.GetFolderGenerator(
***************
*** 1363,1367 ****
                      new_hook.Init(msgstore_folder, self.application, self.manager)
                      new_hooks[msgstore_folder.id] = new_hook
!                     print "SpamBayes: Watching for new messages in folder", name
              else:
                  new_hooks[msgstore_folder.id] = existing
--- 1373,1377 ----
                      new_hook.Init(msgstore_folder, self.application, self.manager)
                      new_hooks[msgstore_folder.id] = new_hook
!                     print "SpamBayes: Watching (for %s) in '%s'" % (what, name)
              else:
                  new_hooks[msgstore_folder.id] = existing