From 94c10ca5da16c8b3453505a703073742e816bc94 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Sat, 15 Mar 2003 11:11:55 +0000
Subject: [PATCH] Changed format of gameknot URL snarfer.

---
 plugins/Forums.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/Forums.py b/plugins/Forums.py
index ad9f42d3b..66730f67f 100644
--- a/plugins/Forums.py
+++ b/plugins/Forums.py
@@ -34,6 +34,7 @@ from baseplugin import *
 import re
 import urllib2
 
+import debug
 import ircmsgs
 import ircutils
 import ircutils
@@ -62,25 +63,31 @@ class Forums(callbacks.PrivmsgRegexp):
             irc.queueMsg(ircmsgs.privmsg(msg.args[0],
               'That doesn\'t appear to be a proper Google Groups page.'))
 
-    gkPlayer = re.compile(r"popd\('(Rating[^']+)'\).*?>([^<]+)<")
+    _gkPlayer = re.compile(r"popd\('(Rating[^']+)'\).*?>([^<]+)<")
+    _gkRating = re.compile(r": (\d+)[^:]+:<br>(\d+)[^,]+, (\d+)[^,]+, (\d+)")
     def gameknot(self, irc, msg, match):
         r"http://(?:www\.)?gameknot.com/chess.pl\?bd=\d+&r=\d+"
         fd = urllib2.urlopen(match.group(0))
         s = fd.read()
+        fd.close()
         try:
-            ((wRating, wName), (bRating, bName)) = self.gkPlayer.findall(s)
+            ((wRating, wName), (bRating, bName)) = self._gkPlayer.findall(s)
             wName = ircutils.bold(wName)
             bName = ircutils.bold(bName)
-            wRating = wRating.replace('<br>', ' ')
-            bRating = bRating.replace('<br>', ' ')
-            wRating = wRating.replace('Wins', '; Wins')
-            bRating = bRating.replace('Wins', '; Wins ')
+            (wRating, wWins, wLosses, wDraws) = \
+                      self._gkRating.search(wRating).groups()
+            (bRating, bWins, bLosses, bDraws) = \
+                      self._gkRating.search(bRating).groups()
+            wStats = '%s; W-%s, L-%s, D-%s' % (wRating, wWins, wLosses, wDraws)
+            bStats = '%s; W-%s, L-%s, D-%s' % (bRating, bWins, bLosses, bDraws)
             irc.queueMsg(ircmsgs.privmsg(msg.args[0],
-              '%s (%s) vs. %s (%s)' % (wName, wRating, bName, bRating)))
+              '%s (%s) vs. %s (%s)' % (wName, wStats, bName, bStats)))
             
         except ValueError:
             irc.queueMsg(ircmsgs.privmsg(msg.args[0],
               'That doesn\'t appear to be a proper Gameknot game.'))
+        except Exception, e:
+            irc.error(msg, debug.exnToString(e))
 
 
 Class = Forums