[pybot-commits] CVS: pybot/pybot/modules freshmeat.py,1.2,1.3

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

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

Modified Files:
	freshmeat.py 
Log Message:
- Implemented help system.
- Fixed little bug in regular expression.


Index: freshmeat.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/freshmeat.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** freshmeat.py	4 Dec 2001 00:57:38 -0000	1.2
--- freshmeat.py	3 Apr 2002 23:25:38 -0000	1.3
***************
*** 23,28 ****
  import re
  
  URL = "http://freshmeat.net/backend/recentnews.txt"
! PROXY = {"http":"http://proxy.conectiva.com.br:3128"}
  FETCHINTERVAL = 10
  
--- 23,36 ----
  import re
  
+ HELP = [
+ ("""\
+ You may tell me which channels/users I have to notify of freshmeat news \
+ with "[don't] show freshmeat news (on|to) [channel|user] <target> [on \
+ server <server>]".\
+ """,)]
+ 
  URL = "http://freshmeat.net/backend/recentnews.txt"
! PROXY = None
! # PROXY = {"http":"http://proxy.conectiva.com.br:3128"}
  FETCHINTERVAL = 10
  
***************
*** 37,46 ****
          
          # Match '[don[']t|do not] show freshmeat news (to|on|at|for) [channel|user] <target> [[on|at] server <server>] [!|.]'
!         self.re1 = re.compile(r"(?P<dont>don'?t\s+|do\s+not\s+)?show\s+freshmeat\s+news(?:(?:to|on|at|for)(?:\s+channel|\s+user)?\s+(?P<target>\S+)(?:(?:\s+on|\s+at)?\s+server\s+(?P<server>\S+?))?)?\s*[!.]*$", re.I)
          
      def unload(self):
          hooks.unregister("Message", self.message)
          mm.unhooktimer(0, FETCHINTERVAL*60, self.checknews, ())
      
      def shownews(self, newslist):
          first = 1
--- 45,59 ----
          
          # Match '[don[']t|do not] show freshmeat news (to|on|at|for) [channel|user] <target> [[on|at] server <server>] [!|.]'
!         self.re1 = re.compile(r"(?P<dont>don'?t\s+|do\s+not\s+)?show\s+freshmeat\s+news(?:\s+(?:to|on|at|for)(?:\s+channel|\s+user)?\s+(?P<target>\S+)(?:(?:\s+on|\s+at)?\s+server\s+(?P<server>\S+?))?)?\s*[!.]*$", re.I)
          
+         # Match '[leav(e|ing)] message[s]'
+         mm.register_help(0, "freshmeat(?:\s+news)?", HELP)
+ 
      def unload(self):
          hooks.unregister("Message", self.message)
          mm.unhooktimer(0, FETCHINTERVAL*60, self.checknews, ())
      
+         mm.unregister_help(0, HELP)
+ 
      def shownews(self, newslist):
          first = 1
***************
*** 61,65 ****
      def fetchnews(self):
          urlopener = urllib.URLopener()
!         urlopener.proxies.update(PROXY)
          try:
              url = urlopener.open(URL)
--- 74,79 ----
      def fetchnews(self):
          urlopener = urllib.URLopener()
!         if PROXY:
!             urlopener.proxies.update(PROXY)
          try:
              url = urlopener.open(URL)