Merge lp:~vhata/ibid/plugin-reorg-399667 into lp:~ibid-core/ibid/old-trunk-1.6

[Jonathan Hitchcock]

[Jonathan Hitchcock (vhata)]

- url needs renaming
- svn,bzr needs marco's thoughts
- crypto needs renaming
- factoid's plurality needs fixing: what does this involve
- lookup isn't even half done

review: Needs Fixing

[Jonathan Hitchcock (vhata)]

I think this is ready...

review: Abstain

[Stefano Rivera (stefanor)]

$ bzr springclean
(where springclean == clean-tree --ignored --detritus)
$ scripts/ibid-setup
Traceback (most recent call last):
  File "scripts/ibid-setup", line 22, in <module>
    from ibid.plugins.auth import hash
ImportError: No module named auth

review: Needs Fixing

[Stefano Rivera (stefanor)]

Traceback (most recent call last):
  File "./ibid/core.py", line 208, in load_processor
    __import__(module)
  File "./ibid/plugins/timezone.py", line 26, in <module>
    help['timezone'] = "Converts times between timezones."
TypeError: '_Helper' object does not support item assignment

Missing a "help = {}"

[Stefano Rivera (stefanor)]

scripts/ibid_import looks like it needs import fixes

> ibid/plugins/conversions.py
> 13:log = logging.getLogger('conversions')
make that plugins.conversions

[Stefano Rivera (stefanor)]

OK With me. Re-propose for Michael?

review: Approve

[Stefano Rivera (stefanor)]

review: Approve

[Michael Gorven (mgorven)]

lotto into games?
morse into strings?
rfc into sysadmin?
timezone into conversions?
weather seems a bit lonely...

[Michael Gorven (mgorven)]

config into admin?
dict seems a bit lonely. translate and dict into lang/langtools/languages ?

[Stefano Rivera (stefanor)]

[10:05:18] STARTED (tumbleweed)
[10:05:50] AGREED: morse -> strings (tumbleweed)
[10:19:41] AGREED: config -> admin (tumbleweed)
[10:21:18] AGREED: dict + translate -> languages (tumbleweed)
[10:49:12] AGREED: timezone -> conversions (tumbleweed)
[11:41:23] AGREED: weather, timezone, distance -> geography (tumbleweed)
[11:41:25] ENDED (tumbleweed)

http://holst.cs.uct.ac.za/~stefanor/tibid-logs/meetings/atrum-%23ibid-2010-01-18-10-05-18.html

[lp:~vhata/ibid/plugin-reorg-399667]

871. By Jonathan Hitchcock on 2010-01-18

config plugin is now part of admin

[Stefano Rivera (stefanor)]

review: Approve

[Michael Gorven (mgorven)]

 review approve
 status approved

review: Approve

=== modified file 'ibid/plugins/admin.py'
--- ibid/plugins/admin.py	2009-10-20 15:45:46 +0000
+++ ibid/plugins/admin.py	2010-01-18 18:54:16 +0000
@@ -1,8 +1,14 @@
+from os.path import join
 from twisted.internet import reactor
+import logging
 
 import ibid
 from ibid.utils import human_join
-from ibid.plugins import Processor, match, authorise
+from ibid.config import FileConfig
+from ibid.plugins import Processor, match, authorise, auth_responses
+from ibid.utils import ibid_version
+
+log = logging.getLogger('plugins.admin')
 
 help = {}
 
@@ -70,4 +76,135 @@
     def die(self, event):
         reactor.stop()
 
+help['sources'] = u'Controls and lists the configured sources.'
+class Admin(Processor):
+    u"""(connect|disconnect) (to|from) <source>
+    load <source> source"""
+    feature = 'sources'
+
+    permission = u'sources'
+
+    @match(r'^connect\s+(?:to\s+)?(\S+)$')
+    @authorise()
+    def connect(self, event, source):
+        if source not in ibid.sources:
+            event.addresponse(u"I don't have a source called %s", source)
+        elif ibid.sources[source].connect():
+            event.addresponse(u'Connecting to %s', source)
+        else:
+            event.addresponse(u"I couldn't connect to %s", source)
+
+    @match(r'^disconnect\s+(?:from\s+)?(\S+)$')
+    @authorise()
+    def disconnect(self, event, source):
+        if source not in ibid.sources:
+            event.addresponse(u"I am not connected to %s", source)
+        elif ibid.sources[source].disconnect():
+            event.addresponse(u'Disconnecting from %s', source)
+        else:
+            event.addresponse(u"I couldn't disconnect from %s", source)
+
+    @match(r'^(?:re)?load\s+(\S+)\s+source$')
+    @authorise()
+    def load(self, event, source):
+        if ibid.reloader.load_source(source, ibid.service):
+            event.addresponse(u"%s source loaded", source)
+        else:
+            event.addresponse(u"Couldn't load %s source", source)
+
+class Info(Processor):
+    u"""(sources|list configured sources)"""
+    feature = 'sources'
+
+    @match(r'^sources$')
+    def list(self, event):
+        sources = []
+        for name, source in ibid.sources.items():
+            url = source.url()
+            sources.append(url and u'%s (%s)' % (name, url) or name)
+        event.addresponse(u'Sources: %s', human_join(sorted(sources)) or u'none')
+
+    @match(r'^list\s+configured\s+sources$')
+    def listall(self, event):
+        event.addresponse(u'Configured sources: %s', human_join(sorted(ibid.config.sources.keys())) or u'none')
+
+help['version'] = u"Show the Ibid version currently running"
+class Version(Processor):
+    u"""version"""
+    feature = 'version'
+
+    @match(r'^version$')
+    def show_version(self, event):
+        if ibid_version():
+            event.addresponse(u'I am version %s', ibid_version())
+        else:
+            event.addresponse(u"I don't know what version I am :-(")
+
+help['config'] = u'Gets and sets configuration settings, and rereads the configuration file.'
+class Config(Processor):
+    u"""reread config
+    set config <name> to <value>
+    get config <name>"""
+    feature = 'config'
+
+    priority = -10
+    permission = u'config'
+
+    @match(r'^reread\s+config$')
+    @authorise()
+    def reload(self, event):
+        ibid.config.reload()
+        ibid.config.merge(FileConfig(join(ibid.options['base'], 'local.ini')))
+        ibid.reloader.reload_config()
+        ibid.auth.drop_caches()
+        event.addresponse(True)
+        log.info(u'Reread configuration file')
+
+    @match(r'^(?:set\s+config|config\s+set)\s+(\S+?)(?:\s+to\s+|\s*=\s*)(\S.*?)$')
+    @authorise()
+    def set(self, event, key, value):
+        config = ibid.config
+        for part in key.split('.')[:-1]:
+            if isinstance(config, dict):
+                if part not in config:
+                    config[part] = {}
+            else:
+                event.addresponse(u'No such option')
+                return
+
+            config = config[part]
+
+        part = key.split('.')[-1]
+        if not isinstance(config, dict):
+            event.addresponse(u'No such option')
+            return
+        if ',' in value:
+            config[part] = [part.strip() for part in value.split(',')]
+        else:
+            config[part] = value
+
+        ibid.config.write()
+        ibid.reloader.reload_config()
+        log.info(u"Set %s to %s", key, value)
+
+        event.addresponse(True)
+
+    @match(r'^(?:get\s+config|config\s+get)\s+(\S+?)$')
+    def get(self, event, key):
+        if 'password' in key.lower() and not auth_responses(event, u'config'):
+            return
+
+        config = ibid.config
+        for part in key.split('.'):
+            if not isinstance(config, dict) or part not in config:
+                event.addresponse(u'No such option')
+                return
+            config = config[part]
+        if isinstance(config, list):
+            event.addresponse(u', '.join(config))
+        elif isinstance(config, dict):
+            event.addresponse(u'Keys: ' + human_join(config.keys()))
+        else:
+            event.addresponse(unicode(config))
+
 # vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/auth.py'
--- ibid/plugins/auth.py	2009-12-20 20:17:17 +0000
+++ ibid/plugins/auth.py	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-import logging
-
-import ibid
-from ibid.db.models import Credential, Permission, Account
-from ibid.plugins import Processor, match, auth_responses, authorise
-from ibid.auth import hash
-from ibid.utils import human_join
-
-help = {}
-
-log = logging.getLogger('plugins.auth')
-
-actions = {'revoke': 'Revoked', 'grant': 'Granted', 'remove': 'Removed'}
-
-help['auth'] = u'Adds and removes authentication credentials and permissions'
-class AddAuth(Processor):
-    u"""authenticate <account> [on source] using <method> [<credential>]"""
-    feature = 'auth'
-
-    @match(r'^authenticate\s+(.+?)(?:\s+on\s+(.+))?\s+using\s+(\S+)\s+(.+)$')
-    def handler(self, event, user, source, method, credential):
-
-        if user.lower() == 'me':
-            if not event.account:
-                event.addresponse(u"I don't know who you are")
-                return
-            if not ibid.auth.authenticate(event):
-                event.complain = 'notauthed'
-                return
-            account = event.session.query(Account).get(event.account)
-
-        else:
-            if not auth_responses(event, 'admin'):
-                return
-            account = event.session.query(Account).filter_by(username=user).first()
-            if not account:
-                event.addresponse(u"I don't know who %s is", user)
-                return
-
-        if source:
-            if source not in ibid.sources:
-                event.addresponse(u"I am not connected to %s", source)
-                return
-            source = ibid.sources[source].name
-
-        if method.lower() == 'password':
-            password = hash(credential)
-            event.message['clean'] = event.message['clean'][:-len(credential)] + password
-            event.message['raw'] = event.message['raw'][:event.message['raw'].rfind(credential)] \
-                    + password + event.message['raw'][event.message['raw'].rfind(credential)+len(credential):]
-            credential = password
-
-        credential = Credential(method, credential, source, account.id)
-        event.session.save_or_update(credential)
-        event.session.commit()
-        log.info(u"Added %s credential %s for account %s (%s) on %s by account %s",
-                method, credential.credential, account.id, account.username, source, event.account)
-
-        event.addresponse(True)
-
-permission_values = {'no': '-', 'yes': '+', 'auth': ''}
-class Permissions(Processor):
-    u"""(grant|revoke|remove) <permission> (to|from|on) <username> [when authed]
-    permissions [for <username>]
-    list permissions"""
-    feature = 'auth'
-
-    permission = u'admin'
-
-    @match(r'^(grant|revoke|remove)\s+(.+?)(?:\s+permission)?\s+(?:to|from|on)\s+(.+?)(\s+(?:with|when|if)\s+(?:auth|authed|authenticated))?$')
-    @authorise()
-    def grant(self, event, action, name, username, auth):
-
-        account = event.session.query(Account).filter_by(username=username).first()
-        if not account:
-            event.addresponse(u"I don't know who %s is", username)
-            return
-
-        permission = event.session.query(Permission) \
-                .filter_by(account_id=account.id, name=name).first()
-        if action.lower() == 'remove':
-            if permission:
-                event.session.delete(permission)
-            else:
-                event.addresponse(u"%s doesn't have that permission anyway", username)
-                return
-
-        else:
-            if not permission:
-                permission = Permission(name)
-                account.permissions.append(permission)
-
-            if action.lower() == 'revoke':
-                value = 'no'
-            elif auth:
-                value = 'auth'
-            else:
-                value = 'yes'
-
-            if permission.value == value:
-                event.addresponse(u'%(permission)s permission for %(user)s is already %(value)s', {
-                    'permission': name,
-                    'user': username,
-                    'value': value,
-                })
-                return
-
-            permission.value = value
-            event.session.save_or_update(permission)
-
-        event.session.commit()
-        ibid.auth.drop_caches()
-        log.info(u"%s %s permission for account %s (%s) by account %s",
-                actions[action.lower()], name, account.id, account.username, event.account)
-
-        event.addresponse(True)
-
-    @match(r'^permissions(?:\s+for\s+(\S+))?$')
-    def list(self, event, username):
-        if not username:
-            if not event.account:
-                event.addresponse(u"I don't know who you are")
-                return
-            account = event.session.query(Account).get(event.account)
-        else:
-            if not auth_responses(event, u'accounts'):
-                return
-            account = event.session.query(Account) \
-                    .filter_by(username=username).first()
-            if not account:
-                event.addresponse(u"I don't know who %s is", username)
-                return
-
-        permissions = sorted(u'%s%s' % (permission_values[perm.value], perm.name) for perm in account.permissions)
-        event.addresponse(u'Permissions: %s', human_join(permissions) or u'none')
-
-    @match(r'^list\s+permissions$')
-    def list_permissions(self, event):
-        permissions = []
-        for processor in ibid.processors:
-            if hasattr(processor, 'permission') and getattr(processor, 'permission') not in permissions:
-                permissions.append(getattr(processor, 'permission'))
-            if hasattr(processor, 'permissions'):
-                for permission in getattr(processor, 'permissions'):
-                    if permission not in permissions:
-                        permissions.append(permission)
-
-        event.addresponse(u'Permissions: %s', human_join(sorted(permissions)) or u'none')
-
-class Auth(Processor):
-    u"""auth <credential>"""
-    feature = 'auth'
-
-    @match(r'^auth(?:\s+(.+))?$')
-    def handler(self, event, password):
-        result = ibid.auth.authenticate(event, password)
-        if result:
-            event.addresponse(u'You are authenticated')
-        else:
-            event.addresponse(u'Authentication failed')
-
-# vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/basic.py'
--- ibid/plugins/basic.py	2010-01-02 11:26:31 +0000
+++ ibid/plugins/basic.py	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-from random import choice
-import re
-
-import ibid
-from ibid.plugins import Processor, match, handler, authorise
-
-help = {}
-
-help['saydo'] = u'Says or does stuff in a channel.'
-class SayDo(Processor):
-    u"""(say|do) in <channel> [on <source>] <text>"""
-    feature = 'saydo'
-
-    permission = u'saydo'
-
-    @match(r'^(say|do)\s+(?:in|to)\s+(\S+)\s+(?:on\s+(\S+)\s+)?(.*)$', 'deaddressed')
-    @authorise()
-    def saydo(self, event, action, channel, source, what):
-        event.addresponse(what, address=False, target=channel, source=source or event.source,
-                action=(action.lower() == u"do"))
-
-help['redirect'] = u'Redirects the response to a command to a different channel.'
-class RedirectCommand(Processor):
-    u"""redirect [to] <channel> [on <source>] <command>"""
-    feature = 'redirect'
-
-    priority = -1200
-    permission = u'saydo'
-
-    @match(r'^redirect\s+(?:to\s+)?(\S+)\s+(?:on\s+(\S+)\s+)?(.+)$')
-    @authorise()
-    def redirect(self, event, channel, source, command):
-        if source:
-            if source.lower() not in ibid.sources:
-                event.addresponse(u'No such source: %s', source)
-                return
-            event.redirect_source = source
-        event.redirect_target = channel
-        event.message['clean'] = command
-
-class Redirect(Processor):
-    feature = 'redirect'
-
-    processed = True
-    priority = 940
-
-    @handler
-    def redirect(self, event):
-        if 'redirect_target' in event:
-            responses = []
-            for response in event.responses:
-                response['target'] = event.redirect_target
-                if 'redirect_source' in event:
-                    response['source'] = event.redirect_source
-                responses.append(response)
-            event.responses = responses
-
-help['choose'] = u'Choose one of the given options.'
-class Choose(Processor):
-    u"""choose <choice> or <choice>..."""
-    feature = 'choose'
-
-    choose_re = re.compile(r'(?:\s*,\s*(?:or\s+)?)|(?:\s+or\s+)', re.I)
-
-    @match(r'^(?:choose|choice|pick)\s+(.+)$')
-    def choose(self, event, choices):
-        event.addresponse(u'I choose %s', choice(self.choose_re.split(choices)))
-
-# vi: set et sta sw=4 ts=4:

=== renamed file 'ibid/plugins/maths.py' => 'ibid/plugins/calc.py'
--- ibid/plugins/maths.py	2010-01-12 10:54:47 +0000
+++ ibid/plugins/calc.py	2010-01-18 18:54:16 +0000
@@ -1,16 +1,15 @@
 from __future__ import division
+from random import random, randint
 
 import logging
 from os import kill
-import re
 from signal import SIGTERM
 from subprocess import Popen, PIPE
 from time import time, sleep
 
-import ibid
 from ibid.compat import all, factorial
 from ibid.config import Option, FloatOption
-from ibid.plugins import Processor, match, handler
+from ibid.plugins import Processor, match
 from ibid.utils import file_in_path, unicode_output
 
 try:
@@ -27,7 +26,7 @@
         futures = ('division',)
 
 help = {}
-log = logging.getLogger('maths')
+log = logging.getLogger('calc')
 
 help['bc'] = u'Calculate mathematical expressions using bc'
 class BC(Processor):
@@ -191,200 +190,18 @@
         if isinstance(result, (int, long, float, complex)):
             event.addresponse(unicode(result))
 
-help['base'] = u'Convert numbers between bases (radixes)'
-class BaseConvert(Processor):
-    u"""[convert] <number> [from base <number>] to base <number>
-    [convert] ascii <text> to base <number>
-    [convert] <sequence> from base <number> to ascii"""
-
-    feature = "base"
-
-    abbr_named_bases = {
-            "hex": 16,
-            "dec": 10,
-            "oct": 8,
-            "bin": 2,
-    }
-
-    base_names = {
-            2: "binary",
-            3: "ternary",
-            4: "quaternary",
-            6: "senary",
-            8: "octal",
-            9: "nonary",
-            10: "decimal",
-            12: "duodecimal",
-            16: "hexadecimal",
-            20: "vigesimal",
-            30: "trigesimal",
-            32: "duotrigesimal",
-            36: "hexatridecimal",
-    }
-    base_values = {}
-    for value, name in base_names.iteritems():
-        base_values[name] = value
-
-    numerals = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/"
-    values = {}
-    for value, numeral in enumerate(numerals):
-        values[numeral] = value
-
-    def _in_base(self, num, base):
-        "Recursive base-display formatter"
-        if num == 0:
-            return "0"
-        return self._in_base(num // base, base).lstrip("0") + self.numerals[num % base]
-
-    def _from_base(self, num, base):
-        "Return a base-n number in decimal. Needed as int(x, n) only works for n<=36"
-
-        if base <= 36:
-            num = num.upper()
-
-        decimal = 0
-        for digit in num:
-            decimal *= base
-            if self.values[digit] >= base:
-                raise ValueError("'%s' is not a valid digit in %s" % (digit, self._base_name(base)))
-            decimal += self.values[digit]
-
-        return decimal
-
-    def _parse_base(self, base):
-        "Parse a base in the form of 'hex' or 'base 13' or None"
-
-        if base is None:
-            base = 10
-        elif len(base) == 3 and base in self.abbr_named_bases:
-            base = self.abbr_named_bases[base]
-        elif base in self.base_values:
-            base = self.base_values[base]
-        elif base.startswith(u"base"):
-            base = int(base.split()[-1])
+help['random'] = u'Generates random numbers.'
+class Random(Processor):
+    u"""random [ <max> | <min> <max> ]"""
+    feature = 'random'
+
+    @match('^rand(?:om)?(?:\s+(\d+)(?:\s+(\d+))?)?$')
+    def random(self, event, begin, end):
+        if not begin and not end:
+            event.addresponse(u'I always liked %f', random())
         else:
-            # The above should be the only cases allowed by the regex
-            # This exception indicates programmer error:
-            raise ValueError("Unparsable base: " + base)
-
-        return base
-
-    def _base_name(self, base):
-        "Shows off the bot's smartypants heritage by naming bases"
-
-        base_name = u"base %i" % base
-
-        if base in self.base_names:
-            base_name = self.base_names[base]
-
-        return base_name
-
-    def setup(self):
-        bases = []
-        for number, name in self.base_names.iteritems():
-            if name[:3] in self.abbr_named_bases and self.abbr_named_bases[name[:3]] == number:
-                bases.append(r"%s(?:%s)?" % (name[:3], name[3:]))
-            else:
-                bases.append(name)
-        bases = "|".join(bases)
-
-        self.base_conversion.im_func.pattern = re.compile(
-            r"^(?:convert\s+)?([0-9a-zA-Z+/]+)\s+(?:(?:(?:from|in)\s+)?(base\s+\d+|%s)\s+)?(?:in|to|into)\s+(base\s+\d+|%s)\s*$"
-            % (bases, bases), re.I)
-
-        self.ascii_decode.im_func.pattern = re.compile(
-            r"^(?:convert\s+)?ascii\s+(.+?)(?:(?:\s+(?:in|to|into))?\s+(base\s+\d+|%s))?$" % bases, re.I)
-
-        self.ascii_encode.im_func.pattern = re.compile(
-            r"^(?:convert\s+)?([0-9a-zA-Z+/\s]+?)(?:\s+(?:(?:from|in)\s+)?(base\s+\d+|%s))?\s+(?:in|to|into)\s+ascii$" % bases, re.I)
-
-    @handler
-    def base_conversion(self, event, number, base_from, base_to):
-        "Arbitrary (2 <= base <= 64) numeric base conversions."
-
-        base_from = self._parse_base(base_from)
-        base_to = self._parse_base(base_to)
-
-        if min(base_from, base_to) < 2 or max(base_from, base_to) > 64:
-            event.addresponse(u'Sorry, valid bases are between 2 and 64, inclusive')
-            return
-
-        try:
-            number = self._from_base(number, base_from)
-        except ValueError, e:
-            event.addresponse(unicode(e))
-            return
-
-        event.addresponse(u'That is %(result)s in %(base)s', {
-            'result': self._in_base(number, base_to),
-            'base': self._base_name(base_to),
-        })
-
-    @handler
-    def ascii_decode(self, event, text, base_to):
-        "Display the values of each character in an ASCII string"
-
-        base_to = self._parse_base(base_to)
-
-        if len(text) > 2 and text[0] == text[-1] and text[0] in ("'", '"'):
-            text = text[1:-1]
-
-        output = u""
-        for char in text:
-            code_point = ord(char)
-            if code_point > 255:
-                output += u'U%s ' % self._in_base(code_point, base_to)
-            else:
-                output += self._in_base(code_point, base_to) + u" "
-
-        output = output.strip()
-
-        event.addresponse(u'That is %(result)s in %(base)s', {
-            'result': output,
-            'base': self._base_name(base_to),
-        })
-
-        if base_to == 64 and [True for plugin in ibid.processors if getattr(plugin, 'feature', None) == 'base64']:
-            event.addresponse(u'If you want a base64 encoding, use the "base64" feature')
-
-    @handler
-    def ascii_encode(self, event, source, base_from):
-
-        base_from = self._parse_base(base_from)
-
-        output = u""
-        buf = u""
-
-        def process_buf(buf):
-            char = self._from_base(buf, base_from)
-            if char > 127:
-                raise ValueError(u"I only deal with the first page of ASCII (i.e. under 127). %i is invalid." % char)
-            elif char < 32:
-                return u" %s " % "NUL SOH STX EOT ENQ ACK BEL BS HT LF VT FF SO SI DLE DC1 DC2 DC2 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US".split()[char]
-            elif char == 127:
-                return u" DEL "
-            return unichr(char)
-
-        try:
-            for char in source:
-                if char == u" ":
-                    if len(buf) > 0:
-                        output += process_buf(buf)
-                        buf = u""
-                else:
-                    buf += char
-                    if (len(buf) == 2 and base_from == 16) or (len(buf) == 3 and base_from == 8) or (len(buf) == 8 and base_from == 2):
-                        output += process_buf(buf)
-                        buf = u""
-
-            if len(buf) > 0:
-                output += process_buf(buf)
-        except ValueError, e:
-            event.addresponse(unicode(e))
-            return
-
-        event.addresponse(u'That is "%s"', output)
-        if base_from == 64 and [True for plugin in ibid.processors if getattr(plugin, 'feature', None) == 'base64']:
-            event.addresponse(u'If you want a base64 encoding, use the "base64" feature')
+            begin = int(begin)
+            end = end and int(end) or 0
+            event.addresponse(u'I always liked %i', randint(min(begin,end), max(begin,end)))
 
 # vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/config.py'
--- ibid/plugins/config.py	2009-12-31 17:27:23 +0000
+++ ibid/plugins/config.py	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-from os.path import join
-import logging
-
-import ibid
-from ibid.config import FileConfig
-from ibid.utils import human_join
-from ibid.plugins import Processor, match, authorise, auth_responses
-
-help = {'config': u'Gets and sets configuration settings, and rereads the configuration file.'}
-
-log = logging.getLogger('plugins.config')
-
-class Config(Processor):
-    u"""reread config
-    set config <name> to <value>
-    get config <name>"""
-    feature = 'config'
-
-    priority = -10
-    permission = u'config'
-
-    @match(r'^reread\s+config$')
-    @authorise()
-    def reload(self, event):
-        ibid.config.reload()
-        ibid.config.merge(FileConfig(join(ibid.options['base'], 'local.ini')))
-        ibid.reloader.reload_config()
-        ibid.auth.drop_caches()
-        event.addresponse(True)
-        log.info(u'Reread configuration file')
-
-    @match(r'^(?:set\s+config|config\s+set)\s+(\S+?)(?:\s+to\s+|\s*=\s*)(\S.*?)$')
-    @authorise()
-    def set(self, event, key, value):
-        config = ibid.config
-        for part in key.split('.')[:-1]:
-            if isinstance(config, dict):
-                if part not in config:
-                    config[part] = {}
-            else:
-                event.addresponse(u'No such option')
-                return
-
-            config = config[part]
-
-        part = key.split('.')[-1]
-        if not isinstance(config, dict):
-            event.addresponse(u'No such option')
-            return
-        if ',' in value:
-            config[part] = [part.strip() for part in value.split(',')]
-        else:
-            config[part] = value
-
-        ibid.config.write()
-        ibid.reloader.reload_config()
-        log.info(u"Set %s to %s", key, value)
-
-        event.addresponse(True)
-
-    @match(r'^(?:get\s+config|config\s+get)\s+(\S+?)$')
-    def get(self, event, key):
-        if 'password' in key.lower() and not auth_responses(event, u'config'):
-            return
-
-        config = ibid.config
-        for part in key.split('.'):
-            if not isinstance(config, dict) or part not in config:
-                event.addresponse(u'No such option')
-                return
-            config = config[part]
-        if isinstance(config, list):
-            event.addresponse(u', '.join(config))
-        elif isinstance(config, dict):
-            event.addresponse(u'Keys: ' + human_join(config.keys()))
-        else:
-            event.addresponse(unicode(config))
-
-# vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/conversions.py'
--- ibid/plugins/conversions.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/conversions.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,412 @@
+from subprocess import Popen, PIPE
+from urllib import urlencode
+import logging
+import re
+
+import ibid
+from ibid.plugins import Processor, handler, match
+from ibid.config import Option
+from ibid.utils import file_in_path, unicode_output, human_join
+from ibid.utils.html import get_country_codes, get_html_parse_tree
+
+help = {}
+log = logging.getLogger('plugins.conversions')
+
+help['base'] = u'Convert numbers between bases (radixes)'
+class BaseConvert(Processor):
+    u"""[convert] <number> [from base <number>] to base <number>
+    [convert] ascii <text> to base <number>
+    [convert] <sequence> from base <number> to ascii"""
+
+    feature = "base"
+
+    abbr_named_bases = {
+            "hex": 16,
+            "dec": 10,
+            "oct": 8,
+            "bin": 2,
+    }
+
+    base_names = {
+            2: "binary",
+            3: "ternary",
+            4: "quaternary",
+            6: "senary",
+            8: "octal",
+            9: "nonary",
+            10: "decimal",
+            12: "duodecimal",
+            16: "hexadecimal",
+            20: "vigesimal",
+            30: "trigesimal",
+            32: "duotrigesimal",
+            36: "hexatridecimal",
+    }
+    base_values = {}
+    for value, name in base_names.iteritems():
+        base_values[name] = value
+
+    numerals = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/"
+    values = {}
+    for value, numeral in enumerate(numerals):
+        values[numeral] = value
+
+    def _in_base(self, num, base):
+        "Recursive base-display formatter"
+        if num == 0:
+            return "0"
+        return self._in_base(num // base, base).lstrip("0") + self.numerals[num % base]
+
+    def _from_base(self, num, base):
+        "Return a base-n number in decimal. Needed as int(x, n) only works for n<=36"
+
+        if base <= 36:
+            num = num.upper()
+
+        decimal = 0
+        for digit in num:
+            decimal *= base
+            if self.values[digit] >= base:
+                raise ValueError("'%s' is not a valid digit in %s" % (digit, self._base_name(base)))
+            decimal += self.values[digit]
+
+        return decimal
+
+    def _parse_base(self, base):
+        "Parse a base in the form of 'hex' or 'base 13' or None"
+
+        if base is None:
+            base = 10
+        elif len(base) == 3 and base in self.abbr_named_bases:
+            base = self.abbr_named_bases[base]
+        elif base in self.base_values:
+            base = self.base_values[base]
+        elif base.startswith(u"base"):
+            base = int(base.split()[-1])
+        else:
+            # The above should be the only cases allowed by the regex
+            # This exception indicates programmer error:
+            raise ValueError("Unparsable base: " + base)
+
+        return base
+
+    def _base_name(self, base):
+        "Shows off the bot's smartypants heritage by naming bases"
+
+        base_name = u"base %i" % base
+
+        if base in self.base_names:
+            base_name = self.base_names[base]
+
+        return base_name
+
+    def setup(self):
+        bases = []
+        for number, name in self.base_names.iteritems():
+            if name[:3] in self.abbr_named_bases and self.abbr_named_bases[name[:3]] == number:
+                bases.append(r"%s(?:%s)?" % (name[:3], name[3:]))
+            else:
+                bases.append(name)
+        bases = "|".join(bases)
+
+        self.base_conversion.im_func.pattern = re.compile(
+            r"^(?:convert\s+)?([0-9a-zA-Z+/]+)\s+(?:(?:(?:from|in)\s+)?(base\s+\d+|%s)\s+)?(?:in|to|into)\s+(base\s+\d+|%s)\s*$"
+            % (bases, bases), re.I)
+
+        self.ascii_decode.im_func.pattern = re.compile(
+            r"^(?:convert\s+)?ascii\s+(.+?)(?:(?:\s+(?:in|to|into))?\s+(base\s+\d+|%s))?$" % bases, re.I)
+
+        self.ascii_encode.im_func.pattern = re.compile(
+            r"^(?:convert\s+)?([0-9a-zA-Z+/\s]+?)(?:\s+(?:(?:from|in)\s+)?(base\s+\d+|%s))?\s+(?:in|to|into)\s+ascii$" % bases, re.I)
+
+    @handler
+    def base_conversion(self, event, number, base_from, base_to):
+        "Arbitrary (2 <= base <= 64) numeric base conversions."
+
+        base_from = self._parse_base(base_from)
+        base_to = self._parse_base(base_to)
+
+        if min(base_from, base_to) < 2 or max(base_from, base_to) > 64:
+            event.addresponse(u'Sorry, valid bases are between 2 and 64, inclusive')
+            return
+
+        try:
+            number = self._from_base(number, base_from)
+        except ValueError, e:
+            event.addresponse(unicode(e))
+            return
+
+        event.addresponse(u'That is %(result)s in %(base)s', {
+            'result': self._in_base(number, base_to),
+            'base': self._base_name(base_to),
+        })
+
+    @handler
+    def ascii_decode(self, event, text, base_to):
+        "Display the values of each character in an ASCII string"
+
+        base_to = self._parse_base(base_to)
+
+        if len(text) > 2 and text[0] == text[-1] and text[0] in ("'", '"'):
+            text = text[1:-1]
+
+        output = u""
+        for char in text:
+            code_point = ord(char)
+            if code_point > 255:
+                output += u'U%s ' % self._in_base(code_point, base_to)
+            else:
+                output += self._in_base(code_point, base_to) + u" "
+
+        output = output.strip()
+
+        event.addresponse(u'That is %(result)s in %(base)s', {
+            'result': output,
+            'base': self._base_name(base_to),
+        })
+
+        if base_to == 64 and [True for plugin in ibid.processors if getattr(plugin, 'feature', None) == 'base64']:
+            event.addresponse(u'If you want a base64 encoding, use the "base64" feature')
+
+    @handler
+    def ascii_encode(self, event, source, base_from):
+
+        base_from = self._parse_base(base_from)
+
+        output = u""
+        buf = u""
+
+        def process_buf(buf):
+            char = self._from_base(buf, base_from)
+            if char > 127:
+                raise ValueError(u"I only deal with the first page of ASCII (i.e. under 127). %i is invalid." % char)
+            elif char < 32:
+                return u" %s " % "NUL SOH STX EOT ENQ ACK BEL BS HT LF VT FF SO SI DLE DC1 DC2 DC2 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US".split()[char]
+            elif char == 127:
+                return u" DEL "
+            return unichr(char)
+
+        try:
+            for char in source:
+                if char == u" ":
+                    if len(buf) > 0:
+                        output += process_buf(buf)
+                        buf = u""
+                else:
+                    buf += char
+                    if (len(buf) == 2 and base_from == 16) or (len(buf) == 3 and base_from == 8) or (len(buf) == 8 and base_from == 2):
+                        output += process_buf(buf)
+                        buf = u""
+
+            if len(buf) > 0:
+                output += process_buf(buf)
+        except ValueError, e:
+            event.addresponse(unicode(e))
+            return
+
+        event.addresponse(u'That is "%s"', output)
+        if base_from == 64 and [True for plugin in ibid.processors if getattr(plugin, 'feature', None) == 'base64']:
+            event.addresponse(u'If you want a base64 encoding, use the "base64" feature')
+
+help['units'] = 'Converts values between various units.'
+class Units(Processor):
+    u"""convert [<value>] <unit> to <unit>"""
+    feature = 'units'
+    priority = 10
+
+    units = Option('units', 'Path to units executable', 'units')
+
+    temp_scale_names = {
+        'fahrenheit': 'tempF',
+        'f': 'tempF',
+        'celsius': 'tempC',
+        'celcius': 'tempC',
+        'c': 'tempC',
+        'kelvin': 'tempK',
+        'k': 'tempK',
+        'rankine': 'tempR',
+        'r': 'tempR',
+    }
+
+    temp_function_names = set(temp_scale_names.values())
+
+    def setup(self):
+        if not file_in_path(self.units):
+            raise Exception("Cannot locate units executable")
+
+    def format_temperature(self, unit):
+        "Return the unit, and convert to 'tempX' format if a known temperature scale"
+
+        lunit = unit.lower()
+        if lunit in self.temp_scale_names:
+            unit = self.temp_scale_names[lunit]
+        elif lunit.startswith("deg") and " " in lunit and lunit.split(None, 1)[1] in self.temp_scale_names:
+            unit = self.temp_scale_names[lunit.split(None, 1)[1]]
+        return unit
+
+    @match(r'^convert\s+(-?[0-9.]+)?\s*(.+)\s+(?:in)?to\s+(.+)$')
+    def convert(self, event, value, frm, to):
+
+        # We have to special-case temperatures because GNU units uses function notation
+        # for direct temperature conversions
+        if self.format_temperature(frm) in self.temp_function_names \
+                and self.format_temperature(to) in self.temp_function_names:
+            frm = self.format_temperature(frm)
+            to = self.format_temperature(to)
+
+        if value is not None:
+            if frm in self.temp_function_names:
+                frm = "%s(%s)" % (frm, value)
+            else:
+                frm = '%s %s' % (value, frm)
+
+        units = Popen([self.units, '--verbose', '--', frm, to], stdout=PIPE, stderr=PIPE)
+        output, error = units.communicate()
+        code = units.wait()
+
+        output = unicode_output(output)
+        result = output.splitlines()[0].strip()
+
+        if code == 0:
+            event.addresponse(result)
+        elif code == 1:
+            if result == "conformability error":
+                event.addresponse(u"I don't think %(from)s can be converted to %(to)s", {
+                    'from': frm,
+                    'to': to,
+                })
+            elif result.startswith("conformability error"):
+                event.addresponse(u"I don't think %(from)s can be converted to %(to)s: %(error)s", {
+                    'from': frm,
+                    'to': to,
+                    'error': result.split(":", 1)[1],
+                })
+            else:
+                event.addresponse(u"I can't do that: %s", result)
+
+help['currency'] = u'Converts amounts between currencies.'
+class Currency(Processor):
+    u"""exchange <amount> <currency> for <currency>
+    currencies for <country>"""
+
+    feature = "currency"
+
+    headers = {'User-Agent': 'Mozilla/5.0', 'Referer': 'http://www.xe.com/'}
+    currencies = {}
+    country_codes = {}
+
+    def _load_currencies(self):
+        etree = get_html_parse_tree('http://www.xe.com/iso4217.php', headers=self.headers, treetype='etree')
+
+        tbl_main = [x for x in etree.getiterator('table') if x.get('class') == 'tbl_main'][0]
+
+        self.currencies = {}
+        for tbl_sub in tbl_main.getiterator('table'):
+            if tbl_sub.get('class') == 'tbl_sub':
+                for tr in tbl_sub.getiterator('tr'):
+                    code, place = [x.text for x in tr.getchildren()]
+                    name = u''
+                    if not place:
+                        place = u''
+                    if u',' in place[1:-1]:
+                        place, name = place.split(u',', 1)
+                    place = place.strip()
+                    if code in self.currencies:
+                        currency = self.currencies[code]
+                        # Are we using another country's currency?
+                        if place != u'' and name != u'' and (currency[1] == u'' or currency[1].rsplit(None, 1)[0] in place
+                                or (u'(also called' in currency[1] and currency[1].split(u'(', 1)[0].rsplit(None, 1)[0] in place)):
+                            currency[0].insert(0, place)
+                            currency[1] = name.strip()
+                        else:
+                            currency[0].append(place)
+                    else:
+                        self.currencies[code] = [[place], name.strip()]
+
+        # Special cases for shared currencies:
+        self.currencies['EUR'][0].insert(0, u'Euro Member Countries')
+        self.currencies['XOF'][0].insert(0, u'Communaut\xe9 Financi\xe8re Africaine')
+        self.currencies['XOF'][1] = u'Francs'
+
+    strip_currency_re = re.compile(r'^[\.\s]*([\w\s]+?)s?$', re.UNICODE)
+
+    def _resolve_currency(self, name, rough=True):
+        "Return the canonical name for a currency"
+
+        if name.upper() in self.currencies:
+            return name.upper()
+
+        m = self.strip_currency_re.match(name)
+
+        if m is None:
+            return False
+
+        name = m.group(1).lower()
+
+        # TLD -> country name
+        if rough and len(name) == 2 and name.upper() in self.country_codes:
+           name = self.country_codes[name.upper()].lower()
+
+        # Currency Name
+        if name == u'dollar':
+            return "USD"
+
+        name_re = re.compile(r'^(.+\s+)?\(?%ss?\)?(\s+.+)?$' % name, re.I | re.UNICODE)
+        for code, (places, currency) in self.currencies.iteritems():
+            if name_re.match(currency) or [True for place in places if name_re.match(place)]:
+                return code
+
+        return False
+
+    @match(r'^(exchange|convert)\s+([0-9.]+)\s+(.+)\s+(?:for|to|into)\s+(.+)$')
+    def exchange(self, event, command, amount, frm, to):
+        if not self.currencies:
+            self._load_currencies()
+
+        if not self.country_codes:
+            self.country_codes = get_country_codes()
+
+        rough = command.lower() == 'exchange'
+
+        canonical_frm = self._resolve_currency(frm, rough)
+        canonical_to = self._resolve_currency(to, rough)
+        if not canonical_frm or not canonical_to:
+            if rough:
+                event.addresponse(u"Sorry, I don't know about a currency for %s", (not canonical_frm and frm or to))
+            return
+
+        data = {'Amount': amount, 'From': canonical_frm, 'To': canonical_to}
+        etree = get_html_parse_tree('http://www.xe.com/ucc/convert.cgi', urlencode(data), self.headers, 'etree')
+
+        result = [tag.text for tag in etree.getiterator('h2')]
+        if result:
+            event.addresponse(u'%(fresult)s (%(fcountry)s %(fcurrency)s) = %(tresult)s (%(tcountry)s %(tcurrency)s)', {
+                'fresult': result[0],
+                'tresult': result[2],
+                'fcountry': self.currencies[canonical_frm][0][0],
+                'fcurrency': self.currencies[canonical_frm][1],
+                'tcountry': self.currencies[canonical_to][0][0],
+                'tcurrency': self.currencies[canonical_to][1],
+            })
+        else:
+            event.addresponse(u"The bureau de change appears to be closed for lunch")
+
+    @match(r'^(?:currency|currencies)\s+for\s+(?:the\s+)?(.+)$')
+    def currency(self, event, place):
+        if not self.currencies:
+            self._load_currencies()
+
+        search = re.compile(place, re.I)
+        results = []
+        for code, (places, name) in self.currencies.iteritems():
+            for place in places:
+                if search.search(place):
+                    results.append(u'%s uses %s (%s)' % (place, name, code))
+                    break
+
+        if results:
+            event.addresponse(human_join(results))
+        else:
+            event.addresponse(u'No currencies found')
+
+# vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/core.py'
--- ibid/plugins/core.py	2010-01-14 22:12:39 +0000
+++ ibid/plugins/core.py	2010-01-18 18:54:16 +0000
@@ -4,7 +4,6 @@
 import logging
 
 import ibid
-from ibid.compat import any
 from ibid.config import IntOption, ListOption, DictOption
 from ibid.plugins import Processor, handler
 from ibid.plugins.identity import identify

=== modified file 'ibid/plugins/dbus.py'
--- ibid/plugins/dbus.py	2009-07-09 14:45:08 +0000
+++ ibid/plugins/dbus.py	2010-01-18 18:54:16 +0000
@@ -1,4 +1,5 @@
 import sys
+import re
 from traceback import print_exc
 
 import ibid
@@ -8,7 +9,7 @@
     autoload = False
 
     def __init__(self, name):
-        Module.__init__(self, name)
+        Processor.__init__(self, name)
         if 'dbus' not in sys.modules:
             raise Exception('dbus library not loaded')
 

=== modified file 'ibid/plugins/factoid.py'
--- ibid/plugins/factoid.py	2009-12-30 22:01:38 +0000
+++ ibid/plugins/factoid.py	2010-01-18 18:54:16 +0000
@@ -15,7 +15,7 @@
 from ibid.plugins.identity import get_identities
 from ibid.utils import format_date
 
-help = {'factoids': u'Factoids are arbitrary pieces of information stored by a key. '
+help = {'factoid': u'Factoids are arbitrary pieces of information stored by a key. '
                     u'Factoids beginning with a command such as "<action>" or "<reply>" will supress the "name verb value" output. '
                     u"Search and replace functions won't use real regexs unless appended with the 'r' flag."}
 
@@ -257,7 +257,7 @@
 
 class Utils(Processor):
     u"""literal <name> [( #<from number> | /<pattern>/[r] )]"""
-    feature = 'factoids'
+    feature = 'factoid'
 
     @match(r'^literal\s+(.+?)(?:\s+#(\d+)|\s+(?:/(.+?)/(r?)))?$')
     def literal(self, event, name, number, pattern, is_regex):
@@ -272,7 +272,7 @@
 class Forget(Processor):
     u"""forget <name> [( #<number> | /<pattern>/[r] )]
     <name> is the same as <other name>"""
-    feature = 'factoids'
+    feature = 'factoid'
 
     priority = 10
     permission = u'factoid'
@@ -368,7 +368,7 @@
 
 class Search(Processor):
     u"""search [for] [<limit>] [(facts|values) [containing]] (<pattern>|/<pattern>/[r]) [from <start>]"""
-    feature = 'factoids'
+    feature = 'factoid'
 
     limit = IntOption('search_limit', u'Maximum number of results to return', 30)
     default = IntOption('search_default', u'Default number of results to return', 10)
@@ -443,7 +443,7 @@
 
 class Get(Processor, RPC):
     u"""<factoid> [( #<number> | /<pattern>/[r] )]"""
-    feature = 'factoids'
+    feature = 'factoid'
 
     priority = 200
 
@@ -497,7 +497,7 @@
     <name> (<verb>|=<verb>=) [also] <value>
     last set factoid
     """
-    feature = 'factoids'
+    feature = 'factoid'
 
     interrogatives = ListOption('interrogatives', 'Question words to strip', default_interrogatives)
     verbs = ListOption('verbs', 'Verbs that split name from value', default_verbs)
@@ -575,7 +575,7 @@
 class Modify(Processor):
     u"""<name> [( #<number> | /<pattern>/[r] )] += <suffix>
     <name> [( #<number> | /<pattern>/[r] )] ~= ( s/<regex>/<replacement>/[g][i][r] | y/<source>/<dest>/ )"""
-    feature = 'factoids'
+    feature = 'factoid'
 
     permission = u'factoid'
     permissions = (u'factoidadmin',)

=== added file 'ibid/plugins/film.py'
--- ibid/plugins/film.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/film.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,212 @@
+from urllib2 import urlopen
+from urllib import urlencode
+from time import strptime, strftime
+import logging
+try:
+    from imdb import IMDb, IMDbDataAccessError, IMDbError
+except ImportError:
+    IMDb = IMDbDataAccessError = IMDbError = None
+
+from ibid.compat import defaultdict
+from ibid.plugins import Processor, match
+from ibid.utils import human_join
+from ibid.config import Option, BoolOption
+
+log = logging.getLogger('plugins.film')
+
+help = {}
+
+help['tvshow'] = u'Retrieves TV show information from tvrage.com.'
+class TVShow(Processor):
+    u"""tvshow <show>"""
+
+    feature = 'tvshow'
+
+    def remote_tvrage(self, show):
+        info_url = 'http://services.tvrage.com/tools/quickinfo.php?%s'
+
+        info = urlopen(info_url % urlencode({'show': show.encode('utf-8')}))
+
+        info = info.read()
+        info = info.decode('utf-8')
+        if info.startswith('No Show Results Were Found'):
+            return
+        info = info[5:].splitlines()
+        show_info = [i.split('@', 1) for i in info]
+        show_dict = dict(show_info)
+
+        #check if there are actual airdates for Latest and Next Episode. None for Next
+        #Episode does not neccesarily mean it is nor airing, just the date is unconfirmed.
+        show_dict = defaultdict(lambda: 'None', show_info)
+
+        for field in ('Latest Episode', 'Next Episode'):
+            if field in show_dict:
+                ep, name, date = show_dict[field].split('^', 2)
+                count = date.count('/')
+                format_from = {
+                    0: '%Y',
+                    1: '%b/%Y',
+                    2: '%b/%d/%Y'
+                }[count]
+                format_to = ' '.join(('%d', '%B', '%Y')[-1 - count:])
+                date = strftime(format_to, strptime(date, format_from))
+                show_dict[field] = u'%s - "%s" - %s' % (ep, name, date)
+
+        if 'Genres' in show_dict:
+            show_dict['Genres'] = human_join(show_dict['Genres'].split(' | '))
+
+        return show_dict
+
+    @match(r'^tv\s*show\s+(.+)$')
+    def tvshow(self, event, show):
+        retr_info = self.remote_tvrage(show)
+
+        message = u'Show: %(Show Name)s. Premiered: %(Premiered)s. ' \
+                    u'Latest Episode: %(Latest Episode)s. Next Episode: %(Next Episode)s. ' \
+                    u'Airtime: %(Airtime)s on %(Network)s. Genres: %(Genres)s. ' \
+                    u'Status: %(Status)s. %(Show URL)s'
+
+        if not retr_info:
+            event.addresponse(u"I can't find anything out about '%s'", show)
+            return
+
+        event.addresponse(message, retr_info)
+
+# Uses the IMDbPY package in http mode against imdb.com
+# This isn't strictly legal: http://www.imdb.com/help/show_leaf?usedatasoftware
+#
+# Note that it will return porn movies by default.
+help['imdb'] = u'Looks up movies on IMDB.com.'
+class IMDB(Processor):
+    u"imdb [search] [character|company|episode|movie|person] <terms> [#<index>]"
+    feature = 'imdb'
+
+    access_system = Option("accesssystem", "Method of querying IMDB", "http")
+    adult_search = BoolOption("adultsearch", "Include adult films in search results", True)
+
+    name_keys = {
+            "character": "long imdb name",
+            "company": "long imdb name",
+            "episode": "long imdb title",
+            "movie": "long imdb title",
+            "person": "name",
+    }
+
+    def setup(self):
+        if IMDb is None:
+            raise Exception("IMDbPY not installed")
+        self.imdb = IMDb(accessSystem=self.access_system, adultSearch=int(self.adult_search))
+
+    @match(r'^imdb(?:\s+search)?(?:\s+(character|company|episode|movie|person))?\s+(.+?)(?:\s+#(\d+))?$')
+    def search(self, event, search_type, terms, index):
+        if search_type is None:
+            search_type = "movie"
+        if index is not None:
+            index = int(index) - 1
+
+        result = None
+        try:
+            if terms.isdigit():
+                result = getattr(self.imdb, "get_" + search_type)(terms)
+            else:
+                results = getattr(self.imdb, "search_" + search_type)(terms)
+
+                if len(results) == 1:
+                    index = 0
+
+                if index is not None:
+                    result = results[index]
+                    self.imdb.update(result)
+
+        except IMDbDataAccessError, e:
+            event.addresponse(u"IMDb doesn't like me today. It said '%s'", e[0]["errmsg"])
+            raise
+
+        except IMDbError, e:
+            event.addresponse(u'IMDb must be having a bad day (or you are asking it silly things)')
+            raise
+
+        if result is not None:
+            event.addresponse(u'Found %s', getattr(self, 'display_' + search_type)(result))
+            return
+
+        if len(results) == 0:
+            event.addresponse(u"Sorry, couldn't find that")
+        else:
+            results = [x[self.name_keys[search_type]] for x in results]
+            results = enumerate(results)
+            results = [u"%i: %s" % (x[0] + 1, x[1]) for x in results]
+            event.addresponse(u'Found %(greaterthan)s%(num)i matches: %(results)s', {
+                'greaterthan': (u'', u'>')[len(results) == 20],
+                'num': len(results),
+                'results': u', '.join(results),
+            })
+
+    def display_character(self, character):
+        desc = u"%s: %s." % (character.characterID, character["long imdb name"])
+        filmography = character.get("filmography", ())
+        if len(filmography):
+            more = (u"", u" etc")[len(filmography) > 5]
+            desc += u" Appeared in %s%s." % (human_join(x["long imdb title"] for x in filmography[:5]), more)
+        if character.has_key("introduction"):
+            desc += u" Bio: %s" % character["introduction"]
+        return desc
+
+    def display_company(self, company):
+        desc = "%s: %s" % (company.companyID, company["long imdb name"])
+        for key, title in (
+                (u"production companies", u"Produced"),
+                (u"distributors", u"Distributed"),
+                (u"miscellaneous companies", u"Was involved in")):
+            if len(company.get(key, ())) > 0:
+                more = (u"", u" etc.")[len(company[key]) > 3]
+                desc += u" %s %s%s" % (title, human_join(x["long imdb title"] for x in company[key][:3]), more)
+        return desc
+
+    def display_episode(self, episode):
+        desc = u"%s: %s s%02ie%02i %s(%s)." % (
+                episode.movieID, episode["series title"], episode["season"],
+                episode["episode"], episode["title"], episode["year"])
+        if len(episode.get("director", ())) > 0:
+            desc += u" Dir: %s." % (human_join(x["name"] for x in episode["director"]))
+        if len(episode.get("cast", ())) > 0:
+            desc += u" Starring: %s." % (human_join(x["name"] for x in episode["cast"][:3]))
+        if episode.has_key("rating"):
+            desc += u" Rated: %.1f " % episode["rating"]
+        desc += human_join(episode.get("genres", ()))
+        desc += u" Plot: %s" % episode.get("plot outline", u"Unknown")
+        return desc
+
+    def display_movie(self, movie):
+        desc = u"%s: %s." % (movie.movieID, movie["long imdb title"])
+        if len(movie.get("director", ())) > 0:
+            desc += u" Dir: %s." % (human_join(x["name"] for x in movie["director"]))
+        if len(movie.get("cast", ())) > 0:
+            desc += u" Starring: %s." % (human_join(x["name"] for x in movie["cast"][:3]))
+        if movie.has_key("rating"):
+            desc += u" Rated: %.1f " % movie["rating"]
+        desc += human_join(movie.get("genres", ()))
+        desc += u" Plot: %s" % movie.get("plot outline", u"Unknown")
+        return desc
+
+    def display_person(self, person):
+        desc = u"%s: %s. %s." % (person.personID, person["name"],
+                human_join(role.title() for role in (
+                    u"actor", u"animation department", u"art department",
+                    u"art director", u"assistant director", u"camera department",
+                    u"casting department", u"casting director", u"cinematographer",
+                    u"composer", u"costume department", u"costume designer",
+                    u"director", u"editorial department", u"editor",
+                    u"make up department", u"music department", u"producer",
+                    u"production designer", u"set decorator", u"sound department",
+                    u"speccial effects department", u"stunts", u"transport department",
+                    u"visual effects department", u"writer", u"miscellaneous crew"
+                ) if person.has_key(role)))
+        if person.has_key("mini biography"):
+            desc += u" " + u" ".join(person["mini biography"])
+        else:
+            if person.has_key("birth name") or person.has_key("birth date"):
+                desc += u" Born %s." % u", ".join(person[attr] for attr in ("birth name", "birth date") if person.has_key(attr))
+        return desc
+
+# vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/fun.py'
--- ibid/plugins/fun.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/fun.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,237 @@
+from unicodedata import normalize
+from random import choice, random
+import re
+
+from nickometer import nickometer
+
+import ibid
+from ibid.plugins import Processor, match
+from ibid.config import IntOption, ListOption
+from ibid.utils import human_join
+
+help = {}
+
+help['nickometer'] = u'Calculates how lame a nick is.'
+class Nickometer(Processor):
+    u"""nickometer [<nick>] [with reasons]"""
+    feature = 'nickometer'
+
+    @match(r'^(?:nick|lame)-?o-?meter(?:(?:\s+for)?\s+(.+?))?(\s+with\s+reasons)?$')
+    def handle_nickometer(self, event, nick, wreasons):
+        nick = nick or event.sender['nick']
+        if u'\ufffd' in nick:
+            score, reasons = 100., ((u'Not UTF-8 clean', u'infinite'),)
+        else:
+            score, reasons = nickometer(normalize('NFKD', nick).encode('ascii', 'ignore'))
+
+        event.addresponse(u'%(nick)s is %(score)s%% lame', {
+            'nick': nick,
+            'score': score,
+        })
+        if wreasons:
+            if not reasons:
+                reasons = ((u'A good, traditional nick', 0),)
+            event.addresponse(u'Because: %s', u', '.join(['%s (%s)' % reason for reason in reasons]))
+
+help['choose'] = u'Choose one of the given options.'
+class Choose(Processor):
+    u"""choose <choice> or <choice>..."""
+    feature = 'choose'
+
+    choose_re = re.compile(r'(?:\s*,\s*(?:or\s+)?)|(?:\s+or\s+)', re.I)
+
+    @match(r'^(?:choose|choice|pick)\s+(.+)$')
+    def choose(self, event, choices):
+        event.addresponse(u'I choose %s', choice(self.choose_re.split(choices)))
+
+help['coffee'] = u"Times coffee brewing and reserves cups for people"
+class Coffee(Processor):
+    u"""coffee (on|please)"""
+    feature = 'coffee'
+
+    pots = {}
+
+    time = IntOption('coffee_time', u'Brewing time in seconds', 240)
+    cups = IntOption('coffee_cups', u'Maximum number of cups', 4)
+
+    def coffee_announce(self, event):
+        event.addresponse(u"Coffee's ready for %s!",
+                human_join(self.pots[(event.source, event.channel)]))
+        del self.pots[(event.source, event.channel)]
+
+    @match(r'^coffee\s+on$')
+    def coffee_on(self, event):
+        if (event.source, event.channel) in self.pots:
+            if len(self.pots[(event.source, event.channel)]) >= self.cups:
+                event.addresponse(u"There's already a pot on, and it's all reserved")
+            elif event.sender['nick'] in self.pots[(event.source, event.channel)]:
+                event.addresponse(u"You already have a pot on the go")
+            else:
+                event.addresponse(u"There's already a pot on. If you ask nicely, maybe you can have a cup")
+            return
+
+        self.pots[(event.source, event.channel)] = [event.sender['nick']]
+        ibid.dispatcher.call_later(self.time, self.coffee_announce, event)
+
+        event.addresponse(choice((
+                u'puts the kettle on',
+                u'starts grinding coffee',
+                u'flips the salt-timer',
+                u'washes some mugs',
+            )), action=True)
+
+    @match('^coffee\s+(?:please|pls)$')
+    def coffee_accept(self, event):
+        if (event.source, event.channel) not in self.pots:
+            event.addresponse(u"There isn't a pot on")
+
+        elif len(self.pots[(event.source, event.channel)]) >= self.cups:
+            event.addresponse(u"Sorry, there aren't any more cups left")
+
+        elif event.sender['nick'] in self.pots[(event.source, event.channel)]:
+            event.addresponse(u"Now now, we don't want anyone getting caffeine overdoses")
+
+        else:
+            self.pots[(event.source, event.channel)].append(event.sender['nick'])
+            event.addresponse(True)
+
+help['insult'] = u"Slings verbal abuse at someone"
+class Insult(Processor):
+    u"""
+    (flame | insult) <person>
+    (swear | cuss | explete) [at <person>]
+    """
+    feature = 'insult'
+
+    adjectives = ListOption('adjectives', 'List of adjectives', (
+        u'acidic', u'antique', u'artless', u'base-court', u'bat-fowling',
+        u'bawdy', u'beef-witted', u'beetle-headed', u'beslubbering',
+        u'boil-brained', u'bootless', u'churlish', u'clapper-clawed',
+        u'clay-brained', u'clouted', u'cockered', u'common-kissing',
+        u'contemptible', u'coughed-up', u'craven', u'crook-pated',
+        u'culturally-unsound', u'currish', u'dankish', u'decayed',
+        u'despicable', u'dismal-dreaming', u'dissembling', u'dizzy-eyed',
+        u'doghearted', u'dread-bolted', u'droning', u'earth-vexing',
+        u'egg-sucking', u'elf-skinned', u'errant', u'evil', u'fat-kidneyed',
+        u'fawning', u'fen-sucked', u'fermented', u'festering', u'flap-mouthed',
+        u'fly-bitten', u'fobbing', u'folly-fallen', u'fool-born', u'foul',
+        u'frothy', u'froward', u'full-gorged', u'fulminating', u'gleeking',
+        u'goatish', u'gorbellied', u'guts-griping', u'hacked-up', u'halfbaked',
+        u'half-faced', u'hasty-witted', u'headless', u'hedge-born',
+        u'hell-hated', u'horn-beat', u'hugger-muggered', u'humid',
+        u'idle-headed', u'ill-borne', u'ill-breeding', u'ill-nurtured',
+        u'imp-bladdereddle-headed', u'impertinent', u'impure', u'industrial',
+        u'inept', u'infected', u'infectious', u'inferior', u'it-fowling',
+        u'jarring', u'knotty-pated', u'left-over', u'lewd-minded',
+        u'loggerheaded', u'low-quality', u'lumpish', u'malodorous',
+        u'malt-wormy', u'mammering', u'mangled', u'measled', u'mewling',
+        u'milk-livered', u'motley-mind', u'motley-minded', u'off-color',
+        u'onion-eyed', u'paunchy', u'penguin-molesting', u'petrified',
+        u'pickled', u'pignutted', u'plume-plucked', u'pointy-nosed', u'porous',
+        u'pottle-deep', u'pox-marked', u'pribbling', u'puking', u'puny',
+        u'railing', u'rank', u'reeky', u'reeling-ripe', u'roguish',
+        u'rough-hewn', u'rude-growing', u'rude-snouted', u'rump-fed',
+        u'ruttish', u'salty', u'saucy', u'saucyspleened', u'sausage-snorfling',
+        u'shard-borne', u'sheep-biting', u'spam-sucking', u'spleeny',
+        u'spongy', u'spur-galled', u'squishy', u'surly', u'swag-bellied',
+        u'tardy-gaited', u'tastless', u'tempestuous', u'tepid', u'thick',
+        u'tickle-brained', u'toad-spotted', u'tofu-nibbling', u'tottering',
+        u'uninspiring', u'unintelligent', u'unmuzzled', u'unoriginal',
+        u'urchin-snouted', u'vain', u'vapid', u'vassal-willed', u'venomed',
+        u'villainous', u'warped', u'wayward', u'weasel-smelling',
+        u'weather-bitten', u'weedy', u'wretched', u'yeasty',
+    ))
+
+    collections = ListOption('collections', 'List of collective nouns', (
+        u'accumulation', u'ass-full', u'assload', u'bag', u'bucket',
+        u'coagulation', u'enema-bucketful', u'gob', u'half-mouthful', u'heap',
+        u'mass', u'mound', u'ooze', u'petrification', u'pile', u'plate',
+        u'puddle', u'quart', u'stack', u'thimbleful', u'tongueful',
+    ))
+
+    nouns = ListOption('nouns', u'List of singular nouns', (
+        u'apple-john', u'baggage', u'barnacle', u'bladder', u'boar-pig',
+        u'bugbear', u'bum-bailey', u'canker-blossom', u'clack-dish',
+        u'clotpole', u'coxcomb', u'codpiece', u'death-token', u'dewberry',
+        u'flap-dragon', u'flax-wench', u'flirt-gill', u'foot-licker',
+        u'fustilarian', u'giglet', u'gudgeon', u'haggard', u'harpy',
+        u'hedge-pig', u'horn-beast', u'hugger-mugger', u'jolthead',
+        u'lewdster', u'lout', u'maggot-pie', u'malt-worm', u'mammet',
+        u'measle', u'minnow', u'miscreant', u'moldwarp', u'mumble-news',
+        u'nut-hook', u'pigeon-egg', u'pignut', u'puttock', u'pumpion',
+        u'ratsbane', u'scut', u'skainsmate', u'strumpet', u'varlet', u'vassal',
+        u'whey-face', u'wagtail',
+    ))
+
+    plnouns = ListOption('plnouns', u'List of plural nouns', (
+        u'anal warts', u'armadillo snouts', u'bat toenails', u'bug spit',
+        u'buzzard gizzards', u'cat bladders', u'cat hair', u'cat-hair-balls',
+        u'chicken piss', u'cold sores', u'craptacular carpet droppings',
+        u'dog balls', u'dog vomit', u'dung', u'eel ooze', u'entrails',
+        u"fat-woman's stomach-bile", u'fish heads', u'guano', u'gunk',
+        u'jizzum', u'pods', u'pond scum', u'poop', u'poopy', u'pus',
+        u'rat-farts', u'rat retch', u'red dye number-9', u'seagull puke',
+        u'slurpee-backwash', u'snake assholes', u'snake bait', u'snake snot',
+        u'squirrel guts', u'Stimpy-drool', u'Sun IPC manuals', u'toxic waste',
+        u'urine samples', u'waffle-house grits', u'yoo-hoo',
+    ))
+
+    @match(r'^(?:insult|flame)\s+(.+)$')
+    def insult(self, event, insultee):
+        articleadj = choice(self.adjectives)
+        articleadj = (articleadj[0] in u'aehiou' and u'an ' or u'a ') + articleadj
+
+        event.addresponse(choice((
+            u'%(insultee)s, thou %(adj1)s, %(adj2)s %(noun)s',
+            u'%(insultee)s is nothing but %(articleadj)s %(collection)s of %(adj1)s %(plnoun)s',
+        )), {
+            'insultee': insultee,
+            'adj1': choice(self.adjectives),
+            'adj2': choice(self.adjectives),
+            'articleadj': articleadj,
+            'collection': choice(self.collections),
+            'noun': choice(self.nouns),
+            'plnoun': choice(self.plnouns),
+        }, address=False)
+
+    loneadjectives = ListOption('loneadjectives',
+        'List of stand-alone adjectives for swearing', (
+            'bloody', 'damn', 'fucking', 'shitting', 'sodding', 'crapping',
+            'wanking', 'buggering',
+    ))
+
+    swearadjectives = ListOption('swearadjectives',
+        'List of adjectives to be combined with swearnouns', (
+            'reaming', 'lapping', 'eating', 'sucking', 'vokken', 'kak',
+            'donder', 'bliksem', 'fucking', 'shitting', 'sodding', 'crapping',
+            'wanking', 'buggering',
+    ))
+
+    swearnouns = ListOption('swearnouns',
+        'List of nounes to be comined with swearadjectives', (
+            'shit', 'cunt', 'hell', 'mother', 'god', 'maggot', 'father', 'crap',
+            'ball', 'whore', 'goat', 'dick', 'cock', 'pile', 'bugger', 'poes',
+            'hoer', 'kakrooker', 'ma', 'pa', 'naiier', 'kak', 'bliksem',
+            'vokker', 'kakrooker',
+    ))
+
+    swearlength = IntOption('swearlength', 'Number of expletives to swear with',
+                            15)
+
+    @match(r'^(?:swear|cuss|explete)(?:\s+at\s+(?:the\s+)?(.*))?$')
+    def swear(self, event, insultee):
+        swearage = []
+        for i in range(self.swearlength):
+            if random() > 0.7:
+                swearage.append(choice(self.loneadjectives))
+            else:
+                swearage.append(choice(self.swearnouns)
+                                + choice(self.swearadjectives))
+        if insultee is not None:
+            swearage.append(insultee)
+        else:
+            swearage.append(choice(self.swearnouns))
+
+        event.addresponse(u' '.join(swearage) + u'!', address=False)
+
+# vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/geography.py'
--- ibid/plugins/geography.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/geography.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,352 @@
+from math import acos, sin, cos, radians
+from urllib import quote
+from urlparse import urljoin
+import re
+import logging
+from os.path import exists, join
+from datetime import datetime
+from os import walk
+from dateutil.parser import parse
+from dateutil.tz import gettz, tzlocal, tzoffset
+
+from ibid.plugins import Processor, match
+from ibid.utils import json_webservice, human_join, format_date
+from ibid.utils.html import get_html_parse_tree
+from ibid.config import Option, DictOption
+from ibid.compat import defaultdict
+
+log = logging.getLogger('plugins.geography')
+
+help = {}
+
+help['distance'] = u"Returns the distance between two places"
+class Distance(Processor):
+    u"""distance [in <unit>] between <source> and <destination>
+    place search for <placename>"""
+
+    # For Mathematics, see:
+    # http://www.mathforum.com/library/drmath/view/51711.html
+    # http://mathworld.wolfram.com/GreatCircle.html
+
+    feature = 'distance'
+
+    default_unit_names = {
+            'km': "kilometres",
+            'mi': "miles",
+            'nm': "nautical miles"}
+    default_radius_values = {
+            'km': 6378,
+            'mi': 3963.1,
+            'nm': 3443.9}
+
+    unit_names = DictOption('unit_names', 'Names of units in which to specify distances', default_unit_names)
+    radius_values = DictOption('radius_values', 'Radius of the earth in the units in which to specify distances', default_radius_values)
+
+    def get_place_data(self, place, num):
+        return json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': num})
+
+    def get_place(self, place):
+        js = self.get_place_data(place, 1)
+        if js['totalResultsCount'] == 0:
+            return None
+        info = js['geonames'][0]
+        return {'name': "%s, %s, %s" % (info['name'], info['adminName1'], info['countryName']),
+                'lng': radians(info['lng']),
+                'lat': radians(info['lat'])}
+
+    @match(r'^(?:(?:search\s+for\s+place)|(?:place\s+search\s+for)|(?:places\s+for))\s+(\S.+?)\s*$')
+    def placesearch(self, event, place):
+        js = self.get_place_data(place, 10)
+        if js['totalResultsCount'] == 0:
+            event.addresponse(u"I don't know of anywhere even remotely like '%s'", place)
+        else:
+            event.addresponse(u"I can find: %s",
+                    (human_join([u"%s, %s, %s" % (p['name'], p['adminName1'], p['countryName'])
+                        for p in js['geonames'][:10]],
+                        separator=u';')))
+
+    @match(r'^(?:how\s*far|distance)(?:\s+in\s+(\S+))?\s+'
+            r'(?:(between)|from)' # Between ... and ... | from ... to ...
+            r'\s+(\S.+?)\s+(?(2)and|to)\s+(\S.+?)\s*$')
+    def distance(self, event, unit, ignore, src, dst):
+        unit_names = self.unit_names
+        if unit and unit not in self.unit_names:
+            event.addresponse(u"I don't know the unit '%(badunit)s'. I know about: %(knownunits)s", {
+                'badunit': unit,
+                'knownunits':
+                    human_join(u"%s (%s)" % (unit, self.unit_names[unit])
+                        for unit in self.unit_names),
+            })
+            return
+        if unit:
+            unit_names = [unit]
+
+        srcp, dstp = self.get_place(src), self.get_place(dst)
+        if not srcp or not dstp:
+            event.addresponse(u"I don't know of anywhere called %s",
+                    (u" or ".join("'%s'" % place[0]
+                        for place in ((src, srcp), (dst, dstp)) if not place[1])))
+            return
+
+        dist = acos(cos(srcp['lng']) * cos(dstp['lng']) * cos(srcp['lat']) * cos(dstp['lat']) +
+                    cos(srcp['lat']) * sin(srcp['lng']) * cos(dstp['lat']) * sin(dstp['lng']) +
+                    sin(srcp['lat'])*sin(dstp['lat']))
+
+        event.addresponse(u"Approximate distance, as the bot flies, between %(srcname)s and %(dstname)s is: %(distance)s", {
+            'srcname': srcp['name'],
+            'dstname': dstp['name'],
+            'distance': human_join([
+                u"%.02f %s" % (self.radius_values[unit]*dist, self.unit_names[unit])
+                for unit in unit_names],
+                conjunction=u'or'),
+        })
+
+help['weather'] = u'Retrieves current weather and forecasts for cities.'
+class Weather(Processor):
+    u"""weather in <city>
+    forecast for <city>"""
+
+    feature = "weather"
+
+    defaults = {    'ct': 'Cape Town, South Africa',
+                    'jhb': 'Johannesburg, South Africa',
+                    'joburg': 'Johannesburg, South Africa',
+               }
+    places = DictOption('places', 'Alternate names for places', defaults)
+    labels = ('temp', 'humidity', 'dew', 'wind', 'pressure', 'conditions', 'visibility', 'uv', 'clouds', 'ymin', 'ymax', 'ycool', 'sunrise', 'sunset', 'moonrise', 'moonset', 'moonphase', 'metar')
+    whitespace = re.compile('\s+')
+
+    class WeatherException(Exception):
+        pass
+
+    class TooManyPlacesException(WeatherException):
+        pass
+
+    def _text(self, string):
+        if not isinstance(string, basestring):
+            string = ''.join(string.findAll(text=True))
+        return self.whitespace.sub(' ', string).strip()
+
+    def _get_page(self, place):
+        if place.lower() in self.places:
+            place = self.places[place.lower()]
+
+        soup = get_html_parse_tree('http://m.wund.com/cgi-bin/findweather/getForecast?brand=mobile_metric&query=' + quote(place))
+
+        if soup.body.center and soup.body.center.b.string == 'Search not found:':
+            raise Weather.WeatherException(u'City not found')
+
+        if soup.table.tr.th and soup.table.tr.th.string == 'Place: Temperature':
+            places = []
+            for td in soup.table.findAll('td'):
+                places.append(td.find('a', href=re.compile('.*html$')).string)
+
+            # Cities with more than one airport give duplicate entries. We can take the first
+            if len([x for x in places if x == places[0]]) == len(places):
+                url = urljoin('http://m.wund.com/cgi-bin/findweather/getForecast',
+                        soup.table.find('td').find('a', href=re.compile('.*html$'))['href'])
+                soup = get_html_parse_tree(url)
+            else:
+                raise Weather.TooManyPlacesException(places)
+
+        return soup
+
+    def remote_weather(self, place):
+        soup = self._get_page(place)
+        tds = [x.table for x in soup.findAll('table') if x.table][0].findAll('td')
+
+        # HACK: Some cities include a windchill row, but others don't
+        if len(tds) == 39:
+            del tds[3]
+            del tds[4]
+
+        values = {'place': tds[0].findAll('b')[1].string, 'time': tds[0].findAll('b')[0].string}
+        for index, td in enumerate(tds[2::2]):
+            values[self.labels[index]] = self._text(td)
+
+        return values
+
+    def remote_forecast(self, place):
+        soup = self._get_page(place)
+        forecasts = []
+        table = [table for table in soup.findAll('table') if table.findAll('td', align='left')][0]
+
+        for td in table.findAll('td', align='left'):
+            day = td.b.string
+            forecast = u' '.join([self._text(line) for line in td.contents[2:]])
+            forecasts.append(u'%s: %s' % (day, self._text(forecast)))
+
+        return forecasts
+
+    @match(r'^weather\s+(?:(?:for|at|in)\s+)?(.+)$')
+    def weather(self, event, place):
+        try:
+            values = self.remote_weather(place)
+            event.addresponse(u'In %(place)s at %(time)s: %(temp)s; Humidity: %(humidity)s; Wind: %(wind)s; Conditions: %(conditions)s; Sunrise/set: %(sunrise)s/%(sunset)s; Moonrise/set: %(moonrise)s/%(moonset)s', values)
+        except Weather.TooManyPlacesException, e:
+            event.addresponse(u'Too many places match %(place)s: %(exception)s', {
+                'place': place,
+                'exception': human_join(e.args[0], separator=u';'),
+            })
+        except Weather.WeatherException, e:
+            event.addresponse(unicode(e))
+
+    @match(r'^forecast\s+(?:for\s+)?(.+)$')
+    def forecast(self, event, place):
+        try:
+            event.addresponse(u', '.join(self.remote_forecast(place)))
+        except Weather.TooManyPlacesException, e:
+            event.addresponse(u'Too many places match %(place)s: %(exception)s', {
+                'place': place,
+                'exception': human_join(e.args[0], separator=u';'),
+            })
+        except Weather.WeatherException, e:
+            event.addresponse(unicode(e))
+
+class TimezoneException(Exception):
+    pass
+
+MONTH_SHORT = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec')
+MONTH_LONG = ('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December')
+OTHER_STUFF = ('am', 'pm', 'st', 'nd', 'rd', 'th')
+
+CUSTOM_ZONES = {
+    'PST': 'US/Pacific',
+    'MST': 'US/Mountain',
+    'CST': 'US/Central',
+    'EST': 'US/Eastern',
+}
+
+help['timezone'] = "Converts times between timezones."
+class TimeZone(Processor):
+    u"""when is <time> <place|timezone> in <place|timezone>
+    time in <place|timezone>"""
+    feature = 'timezone'
+
+    zoneinfo = Option('zoneinfo', 'Timezone info directory', '/usr/share/zoneinfo')
+    custom_zones = DictOption('timezones', 'Custom timezone names', CUSTOM_ZONES)
+
+    countries = {}
+    timezones = {}
+    lowerzones = {}
+
+    def setup(self):
+        iso3166 = join(self.zoneinfo, 'iso3166.tab')
+        if exists(iso3166):
+            self.countries = {}
+            for line in open(iso3166).readlines():
+                if not line.startswith('#'):
+                    code, name = line.strip().split('\t')
+                    self.countries[code] = name
+
+        zones = join(self.zoneinfo, 'zone.tab')
+        if exists(zones):
+            self.timezones = defaultdict(list)
+            for line in open(zones).readlines():
+                if not line.startswith('#'):
+                    code, coordinates, zone = line.strip().split('\t', 2)
+                    if '\t' in zone:
+                        zone, comment = zone.split('\t')
+                    self.timezones[code].append(zone)
+
+        lowerzones = {}
+        for path, directories, filenames in walk(self.zoneinfo):
+            if path.replace(self.zoneinfo, '').lstrip('/').split('/')[0] not in ('posix', 'right'):
+                for filename in filenames:
+                    name = join(path, filename).replace(self.zoneinfo, '').lstrip('/')
+                    self.lowerzones[name.lower().replace('etc/', '')] = name
+
+    def _find_timezone(self, string):
+        for name, zonename in self.custom_zones.items():
+            if string.lower() == name.lower():
+                return gettz(zonename)
+
+        zone = gettz(string)
+        if zone:
+            return zone
+
+        zone = gettz(string.upper())
+        if zone:
+            return zone
+
+        if string.lower() in self.lowerzones:
+            return gettz(self.lowerzones[string.lower()])
+
+        ccode = None
+        for code, name in self.countries.items():
+            if name.lower() == string.lower():
+                ccode = code
+        if not ccode:
+            if string.replace('.', '').upper() in self.timezones:
+                ccode = string.replace('.', '').upper()
+
+        if ccode:
+            if len(self.timezones[ccode]) == 1:
+                return gettz(self.timezones[ccode][0])
+            else:
+                raise TimezoneException(u'%s has multiple timezones: %s' % (self.countries[ccode], human_join(self.timezones[ccode])))
+
+        possibles = []
+        for zones in self.timezones.values():
+            for name in zones:
+                if string.replace(' ', '_').lower() in [part.lower() for part in name.split('/')]:
+                    possibles.append(name)
+
+        if len(possibles) == 1:
+            return gettz(possibles[0])
+        elif len(possibles) > 1:
+            raise TimezoneException(u'Multiple timezones found: %s' % (human_join(possibles)))
+
+        zone = self._geonames_lookup(string)
+        if zone:
+            return zone
+
+        raise TimezoneException(u"I don't know about the %s timezone" % (string,))
+
+    def _geonames_lookup(self, place):
+        search = json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': 1})
+        if search['totalResultsCount'] == 0:
+            return None
+
+        city = search['geonames'][0]
+        timezone = json_webservice('http://ws.geonames.org/timezoneJSON', {'lat': city['lat'], 'lng': city['lng']})
+
+        if 'timezoneId' in timezone:
+            return gettz(timezone['timezoneId'])
+
+        if 'rawOffset' in timezone:
+            offset = timezone['rawOffset']
+            return tzoffset('UTC%s%s' % (offset>=0 and '+' or '', offset), offset*3600)
+
+    @match(r'^when\s+is\s+((?:[0-9.:/hT -]|%s)+)(?:\s+in)?(?:\s+(.+))?\s+in\s+(.+)$' % '|'.join(MONTH_SHORT+MONTH_LONG+OTHER_STUFF))
+    def convert(self, event, time, from_, to):
+        try:
+            source = time and parse(time) or datetime.now()
+        except ValueError:
+            event.addresponse(u"That's not a real time")
+            return
+
+        try:
+            if from_:
+                from_zone = self._find_timezone(from_)
+            else:
+                from_zone = tzlocal()
+
+            to_zone = self._find_timezone(to)
+        except TimezoneException, e:
+            event.addresponse(unicode(e))
+            return
+
+        source = source.replace(tzinfo=from_zone)
+        result = source.astimezone(to_zone)
+
+        event.addresponse(time and u'%(source)s is %(destination)s' or 'It is %(destination)s', {
+            'source': format_date(source, tolocaltime=False),
+            'destination': format_date(result, tolocaltime=False),
+        })
+
+    @match(r"^(?:(?:what(?:'?s|\s+is)\s+the\s+)?time\s+in|what\s+time\s+is\s+it\s+in)\s+(.+)$")
+    def time(self, event, place):
+        self.convert(event, None, None, place)
+
+# vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/google.py'
--- ibid/plugins/google.py	2010-01-01 12:16:12 +0000
+++ ibid/plugins/google.py	2010-01-18 18:54:16 +0000
@@ -1,18 +1,16 @@
-import codecs
 from httplib import BadStatusLine
-import re
 from urllib import quote
-from urllib2 import build_opener, urlopen, HTTPCookieProcessor, Request
+from urllib2 import urlopen, Request
 
 from BeautifulSoup import BeautifulSoup
 
 from ibid.plugins import Processor, match
-from ibid.config import Option, IntOption
-from ibid.utils import decode_htmlentities, json_webservice, cacheable_download
-from ibid.utils import human_join
-from ibid.utils.html import get_html_parse_tree
-
-help = {'google': u'Retrieves results from Google and Google Calculator.'}
+from ibid.config import Option
+from ibid.utils import decode_htmlentities, json_webservice
+
+help = {}
+
+help['google'] = u'Retrieves results from Google and Google Calculator.'
 
 default_user_agent = 'Mozilla/5.0'
 default_referer = "http://ibid.omnia.za.net/"
@@ -125,169 +123,4 @@
         else:
             event.addresponse(u'Are you making up words again?')
 
-class UnknownLanguageException (Exception): pass
-class TranslationException (Exception): pass
-
-help['translate'] = u'''Translates a phrase using Google Translate.'''
-class Translate(Processor):
-    u"""translate <phrase> [from <language>] [to <language>]
-        translation chain <phrase> [from <language>] [to <language>]"""
-
-    feature = 'translate'
-
-    api_key = Option('api_key', 'Your Google API Key (optional)', None)
-    referer = Option('referer', 'The referer string to use (API searches)', default_referer)
-    dest_lang = Option('dest_lang', 'Destination language when none is specified', 'english')
-
-    chain_length = IntOption('chain_length', 'Maximum length of translation chains', 10)
-
-    lang_names = {'afrikaans':'af', 'albanian':'sq', 'arabic':'ar',
-                  'belarusian':'be', 'bulgarian':'bg', 'catalan':'ca',
-                  'chinese':'zh', 'chinese simplified':'zh-cn',
-                  'chinese traditional':'zh-tw', 'croatian':'hr', 'czech':'cs',
-                  'danish':'da', 'dutch':'nl', 'english':'en', 'estonian':'et',
-                  'filipino':'tl', 'finnish':'fi', 'french':'fr',
-                  'galacian':'gl', 'german':'de', 'greek':'el', 'hebrew':'iw',
-                  'hindi':'hi', 'hungarian':'hu', 'icelandic':'is',
-                  'indonesian':'id', 'irish':'ga', 'italian':'it',
-                  'japanese':'ja', 'korean': 'ko', 'latvian':'lv',
-                  'lithuanian':'lt', 'macedonian':'mk', 'malay':'ms',
-                  'maltese':'mt', 'norwegian':'no', 'persian':'fa',
-                  'polish':'pl', 'portuguese':'pt', 'romanian':'ro',
-                  'russian': 'ru', 'serbian':'sr', 'slovak':'sk',
-                  'slovenian':'sl', 'spanish':'es', 'swahili':'sw',
-                  'swedish':'sv', 'thai':'th', 'turkish':'tr', 'ukrainian':'uk',
-                  'uzbek': 'uz', 'vietnamese':'vi', 'welsh':'cy',
-                  'yiddish':'yi'}
-
-    alt_lang_names = {'simplified':'zh-CN', 'simplified chinese':'zh-CN',
-                   'traditional':'zh-TW', 'traditional chinese':'zh-TW',
-                   'bokmal':'no', 'norwegian bokmal':'no',
-                   u'bokm\N{LATIN SMALL LETTER A WITH RING ABOVE}l':'no',
-                   u'norwegian bokm\N{LATIN SMALL LETTER A WITH RING ABOVE}l':
-                        'no',
-                   'farsi':'fa'}
-
-    LANG_REGEX = '|'.join(lang_names.keys() + lang_names.values() +
-                            alt_lang_names.keys())
-
-    @match(r'^(?:translation\s*)?languages$')
-    def languages (self, event):
-        event.addresponse(human_join(sorted(self.lang_names.keys())))
-
-    @match(r'^translate\s+(.*?)(?:\s+from\s+(' + LANG_REGEX + r'))?'
-            r'(?:\s+(?:in)?to\s+(' + LANG_REGEX + r'))?$')
-    def translate (self, event, text, src_lang, dest_lang):
-        dest_lang = self.language_code(dest_lang or self.dest_lang)
-        src_lang = self.language_code(src_lang or '')
-
-        try:
-            translated = self._translate(event, text, src_lang, dest_lang)[0]
-            event.addresponse(translated)
-        except TranslationException, e:
-            event.addresponse(u"I couldn't translate that: %s.", unicode(e))
-
-    @match(r'^translation[-\s]*(?:chain|party)\s+(.*?)'
-            r'(?:\s+from\s+(' + LANG_REGEX + r'))?'
-            r'(?:\s+(?:in)?to\s+(' + LANG_REGEX + r'))?$')
-    def translation_chain (self, event, phrase, src_lang, dest_lang):
-        if self.chain_length < 1:
-            event.addresponse(u"I'm not allowed to play translation games.")
-        try:
-            dest_lang = self.language_code(dest_lang or self.dest_lang)
-            src_lang = self.language_code(src_lang or '')
-
-            chain = [phrase]
-            for i in range(self.chain_length):
-                phrase, src_lang = self._translate(event, phrase,
-                                                    src_lang, dest_lang)
-                src_lang, dest_lang = dest_lang, src_lang
-                chain.append(phrase)
-                if phrase in chain[:-1]:
-                    break
-
-            event.addresponse(u'\n'.join(chain[1:]), conflate=False)
-
-        except TranslationException, e:
-            event.addresponse(u"I couldn't translate that: %s.", unicode(e))
-
-    def _translate (self, event, phrase, src_lang, dest_lang):
-        params = {
-            'v': '1.0',
-            'q': phrase,
-            'langpair': src_lang + '|' + dest_lang,
-        }
-        if self.api_key:
-            params['key'] = self.api_key
-
-        headers = {'referer': self.referer}
-
-        response = json_webservice(
-            'http://ajax.googleapis.com/ajax/services/language/translate',
-            params, headers)
-
-        if response['responseStatus'] == 200:
-            translated = unicode(decode_htmlentities(
-                response['responseData']['translatedText']))
-            return (translated, src_lang or
-                    response['responseData']['detectedSourceLanguage'])
-        else:
-            errors = {
-                'invalid translation language pair':
-                    u"I don't know that language",
-                'invalid text':
-                    u"there's not much to go on",
-                 'could not reliably detect source language':
-                    u"I'm not sure what language that was",
-            }
-
-            msg = errors.get(response['responseDetails'],
-                            response['responseDetails'])
-
-            raise TranslationException(msg)
-
-    def language_code (self, name):
-        """Convert a name to a language code."""
-
-        name = name.lower()
-
-        if name == '':
-            return name
-
-        try:
-            return self.lang_names.get(name) or self.alt_lang_names[name]
-        except KeyError:
-            m = re.match('^([a-z]{2,3})(?:-[a-z]{2})?$', name)
-            if m and m.group(1) in self.lang_names.values():
-                return name
-            else:
-                raise UnknownLanguageException
-
-# This Plugin uses code from youtube-dl
-# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez
-# Released under MIT Licence
-
-help['youtube'] = u'Determine the title and a download URL for a Youtube Video'
-class Youtube(Processor):
-    u'<Youtube URL>'
-
-    feature = 'youtube'
-
-    @match(r'^(?:youtube(?:\.com)?\s+)?'
-        r'(?:http://)?(?:\w+\.)?youtube\.com/'
-        r'(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=)'
-        r'([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
-    def youtube(self, event, id):
-        url = 'http://www.youtube.com/watch?v=' + id
-        opener = build_opener(HTTPCookieProcessor())
-        opener.addheaders = [('User-Agent', default_user_agent)]
-        video_webpage = opener.open(url).read()
-        title = re.search(r'<title>\s*YouTube\s+-\s+([^<]*)</title>',
-                video_webpage, re.M | re.I | re.DOTALL).group(1).strip()
-        t = re.search(r', "t": "([^"]+)"', video_webpage).group(1)
-        event.addresponse(u'%(title)s: %(url)s', {
-            'title': title,
-            'url': 'http://www.youtube.com/get_video?video_id=%s&t=%s' % (id, t),
-        })
-
 # vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/http.py'
--- ibid/plugins/http.py	2009-07-13 15:19:39 +0000
+++ ibid/plugins/http.py	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-from httplib import HTTPConnection, HTTPSConnection
-from urllib import getproxies_environment
-from urlparse import urlparse
-import re
-
-from ibid.plugins import Processor, match
-from ibid.config import IntOption
-
-help = {}
-
-title = re.compile(r'<title>(.*)<\/title>', re.I+re.S)
-
-help['get'] = u'Retrieves a URL and returns the HTTP status and optionally the HTML title.'
-class HTTP(Processor):
-    u"""(get|head) <url>"""
-    feature = 'get'
-
-    max_size = IntOption('max_size', 'Only request this many bytes', 500)
-
-    @match(r'^(get|head)\s+(\S+\.\S+)$')
-    def handler(self, event, action, url):
-        if not url.lower().startswith("http://") and not url.lower().startswith("https://"):
-            url = "http://" + url
-        if url.count("/") < 3:
-            url += "/"
-
-        action = action.upper()
-
-        scheme, host = urlparse(url)[:2]
-        scheme = scheme.lower()
-        proxies = getproxies_environment()
-        if scheme in proxies:
-            scheme, host = urlparse(proxies[scheme])[:2]
-            scheme = scheme.lower()
-
-        if scheme == "https":
-            conn = HTTPSConnection(host)
-        else:
-            conn = HTTPConnection(host)
-
-        headers={}
-        if action == 'GET':
-            headers['Range'] = 'bytes=0-%s' % self.max_size
-        conn.request(action.upper(), url, headers=headers)
-
-        response = conn.getresponse()
-        reply = u'%s %s' % (response.status, response.reason)
-
-        data = response.read()
-        conn.close()
-
-        if action == 'GET':
-            match = title.search(data)
-            if match:
-                reply += u' "%s"' % match.groups()[0].strip()
-
-        event.addresponse(reply)
-
-# vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/identity.py'
--- ibid/plugins/identity.py	2010-01-15 12:42:48 +0000
+++ ibid/plugins/identity.py	2010-01-18 18:54:16 +0000
@@ -4,10 +4,12 @@
 
 import ibid
 from ibid.config import Option
+from ibid.compat import any
 from ibid.db import eagerload, IntegrityError, and_, or_
-from ibid.db.models import Account, Identity, Attribute
+from ibid.db.models import Account, Identity, Attribute, Credential, Permission
 from ibid.plugins import Processor, match, handler, auth_responses, authorise
 from ibid.utils import human_join
+from ibid.auth import hash
 
 help = {}
 identify_cache = {}
@@ -488,4 +490,154 @@
                       .filter_by(source=source, identity=id).first()
     return identity and identity.id
 
+actions = {'revoke': 'Revoked', 'grant': 'Granted', 'remove': 'Removed'}
+
+help['auth'] = u'Adds and removes authentication credentials and permissions'
+class AddAuth(Processor):
+    u"""authenticate <account> [on source] using <method> [<credential>]"""
+    feature = 'auth'
+
+    @match(r'^authenticate\s+(.+?)(?:\s+on\s+(.+))?\s+using\s+(\S+)\s+(.+)$')
+    def handler(self, event, user, source, method, credential):
+
+        if user.lower() == 'me':
+            if not event.account:
+                event.addresponse(u"I don't know who you are")
+                return
+            if not ibid.auth.authenticate(event):
+                event.complain = 'notauthed'
+                return
+            account = event.session.query(Account).get(event.account)
+
+        else:
+            if not auth_responses(event, 'admin'):
+                return
+            account = event.session.query(Account).filter_by(username=user).first()
+            if not account:
+                event.addresponse(u"I don't know who %s is", user)
+                return
+
+        if source:
+            if source not in ibid.sources:
+                event.addresponse(u"I am not connected to %s", source)
+                return
+            source = ibid.sources[source].name
+
+        if method.lower() == 'password':
+            password = hash(credential)
+            event.message['clean'] = event.message['clean'][:-len(credential)] + password
+            event.message['raw'] = event.message['raw'][:event.message['raw'].rfind(credential)] \
+                    + password + event.message['raw'][event.message['raw'].rfind(credential)+len(credential):]
+            credential = password
+
+        credential = Credential(method, credential, source, account.id)
+        event.session.save_or_update(credential)
+        event.session.commit()
+        log.info(u"Added %s credential %s for account %s (%s) on %s by account %s",
+                method, credential.credential, account.id, account.username, source, event.account)
+
+        event.addresponse(True)
+
+permission_values = {'no': '-', 'yes': '+', 'auth': ''}
+class Permissions(Processor):
+    u"""(grant|revoke|remove) <permission> (to|from|on) <username> [when authed]
+    permissions [for <username>]
+    list permissions"""
+    feature = 'auth'
+
+    permission = u'admin'
+
+    @match(r'^(grant|revoke|remove)\s+(.+?)(?:\s+permission)?\s+(?:to|from|on)\s+(.+?)(\s+(?:with|when|if)\s+(?:auth|authed|authenticated))?$')
+    @authorise()
+    def grant(self, event, action, name, username, auth):
+
+        account = event.session.query(Account).filter_by(username=username).first()
+        if not account:
+            event.addresponse(u"I don't know who %s is", username)
+            return
+
+        permission = event.session.query(Permission) \
+                .filter_by(account_id=account.id, name=name).first()
+        if action.lower() == 'remove':
+            if permission:
+                event.session.delete(permission)
+            else:
+                event.addresponse(u"%s doesn't have that permission anyway", username)
+                return
+
+        else:
+            if not permission:
+                permission = Permission(name)
+                account.permissions.append(permission)
+
+            if action.lower() == 'revoke':
+                value = 'no'
+            elif auth:
+                value = 'auth'
+            else:
+                value = 'yes'
+
+            if permission.value == value:
+                event.addresponse(u'%(permission)s permission for %(user)s is already %(value)s', {
+                    'permission': name,
+                    'user': username,
+                    'value': value,
+                })
+                return
+
+            permission.value = value
+            event.session.save_or_update(permission)
+
+        event.session.commit()
+        ibid.auth.drop_caches()
+        log.info(u"%s %s permission for account %s (%s) by account %s",
+                actions[action.lower()], name, account.id, account.username, event.account)
+
+        event.addresponse(True)
+
+    @match(r'^permissions(?:\s+for\s+(\S+))?$')
+    def list(self, event, username):
+        if not username:
+            if not event.account:
+                event.addresponse(u"I don't know who you are")
+                return
+            account = event.session.query(Account).get(event.account)
+        else:
+            if not auth_responses(event, u'accounts'):
+                return
+            account = event.session.query(Account) \
+                    .filter_by(username=username).first()
+            if not account:
+                event.addresponse(u"I don't know who %s is", username)
+                return
+
+        permissions = sorted(u'%s%s' % (permission_values[perm.value], perm.name) for perm in account.permissions)
+        event.addresponse(u'Permissions: %s', human_join(permissions) or u'none')
+
+    @match(r'^list\s+permissions$')
+    def list_permissions(self, event):
+        permissions = []
+        for processor in ibid.processors:
+            if hasattr(processor, 'permission') and getattr(processor, 'permission') not in permissions:
+                permissions.append(getattr(processor, 'permission'))
+            if hasattr(processor, 'permissions'):
+                for permission in getattr(processor, 'permissions'):
+                    if permission not in permissions:
+                        permissions.append(permission)
+
+        event.addresponse(u'Permissions: %s', human_join(sorted(permissions)) or u'none')
+
+class Auth(Processor):
+    u"""auth <credential>"""
+    feature = 'auth'
+
+    @match(r'^auth(?:\s+(.+))?$')
+    def handler(self, event, password):
+        result = ibid.auth.authenticate(event, password)
+        if result:
+            event.addresponse(u'You are authenticated')
+        else:
+            event.addresponse(u'Authentication failed')
+
+
 # vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/imdb.py'
--- ibid/plugins/imdb.py	2009-07-27 14:00:45 +0000
+++ ibid/plugins/imdb.py	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-# Uses the IMDbPY package in http mode against imdb.com
-# This isn't strictly legal: http://www.imdb.com/help/show_leaf?usedatasoftware
-#
-# Note that it will return porn movies by default.
-
-from .. imdb import IMDb, IMDbDataAccessError, IMDbError
-
-from ibid.plugins import Processor, match
-from ibid.config import Option, BoolOption
-from ibid.utils import human_join
-
-help = {'imdb': u'Looks up movies on IMDB.com.'}
-
-class IMDB(Processor):
-    u"imdb [search] [character|company|episode|movie|person] <terms> [#<index>]"
-    feature = 'imdb'
-
-    access_system = Option("accesssystem", "Method of querying IMDB", "http")
-    adult_search = BoolOption("adultsearch", "Include adult films in search results", True)
-
-    name_keys = {
-            "character": "long imdb name",
-            "company": "long imdb name",
-            "episode": "long imdb title",
-            "movie": "long imdb title",
-            "person": "name",
-    }
-
-    def setup(self):
-        self.imdb = IMDb(accessSystem=self.access_system, adultSearch=int(self.adult_search))
-
-    @match(r'^imdb(?:\s+search)?(?:\s+(character|company|episode|movie|person))?\s+(.+?)(?:\s+#(\d+))?$')
-    def search(self, event, search_type, terms, index):
-        if search_type is None:
-            search_type = "movie"
-        if index is not None:
-            index = int(index) - 1
-
-        result = None
-        try:
-            if terms.isdigit():
-                result = getattr(self.imdb, "get_" + search_type)(terms)
-            else:
-                results = getattr(self.imdb, "search_" + search_type)(terms)
-
-                if len(results) == 1:
-                    index = 0
-
-                if index is not None:
-                    result = results[index]
-                    self.imdb.update(result)
-
-        except IMDbDataAccessError, e:
-            event.addresponse(u"IMDb doesn't like me today. It said '%s'", e[0]["errmsg"])
-            raise
-
-        except IMDbError, e:
-            event.addresponse(u'IMDb must be having a bad day (or you are asking it silly things)')
-            raise
-
-        if result is not None:
-            event.addresponse(u'Found %s', getattr(self, 'display_' + search_type)(result))
-            return
-
-        if len(results) == 0:
-            event.addresponse(u"Sorry, couldn't find that")
-        else:
-            results = [x[self.name_keys[search_type]] for x in results]
-            results = enumerate(results)
-            results = [u"%i: %s" % (x[0] + 1, x[1]) for x in results]
-            event.addresponse(u'Found %(greaterthan)s%(num)i matches: %(results)s', {
-                'greaterthan': (u'', u'>')[len(results) == 20],
-                'num': len(results),
-                'results': u', '.join(results),
-            })
-
-    def display_character(self, character):
-        desc = u"%s: %s." % (character.characterID, character["long imdb name"])
-        filmography = character.get("filmography", ())
-        if len(filmography):
-            more = (u"", u" etc")[len(filmography) > 5]
-            desc += u" Appeared in %s%s." % (human_join(x["long imdb title"] for x in filmography[:5]), more)
-        if character.has_key("introduction"):
-            desc += u" Bio: %s" % character["introduction"]
-        return desc
-
-    def display_company(self, company):
-        desc = "%s: %s" % (company.companyID, company["long imdb name"])
-        for key, title in (
-                (u"production companies", u"Produced"),
-                (u"distributors", u"Distributed"),
-                (u"miscellaneous companies", u"Was involved in")):
-            if len(company.get(key, ())) > 0:
-                more = (u"", u" etc.")[len(company[key]) > 3]
-                desc += u" %s %s%s" % (title, human_join(x["long imdb title"] for x in company[key][:3]), more)
-        return desc
-
-    def display_episode(self, episode):
-        desc = u"%s: %s s%02ie%02i %s(%s)." % (
-                episode.movieID, episode["series title"], episode["season"],
-                episode["episode"], episode["title"], episode["year"])
-        if len(episode.get("director", ())) > 0:
-            desc += u" Dir: %s." % (human_join(x["name"] for x in episode["director"]))
-        if len(episode.get("cast", ())) > 0:
-            desc += u" Starring: %s." % (human_join(x["name"] for x in episode["cast"][:3]))
-        if episode.has_key("rating"):
-            desc += u" Rated: %.1f " % episode["rating"]
-        desc += human_join(episode.get("genres", ()))
-        desc += u" Plot: %s" % episode.get("plot outline", u"Unknown")
-        return desc
-
-    def display_movie(self, movie):
-        desc = u"%s: %s." % (movie.movieID, movie["long imdb title"])
-        if len(movie.get("director", ())) > 0:
-            desc += u" Dir: %s." % (human_join(x["name"] for x in movie["director"]))
-        if len(movie.get("cast", ())) > 0:
-            desc += u" Starring: %s." % (human_join(x["name"] for x in movie["cast"][:3]))
-        if movie.has_key("rating"):
-            desc += u" Rated: %.1f " % movie["rating"]
-        desc += human_join(movie.get("genres", ()))
-        desc += u" Plot: %s" % movie.get("plot outline", u"Unknown")
-        return desc
-
-    def display_person(self, person):
-        desc = u"%s: %s. %s." % (person.personID, person["name"],
-                human_join(role.title() for role in (
-                    u"actor", u"animation department", u"art department",
-                    u"art director", u"assistant director", u"camera department",
-                    u"casting department", u"casting director", u"cinematographer",
-                    u"composer", u"costume department", u"costume designer",
-                    u"director", u"editorial department", u"editor",
-                    u"make up department", u"music department", u"producer",
-                    u"production designer", u"set decorator", u"sound department",
-                    u"speccial effects department", u"stunts", u"transport department",
-                    u"visual effects department", u"writer", u"miscellaneous crew"
-                ) if person.has_key(role)))
-        if person.has_key("mini biography"):
-            desc += u" " + u" ".join(person["mini biography"])
-        else:
-            if person.has_key("birth name") or person.has_key("birth date"):
-                desc += u" Born %s." % u", ".join(person[attr] for attr in ("birth name", "birth date") if person.has_key(attr))
-        return desc
-
-# vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/info.py'
--- ibid/plugins/info.py	2009-12-30 14:08:03 +0000
+++ ibid/plugins/info.py	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-from subprocess import Popen, PIPE
-import os
-from unicodedata import normalize
-
-from nickometer import nickometer
-
-from ibid.plugins import Processor, match, RPC
-from ibid.config import Option
-from ibid.utils import file_in_path, unicode_output
-
-help = {}
-
-help['fortune'] = u'Returns a random fortune.'
-class Fortune(Processor, RPC):
-    u"""fortune"""
-    feature = 'fortune'
-
-    fortune = Option('fortune', 'Path of the fortune executable', 'fortune')
-
-    def __init__(self, name):
-        super(Fortune, self).__init__(name)
-        RPC.__init__(self)
-
-    def setup(self):
-        if not file_in_path(self.fortune):
-            raise Exception("Cannot locate fortune executable")
-
-    @match(r'^fortune$')
-    def handler(self, event):
-        fortune = self.remote_fortune()
-        if fortune:
-            event.addresponse(fortune)
-        else:
-            event.addresponse(u"Couldn't execute fortune")
-
-    def remote_fortune(self):
-        fortune = Popen(self.fortune, stdout=PIPE, stderr=PIPE)
-        output, error = fortune.communicate()
-        code = fortune.wait()
-
-        output = unicode_output(output.strip(), 'replace')
-
-        if code == 0:
-            return output
-        else:
-            return None
-
-help['nickometer'] = u'Calculates how lame a nick is.'
-class Nickometer(Processor):
-    u"""nickometer [<nick>] [with reasons]"""
-    feature = 'nickometer'
-
-    @match(r'^(?:nick|lame)-?o-?meter(?:(?:\s+for)?\s+(.+?))?(\s+with\s+reasons)?$')
-    def handle_nickometer(self, event, nick, wreasons):
-        nick = nick or event.sender['nick']
-        if u'\ufffd' in nick:
-            score, reasons = 100., ((u'Not UTF-8 clean', u'infinite'),)
-        else:
-            score, reasons = nickometer(normalize('NFKD', nick).encode('ascii', 'ignore'))
-
-        event.addresponse(u'%(nick)s is %(score)s%% lame', {
-            'nick': nick,
-            'score': score,
-        })
-        if wreasons:
-            if not reasons:
-                reasons = ((u'A good, traditional nick', 0),)
-            event.addresponse(u'Because: %s', u', '.join(['%s (%s)' % reason for reason in reasons]))
-
-help['man'] = u'Retrieves information from manpages.'
-class Man(Processor):
-    u"""man [<section>] <page>"""
-    feature = 'man'
-
-    man = Option('man', 'Path of the man executable', 'man')
-
-    def setup(self):
-        if not file_in_path(self.man):
-            raise Exception("Cannot locate man executable")
-
-    @match(r'^man\s+(?:(\d)\s+)?(\S+)$')
-    def handle_man(self, event, section, page):
-        command = [self.man, page]
-        if section:
-            command.insert(1, section)
-
-        if page.strip().startswith("-"):
-            event.addresponse(False)
-            return
-
-        env = os.environ.copy()
-        env["COLUMNS"] = "500"
-
-        man = Popen(command, stdout=PIPE, stderr=PIPE, env=env)
-        output, error = man.communicate()
-        code = man.wait()
-
-        if code != 0:
-            event.addresponse(u'Manpage not found')
-        else:
-            output = unicode_output(output.strip(), errors="replace")
-            output = output.splitlines()
-            index = output.index('NAME')
-            if index:
-                event.addresponse(output[index+1].strip())
-            index = output.index('SYNOPSIS')
-            if index:
-                event.addresponse(output[index+1].strip())
-
-# vi: set et sta sw=4 ts=4:

=== renamed file 'ibid/plugins/dict.py' => 'ibid/plugins/languages.py'
--- ibid/plugins/dict.py	2009-10-25 16:29:12 +0000
+++ ibid/plugins/languages.py	2010-01-18 18:54:16 +0000
@@ -1,13 +1,15 @@
 from random import choice
+import re
 
 from dictclient import Connection
 
 from ibid.plugins import Processor, match
 from ibid.config import Option, IntOption
-from ibid.utils import human_join
-
-help = {'dict': u'Defines words and checks spellings.'}
-
+from ibid.utils import decode_htmlentities, json_webservice, human_join
+
+help = {}
+
+help['dict'] = u'Defines words and checks spellings.'
 class Dict(Processor):
     u"""spell <word> [using <strategy>]
     define <word> [using <dictionary>]
@@ -116,4 +118,145 @@
         else:
             event.addresponse(u"I don't have that strategy")
 
+default_user_agent = 'Mozilla/5.0'
+default_referer = "http://ibid.omnia.za.net/"
+
+class UnknownLanguageException (Exception): pass
+class TranslationException (Exception): pass
+
+help['translate'] = u'''Translates a phrase using Google Translate.'''
+class Translate(Processor):
+    u"""translate <phrase> [from <language>] [to <language>]
+        translation chain <phrase> [from <language>] [to <language>]"""
+
+    feature = 'translate'
+
+    api_key = Option('api_key', 'Your Google API Key (optional)', None)
+    referer = Option('referer', 'The referer string to use (API searches)', default_referer)
+    dest_lang = Option('dest_lang', 'Destination language when none is specified', 'english')
+
+    chain_length = IntOption('chain_length', 'Maximum length of translation chains', 10)
+
+    lang_names = {'afrikaans':'af', 'albanian':'sq', 'arabic':'ar',
+                  'belarusian':'be', 'bulgarian':'bg', 'catalan':'ca',
+                  'chinese':'zh', 'chinese simplified':'zh-cn',
+                  'chinese traditional':'zh-tw', 'croatian':'hr', 'czech':'cs',
+                  'danish':'da', 'dutch':'nl', 'english':'en', 'estonian':'et',
+                  'filipino':'tl', 'finnish':'fi', 'french':'fr',
+                  'galacian':'gl', 'german':'de', 'greek':'el', 'hebrew':'iw',
+                  'hindi':'hi', 'hungarian':'hu', 'icelandic':'is',
+                  'indonesian':'id', 'irish':'ga', 'italian':'it',
+                  'japanese':'ja', 'korean': 'ko', 'latvian':'lv',
+                  'lithuanian':'lt', 'macedonian':'mk', 'malay':'ms',
+                  'maltese':'mt', 'norwegian':'no', 'persian':'fa',
+                  'polish':'pl', 'portuguese':'pt', 'romanian':'ro',
+                  'russian': 'ru', 'serbian':'sr', 'slovak':'sk',
+                  'slovenian':'sl', 'spanish':'es', 'swahili':'sw',
+                  'swedish':'sv', 'thai':'th', 'turkish':'tr', 'ukrainian':'uk',
+                  'uzbek': 'uz', 'vietnamese':'vi', 'welsh':'cy',
+                  'yiddish':'yi'}
+
+    alt_lang_names = {'simplified':'zh-CN', 'simplified chinese':'zh-CN',
+                   'traditional':'zh-TW', 'traditional chinese':'zh-TW',
+                   'bokmal':'no', 'norwegian bokmal':'no',
+                   u'bokm\N{LATIN SMALL LETTER A WITH RING ABOVE}l':'no',
+                   u'norwegian bokm\N{LATIN SMALL LETTER A WITH RING ABOVE}l':
+                        'no',
+                   'farsi':'fa'}
+
+    LANG_REGEX = '|'.join(lang_names.keys() + lang_names.values() +
+                            alt_lang_names.keys())
+
+    @match(r'^(?:translation\s*)?languages$')
+    def languages (self, event):
+        event.addresponse(human_join(sorted(self.lang_names.keys())))
+
+    @match(r'^translate\s+(.*?)(?:\s+from\s+(' + LANG_REGEX + r'))?'
+            r'(?:\s+(?:in)?to\s+(' + LANG_REGEX + r'))?$')
+    def translate (self, event, text, src_lang, dest_lang):
+        dest_lang = self.language_code(dest_lang or self.dest_lang)
+        src_lang = self.language_code(src_lang or '')
+
+        try:
+            translated = self._translate(event, text, src_lang, dest_lang)[0]
+            event.addresponse(translated)
+        except TranslationException, e:
+            event.addresponse(u"I couldn't translate that: %s.", unicode(e))
+
+    @match(r'^translation[-\s]*(?:chain|party)\s+(.*?)'
+            r'(?:\s+from\s+(' + LANG_REGEX + r'))?'
+            r'(?:\s+(?:in)?to\s+(' + LANG_REGEX + r'))?$')
+    def translation_chain (self, event, phrase, src_lang, dest_lang):
+        if self.chain_length < 1:
+            event.addresponse(u"I'm not allowed to play translation games.")
+        try:
+            dest_lang = self.language_code(dest_lang or self.dest_lang)
+            src_lang = self.language_code(src_lang or '')
+
+            chain = [phrase]
+            for i in range(self.chain_length):
+                phrase, src_lang = self._translate(event, phrase,
+                                                    src_lang, dest_lang)
+                src_lang, dest_lang = dest_lang, src_lang
+                chain.append(phrase)
+                if phrase in chain[:-1]:
+                    break
+
+            event.addresponse(u'\n'.join(chain[1:]), conflate=False)
+
+        except TranslationException, e:
+            event.addresponse(u"I couldn't translate that: %s.", unicode(e))
+
+    def _translate (self, event, phrase, src_lang, dest_lang):
+        params = {
+            'v': '1.0',
+            'q': phrase,
+            'langpair': src_lang + '|' + dest_lang,
+        }
+        if self.api_key:
+            params['key'] = self.api_key
+
+        headers = {'referer': self.referer}
+
+        response = json_webservice(
+            'http://ajax.googleapis.com/ajax/services/language/translate',
+            params, headers)
+
+        if response['responseStatus'] == 200:
+            translated = unicode(decode_htmlentities(
+                response['responseData']['translatedText']))
+            return (translated, src_lang or
+                    response['responseData']['detectedSourceLanguage'])
+        else:
+            errors = {
+                'invalid translation language pair':
+                    u"I don't know that language",
+                'invalid text':
+                    u"there's not much to go on",
+                 'could not reliably detect source language':
+                    u"I'm not sure what language that was",
+            }
+
+            msg = errors.get(response['responseDetails'],
+                            response['responseDetails'])
+
+            raise TranslationException(msg)
+
+    def language_code (self, name):
+        """Convert a name to a language code."""
+
+        name = name.lower()
+
+        if name == '':
+            return name
+
+        try:
+            return self.lang_names.get(name) or self.alt_lang_names[name]
+        except KeyError:
+            m = re.match('^([a-z]{2,3})(?:-[a-z]{2})?$', name)
+            if m and m.group(1) in self.lang_names.values():
+                return name
+            else:
+                raise UnknownLanguageException
+
 # vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py	2009-12-30 14:08:03 +0000
+++ ibid/plugins/lookup.py	1970-01-01 00:00:00 +0000
@@ -1,1019 +0,0 @@
-from urllib2 import urlopen, HTTPError
-from urllib import urlencode, quote
-from httplib import BadStatusLine
-from urlparse import urljoin
-from time import time, strptime, strftime
-from datetime import datetime
-from random import choice, shuffle, randint
-from math import acos, sin, cos, radians
-import re
-from sys import exc_info
-import logging
-
-import feedparser
-
-from ibid.compat import defaultdict, dt_strptime, ElementTree
-from ibid.config import Option, BoolOption, DictOption
-from ibid.plugins import Processor, match, handler
-from ibid.utils import ago, decode_htmlentities, cacheable_download, \
-        json_webservice, human_join, plural
-from ibid.utils.html import get_html_parse_tree
-
-log = logging.getLogger('plugins.lookup')
-
-help = {}
-
-def get_country_codes():
-    # The XML download doesn't include things like UK, so we consume this steaming pile of crud instead
-    filename = cacheable_download('http://www.iso.org/iso/country_codes/iso_3166_code_lists/iso-3166-1_decoding_table.htm', 'lookup/iso-3166-1_decoding_table.htm')
-    etree = get_html_parse_tree('file://' + filename, treetype='etree')
-    table = [x for x in etree.getiterator('table')][2]
-
-    countries = {}
-    for tr in table.getiterator('tr'):
-        abbr = [x.text for x in tr.getiterator('div')][0]
-        eng_name = [x.text for x in tr.getchildren()][1]
-
-        if eng_name and eng_name.strip():
-            # Cleanup:
-            if u',' in eng_name:
-                eng_name = u' '.join(reversed(eng_name.split(',', 1)))
-            eng_name = u' '.join(eng_name.split())
-
-            countries[abbr.upper()] = eng_name.title()
-
-    return countries
-
-help['bash'] = u'Retrieve quotes from bash.org.'
-class Bash(Processor):
-    u"bash[.org] [(random|<number>)]"
-
-    feature = 'bash'
-
-    public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
-
-    @match(r'^bash(?:\.org)?(?:\s+(random|\d+))?$')
-    def bash(self, event, id):
-        id = id is None and u'random' or id.lower()
-
-        if id == u'random' and event.public and not self.public_browse:
-            event.addresponse(u'Sorry, not in public. PM me')
-            return
-
-        soup = get_html_parse_tree('http://bash.org/?%s' % id)
-
-        number = u"".join(soup.find('p', 'quote').find('b').contents)
-        output = [u'%s:' % number]
-
-        body = soup.find('p', 'qt')
-        if not body:
-            event.addresponse(u"There's no such quote, but if you keep talking like that maybe there will be")
-        else:
-            for line in body.contents:
-                line = unicode(line).strip()
-                if line != u'<br />':
-                    output.append(line)
-            event.addresponse(u'\n'.join(output), conflate=False)
-
-help['lastfm'] = u'Lists the tracks last listened to by the specified user.'
-class LastFm(Processor):
-    u"last.fm for <username>"
-
-    feature = "lastfm"
-
-    @match(r'^last\.?fm\s+for\s+(\S+?)\s*$')
-    def listsongs(self, event, username):
-        songs = feedparser.parse('http://ws.audioscrobbler.com/1.0/user/%s/recenttracks.rss?%s' % (username, time()))
-        if songs['bozo']:
-            event.addresponse(u'No such user')
-        else:
-            event.addresponse(u', '.join(u'%s (%s ago)' % (
-                    e.title,
-                    ago(event.time - dt_strptime(e.updated, '%a, %d %b %Y %H:%M:%S +0000'), 1)
-                ) for e in songs['entries']))
-
-help['lotto'] = u"Gets the latest lotto results from the South African National Lottery."
-class Lotto(Processor):
-    u"""lotto"""
-
-    feature = 'lotto'
-
-    za_url = 'http://www.nationallottery.co.za/'
-    za_re = re.compile(r'images/(?:power_)?balls/(?:ball|power)_(\d+).gif')
-
-    @match(r'^lotto(\s+for\s+south\s+africa)?$')
-    def za(self, event, za):
-        try:
-            f = urlopen(self.za_url)
-        except Exception, e:
-            event.addresponse(u'Something went wrong getting to the Lotto site')
-            return
-
-        s = "".join(f)
-        f.close()
-
-        balls = self.za_re.findall(s)
-
-        if len(balls) != 20:
-            event.addresponse(u'I expected to get %(expected)s balls, but found %(found)s. They were: %(balls)s', {
-                'expected': 20,
-                'found': len(balls),
-                'balls': u', '.join(balls),
-            })
-            return
-
-        event.addresponse(u'Latest lotto results for South Africa, '
-            u'Lotto: %(lottoballs)s (Bonus: %(lottobonus)s), '
-            u'Lotto Plus: %(plusballs)s (Bonus: %(plusbonus)s), '
-            u'PowerBall: %(powerballs)s PB: %(powerball)s', {
-            'lottoballs': u' '.join(balls[:6]),
-            'lottobonus': balls[6],
-            'plusballs':  u' '.join(balls[7:13]),
-            'plusbonus':  balls[13],
-            'powerballs': u' '.join(balls[14:19]),
-            'powerball': balls[19],
-        })
-
-help['fml'] = u'Retrieves quotes from fmylife.com.'
-class FMLException(Exception):
-    pass
-
-class FMyLife(Processor):
-    u"""fml (<number> | [random] | flop | top | last | love | money | kids | work | health | sex | miscellaneous )"""
-
-    feature = "fml"
-
-    api_url = Option('fml_api_url', 'FML API URL base', 'http://api.betacie.com/')
-    # The Ibid API Key, registered by Stefano Rivera:
-    api_key = Option('fml_api_key', 'FML API Key', '4b39a7fcaf01c')
-    fml_lang = Option('fml_lang', 'FML Lanugage', 'en')
-
-    public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
-
-    failure_messages = (
-            u'Today, I tried to get a quote for %(nick)s but failed. FML',
-            u'Today, FML is down. FML',
-            u"Sorry, it's broken, the FML admins must having a really bad day",
-    )
-
-    def remote_get(self, id):
-        url = urljoin(self.api_url, 'view/%s?%s' % (
-            id.isalnum() and id + '/nocomment' or quote(id),
-            urlencode({'language': self.fml_lang, 'key': self.api_key}))
-        )
-        f = urlopen(url)
-        try:
-            tree = ElementTree.parse(f)
-        except SyntaxError:
-            class_, e, tb = exc_info()
-            new_exc = FMLException(u'XML Parsing Error: %s' % unicode(e))
-            raise new_exc.__class__, new_exc, tb
-
-        if tree.find('.//error'):
-            raise FMLException(tree.findtext('.//error'))
-
-        item = tree.find('.//item')
-        if item:
-            url = u"http://www.fmylife.com/%s/%s" % (
-                item.findtext('category'),
-                item.get('id'),
-            )
-            text = item.find('text').text
-            return u'%s\n- %s' % (text, url)
-
-    @match(r'^(?:fml\s+|http://www\.fmylife\.com/\S+/)(\d+|random|flop|top|last|love|money|kids|work|health|sex|miscellaneous)$')
-    def fml(self, event, id):
-        try:
-            body = self.remote_get(id)
-        except (FMLException, HTTPError, BadStatusLine):
-            event.addresponse(choice(self.failure_messages) % event.sender)
-            return
-
-        if body:
-            event.addresponse(body)
-        elif id.isdigit():
-            event.addresponse(u'No such quote')
-        else:
-            event.addresponse(choice(self.failure_messages) % event.sender)
-
-    @match(r'^fml$')
-    def fml_default(self, event):
-        if not event.public or self.public_browse:
-            self.fml(event, 'random')
-        else:
-            event.addresponse(u'Sorry, not in public. PM me')
-
-help["tfln"] = u"Looks up quotes from textsfromlastnight.com"
-class TextsFromLastNight(Processor):
-    u"""tfln [(random|<number>)]
-    tfln (worst|best) [(today|this week|this month)]"""
-
-    feature = 'tfln'
-
-    public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
-
-    random_pool = []
-
-    def get_tfln(self, section):
-        tree = get_html_parse_tree('http://textsfromlastnight.com/%s/' % section.lower())
-        for div in tree.findAll('div', attrs={'class': 'post_wrap'}):
-            id = int(div.get('id').split('_', 1)[1])
-            message = []
-            line = ''
-            for a in div.findAll('div', attrs={'class': 'post_content'})[0].findAll('a'):
-                if a['href'].startswith('/areacode/'):
-                    line = u'%s: ' % a.contents[0]
-                else:
-                    message.append(line + a.contents[0])
-            yield id, message
-
-    @match(r'^tfln'
-            r'(?:\s+(random|worst|best|\d+))?'
-            r'(?:this\s+)?(?:\s+(today|week|month))?$')
-    def tfln(self, event, number, timeframe=None):
-        number = number is None and u'random' or number.lower()
-
-        if number == u'random' and not timeframe \
-                and event.public and not self.public_browse:
-            event.addresponse(u'Sorry, not in public. PM me')
-            return
-
-        if number in (u'worst', u'best'):
-            number += u'-nights'
-            if timeframe.lower() in (u'week', u'month'):
-                number += u'this-' + timeframe.lower()
-        elif number.isdigit():
-            number = 'view/%s' % number
-
-        if number == u'random':
-            if not self.random_pool:
-                self.random_pool = [message for message in self.get_tfln(number)]
-                shuffle(self.random_pool)
-
-            message = self.random_pool.pop()
-        else:
-            try:
-                message = self.get_tfln(number).next()
-            except StopIteration:
-                event.addresponse(u'No such quote')
-                return
-
-        id, body = message
-        if len(body) > 1:
-            for line in body:
-                event.addresponse(line)
-            event.addresponse(u'- http://textsfromlastnight.com/view/%i', id)
-        else:
-            event.addresponse(u'%(body)s\n- http://textsfromlastnight.com/view/%(id)i', {
-                'id': id,
-                'body': body[0],
-            })
-
-    @match(r'^(?:http://)?(?:www\.)?textsfromlastnight\.com/view/(\d+)$')
-    def tfln_url(self, event, id):
-        self.tfln(event, id)
-
-help["mlia"] = u"Looks up quotes from MyLifeIsAverage.com and MyLifeIsG.com"
-class MyLifeIsAverage(Processor):
-    u"""mlia [(<number> | random | recent | today | yesterday | this week | this month | this year )]
-    mlig [(<number> | random | recent | today | yesterday | this week | this month | this year )]"""
-
-    feature = 'mlia'
-
-    public_browse = BoolOption('public_browse',
-                               'Allow random quotes in public', True)
-
-    random_pool = {}
-    pages = {}
-
-    def find_stories(self, url, site='mlia'):
-        if isinstance(url, basestring):
-            tree = get_html_parse_tree(url, treetype='etree')
-        else:
-            tree = url
-
-        stories = [div for div in tree.findall('.//div')
-                       if div.get(u'class') in
-                            (u'story s', # mlia
-                             u'stories', u'stories-wide')] # mlig
-
-        for story in stories:
-            if site == 'mlia':
-                body = story.findtext('div').strip()
-            else:
-                body = story.findtext('div/span/span').strip()
-            id = story.findtext('.//a')
-            if isinstance(id, basestring) and id[1:].isdigit():
-                id = int(id[1:])
-                yield id, body
-
-    @match(r'^(mli[ag])(?:\s+this)?'
-           r'(?:\s+(\d+|random|recent|today|yesterday|week|month|year))?$')
-    def mlia(self, event, site, query):
-        query = query is None and u'random' or query.lower()
-
-        if query == u'random' and event.public and not self.public_browse:
-            event.addresponse(u'Sorry, not in public. PM me')
-            return
-
-        site = site.lower()
-        url = {
-                'mlia': 'http://mylifeisaverage.com/',
-                'mlig': 'http://mylifeisg.com/',
-            }[site]
-
-        if query == u'random' or query is None:
-            if not self.random_pool.get(site):
-                if site == 'mlia':
-                    purl = url + str(randint(1, self.pages.get(site, 1)))
-                else:
-                    purl = url + 'index.php?' + urlencode({
-                            'page': randint(1, self.pages.get(site, 1))
-                        })
-                tree = get_html_parse_tree(purl, treetype='etree')
-                self.random_pool[site] = [story for story
-                        in self.find_stories(tree, site=site)]
-                shuffle(self.random_pool[site])
-
-                if site == 'mlia':
-                    pagination = [ul for ul in tree.findall('.//ul')
-                                           if ul.get(u'class') == u'pages'][0]
-                    self.pages[site] = int(
-                        [li for li in pagination.findall('li')
-                            if li.get(u'class') == u'last'][0]
-                        .find(u'a').get(u'href'))
-                else:
-                    pagination = [div for div in tree.findall('.//div')
-                                      if div.get(u'class') == u'pagination'][0]
-                    self.pages[site] = sorted(int(a.text) for a
-                            in pagination.findall('.//a')
-                            if a.text.isdigit())[-1]
-
-            story = self.random_pool[site].pop()
-
-        else:
-            try:
-                if site == 'mlia':
-                    if query.isdigit():
-                        surl = url + '/s/' + query
-                    else:
-                        surl = url + '/best/' + query
-                else:
-                    if query.isdigit():
-                        surl = url + 'story.php?' + urlencode({'id': query})
-                    else:
-                        surl = url + 'index.php?' + urlencode({'part': query})
-
-                story = self.find_stories(surl, site=site).next()
-
-            except StopIteration:
-                event.addresponse(u'No such quote')
-                return
-
-        id, body = story
-        if site == 'mlia':
-            url += 's/%i' % id
-        else:
-            url += 'story.php?id=%i' % id
-        event.addresponse(u'%(body)s\n- %(url)s', {
-            'url': url,
-            'body': body,
-        })
-
-    @match(r'^(?:http://)?(?:www\.)?mylifeis(average|g)\.com'
-           r'/story\.php\?id=(\d+)$')
-    def mlia_url(self, event, site, id):
-        self.mlia(event, 'mli' + site[0].lower(), id)
-
-help["microblog"] = u"Looks up messages on microblogging services like twitter and identica."
-class Twitter(Processor):
-    u"""latest (tweet|identica) from <name>
-    (tweet|identica) <number>"""
-
-    feature = "microblog"
-
-    default = {
-        'twitter':   {'endpoint': 'http://twitter.com/',   'api': 'twitter',  'name': 'tweet', 'user': 'twit'},
-        'tweet':     {'endpoint': 'http://twitter.com/',   'api': 'twitter',  'name': 'tweet', 'user': 'twit'},
-        'identica':  {'endpoint': 'http://identi.ca/api/', 'api': 'laconica', 'name': 'dent',  'user': 'denter'},
-        'identi.ca': {'endpoint': 'http://identi.ca/api/', 'api': 'laconica', 'name': 'dent',  'user': 'denter'},
-        'dent':      {'endpoint': 'http://identi.ca/api/', 'api': 'laconica', 'name': 'dent',  'user': 'denter'},
-    }
-    services = DictOption('services', 'Micro blogging services', default)
-
-    class NoSuchUserException(Exception):
-        pass
-
-    def setup(self):
-        self.update.im_func.pattern = re.compile(r'^(%s)\s+(\d+)$' % '|'.join(self.services.keys()), re.I)
-        self.latest.im_func.pattern = re.compile(r'^(?:latest|last)\s+(%s)\s+(?:update\s+)?(?:(?:by|from|for)\s+)?@?(\S+)$'
-                % '|'.join(self.services.keys()), re.I)
-
-    def remote_update(self, service, id):
-        status = json_webservice('%sstatuses/show/%s.json' % (service['endpoint'], id))
-
-        return {'screen_name': status['user']['screen_name'], 'text': decode_htmlentities(status['text'])}
-
-    def remote_latest(self, service, user):
-        statuses = json_webservice(
-                '%sstatuses/user_timeline/%s.json' % (service['endpoint'], user.encode('utf-8')),
-                {'count': 1})
-
-        if not statuses:
-            raise self.NoSuchUserException(user)
-
-        latest = statuses[0]
-
-        if service['api'] == 'twitter':
-            url = '%s%s/status/%i' % (service['endpoint'], latest['user']['screen_name'], latest['id'])
-        elif service['api'] == 'laconica':
-            url = '%s/notice/%i' % (service['endpoint'].split('/api/', 1)[0], latest['id'])
-
-        return {
-            'text': decode_htmlentities(latest['text']),
-            'ago': ago(datetime.utcnow() - dt_strptime(latest['created_at'], '%a %b %d %H:%M:%S +0000 %Y')),
-            'url': url,
-        }
-
-    @handler
-    def update(self, event, service_name, id):
-        service = self.services[service_name.lower()]
-        try:
-            event.addresponse(u'%(screen_name)s: "%(text)s"', self.remote_update(service, int(id)))
-        except HTTPError, e:
-            if e.code in (401, 403):
-                event.addresponse(u'That %s is private', service['name'])
-            elif e.code == 404:
-                event.addresponse(u'No such %s', service['name'])
-            else:
-                event.addresponse(u'I can only see the Fail Whale')
-
-    @handler
-    def latest(self, event, service_name, user):
-        service = self.services[service_name.lower()]
-        try:
-            event.addresponse(u'"%(text)s" %(ago)s ago, %(url)s', self.remote_latest(service, user))
-        except HTTPError, e:
-            if e.code in (401, 403):
-                event.addresponse(u"Sorry, %s's feed is private", user)
-            elif e.code == 404:
-                event.addresponse(u'No such %s', service['user'])
-            else:
-                event.addresponse(u'I can only see the Fail Whale')
-        except self.NoSuchUserException, e:
-                event.addresponse(u'No such %s', service['user'])
-
-    @match(r'^https?://(?:www\.)?twitter\.com/[^/ ]+/statuse?s?/(\d+)$')
-    def twitter(self, event, id):
-        self.update(event, u'twitter', id)
-
-    @match(r'^https?://(?:www\.)?identi.ca/notice/(\d+)$')
-    def identica(self, event, id):
-        self.update(event, u'identica', id)
-
-help['currency'] = u'Converts amounts between currencies.'
-class Currency(Processor):
-    u"""exchange <amount> <currency> for <currency>
-    currencies for <country>"""
-
-    feature = "currency"
-
-    headers = {'User-Agent': 'Mozilla/5.0', 'Referer': 'http://www.xe.com/'}
-    currencies = {}
-    country_codes = {}
-
-    def _load_currencies(self):
-        etree = get_html_parse_tree('http://www.xe.com/iso4217.php', headers=self.headers, treetype='etree')
-
-        tbl_main = [x for x in etree.getiterator('table') if x.get('class') == 'tbl_main'][0]
-
-        self.currencies = {}
-        for tbl_sub in tbl_main.getiterator('table'):
-            if tbl_sub.get('class') == 'tbl_sub':
-                for tr in tbl_sub.getiterator('tr'):
-                    code, place = [x.text for x in tr.getchildren()]
-                    name = u''
-                    if not place:
-                        place = u''
-                    if u',' in place[1:-1]:
-                        place, name = place.split(u',', 1)
-                    place = place.strip()
-                    if code in self.currencies:
-                        currency = self.currencies[code]
-                        # Are we using another country's currency?
-                        if place != u'' and name != u'' and (currency[1] == u'' or currency[1].rsplit(None, 1)[0] in place
-                                or (u'(also called' in currency[1] and currency[1].split(u'(', 1)[0].rsplit(None, 1)[0] in place)):
-                            currency[0].insert(0, place)
-                            currency[1] = name.strip()
-                        else:
-                            currency[0].append(place)
-                    else:
-                        self.currencies[code] = [[place], name.strip()]
-
-        # Special cases for shared currencies:
-        self.currencies['EUR'][0].insert(0, u'Euro Member Countries')
-        self.currencies['XOF'][0].insert(0, u'Communaut\xe9 Financi\xe8re Africaine')
-        self.currencies['XOF'][1] = u'Francs'
-
-    strip_currency_re = re.compile(r'^[\.\s]*([\w\s]+?)s?$', re.UNICODE)
-
-    def _resolve_currency(self, name, rough=True):
-        "Return the canonical name for a currency"
-
-        if name.upper() in self.currencies:
-            return name.upper()
-
-        m = self.strip_currency_re.match(name)
-
-        if m is None:
-            return False
-
-        name = m.group(1).lower()
-
-        # TLD -> country name
-        if rough and len(name) == 2 and name.upper() in self.country_codes:
-           name = self.country_codes[name.upper()].lower()
-
-        # Currency Name
-        if name == u'dollar':
-            return "USD"
-
-        name_re = re.compile(r'^(.+\s+)?\(?%ss?\)?(\s+.+)?$' % name, re.I | re.UNICODE)
-        for code, (places, currency) in self.currencies.iteritems():
-            if name_re.match(currency) or [True for place in places if name_re.match(place)]:
-                return code
-
-        return False
-
-    @match(r'^(exchange|convert)\s+([0-9.]+)\s+(.+)\s+(?:for|to|into)\s+(.+)$')
-    def exchange(self, event, command, amount, frm, to):
-        if not self.currencies:
-            self._load_currencies()
-
-        if not self.country_codes:
-            self.country_codes = get_country_codes()
-
-        rough = command.lower() == 'exchange'
-
-        canonical_frm = self._resolve_currency(frm, rough)
-        canonical_to = self._resolve_currency(to, rough)
-        if not canonical_frm or not canonical_to:
-            if rough:
-                event.addresponse(u"Sorry, I don't know about a currency for %s", (not canonical_frm and frm or to))
-            return
-
-        data = {'Amount': amount, 'From': canonical_frm, 'To': canonical_to}
-        etree = get_html_parse_tree('http://www.xe.com/ucc/convert.cgi', urlencode(data), self.headers, 'etree')
-
-        result = [tag.text for tag in etree.getiterator('h2')]
-        if result:
-            event.addresponse(u'%(fresult)s (%(fcountry)s %(fcurrency)s) = %(tresult)s (%(tcountry)s %(tcurrency)s)', {
-                'fresult': result[0],
-                'tresult': result[2],
-                'fcountry': self.currencies[canonical_frm][0][0],
-                'fcurrency': self.currencies[canonical_frm][1],
-                'tcountry': self.currencies[canonical_to][0][0],
-                'tcurrency': self.currencies[canonical_to][1],
-            })
-        else:
-            event.addresponse(u"The bureau de change appears to be closed for lunch")
-
-    @match(r'^(?:currency|currencies)\s+for\s+(?:the\s+)?(.+)$')
-    def currency(self, event, place):
-        if not self.currencies:
-            self._load_currencies()
-
-        search = re.compile(place, re.I)
-        results = []
-        for code, (places, name) in self.currencies.iteritems():
-            for place in places:
-                if search.search(place):
-                    results.append(u'%s uses %s (%s)' % (place, name, code))
-                    break
-
-        if results:
-            event.addresponse(human_join(results))
-        else:
-            event.addresponse(u'No currencies found')
-
-help['tld'] = u"Resolve country TLDs (ISO 3166)"
-class TLD(Processor):
-    u""".<tld>
-    tld for <country>"""
-    feature = 'tld'
-
-    country_codes = {}
-
-    @match(r'^\.([a-zA-Z]{2})$')
-    def tld_to_country(self, event, tld):
-        if not self.country_codes:
-            self.country_codes = get_country_codes()
-
-        tld = tld.upper()
-
-        if tld in self.country_codes:
-            event.addresponse(u'%(tld)s is the TLD for %(country)s', {
-                'tld': tld,
-                'country': self.country_codes[tld],
-            })
-        else:
-            event.addresponse(u"ISO doesn't know about any such TLD")
-
-    @match(r'^tld\s+for\s+(.+)$')
-    def country_to_tld(self, event, location):
-        if not self.country_codes:
-            self.country_codes = get_country_codes()
-
-        for tld, country in self.country_codes.iteritems():
-            if location.lower() in country.lower():
-                event.addresponse(u'%(tld)s is the TLD for %(country)s', {
-                    'tld': tld,
-                    'country': country,
-                })
-                return
-
-        event.addresponse(u"ISO doesn't know about any TLD for %s", location)
-
-help['weather'] = u'Retrieves current weather and forecasts for cities.'
-class Weather(Processor):
-    u"""weather in <city>
-    forecast for <city>"""
-
-    feature = "weather"
-
-    defaults = {    'ct': 'Cape Town, South Africa',
-                    'jhb': 'Johannesburg, South Africa',
-                    'joburg': 'Johannesburg, South Africa',
-               }
-    places = DictOption('places', 'Alternate names for places', defaults)
-    labels = ('temp', 'humidity', 'dew', 'wind', 'pressure', 'conditions', 'visibility', 'uv', 'clouds', 'ymin', 'ymax', 'ycool', 'sunrise', 'sunset', 'moonrise', 'moonset', 'moonphase', 'metar')
-    whitespace = re.compile('\s+')
-
-    class WeatherException(Exception):
-        pass
-
-    class TooManyPlacesException(WeatherException):
-        pass
-
-    def _text(self, string):
-        if not isinstance(string, basestring):
-            string = ''.join(string.findAll(text=True))
-        return self.whitespace.sub(' ', string).strip()
-
-    def _get_page(self, place):
-        if place.lower() in self.places:
-            place = self.places[place.lower()]
-
-        soup = get_html_parse_tree('http://m.wund.com/cgi-bin/findweather/getForecast?brand=mobile_metric&query=' + quote(place))
-
-        if soup.body.center and soup.body.center.b.string == 'Search not found:':
-            raise Weather.WeatherException(u'City not found')
-
-        if soup.table.tr.th and soup.table.tr.th.string == 'Place: Temperature':
-            places = []
-            for td in soup.table.findAll('td'):
-                places.append(td.find('a', href=re.compile('.*html$')).string)
-
-            # Cities with more than one airport give duplicate entries. We can take the first
-            if len([x for x in places if x == places[0]]) == len(places):
-                url = urljoin('http://m.wund.com/cgi-bin/findweather/getForecast',
-                        soup.table.find('td').find('a', href=re.compile('.*html$'))['href'])
-                soup = get_html_parse_tree(url)
-            else:
-                raise Weather.TooManyPlacesException(places)
-
-        return soup
-
-    def remote_weather(self, place):
-        soup = self._get_page(place)
-        tds = [x.table for x in soup.findAll('table') if x.table][0].findAll('td')
-
-        # HACK: Some cities include a windchill row, but others don't
-        if len(tds) == 39:
-            del tds[3]
-            del tds[4]
-
-        values = {'place': tds[0].findAll('b')[1].string, 'time': tds[0].findAll('b')[0].string}
-        for index, td in enumerate(tds[2::2]):
-            values[self.labels[index]] = self._text(td)
-
-        return values
-
-    def remote_forecast(self, place):
-        soup = self._get_page(place)
-        forecasts = []
-        table = [table for table in soup.findAll('table') if table.findAll('td', align='left')][0]
-
-        for td in table.findAll('td', align='left'):
-            day = td.b.string
-            forecast = u' '.join([self._text(line) for line in td.contents[2:]])
-            forecasts.append(u'%s: %s' % (day, self._text(forecast)))
-
-        return forecasts
-
-    @match(r'^weather\s+(?:(?:for|at|in)\s+)?(.+)$')
-    def weather(self, event, place):
-        try:
-            values = self.remote_weather(place)
-            event.addresponse(u'In %(place)s at %(time)s: %(temp)s; Humidity: %(humidity)s; Wind: %(wind)s; Conditions: %(conditions)s; Sunrise/set: %(sunrise)s/%(sunset)s; Moonrise/set: %(moonrise)s/%(moonset)s', values)
-        except Weather.TooManyPlacesException, e:
-            event.addresponse(u'Too many places match %(place)s: %(exception)s', {
-                'place': place,
-                'exception': human_join(e.args[0], separator=u';'),
-            })
-        except Weather.WeatherException, e:
-            event.addresponse(unicode(e))
-
-    @match(r'^forecast\s+(?:for\s+)?(.+)$')
-    def forecast(self, event, place):
-        try:
-            event.addresponse(u', '.join(self.remote_forecast(place)))
-        except Weather.TooManyPlacesException, e:
-            event.addresponse(u'Too many places match %(place)s: %(exception)s', {
-                'place': place,
-                'exception': human_join(e.args[0], separator=u';'),
-            })
-        except Weather.WeatherException, e:
-            event.addresponse(unicode(e))
-
-help['distance'] = u"Returns the distance between two places"
-class Distance(Processor):
-    u"""distance [in <unit>] between <source> and <destination>
-    place search for <placename>"""
-
-    # For Mathematics, see:
-    # http://www.mathforum.com/library/drmath/view/51711.html
-    # http://mathworld.wolfram.com/GreatCircle.html
-
-    feature = 'distance'
-
-    default_unit_names = {
-            'km': "kilometres",
-            'mi': "miles",
-            'nm': "nautical miles"}
-    default_radius_values = {
-            'km': 6378,
-            'mi': 3963.1,
-            'nm': 3443.9}
-
-    unit_names = DictOption('unit_names', 'Names of units in which to specify distances', default_unit_names)
-    radius_values = DictOption('radius_values', 'Radius of the earth in the units in which to specify distances', default_radius_values)
-
-    def get_place_data(self, place, num):
-        return json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': num})
-
-    def get_place(self, place):
-        js = self.get_place_data(place, 1)
-        if js['totalResultsCount'] == 0:
-            return None
-        info = js['geonames'][0]
-        return {'name': "%s, %s, %s" % (info['name'], info['adminName1'], info['countryName']),
-                'lng': radians(info['lng']),
-                'lat': radians(info['lat'])}
-
-    @match(r'^(?:(?:search\s+for\s+place)|(?:place\s+search\s+for)|(?:places\s+for))\s+(\S.+?)\s*$')
-    def placesearch(self, event, place):
-        js = self.get_place_data(place, 10)
-        if js['totalResultsCount'] == 0:
-            event.addresponse(u"I don't know of anywhere even remotely like '%s'", place)
-        else:
-            event.addresponse(u"I can find: %s",
-                    (human_join([u"%s, %s, %s" % (p['name'], p['adminName1'], p['countryName'])
-                        for p in js['geonames'][:10]],
-                        separator=u';')))
-
-    @match(r'^(?:how\s*far|distance)(?:\s+in\s+(\S+))?\s+'
-            r'(?:(between)|from)' # Between ... and ... | from ... to ...
-            r'\s+(\S.+?)\s+(?(2)and|to)\s+(\S.+?)\s*$')
-    def distance(self, event, unit, ignore, src, dst):
-        unit_names = self.unit_names
-        if unit and unit not in self.unit_names:
-            event.addresponse(u"I don't know the unit '%(badunit)s'. I know about: %(knownunits)s", {
-                'badunit': unit,
-                'knownunits':
-                    human_join(u"%s (%s)" % (unit, self.unit_names[unit])
-                        for unit in self.unit_names),
-            })
-            return
-        if unit:
-            unit_names = [unit]
-
-        srcp, dstp = self.get_place(src), self.get_place(dst)
-        if not srcp or not dstp:
-            event.addresponse(u"I don't know of anywhere called %s",
-                    (u" or ".join("'%s'" % place[0]
-                        for place in ((src, srcp), (dst, dstp)) if not place[1])))
-            return
-
-        dist = acos(cos(srcp['lng']) * cos(dstp['lng']) * cos(srcp['lat']) * cos(dstp['lat']) +
-                    cos(srcp['lat']) * sin(srcp['lng']) * cos(dstp['lat']) * sin(dstp['lng']) +
-                    sin(srcp['lat'])*sin(dstp['lat']))
-
-        event.addresponse(u"Approximate distance, as the bot flies, between %(srcname)s and %(dstname)s is: %(distance)s", {
-            'srcname': srcp['name'],
-            'dstname': dstp['name'],
-            'distance': human_join([
-                u"%.02f %s" % (self.radius_values[unit]*dist, self.unit_names[unit])
-                for unit in unit_names],
-                conjunction=u'or'),
-        })
-
-help['tvshow'] = u'Retrieves TV show information from tvrage.com.'
-class TVShow(Processor):
-    u"""tvshow <show>"""
-
-    feature = 'tvshow'
-
-    def remote_tvrage(self, show):
-        info_url = 'http://services.tvrage.com/tools/quickinfo.php?%s'
-
-        info = urlopen(info_url % urlencode({'show': show.encode('utf-8')}))
-
-        info = info.read()
-        info = info.decode('utf-8')
-        if info.startswith('No Show Results Were Found'):
-            return
-        info = info[5:].splitlines()
-        show_info = [i.split('@', 1) for i in info]
-        show_dict = dict(show_info)
-
-        #check if there are actual airdates for Latest and Next Episode. None for Next
-        #Episode does not neccesarily mean it is nor airing, just the date is unconfirmed.
-        show_dict = defaultdict(lambda: 'None', show_info)
-
-        for field in ('Latest Episode', 'Next Episode'):
-            if field in show_dict:
-                ep, name, date = show_dict[field].split('^', 2)
-                count = date.count('/')
-                format_from = {
-                    0: '%Y',
-                    1: '%b/%Y',
-                    2: '%b/%d/%Y'
-                }[count]
-                format_to = ' '.join(('%d', '%B', '%Y')[-1 - count:])
-                date = strftime(format_to, strptime(date, format_from))
-                show_dict[field] = u'%s - "%s" - %s' % (ep, name, date)
-
-        if 'Genres' in show_dict:
-            show_dict['Genres'] = human_join(show_dict['Genres'].split(' | '))
-
-        return show_dict
-
-    @match(r'^tv\s*show\s+(.+)$')
-    def tvshow(self, event, show):
-        retr_info = self.remote_tvrage(show)
-
-        message = u'Show: %(Show Name)s. Premiered: %(Premiered)s. ' \
-                    u'Latest Episode: %(Latest Episode)s. Next Episode: %(Next Episode)s. ' \
-                    u'Airtime: %(Airtime)s on %(Network)s. Genres: %(Genres)s. ' \
-                    u'Status: %(Status)s. %(Show URL)s'
-
-        if not retr_info:
-            event.addresponse(u"I can't find anything out about '%s'", show)
-            return
-
-        event.addresponse(message, retr_info)
-
-help['bible'] = u'Retrieves Bible verses'
-class Bible(Processor):
-    u"""bible <passages> [in <version>]
-    <book> <verses> [in <version>]"""
-
-    feature = 'bible'
-    # http://labs.bible.org/api/ is an alternative
-    # Their feature set is a little different, but they should be fairly
-    # compatible
-    api_url = Option('bible_api_url', 'Bible API URL base',
-                    'http://api.preachingcentral.com/bible.php')
-
-    psalm_pat = re.compile(r'\bpsalm\b', re.IGNORECASE)
-
-    # The API doesn't seem to work with the apocrypha, even when looking in
-    # versions that include it
-    books = '|'.join(['Genesis', 'Exodus', 'Leviticus', 'Numbers', 'Deuteronomy',
-    'Joshua', 'Judges', 'Ruth', '(?:1|2|I|II) Samuel', '(?:1|2|I|II) Kings',
-    '(?:1|2|I|II) Chronicles', 'Ezra', 'Nehemiah', 'Esther', 'Job', 'Psalms?',
-    'Proverbs', 'Ecclesiastes', 'Song(?: of (?:Songs|Solomon)?)?',
-    'Canticles', 'Isaiah', 'Jeremiah', 'Lamentations',
-    'Ezekiel', 'Daniel', 'Hosea', 'Joel', 'Amos', 'Obadiah', 'Jonah', 'Micah',
-    'Nahum', 'Habakkuk', 'Zephaniah', 'Haggai', 'Zechariah', 'Malachi',
-    'Matthew', 'Mark', 'Luke', 'John', 'Acts', 'Romans',
-    '(?:1|2|I|II) Corinthians', 'Galatians', 'Ephesians', 'Philippians',
-    'Colossians', '(?:1|2|I|II) Thessalonians', '(?:1|2|I|II) Timothy',
-    'Titus', 'Philemon', 'Hebrews', 'James', '(?:1|2|I|II) Peter',
-    '(?:1|2|3|I|II|III) John', 'Jude',
-    'Revelations?(?: of (?:St.|Saint) John)?']).replace(' ', '\s*')
-
-    @match(r'^bible\s+(.*?)(?:\s+(?:in|from)\s+(.*))?$')
-    def bible(self, event, passage, version=None):
-        passage = self.psalm_pat.sub('psalms', passage)
-
-        params = {'passage': passage.encode('utf-8'),
-                  'type': 'xml',
-                  'formatting': 'plain'}
-        if version:
-            params['version'] = version.lower().encode('utf-8')
-
-        f = urlopen(self.api_url + '?' + urlencode(params))
-        tree = ElementTree.parse(f)
-
-        message = self.formatPassage(tree)
-        if message:
-            event.addresponse(message)
-        errors = list(tree.findall('.//error'))
-        if errors:
-            event.addresponse('There were errors: %s.', '. '.join(err.text for err in errors))
-        elif not message:
-            event.addresponse("I couldn't find that passage.")
-   
-    # Allow queries which are quite definitely bible references to omit "bible".
-    # Specifically, they must start with the name of a book and be followed only
-    # by book names, chapters and verses.
-    @match(r'^((?:(?:' + books + ')(?:\d|[-:,]|\s)*)+?)(?:\s+(?:in|from)\s+(.*))?$')
-    def bookbible(self, *args):
-        self.bible(*args)
-
-    def formatPassage(self, xml):
-        message = []
-        oldref = (None, None, None)
-        for item in xml.findall('.//item'):
-            ref, text = self.verseInfo(item)
-            if oldref[0] != ref[0]:
-                message.append(u'(%s %s:%s)' % ref)
-            elif oldref[1] != ref[1]:
-                message.append(u'(%s:%s)' % ref[1:])
-            else:
-                message.append(u'%s' % ref[2])
-            oldref = ref
-
-            message.append(text)
-
-        return u' '.join(message)
-    
-    def verseInfo(self, xml):
-        book, chapter, verse, text = map(xml.findtext,
-                                        ('bookname', 'chapter', 'verse', 'text'))
-        return ((book, chapter, verse), text)
-
-class Sequence(object):
-    def __init__ (self, lines):
-        cmds = defaultdict(list)
-        for line in lines:
-            line = line.lstrip()[:-1]
-            if not line:
-                break
-
-            line_m = re.match(r'%([A-Z]) (A\d+)(?: (.*))?$', line)
-            if line_m:
-                cmd, self.catalog_num, info = line_m.groups()
-                cmds[cmd].append(info)
-            else:
-                cmds[cmd][-1] += line
-
-        # %V, %W and %X give signed values if the sequence is signed.
-        # Otherwise, only %S, %T and %U are given.
-        self.values = (''.join(cmds['V'] + cmds['W'] + cmds['X']) or
-                        ''.join(cmds['S'] + cmds['T'] + cmds['U']))
-        
-        self.name = ''.join(cmds['N'])
-
-    def url (self):
-        return 'http://www.research.att.com/~njas/sequences/' + self.catalog_num
-
-help['oeis'] = 'Query the Online Encyclopedia of Integer Sequences'
-class OEIS(Processor):
-    u"""oeis (A<OEIS number>|M<EIS number>|N<HIS number>)
-    oeis <term>[, ...]"""
-    
-    feature = 'oeis'
-
-    @match(r'^oeis\s+([AMN]\d+|-?\d(?:\d|-|,|\s)*)$')
-    def oeis (self, event, query):
-        query = re.sub(r'(,|\s)+', ',', query)
-        f = urlopen('http://www.research.att.com/~njas/sequences/?n=1&fmt=3&q='
-                    + query)
-
-        f.next() # the first line is uninteresting
-        results_m = re.search(r'(\d+) results found', f.next())
-        if results_m:
-            f.next()
-            sequence = Sequence(f)
-            event.addresponse(u'%(name)s - %(url)s - %(values)s', 
-                                {'name': sequence.name,
-                                 'url': sequence.url(),
-                                 'values': sequence.values})
-        
-            results = int(results_m.group(1))
-            if results > 1:
-                event.addresponse(u'There %(was)s %(count)d more %(results)s. '
-                                  u'See %(url)s%(query)s for more.',
-                    {'was': plural(results-1, 'was', 'were'),
-                     'count': results-1,
-                     'results': plural(results-1, 'result', 'results'),
-                     'url':
-                      'http://www.research.att.com/~njas/sequences/?fmt=1&q=',
-                     'query': query})
-        else:
-            event.addresponse(u"I couldn't find that sequence.")
-
-# vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/lotto.py'
--- ibid/plugins/lotto.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/lotto.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,52 @@
+import re
+from urllib2 import urlopen
+import logging
+
+from ibid.plugins import Processor, match
+
+log = logging.getLogger('plugins.lotto')
+help = {}
+
+help['lotto'] = u"Gets the latest lotto results from the South African National Lottery."
+class Lotto(Processor):
+    u"""lotto"""
+
+    feature = 'lotto'
+
+    za_url = 'http://www.nationallottery.co.za/'
+    za_re = re.compile(r'images/(?:power_)?balls/(?:ball|power)_(\d+).gif')
+
+    @match(r'^lotto(\s+for\s+south\s+africa)?$')
+    def za(self, event, za):
+        try:
+            f = urlopen(self.za_url)
+        except Exception, e:
+            event.addresponse(u'Something went wrong getting to the Lotto site')
+            return
+
+        s = "".join(f)
+        f.close()
+
+        balls = self.za_re.findall(s)
+
+        if len(balls) != 20:
+            event.addresponse(u'I expected to get %(expected)s balls, but found %(found)s. They were: %(balls)s', {
+                'expected': 20,
+                'found': len(balls),
+                'balls': u', '.join(balls),
+            })
+            return
+
+        event.addresponse(u'Latest lotto results for South Africa, '
+            u'Lotto: %(lottoballs)s (Bonus: %(lottobonus)s), '
+            u'Lotto Plus: %(plusballs)s (Bonus: %(plusbonus)s), '
+            u'PowerBall: %(powerballs)s PB: %(powerball)s', {
+            'lottoballs': u' '.join(balls[:6]),
+            'lottobonus': balls[6],
+            'plusballs':  u' '.join(balls[7:13]),
+            'plusbonus':  balls[13],
+            'powerballs': u' '.join(balls[14:19]),
+            'powerball': balls[19],
+        })
+
+# vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/memory.py'
--- ibid/plugins/memory.py	2009-10-19 15:07:40 +0000
+++ ibid/plugins/memory.py	2010-01-18 18:54:16 +0000
@@ -3,7 +3,6 @@
 import gc
 import gzip
 import os
-import os.path
 
 import objgraph
 

=== removed file 'ibid/plugins/misc.py'
--- ibid/plugins/misc.py	2009-12-20 18:47:12 +0000
+++ ibid/plugins/misc.py	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-import logging
-from random import choice, random
-
-import ibid
-from ibid.plugins import Processor, match
-from ibid.config import IntOption, ListOption
-from ibid.utils import ibid_version, human_join
-
-help = {}
-log = logging.getLogger('plugins.misc')
-
-help['coffee'] = u"Times coffee brewing and reserves cups for people"
-class Coffee(Processor):
-    u"""coffee (on|please)"""
-    feature = 'coffee'
-
-    pots = {}
-
-    time = IntOption('coffee_time', u'Brewing time in seconds', 240)
-    cups = IntOption('coffee_cups', u'Maximum number of cups', 4)
-
-    def coffee_announce(self, event):
-        event.addresponse(u"Coffee's ready for %s!",
-                human_join(self.pots[(event.source, event.channel)]))
-        del self.pots[(event.source, event.channel)]
-
-    @match(r'^coffee\s+on$')
-    def coffee_on(self, event):
-        if (event.source, event.channel) in self.pots:
-            if len(self.pots[(event.source, event.channel)]) >= self.cups:
-                event.addresponse(u"There's already a pot on, and it's all reserved")
-            elif event.sender['nick'] in self.pots[(event.source, event.channel)]:
-                event.addresponse(u"You already have a pot on the go")
-            else:
-                event.addresponse(u"There's already a pot on. If you ask nicely, maybe you can have a cup")
-            return
-
-        self.pots[(event.source, event.channel)] = [event.sender['nick']]
-        ibid.dispatcher.call_later(self.time, self.coffee_announce, event)
-
-        event.addresponse(choice((
-                u'puts the kettle on',
-                u'starts grinding coffee',
-                u'flips the salt-timer',
-                u'washes some mugs',
-            )), action=True)
-
-    @match('^coffee\s+(?:please|pls)$')
-    def coffee_accept(self, event):
-        if (event.source, event.channel) not in self.pots:
-            event.addresponse(u"There isn't a pot on")
-
-        elif len(self.pots[(event.source, event.channel)]) >= self.cups:
-            event.addresponse(u"Sorry, there aren't any more cups left")
-
-        elif event.sender['nick'] in self.pots[(event.source, event.channel)]:
-            event.addresponse(u"Now now, we don't want anyone getting caffeine overdoses")
-
-        else:
-            self.pots[(event.source, event.channel)].append(event.sender['nick'])
-            event.addresponse(True)
-
-help['version'] = u"Show the Ibid version currently running"
-class Version(Processor):
-    u"""version"""
-    feature = 'version'
-
-    @match(r'^version$')
-    def show_version(self, event):
-        if ibid_version():
-            event.addresponse(u'I am version %s', ibid_version())
-        else:
-            event.addresponse(u"I don't know what version I am :-(")
-
-help['dvorak'] = u"Makes text typed on a QWERTY keyboard as if it was Dvorak work, and vice-versa"
-class Dvorak(Processor):
-    u"""(aoeu|asdf) <text>"""
-    feature = 'dvorak'
-
-    # List of characters on each keyboard layout
-    dvormap = u"""',.pyfgcrl/=aoeuidhtns-;qjkxbmwvz"<>PYFGCRL?+AOEUIDHTNS_:QJKXBMWVZ[]{}|"""
-    qwermap = u"""qwertyuiop[]asdfghjkl;'zxcvbnm,./QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?-=_+|"""
-
-    # Typed by a QWERTY typist on a Dvorak-mapped keyboard
-    typed_on_dvorak = dict(zip(map(ord, dvormap), qwermap))
-    # Typed by a Dvorak typist on a QWERTY-mapped keyboard
-    typed_on_qwerty = dict(zip(map(ord, qwermap), dvormap))
-
-    @match(r'^(?:asdf|dvorak)\s+(.+)$')
-    def convert_from_qwerty(self, event, text):
-        event.addresponse(text.translate(self.typed_on_qwerty))
-
-    @match(r'^(?:aoeu|qwerty)\s+(.+)$')
-    def convert_from_dvorak(self, event, text):
-        event.addresponse(text.translate(self.typed_on_dvorak))
-
-help['insult'] = u"Slings verbal abuse at someone"
-class Insult(Processor):
-    u"""
-    (flame | insult) <person>
-    (swear | cuss | explete) [at <person>]
-    """
-    feature = 'insult'
-
-    adjectives = ListOption('adjectives', 'List of adjectives', (
-        u'acidic', u'antique', u'artless', u'base-court', u'bat-fowling',
-        u'bawdy', u'beef-witted', u'beetle-headed', u'beslubbering',
-        u'boil-brained', u'bootless', u'churlish', u'clapper-clawed',
-        u'clay-brained', u'clouted', u'cockered', u'common-kissing',
-        u'contemptible', u'coughed-up', u'craven', u'crook-pated',
-        u'culturally-unsound', u'currish', u'dankish', u'decayed',
-        u'despicable', u'dismal-dreaming', u'dissembling', u'dizzy-eyed',
-        u'doghearted', u'dread-bolted', u'droning', u'earth-vexing',
-        u'egg-sucking', u'elf-skinned', u'errant', u'evil', u'fat-kidneyed',
-        u'fawning', u'fen-sucked', u'fermented', u'festering', u'flap-mouthed',
-        u'fly-bitten', u'fobbing', u'folly-fallen', u'fool-born', u'foul',
-        u'frothy', u'froward', u'full-gorged', u'fulminating', u'gleeking',
-        u'goatish', u'gorbellied', u'guts-griping', u'hacked-up', u'halfbaked',
-        u'half-faced', u'hasty-witted', u'headless', u'hedge-born',
-        u'hell-hated', u'horn-beat', u'hugger-muggered', u'humid',
-        u'idle-headed', u'ill-borne', u'ill-breeding', u'ill-nurtured',
-        u'imp-bladdereddle-headed', u'impertinent', u'impure', u'industrial',
-        u'inept', u'infected', u'infectious', u'inferior', u'it-fowling',
-        u'jarring', u'knotty-pated', u'left-over', u'lewd-minded',
-        u'loggerheaded', u'low-quality', u'lumpish', u'malodorous',
-        u'malt-wormy', u'mammering', u'mangled', u'measled', u'mewling',
-        u'milk-livered', u'motley-mind', u'motley-minded', u'off-color',
-        u'onion-eyed', u'paunchy', u'penguin-molesting', u'petrified',
-        u'pickled', u'pignutted', u'plume-plucked', u'pointy-nosed', u'porous',
-        u'pottle-deep', u'pox-marked', u'pribbling', u'puking', u'puny',
-        u'railing', u'rank', u'reeky', u'reeling-ripe', u'roguish',
-        u'rough-hewn', u'rude-growing', u'rude-snouted', u'rump-fed',
-        u'ruttish', u'salty', u'saucy', u'saucyspleened', u'sausage-snorfling',
-        u'shard-borne', u'sheep-biting', u'spam-sucking', u'spleeny',
-        u'spongy', u'spur-galled', u'squishy', u'surly', u'swag-bellied',
-        u'tardy-gaited', u'tastless', u'tempestuous', u'tepid', u'thick',
-        u'tickle-brained', u'toad-spotted', u'tofu-nibbling', u'tottering',
-        u'uninspiring', u'unintelligent', u'unmuzzled', u'unoriginal',
-        u'urchin-snouted', u'vain', u'vapid', u'vassal-willed', u'venomed',
-        u'villainous', u'warped', u'wayward', u'weasel-smelling',
-        u'weather-bitten', u'weedy', u'wretched', u'yeasty',
-    ))
-
-    collections = ListOption('collections', 'List of collective nouns', (
-        u'accumulation', u'ass-full', u'assload', u'bag', u'bucket',
-        u'coagulation', u'enema-bucketful', u'gob', u'half-mouthful', u'heap',
-        u'mass', u'mound', u'ooze', u'petrification', u'pile', u'plate',
-        u'puddle', u'quart', u'stack', u'thimbleful', u'tongueful',
-    ))
-
-    nouns = ListOption('nouns', u'List of singular nouns', (
-        u'apple-john', u'baggage', u'barnacle', u'bladder', u'boar-pig',
-        u'bugbear', u'bum-bailey', u'canker-blossom', u'clack-dish',
-        u'clotpole', u'coxcomb', u'codpiece', u'death-token', u'dewberry',
-        u'flap-dragon', u'flax-wench', u'flirt-gill', u'foot-licker',
-        u'fustilarian', u'giglet', u'gudgeon', u'haggard', u'harpy',
-        u'hedge-pig', u'horn-beast', u'hugger-mugger', u'jolthead',
-        u'lewdster', u'lout', u'maggot-pie', u'malt-worm', u'mammet',
-        u'measle', u'minnow', u'miscreant', u'moldwarp', u'mumble-news',
-        u'nut-hook', u'pigeon-egg', u'pignut', u'puttock', u'pumpion',
-        u'ratsbane', u'scut', u'skainsmate', u'strumpet', u'varlet', u'vassal',
-        u'whey-face', u'wagtail',
-    ))
-
-    plnouns = ListOption('plnouns', u'List of plural nouns', (
-        u'anal warts', u'armadillo snouts', u'bat toenails', u'bug spit',
-        u'buzzard gizzards', u'cat bladders', u'cat hair', u'cat-hair-balls',
-        u'chicken piss', u'cold sores', u'craptacular carpet droppings',
-        u'dog balls', u'dog vomit', u'dung', u'eel ooze', u'entrails',
-        u"fat-woman's stomach-bile", u'fish heads', u'guano', u'gunk',
-        u'jizzum', u'pods', u'pond scum', u'poop', u'poopy', u'pus',
-        u'rat-farts', u'rat retch', u'red dye number-9', u'seagull puke',
-        u'slurpee-backwash', u'snake assholes', u'snake bait', u'snake snot',
-        u'squirrel guts', u'Stimpy-drool', u'Sun IPC manuals', u'toxic waste',
-        u'urine samples', u'waffle-house grits', u'yoo-hoo',
-    ))
-
-    @match(r'^(?:insult|flame)\s+(.+)$')
-    def insult(self, event, insultee):
-        articleadj = choice(self.adjectives)
-        articleadj = (articleadj[0] in u'aehiou' and u'an ' or u'a ') + articleadj
-
-        event.addresponse(choice((
-            u'%(insultee)s, thou %(adj1)s, %(adj2)s %(noun)s',
-            u'%(insultee)s is nothing but %(articleadj)s %(collection)s of %(adj1)s %(plnoun)s',
-        )), {
-            'insultee': insultee,
-            'adj1': choice(self.adjectives),
-            'adj2': choice(self.adjectives),
-            'articleadj': articleadj,
-            'collection': choice(self.collections),
-            'noun': choice(self.nouns),
-            'plnoun': choice(self.plnouns),
-        }, address=False)
-
-    loneadjectives = ListOption('loneadjectives',
-        'List of stand-alone adjectives for swearing', (
-            'bloody', 'damn', 'fucking', 'shitting', 'sodding', 'crapping',
-            'wanking', 'buggering',
-    ))
-
-    swearadjectives = ListOption('swearadjectives',
-        'List of adjectives to be combined with swearnouns', (
-            'reaming', 'lapping', 'eating', 'sucking', 'vokken', 'kak',
-            'donder', 'bliksem', 'fucking', 'shitting', 'sodding', 'crapping',
-            'wanking', 'buggering',
-    ))
-
-    swearnouns = ListOption('swearnouns',
-        'List of nounes to be comined with swearadjectives', (
-            'shit', 'cunt', 'hell', 'mother', 'god', 'maggot', 'father', 'crap',
-            'ball', 'whore', 'goat', 'dick', 'cock', 'pile', 'bugger', 'poes',
-            'hoer', 'kakrooker', 'ma', 'pa', 'naiier', 'kak', 'bliksem',
-            'vokker', 'kakrooker',
-    ))
-
-    swearlength = IntOption('swearlength', 'Number of expletives to swear with',
-                            15)
-
-    @match(r'^(?:swear|cuss|explete)(?:\s+at\s+(?:the\s+)?(.*))?$')
-    def swear(self, event, insultee):
-        swearage = []
-        for i in range(self.swearlength):
-            if random() > 0.7:
-                swearage.append(choice(self.loneadjectives))
-            else:
-                swearage.append(choice(self.swearnouns)
-                                + choice(self.swearadjectives))
-        if insultee is not None:
-            swearage.append(insultee)
-        else:
-            swearage.append(choice(self.swearnouns))
-
-        event.addresponse(u' '.join(swearage) + u'!', address=False)
-
-# vi: set et sta sw=4 ts=4:

=== removed file 'ibid/plugins/morse.py'
--- ibid/plugins/morse.py	2009-10-16 16:31:34 +0000
+++ ibid/plugins/morse.py	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-from ibid.plugins import Processor, match
-
-help = {}
-
-help["morse"] = u"Translates messages into and out of morse code."
-
-class Morse(Processor):
-    u"""morse (text|morsecode)"""
-    feature = 'morse'
-
-    _table = {
-        'A': ".-",
-        'B': "-...",
-        'C': "-.-.",
-        'D': "-..",
-        'E': ".",
-        'F': "..-.",
-        'G': "--.",
-        'H': "....",
-        'I': "..",
-        'J': ".---",
-        'K': "-.-",
-        'L': ".-..",
-        'M': "--",
-        'N': "-.",
-        'O': "---",
-        'P': ".--.",
-        'Q': "--.-",
-        'R': ".-.",
-        'S': "...",
-        'T': "-",
-        'U': "..-",
-        'V': "...-",
-        'W': ".--",
-        'X': "-..-",
-        'Y': "-.--",
-        'Z': "--..",
-        '0': "-----",
-        '1': ".----",
-        '2': "..---",
-        '3': "...--",
-        '4': "....-",
-        '5': ".....",
-        '6': "-....",
-        '7': "--...",
-        '8': "---..",
-        '9': "----.",
-        ' ': " ",
-        '.': ".-.-.-",
-        ',': "--..--",
-        '?': "..--..",
-        ':': "---...",
-        ';': "-.-.-.",
-        '-': "-....-",
-        '_': "..--.-",
-        '"': ".-..-.",
-        "'": ".----.",
-        '/': "-..-.",
-        '(': "-.--.",
-        ')': "-.--.-",
-        '=': "-...-",
-    }
-    _rtable = dict((v, k) for k, v in _table.items())
-
-    def _text2morse(self, text):
-        return u" ".join(self._table.get(c.upper(), c) for c in text)
-
-    def _morse2text(self, morse):
-        toks = morse.split(u' ')
-        return u"".join(self._rtable.get(t, u' ') for t in toks)
-
-    @match(r'^morse\s*(.*)$', 'deaddressed')
-    def morse(self, event, message):
-        if not (set(message) - set(u'-./ \t\n')):
-            event.addresponse(u'Decodes as %s', self._morse2text(message))
-        else:
-            event.addresponse(u'Encodes as %s', self._text2morse(message))
-
-# vi: set et sta sw=4 ts=4:

=== modified file 'ibid/plugins/network.py'
--- ibid/plugins/network.py	2009-12-30 14:08:03 +0000
+++ ibid/plugins/network.py	2010-01-18 18:54:16 +0000
@@ -3,13 +3,18 @@
 
 from dns.resolver import Resolver, NoAnswer, NXDOMAIN
 from dns.reversename import from_address
+from httplib import HTTPConnection, HTTPSConnection
+from urllib import getproxies_environment
+from urlparse import urlparse
 
 from ibid.plugins import Processor, match
-from ibid.config import Option
+from ibid.config import Option, IntOption
 from ibid.utils import file_in_path, unicode_output, human_join
+from ibid.utils.html import get_country_codes
 
 help = {}
 ipaddr = re.compile('\d+\.\d+\.\d+\.\d+')
+title = re.compile(r'<title>(.*)<\/title>', re.I+re.S)
 
 help['dns'] = u'Performs DNS lookups'
 class DNS(Processor):
@@ -166,4 +171,88 @@
             error = unicode_output(error.strip())
             event.addresponse(error.replace(u'\n', u' '))
 
+help['get'] = u'Retrieves a URL and returns the HTTP status and optionally the HTML title.'
+class HTTP(Processor):
+    u"""(get|head) <url>"""
+    feature = 'get'
+
+    max_size = IntOption('max_size', 'Only request this many bytes', 500)
+
+    @match(r'^(get|head)\s+(\S+\.\S+)$')
+    def handler(self, event, action, url):
+        if not url.lower().startswith("http://") and not url.lower().startswith("https://"):
+            url = "http://" + url
+        if url.count("/") < 3:
+            url += "/"
+
+        action = action.upper()
+
+        scheme, host = urlparse(url)[:2]
+        scheme = scheme.lower()
+        proxies = getproxies_environment()
+        if scheme in proxies:
+            scheme, host = urlparse(proxies[scheme])[:2]
+            scheme = scheme.lower()
+
+        if scheme == "https":
+            conn = HTTPSConnection(host)
+        else:
+            conn = HTTPConnection(host)
+
+        headers={}
+        if action == 'GET':
+            headers['Range'] = 'bytes=0-%s' % self.max_size
+        conn.request(action.upper(), url, headers=headers)
+
+        response = conn.getresponse()
+        reply = u'%s %s' % (response.status, response.reason)
+
+        data = response.read()
+        conn.close()
+
+        if action == 'GET':
+            match = title.search(data)
+            if match:
+                reply += u' "%s"' % match.groups()[0].strip()
+
+        event.addresponse(reply)
+
+help['tld'] = u"Resolve country TLDs (ISO 3166)"
+class TLD(Processor):
+    u""".<tld>
+    tld for <country>"""
+    feature = 'tld'
+
+    country_codes = {}
+
+    @match(r'^\.([a-zA-Z]{2})$')
+    def tld_to_country(self, event, tld):
+        if not self.country_codes:
+            self.country_codes = get_country_codes()
+
+        tld = tld.upper()
+
+        if tld in self.country_codes:
+            event.addresponse(u'%(tld)s is the TLD for %(country)s', {
+                'tld': tld,
+                'country': self.country_codes[tld],
+            })
+        else:
+            event.addresponse(u"ISO doesn't know about any such TLD")
+
+    @match(r'^tld\s+for\s+(.+)$')
+    def country_to_tld(self, event, location):
+        if not self.country_codes:
+            self.country_codes = get_country_codes()
+
+        for tld, country in self.country_codes.iteritems():
+            if location.lower() in country.lower():
+                event.addresponse(u'%(tld)s is the TLD for %(country)s', {
+                    'tld': tld,
+                    'country': country,
+                })
+                return
+
+        event.addresponse(u"ISO doesn't know about any TLD for %s", location)
+
 # vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/oeis.py'
--- ibid/plugins/oeis.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/oeis.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,74 @@
+from urllib2 import urlopen
+import re
+import logging
+
+from ibid.compat import defaultdict
+from ibid.plugins import Processor, match
+from ibid.utils import plural
+
+log = logging.getLogger('plugins.oeis')
+
+help = {}
+
+help['oeis'] = 'Query the Online Encyclopedia of Integer Sequences'
+class OEIS(Processor):
+    u"""oeis (A<OEIS number>|M<EIS number>|N<HIS number>)
+    oeis <term>[, ...]"""
+    
+    feature = 'oeis'
+
+    @match(r'^oeis\s+([AMN]\d+|-?\d(?:\d|-|,|\s)*)$')
+    def oeis (self, event, query):
+        query = re.sub(r'(,|\s)+', ',', query)
+        f = urlopen('http://www.research.att.com/~njas/sequences/?n=1&fmt=3&q='
+                    + query)
+
+        f.next() # the first line is uninteresting
+        results_m = re.search(r'(\d+) results found', f.next())
+        if results_m:
+            f.next()
+            sequence = Sequence(f)
+            event.addresponse(u'%(name)s - %(url)s - %(values)s', 
+                                {'name': sequence.name,
+                                 'url': sequence.url(),
+                                 'values': sequence.values})
+        
+            results = int(results_m.group(1))
+            if results > 1:
+                event.addresponse(u'There %(was)s %(count)d more %(results)s. '
+                                  u'See %(url)s%(query)s for more.',
+                    {'was': plural(results-1, 'was', 'were'),
+                     'count': results-1,
+                     'results': plural(results-1, 'result', 'results'),
+                     'url':
+                      'http://www.research.att.com/~njas/sequences/?fmt=1&q=',
+                     'query': query})
+        else:
+            event.addresponse(u"I couldn't find that sequence.")
+
+class Sequence(object):
+    def __init__ (self, lines):
+        cmds = defaultdict(list)
+        for line in lines:
+            line = line.lstrip()[:-1]
+            if not line:
+                break
+
+            line_m = re.match(r'%([A-Z]) (A\d+)(?: (.*))?$', line)
+            if line_m:
+                cmd, self.catalog_num, info = line_m.groups()
+                cmds[cmd].append(info)
+            else:
+                cmds[cmd][-1] += line
+
+        # %V, %W and %X give signed values if the sequence is signed.
+        # Otherwise, only %S, %T and %U are given.
+        self.values = (''.join(cmds['V'] + cmds['W'] + cmds['X']) or
+                        ''.join(cmds['S'] + cmds['T'] + cmds['U']))
+        
+        self.name = ''.join(cmds['N'])
+
+    def url (self):
+        return 'http://www.research.att.com/~njas/sequences/' + self.catalog_num
+
+# vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/quotes.py'
--- ibid/plugins/quotes.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/quotes.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,419 @@
+from urllib2 import urlopen, HTTPError
+from urllib import urlencode, quote
+from httplib import BadStatusLine
+from urlparse import urljoin
+from random import choice, shuffle, randint
+from sys import exc_info
+from subprocess import Popen, PIPE
+import logging
+import re
+
+from ibid.compat import ElementTree
+from ibid.config import Option, BoolOption
+from ibid.plugins import Processor, match, RPC
+from ibid.utils.html import get_html_parse_tree
+from ibid.utils import file_in_path, unicode_output
+
+log = logging.getLogger('plugins.quotes')
+
+help = {}
+
+help['fortune'] = u'Returns a random fortune.'
+class Fortune(Processor, RPC):
+    u"""fortune"""
+    feature = 'fortune'
+
+    fortune = Option('fortune', 'Path of the fortune executable', 'fortune')
+
+    def __init__(self, name):
+        super(Fortune, self).__init__(name)
+        RPC.__init__(self)
+
+    def setup(self):
+        if not file_in_path(self.fortune):
+            raise Exception("Cannot locate fortune executable")
+
+    @match(r'^fortune$')
+    def handler(self, event):
+        fortune = self.remote_fortune()
+        if fortune:
+            event.addresponse(fortune)
+        else:
+            event.addresponse(u"Couldn't execute fortune")
+
+    def remote_fortune(self):
+        fortune = Popen(self.fortune, stdout=PIPE, stderr=PIPE)
+        output, error = fortune.communicate()
+        code = fortune.wait()
+
+        output = unicode_output(output.strip(), 'replace')
+
+        if code == 0:
+            return output
+        else:
+            return None
+
+help['bash'] = u'Retrieve quotes from bash.org.'
+class Bash(Processor):
+    u"bash[.org] [(random|<number>)]"
+
+    feature = 'bash'
+
+    public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
+
+    @match(r'^bash(?:\.org)?(?:\s+(random|\d+))?$')
+    def bash(self, event, id):
+        id = id is None and u'random' or id.lower()
+
+        if id == u'random' and event.public and not self.public_browse:
+            event.addresponse(u'Sorry, not in public. PM me')
+            return
+
+        soup = get_html_parse_tree('http://bash.org/?%s' % id)
+
+        number = u"".join(soup.find('p', 'quote').find('b').contents)
+        output = [u'%s:' % number]
+
+        body = soup.find('p', 'qt')
+        if not body:
+            event.addresponse(u"There's no such quote, but if you keep talking like that maybe there will be")
+        else:
+            for line in body.contents:
+                line = unicode(line).strip()
+                if line != u'<br />':
+                    output.append(line)
+            event.addresponse(u'\n'.join(output), conflate=False)
+
+help['fml'] = u'Retrieves quotes from fmylife.com.'
+class FMLException(Exception):
+    pass
+
+class FMyLife(Processor):
+    u"""fml (<number> | [random] | flop | top | last | love | money | kids | work | health | sex | miscellaneous )"""
+
+    feature = "fml"
+
+    api_url = Option('fml_api_url', 'FML API URL base', 'http://api.betacie.com/')
+    # The Ibid API Key, registered by Stefano Rivera:
+    api_key = Option('fml_api_key', 'FML API Key', '4b39a7fcaf01c')
+    fml_lang = Option('fml_lang', 'FML Lanugage', 'en')
+
+    public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
+
+    failure_messages = (
+            u'Today, I tried to get a quote for %(nick)s but failed. FML',
+            u'Today, FML is down. FML',
+            u"Sorry, it's broken, the FML admins must having a really bad day",
+    )
+
+    def remote_get(self, id):
+        url = urljoin(self.api_url, 'view/%s?%s' % (
+            id.isalnum() and id + '/nocomment' or quote(id),
+            urlencode({'language': self.fml_lang, 'key': self.api_key}))
+        )
+        f = urlopen(url)
+        try:
+            tree = ElementTree.parse(f)
+        except SyntaxError:
+            class_, e, tb = exc_info()
+            new_exc = FMLException(u'XML Parsing Error: %s' % unicode(e))
+            raise new_exc.__class__, new_exc, tb
+
+        if tree.find('.//error'):
+            raise FMLException(tree.findtext('.//error'))
+
+        item = tree.find('.//item')
+        if item:
+            url = u"http://www.fmylife.com/%s/%s" % (
+                item.findtext('category'),
+                item.get('id'),
+            )
+            text = item.find('text').text
+            return u'%s\n- %s' % (text, url)
+
+    @match(r'^(?:fml\s+|http://www\.fmylife\.com/\S+/)(\d+|random|flop|top|last|love|money|kids|work|health|sex|miscellaneous)$')
+    def fml(self, event, id):
+        try:
+            body = self.remote_get(id)
+        except (FMLException, HTTPError, BadStatusLine):
+            event.addresponse(choice(self.failure_messages) % event.sender)
+            return
+
+        if body:
+            event.addresponse(body)
+        elif id.isdigit():
+            event.addresponse(u'No such quote')
+        else:
+            event.addresponse(choice(self.failure_messages) % event.sender)
+
+    @match(r'^fml$')
+    def fml_default(self, event):
+        if not event.public or self.public_browse:
+            self.fml(event, 'random')
+        else:
+            event.addresponse(u'Sorry, not in public. PM me')
+
+help["tfln"] = u"Looks up quotes from textsfromlastnight.com"
+class TextsFromLastNight(Processor):
+    u"""tfln [(random|<number>)]
+    tfln (worst|best) [(today|this week|this month)]"""
+
+    feature = 'tfln'
+
+    public_browse = BoolOption('public_browse', 'Allow random quotes in public', True)
+
+    random_pool = []
+
+    def get_tfln(self, section):
+        tree = get_html_parse_tree('http://textsfromlastnight.com/%s/' % section.lower())
+        for div in tree.findAll('div', attrs={'class': 'post_wrap'}):
+            id = int(div.get('id').split('_', 1)[1])
+            message = []
+            line = ''
+            for a in div.findAll('div', attrs={'class': 'post_content'})[0].findAll('a'):
+                if a['href'].startswith('/areacode/'):
+                    line = u'%s: ' % a.contents[0]
+                else:
+                    message.append(line + a.contents[0])
+            yield id, message
+
+    @match(r'^tfln'
+            r'(?:\s+(random|worst|best|\d+))?'
+            r'(?:this\s+)?(?:\s+(today|week|month))?$')
+    def tfln(self, event, number, timeframe=None):
+        number = number is None and u'random' or number.lower()
+
+        if number == u'random' and not timeframe \
+                and event.public and not self.public_browse:
+            event.addresponse(u'Sorry, not in public. PM me')
+            return
+
+        if number in (u'worst', u'best'):
+            number += u'-nights'
+            if timeframe.lower() in (u'week', u'month'):
+                number += u'this-' + timeframe.lower()
+        elif number.isdigit():
+            number = 'view/%s' % number
+
+        if number == u'random':
+            if not self.random_pool:
+                self.random_pool = [message for message in self.get_tfln(number)]
+                shuffle(self.random_pool)
+
+            message = self.random_pool.pop()
+        else:
+            try:
+                message = self.get_tfln(number).next()
+            except StopIteration:
+                event.addresponse(u'No such quote')
+                return
+
+        id, body = message
+        if len(body) > 1:
+            for line in body:
+                event.addresponse(line)
+            event.addresponse(u'- http://textsfromlastnight.com/view/%i', id)
+        else:
+            event.addresponse(u'%(body)s\n- http://textsfromlastnight.com/view/%(id)i', {
+                'id': id,
+                'body': body[0],
+            })
+
+    @match(r'^(?:http://)?(?:www\.)?textsfromlastnight\.com/view/(\d+)$')
+    def tfln_url(self, event, id):
+        self.tfln(event, id)
+
+help["mlia"] = u"Looks up quotes from MyLifeIsAverage.com and MyLifeIsG.com"
+class MyLifeIsAverage(Processor):
+    u"""mlia [(<number> | random | recent | today | yesterday | this week | this month | this year )]
+    mlig [(<number> | random | recent | today | yesterday | this week | this month | this year )]"""
+
+    feature = 'mlia'
+
+    public_browse = BoolOption('public_browse',
+                               'Allow random quotes in public', True)
+
+    random_pool = {}
+    pages = {}
+
+    def find_stories(self, url, site='mlia'):
+        if isinstance(url, basestring):
+            tree = get_html_parse_tree(url, treetype='etree')
+        else:
+            tree = url
+
+        stories = [div for div in tree.findall('.//div')
+                       if div.get(u'class') in
+                            (u'story s', # mlia
+                             u'stories', u'stories-wide')] # mlig
+
+        for story in stories:
+            if site == 'mlia':
+                body = story.findtext('div').strip()
+            else:
+                body = story.findtext('div/span/span').strip()
+            id = story.findtext('.//a')
+            if isinstance(id, basestring) and id[1:].isdigit():
+                id = int(id[1:])
+                yield id, body
+
+    @match(r'^(mli[ag])(?:\s+this)?'
+           r'(?:\s+(\d+|random|recent|today|yesterday|week|month|year))?$')
+    def mlia(self, event, site, query):
+        query = query is None and u'random' or query.lower()
+
+        if query == u'random' and event.public and not self.public_browse:
+            event.addresponse(u'Sorry, not in public. PM me')
+            return
+
+        site = site.lower()
+        url = {
+                'mlia': 'http://mylifeisaverage.com/',
+                'mlig': 'http://mylifeisg.com/',
+            }[site]
+
+        if query == u'random' or query is None:
+            if not self.random_pool.get(site):
+                if site == 'mlia':
+                    purl = url + str(randint(1, self.pages.get(site, 1)))
+                else:
+                    purl = url + 'index.php?' + urlencode({
+                            'page': randint(1, self.pages.get(site, 1))
+                        })
+                tree = get_html_parse_tree(purl, treetype='etree')
+                self.random_pool[site] = [story for story
+                        in self.find_stories(tree, site=site)]
+                shuffle(self.random_pool[site])
+
+                if site == 'mlia':
+                    pagination = [ul for ul in tree.findall('.//ul')
+                                           if ul.get(u'class') == u'pages'][0]
+                    self.pages[site] = int(
+                        [li for li in pagination.findall('li')
+                            if li.get(u'class') == u'last'][0]
+                        .find(u'a').get(u'href'))
+                else:
+                    pagination = [div for div in tree.findall('.//div')
+                                      if div.get(u'class') == u'pagination'][0]
+                    self.pages[site] = sorted(int(a.text) for a
+                            in pagination.findall('.//a')
+                            if a.text.isdigit())[-1]
+
+            story = self.random_pool[site].pop()
+
+        else:
+            try:
+                if site == 'mlia':
+                    if query.isdigit():
+                        surl = url + '/s/' + query
+                    else:
+                        surl = url + '/best/' + query
+                else:
+                    if query.isdigit():
+                        surl = url + 'story.php?' + urlencode({'id': query})
+                    else:
+                        surl = url + 'index.php?' + urlencode({'part': query})
+
+                story = self.find_stories(surl, site=site).next()
+
+            except StopIteration:
+                event.addresponse(u'No such quote')
+                return
+
+        id, body = story
+        if site == 'mlia':
+            url += 's/%i' % id
+        else:
+            url += 'story.php?id=%i' % id
+        event.addresponse(u'%(body)s\n- %(url)s', {
+            'url': url,
+            'body': body,
+        })
+
+    @match(r'^(?:http://)?(?:www\.)?mylifeis(average|g)\.com'
+           r'/story\.php\?id=(\d+)$')
+    def mlia_url(self, event, site, id):
+        self.mlia(event, 'mli' + site[0].lower(), id)
+
+help['bible'] = u'Retrieves Bible verses'
+class Bible(Processor):
+    u"""bible <passages> [in <version>]
+    <book> <verses> [in <version>]"""
+
+    feature = 'bible'
+    # http://labs.bible.org/api/ is an alternative
+    # Their feature set is a little different, but they should be fairly
+    # compatible
+    api_url = Option('bible_api_url', 'Bible API URL base',
+                    'http://api.preachingcentral.com/bible.php')
+
+    psalm_pat = re.compile(r'\bpsalm\b', re.IGNORECASE)
+
+    # The API doesn't seem to work with the apocrypha, even when looking in
+    # versions that include it
+    books = '|'.join(['Genesis', 'Exodus', 'Leviticus', 'Numbers', 'Deuteronomy',
+    'Joshua', 'Judges', 'Ruth', '(?:1|2|I|II) Samuel', '(?:1|2|I|II) Kings',
+    '(?:1|2|I|II) Chronicles', 'Ezra', 'Nehemiah', 'Esther', 'Job', 'Psalms?',
+    'Proverbs', 'Ecclesiastes', 'Song(?: of (?:Songs|Solomon)?)?',
+    'Canticles', 'Isaiah', 'Jeremiah', 'Lamentations',
+    'Ezekiel', 'Daniel', 'Hosea', 'Joel', 'Amos', 'Obadiah', 'Jonah', 'Micah',
+    'Nahum', 'Habakkuk', 'Zephaniah', 'Haggai', 'Zechariah', 'Malachi',
+    'Matthew', 'Mark', 'Luke', 'John', 'Acts', 'Romans',
+    '(?:1|2|I|II) Corinthians', 'Galatians', 'Ephesians', 'Philippians',
+    'Colossians', '(?:1|2|I|II) Thessalonians', '(?:1|2|I|II) Timothy',
+    'Titus', 'Philemon', 'Hebrews', 'James', '(?:1|2|I|II) Peter',
+    '(?:1|2|3|I|II|III) John', 'Jude',
+    'Revelations?(?: of (?:St.|Saint) John)?']).replace(' ', '\s*')
+
+    @match(r'^bible\s+(.*?)(?:\s+(?:in|from)\s+(.*))?$')
+    def bible(self, event, passage, version=None):
+        passage = self.psalm_pat.sub('psalms', passage)
+
+        params = {'passage': passage.encode('utf-8'),
+                  'type': 'xml',
+                  'formatting': 'plain'}
+        if version:
+            params['version'] = version.lower().encode('utf-8')
+
+        f = urlopen(self.api_url + '?' + urlencode(params))
+        tree = ElementTree.parse(f)
+
+        message = self.formatPassage(tree)
+        if message:
+            event.addresponse(message)
+        errors = list(tree.findall('.//error'))
+        if errors:
+            event.addresponse('There were errors: %s.', '. '.join(err.text for err in errors))
+        elif not message:
+            event.addresponse("I couldn't find that passage.")
+   
+    # Allow queries which are quite definitely bible references to omit "bible".
+    # Specifically, they must start with the name of a book and be followed only
+    # by book names, chapters and verses.
+    @match(r'^((?:(?:' + books + ')(?:\d|[-:,]|\s)*)+?)(?:\s+(?:in|from)\s+(.*))?$')
+    def bookbible(self, *args):
+        self.bible(*args)
+
+    def formatPassage(self, xml):
+        message = []
+        oldref = (None, None, None)
+        for item in xml.findall('.//item'):
+            ref, text = self.verseInfo(item)
+            if oldref[0] != ref[0]:
+                message.append(u'(%s %s:%s)' % ref)
+            elif oldref[1] != ref[1]:
+                message.append(u'(%s:%s)' % ref[1:])
+            else:
+                message.append(u'%s' % ref[2])
+            oldref = ref
+
+            message.append(text)
+
+        return u' '.join(message)
+    
+    def verseInfo(self, xml):
+        book, chapter, verse, text = map(xml.findtext,
+                                        ('bookname', 'chapter', 'verse', 'text'))
+        return ((book, chapter, verse), text)
+
+# vi: set et sta sw=4 ts=4:

=== added file 'ibid/plugins/social.py'
--- ibid/plugins/social.py	1970-01-01 00:00:00 +0000
+++ ibid/plugins/social.py	2010-01-18 18:54:16 +0000
@@ -0,0 +1,120 @@
+from urllib2 import HTTPError
+from time import time
+from datetime import datetime
+import re
+import logging
+
+import feedparser
+
+from ibid.compat import dt_strptime
+from ibid.config import DictOption
+from ibid.plugins import Processor, match, handler
+from ibid.utils import ago, decode_htmlentities, json_webservice
+
+log = logging.getLogger('plugins.social')
+help = {}
+
+help['lastfm'] = u'Lists the tracks last listened to by the specified user.'
+class LastFm(Processor):
+    u"last.fm for <username>"
+
+    feature = "lastfm"
+
+    @match(r'^last\.?fm\s+for\s+(\S+?)\s*$')
+    def listsongs(self, event, username):
+        songs = feedparser.parse('http://ws.audioscrobbler.com/1.0/user/%s/recenttracks.rss?%s' % (username, time()))
+        if songs['bozo']:
+            event.addresponse(u'No such user')
+        else:
+            event.addresponse(u', '.join(u'%s (%s ago)' % (
+                    e.title,
+                    ago(event.time - dt_strptime(e.updated, '%a, %d %b %Y %H:%M:%S +0000'), 1)
+                ) for e in songs['entries']))
+
+help["microblog"] = u"Looks up messages on microblogging services like twitter and identica."