Check in some initial code for the new network stuff design.

p2p/Buddy.py

@@ -0,0 +1,32 @@
+import pwd
+import os
+
+import Service
+
+class Buddy:
+	def __init__(self, service, nick_name):
+		self._service = service
+		self._nick_name = nick_name
+		
+	def get_service(self):
+		return self._service
+		
+	def get_nick_name(self):
+		return self._nick_name
+		
+class Owner(Buddy):
+	instance = None
+
+	def __init__(self):
+		ent = pwd.getpwuid(os.getuid())
+		nick = ent[0]
+		if not nick or not len(nick):
+			nick = "n00b"
+		Buddy.__init__(self, None, nick)
+
+	def get_instance():
+		if not Owner.instance:
+			Owner.instance = Owner()
+		return Owner.instance
+
+	get_instance = staticmethod(get_instance)

p2p/Group.py

@@ -0,0 +1,83 @@
+import avahi
+
+import presence
+from Buddy import *
+from Service import *
+
+BUDDY_JOIN = "join"
+BUDDY_LEAVE = "leave"
+
+BUDDY_SERVICE_TYPE = "_olpc_buddy._tcp"
+BUDDY_SERVICE_PORT = 666
+
+class Group:
+	def __init__(self):
+		self._listeners = []
+	
+	def join(self, buddy):
+		pass
+	
+	def add_listener(self, group_listener):
+		self._listeners.append(group_listener)
+		
+	def _notify_buddy_join(self, buddy):
+		for listener in self._listeners:
+			listener(BUDDY_JOIN, buddy)
+	
+	def _notify_buddy_leave(self, buddy):
+		for listener in self._listeners:
+			listener(BUDDY_LEAVE,buddy)
+
+class LocalGroup(Group):
+	def __init__(self):
+		Group.__init__(self)
+
+		self._services = {}
+		self._buddies = {}
+
+		self._pdiscovery = presence.PresenceDiscovery()
+		self._pdiscovery.add_service_listener(self._on_service_change)
+		self._pdiscovery.start()
+
+	def join(self):
+		self._pannounce = presence.PresenceAnnounce()
+		name = Owner.get_instance().get_nick_name()
+		self._pannounce.register_service(name, BUDDY_SERVICE_PORT, BUDDY_SERVICE_TYPE,
+										 nickname = name)
+
+	def _on_service_change(self, action, interface, protocol, name, stype, domain, flags):
+		if action == presence.ACTION_SERVICE_NEW:
+			self._pdiscovery.resolve_service(interface, protocol, name, stype, domain,
+											 self._on_service_resolved)
+		elif action == presence.ACTION_SERVICE_REMOVED:
+			del self._services[name]
+			self._remove_buddy(name)
+						
+	def _on_service_resolved(self, interface, protocol, name, stype, domain,
+							 host, aprotocol, address, port, txt, flags):
+		service = Service(name, host, address, port)
+		self._services[name] = service
+		if stype == BUDDY_SERVICE_TYPE:
+			self._add_buddy(service, txt)
+
+	def _add_buddy(self, service, txt):
+		name = service.get_name()
+		if not self._buddies.has_key(name):
+			data = self._pair_to_dict(avahi.txt_array_to_string_array(txt))
+			buddy = Buddy(service, data['nickname'])
+			self._buddies[name] = buddy
+			self._notify_buddy_join(buddy)
+	
+	def _remove_buddy(self, name):
+		self._notify_buddy_leave(self._buddies[name])
+		del self._buddies[name]
+		
+	def _pair_to_dict(self, l):
+		res = {}
+		for el in l:
+			tmp = el.split('=', 1)
+			if len(tmp) > 1:
+				res[tmp[0]] = tmp[1]
+			else:
+				res[tmp[0]] = ''
+		return res

p2p/Service.py

@@ -0,0 +1,18 @@
+class Service(object):
+	def __init__(self, name, host, address, port):
+		self._name = name
+		self._host = host
+		self._address = str(address)
+		self._port = int(port)
+
+	def get_name(self):
+		return self._name
+
+	def get_host(self):
+		return self._host
+
+	def get_address(self):
+		return self._address
+
+	def get_port(self):
+		return self._port

p2p/StreamReader.py

@@ -0,0 +1,4 @@
+class StreamReader:
+	def __init__(service, callback):
+		self._service == service
+		self._callback = callback

p2p/StreamWriter.py

@@ -0,0 +1,6 @@
+class StreamWriter:
+	def __init__(service):
+		self._service = service
+		
+	def write(self, data):
+		pass