Changeset 2978

Timestamp:

01/04/08 15:32:54 (1 year ago)

Author:

mitsuhiko

Message:

again some small improvements, this time added wiki page support

Files:

• ircannouncerplugin/0.11/tracext/ircannouncer/listener.py (modified) (4 diffs)
• ircannouncerplugin/0.11/tracext/ircannouncer/service.py (modified) (3 diffs)
• ircannouncerplugin/0.11/tracext/ircannouncer/utils.py (modified) (1 diff)
• ircannouncerplugin/Trac/plugin.py (modified) (9 diffs)

ircannouncerplugin/0.11/tracext/ircannouncer/listener.py

@@ -17 +17 @@
-from trac.ticket.api import ITicketChangeListener
-from trac.versioncontrol.api import IRepositoryListener
+from trac.wiki.api import IWikiChangeListener
-from tracext.ircannouncer.utils import prepare_ticket_values, \
-
+, prepare_wiki_page_values
-
-
-class ChangeListener(Component):
-
+
+
-
-    host = Option('ircannouncer', 'bot_host', '127.0.0.1',
@@ -37 +39 @@
-            self.bot.ircannouncer.notify(type, values)
-        except (IOError, SocketError, Fault):
-            raise
-            return False
-        return True
@@ -50 +51 @@
-        values = prepare_ticket_values(ticket, 'changed')
-        values.update({
-
-
+ or ''
+ or ''
-            'old_values':   old_values
-        })
@@ -66 +67 @@
-    def changeset_commited(self, chgset):
-        self.notify('changeset', prepare_changeset_values(self.env, chgset))
+
+    # -- IWikiChangeListener
+
+    def wiki_page_added(self, page):
+        self.notify('wiki_page', prepare_wiki_page_values(page, 'added'))
+
+    def wiki_page_changed(self, page, version, t, comment, author, ipnr):
+        values = prepare_wiki_page_values(page, 'changed')
+        values['comment'] = comment or ''
+        values['last_author'] = author or ''
+        self.notify('wiki_page', values)
+
+    def wiki_page_deleted(self, page):
+        pass
+
+    def wiki_page_version_deleted(self, page):
+        pass

ircannouncerplugin/0.11/tracext/ircannouncer/service.py

@@ -15 +15 @@
-from trac.resource import ResourceNotFound
-from trac.versioncontrol.api import NoSuchChangeset
+from trac.wiki.model import WikiPage
-
-from tracext.ircannouncer.utils import TracXMLRPCRequestHandler, \
-
+
+
-
-
@@ -26 +28 @@
-        self.dispatcher = TracXMLRPCRequestHandler({
-            'ircannouncer.getTicket':       self.get_ticket,
-
+
+
-        })
-
@@ -47 +50 @@
-        return prepare_changeset_values(self.env, chgset)
-
+    def get_wiki_page(self, req, page_name):
+        page = WikiPage(self.env, page_name)
+        if not page.exists:
+            raise NotFound()
+        return prepare_wiki_page_values(page)
+
-    # -- IRequestHandler methods
-

ircannouncerplugin/0.11/tracext/ircannouncer/utils.py

@@ -86 +86 @@
-        'url':          env.abs_href.changeset(chgset.rev)
-    })
+
+
+def prepare_wiki_page_values(page, action=None):
+    """Converts a wiki page object into a dict."""
+    values = add_environment_info(page.env, {
+        'name':         page.name,
+        'version':      page.version,
+        'readonly':     page.readonly,
+        'exists':       page.exists,
+        'author':       page.author or '',
+        'comment':      page.comment or '',
+        'url':          page.env.abs_href.wiki(page.name)
+    })
+    if action is not None:
+        values['action'] = action
+    return values

ircannouncerplugin/Trac/plugin.py

@@ -57 +57 @@
-    def _dispatch(self, name, args):
-        if name not in self.connector.rpcMethods:
-'
+ (%s)' % name
-        try:
-            return self.connector.rpcMethods[name](*args)
@@ -90 +90 @@
-class Trac(callbacks.PrivmsgCommandAndRegexp):
-    threaded = True
-
+, 'wikipageRegexp'
-    commands = ['ticket', 'changeset', 'add', 'remove', 'announce',
-
+, 'wikipage'
-
-    def __init__(self, irc):
@@ -166 +166 @@
-                                    silent=True)
-
+    def wikipageRegexp(self, irc, msg, match):
+        r"(?:\b([a-zA-Z_]+):)?\bwiki:(\w[\w_]*)"
+        trac_name, wiki_page = match.groups()
+        self._wikipageLink(irc, msg, trac_name, wiki_page, silent=True)
+
-    # Regular Callbacks
-
@@ -186 +191 @@
-    changeset = wrap(changeset, [('regexpMatcher', '/^[a-fA-F0-9:]+$/'),
-                                 optional('commandName')])
+
+    def wikipage(self, irc, msg, args, wiki_page, trac_name):
+        """<wiki page> [<trac>]
+
+        Get a link to that wiki page.  If the trac is not provided, the
+        channel's default trac is used.
+        """
+        wiki_page = '_'.join(wiki_page.split())
+        self._wikipageLink(irc, msg, trac_name, wiki_page, silent=False)
+    wikipage = wrap(wikipage, ['something', optional('commandName')])
-
-    def add(self, irc, msg, args, trac_name, trac_url):
@@ -255 +270 @@
-                irc.error('No such ticket')
-
+    def _wikipageLink(self, irc, msg, trac_name, wiki_page, silent=False):
+        try:
+            trac = self._openTrac(irc, msg, trac_name, silent)
+            for line in self._printWikiPage(trac.getWikiPage(wiki_page)):
+                irc.reply(line, prefixNick=False)
+        except ResourceNotFound:
+            if not silent:
+                irc.error('No such wiki page')
+
-    def _onRemoteNotify(self, type, values):
-        trac = self._findTracByURL(values['trac']['url'])
@@ -261 +285 @@
-        handler = {
-            'changeset':        self._printChangeset,
-
+
+
-        }[type]
-        for irc, channel in self._findAnnouncementChannels(trac):
-, detailed=True
+
-                irc.sendMsg(ircmsgs.privmsg(channel, line))
-        return 0
-
-, detailed=False
+
-        yield format('%s [%s] by %s in %s (%n): %s',
-            bold('Changeset'),
@@ -279 +304 @@
-        yield '<%s>' % values['url']
-
-, detailed=False
+
-        action = values.get('action')
-        if action is not None:
@@ -286 +311 @@
-            elif action == 'changed':
-                action = 'changed by %s' % underline(values['author'])
-
+
+
+
+
-        yield format('%s #%s: %s%s',
-            bold('Ticket'),
@@ -294 +322 @@
-        )
-        yield '<%s>' % values['url']
+
+    def _printWikiPage(self, values):
+        action = values.get('action')
+        if action is not None:
+            if action == 'created':
+                action = 'created by %s' % underline(values['author'])
+            elif action == 'changed':
+                action = 'changed by %s' % underline(values['author'])
+            action = ' (%s)' % action
+        yield format('%s%s %u',
+            bold(values['name']),
+            action or '',
+            values['url']
+        )
-
-    def _findTracByURL(self, trac_url):