Changeset 2977

Timestamp:

01/04/08 14:28:20 (11 months ago)

Author:

mitsuhiko

Message:

beefed up the plugin a bit

Files:

• ircannouncerplugin/Trac/plugin.py (modified) (8 diffs)

ircannouncerplugin/Trac/plugin.py

@@ -90 +90 @@
-class Trac(callbacks.PrivmsgCommandAndRegexp):
-    threaded = True
-
-
+
+
+
-
-    def __init__(self, irc):
@@ -115 +116 @@
-
-    def listCommands(self):
-lf.commands + self.tracs.keys(
-sort(
-commands
+t(self.commands
+update(self.tracs.keys()
+sorted(commands)
-
-    def isCommandMethod(self, name):
@@ -148 +149 @@
-
-    def ticketRegexp(self, irc, msg, match):
-([a-zA-Z_]+):)?(?:\bticket:|#)([0-9]+)|#([a-zA-Z]
+\b([a-zA-Z_]+):)?(?:\bticket:|#)([0-9]+)|#([a-zA-Z]+
-        for idx in xrange(1, 4, 2):
-            trac_name, ticket_id = match.group(idx, idx + 1)
@@ -155 +156 @@
-                                 silent=True)
-
+    def changesetRegexp(self, irc, msg, match):
+        r"""(?x)
+            (?:\b([a-zA-Z_]+):)?\bchangeset:([0-9a-fA-F]+(?::[0-9a-fA-F]*)?) |
+            \B\[([a-zA-Z]+)?([0-9]+)\]"""
+        for idx in xrange(1, 4, 2):
+            trac_name, changeset_id = match.group(idx, idx + 1)
+            if changeset_id:
+                self._changesetLink(irc, msg, trac_name, changeset_id,
+                                    silent=True)
+
-    # Regular Callbacks
-
@@ -161 +172 @@
-
-        Gets the summary of the ticket provided and the link to it.  If the
-provided
+given
-        """
-        self._ticketLink(irc, msg, trac_name, ticket_id, silent=False)
-    ticket = wrap(ticket, ['int', optional('commandName')])
+
+    def changeset(self, irc, msg, args, ticket_id, trac_name):
+        """<changeset id> [<trac>]
+
+        Gets the summary of the changeset provided and the link to it.  If the
+        trac is not given, the channel's default trac is used.
+        """
+        self._changesetLink(irc, msg, trac_name, changeset_id, silent=False)
+    changeset = wrap(changeset, [('regexpMatcher', '/^[a-fA-F0-9:]+$/'),
+                                 optional('commandName')])
-
-    def add(self, irc, msg, args, trac_name, trac_url):
@@ -173 +194 @@
-        etc.) or one letter if you want to use the short forms."""
-        self._addTrac(trac_name, trac_url)
-%s
+"%s"
-    add = wrap(add, ['commandName', 'httpUrl'])
-
+    def remove(self, irc, msg, args, trac_name):
+        """<trac name>
+
+        Remove a new trac to the database."""
+        if trac_name not in self.tracs:
+            irc.error('Unknown trac "%s".' % trac_name)
+        else:
+            self._removeTrac(trac_name)
+            irc.reply('Removed "%s".' % trac_name)
+    remove = wrap(remove, ['commandName'])
+
-    def announce(self, irc, msg, args, channel, trac_name):
-<channel>
+[<channel>]
-
-        Announce the trac in the channel."""
-        url = self._getTracURL(irc, msg, trac_name, silent=False)
-_announceTrac(trac_name, channel
+registryValue('announce', channel).add(trac_name
-        irc.reply('The trac %s at %s will now be announced in %s' % (
-                  trac_name, url, channel))
-    announce = wrap(announce, ['channel', 'commandName'])
-
+    def denounce(self, irc, msg, args, channel, trac_name):
+        """[<channel>] <trac name>
+
+        Stop announcing a trac in a channel."""
+        if trac_name in self.tracs:
+            announced_tracs = self.registryValue('announce', channel)
+            if trac_name in announced_tracs:
+                announced_tracs.discard(trac_name)
+                irc.reply('I\'m not announcing "%s" in %s any longer' % (
+                          trac_name, channel))
+            else:
+                irc.error('I\'m not annoucing "%s" in %s!' % (
+                          trac_name, channel))
+        else:
+            irc.error('Sorry, I don\'t know "%s" yet' % trac_name)
+    denounce = wrap(denounce, ['channel', 'commandName'])
+
-    # Helper methods
-
-    def _ticketLink(self, irc, msg, trac_name, ticket_id, silent=False):
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def _onRemoteNotify(self, type, values):
@@ -218 +280 @@
-
-    def _printTicket(self, values, detailed=False):
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            bold('Ticket'),
-            values['id'],
-            values['summary'],
-
+ or ''
-        )
-        yield '<%s>' % values['url']
@@ -281 +345 @@
-        group.register(name, registry.String(url, ''))
-
-    def _announceTrac(self, name, channel):
-        self.registryValue('announce', channel).add(name)
-
-    def _removeTrac(self, name):
-        self.tracs.pop(name, None)