[pybot-commits] CVS: pybot/pybot/modules log.py,1.3,1.4

[Gustavo N. <nie...@us...>]

Update of /cvsroot/pybot/pybot/pybot/modules
In directory usw-pr-cvs1:/tmp/cvs-serv14077

Modified Files:
	log.py 
Log Message:
- Don't show search line on results.
- Decrease message priority a little bit.


Index: log.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/log.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** log.py	19 Jun 2002 22:10:42 -0000	1.3
--- log.py	20 Jun 2002 01:12:55 -0000	1.4
***************
*** 93,101 ****
          return logmsg
  
!     def search(self, regexp, max):
          p = re.compile(regexp, re.I)
          file = open(self.__logname)
          l = []
          for line in file.xreadlines():
              stime, servername, type, src, dest, line = line.split(" ", 5)
              if src == "-" or dest == "-":
--- 93,102 ----
          return logmsg
  
!     def search(self, regexp, max, searchline):
          p = re.compile(regexp, re.I)
          file = open(self.__logname)
          l = []
          for line in file.xreadlines():
+             line = line[:-1]
              stime, servername, type, src, dest, line = line.split(" ", 5)
              if src == "-" or dest == "-":
***************
*** 103,108 ****
              if p.search(line):
                  l.append(LogMsg(int(stime), servername, type, src, dest, line))
!             if len(l) > max:
                  l.pop(0)
          file.close()
          return l
--- 104,113 ----
              if p.search(line):
                  l.append(LogMsg(int(stime), servername, type, src, dest, line))
!             if len(l) > max+1:
                  l.pop(0)
+         if l and l[-1].line == searchline:
+             l.pop()
+         elif len(l) > max:
+             l.pop(0)
          file.close()
          return l
***************
*** 113,120 ****
          
          hooks.register("Message", self.message)
!         hooks.register("Message", self.log_message, 90)
!         hooks.register("CTCP", self.log_ctcp, 90)
!         hooks.register("OutMessage", self.log_outmessage, 90)
!         hooks.register("OutCTCP", self.log_outctcp, 90)
  
          # Match '[have you] seen <nick> [!?]'
--- 118,125 ----
          
          hooks.register("Message", self.message)
!         hooks.register("Message", self.log_message, 95)
!         hooks.register("CTCP", self.log_ctcp, 95)
!         hooks.register("OutMessage", self.log_outmessage, 95)
!         hooks.register("OutCTCP", self.log_outctcp, 95)
  
          # Match '[have you] seen <nick> [!?]'
***************
*** 122,126 ****
  
          # Match '[show] (log[s]|message[s]) [with] /<regexp>/[.!]'
!         self.re2 = re.compile("(?:show\s+)?(?:log|message)s?\s+(?:with\s+)?/(?P<regexp>.*)/\s*[.!?]*", re.I)
  
          # Match 'seen'
--- 127,131 ----
  
          # Match '[show] (log[s]|message[s]) [with] /<regexp>/[.!]'
!         self.re2 = re.compile("(?:show\s+|search\s+)?(?:log|message)s?\s+(?:with\s+|search\s+)?/(?P<regexp>.*)/\s*[.!?]*$", re.I)
  
          # Match 'seen'
***************
*** 132,139 ****
      def unload(self):
          hooks.unregister("Message", self.message)
!         hooks.unregister("Message", self.log_message, 90)
!         hooks.unregister("CTCP", self.log_ctcp, 90)
!         hooks.unregister("OutMessage", self.log_outmessage, 90)
!         hooks.unregister("OutCTCP", self.log_outctcp, 90)
  
          mm.unregister_help(0, HELP_SEEN)
--- 137,144 ----
      def unload(self):
          hooks.unregister("Message", self.message)
!         hooks.unregister("Message", self.log_message, 95)
!         hooks.unregister("CTCP", self.log_ctcp, 95)
!         hooks.unregister("OutMessage", self.log_outmessage, 95)
!         hooks.unregister("OutCTCP", self.log_outctcp, 95)
  
          mm.unregister_help(0, HELP_SEEN)
***************
*** 156,160 ****
                  if mm.hasperm(1, msg.server.servername, msg.target, msg.user, "logsearch"):
                      max = 5
!                     logmsgs = self.log.search(m.group("regexp"), max)
                      if logmsgs:
                          llen = len(logmsgs)
--- 161,166 ----
                  if mm.hasperm(1, msg.server.servername, msg.target, msg.user, "logsearch"):
                      max = 5
!                     logmsgs = self.log.search(m.group("regexp"), max,
!                                               msg.rawline)
                      if logmsgs:
                          llen = len(logmsgs)