trivia - add date to topstreaks

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index 91e05843dd306a49adc15596806d6d2ed3aa5d51..cc1c47c7a6ac179391c6bc268da0c161fb6814bc 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -170,33 +170,61 @@ class modlib(object):
                        return func
                return realhook
 
-       def bind_tcp(self, host, port):
-               return self._hooksocket(socket.AF_INET, socket.SOCK_STREAM, (host, port))
-       def bind_udp(self, host, port):
-               return self._hooksocket(socket.AF_INET, socket.SOCK_DGRAM, (host, port))
-       def bind_unix(self, path):
-               return self._hooksocket(socket.AF_UNIX, socket.SOCK_STREAM, path)
-       def _hooksocket(self, af, ty, address):
+       def bind(self, bindto, data=None):
+               """Used as a decorator on a class which implements getdata and parse methods.
+                       See modules/sockets.py for an example.
+                       Takes an arg like:
+                       [unix:]/foo/bar
+                       [udp|tcp:][ip:]port
+               """
+               if len(bindto) == 0:
+                       raise Exception('bindto must have a value')
+               if bindto[0] == '/':
+                       return self._hooksocket(socket.AF_UNIX, socket.SOCK_STREAM, bindto)
+               if len(bindto) > 5 and bindto[0:5] == 'unix:':
+                       return self._hooksocket(socket.AF_UNIX, socket.SOCK_STREAM, bindto[5:])
+               af = socket.AF_INET
+               ty = socket.SOCK_STREAM
+               host = '0.0.0.0'
+               if len(bindto) > 4 and bindto[0:4] == 'udp:':
+                       ty = socket.SOCK_DGRAM
+                       bindto = bindto[4:]
+               if len(bindto) > 4 and bindto[0:4] == 'tcp:':
+                       bindto = bindto[4:]
+               if ':' in bindto:
+                       pieces = bindto.rsplit(':', 1)
+                       host = pieces[0]
+                       bindto = pieces[1]
+               port = int(bindto)
+               return self._hooksocket(af, ty, (host, port), data)
+
+       def bind_tcp(self, host, port, data=None):
+               return self._hooksocket(socket.AF_INET, socket.SOCK_STREAM, (host, port), data)
+       def bind_udp(self, host, port, data=None):
+               return self._hooksocket(socket.AF_INET, socket.SOCK_DGRAM, (host, port), data)
+       def bind_unix(self, path, data=None):
+               return self._hooksocket(socket.AF_UNIX, socket.SOCK_STREAM, path, data)
+       def _hooksocket(self, af, ty, address, data):
                def realhook(cls):
                        if not (hasattr(cls, 'getdata') and callable(cls.getdata)):
                                # Check early that the object implements getdata.
                                # If getdata ever returns a non-empty list, then a parse method must also exist, but we don't check that.
                                raise Exception('Attempted to hook a socket without a class to process data')
-                       self.sockhooks.append((af, ty, address, cls))
+                       self.sockhooks.append((af, ty, address, cls, data))
                        if self.parent is not None:
-                               self._create_socket(af, ty, address, cls)
+                               self._create_socket(af, ty, address, cls, data)
                        return cls
                return realhook
-       def _create_socket(self, af, ty, address, cls):
+       def _create_socket(self, af, ty, address, cls, data):
                ty = ty | socket.SOCK_NONBLOCK
                sock = socket.socket(af, ty)
                sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                sock.bind(address)
-               obj = _ListenSocket(self, sock, cls)
+               obj = _ListenSocket(self, sock, cls, data)
                self.sockets.append((sock,obj))
                sock.listen(5)
                self.parent.newfd(obj, sock.fileno())
-               self.parent.log(repr(obj), '?', 'Socket ready to accept new connections')
+               self.parent.log(repr(obj), '?', 'Socket ready to accept new connections (%r, %r, %r, %r)' % (af, ty, address, cls))
        def _destroy_socket(self, sock, obj):
                obj.close()
 
@@ -250,11 +278,12 @@ class modlib(object):
                return realhook
 
 class _ListenSocket(object):
-       def __init__(self, lib, sock, cls):
+       def __init__(self, lib, sock, cls, data):
                self.clients = []
                self.lib = lib
                self.sock = sock
                self.cls = cls
+               self.data = data
 
        def _make_closer(self, obj, client):
                def close():
@@ -271,7 +300,7 @@ class _ListenSocket(object):
 
        def getdata(self):
                client, addr = self.sock.accept()
-               obj = self.cls(client)
+               obj = self.cls(client, self.data)
                obj.close = self._make_closer(obj, client)
                self.lib.parent.log(repr(self), '?', 'New connection #%d from %s' % (client.fileno(), addr))
                self.clients.append((client,obj))