Split the model classes in different files

sugar/p2p/model/LocalModel.py

@@ -0,0 +1,52 @@
+import socket
+import xmlrpclib
+
+from sugar.p2p.Service import Service
+
+MODEL_SERVICE_TYPE = "_olpc_model._tcp"
+MODEL_SERVICE_PORT = 6300
+
+class ModelRequestHandler(object):
+	def __init__(self, model):
+		self._model = model
+
+	def get_value(self, key):
+		return self._model.get_value(key)
+
+	def set_value(self, key, value):
+		return self._model.set_value(key, value)
+
+class LocalModel:
+	def __init__(self, group, model_id):
+		self._group = group
+		self._model_id = model_id
+		self._values = {}
+		
+		self._setup_service()
+	
+	def get_value(self, key):
+		return self._values[key]
+		
+	def set_value(self, key, value):
+		self._values[key] = value
+
+	def _setup_service(self):
+		service = Service(self._model_id, MODEL_SERVICE_TYPE,
+						  '', MODEL_SERVICE_PORT)
+		self._setup_server(service)
+		service.register(self._group)
+		
+	# FIXME this is duplicated with StreamReader
+	def _setup_server(self, service):
+		started = False
+		tries = 10
+		port = service.get_port()
+		while not started and tries > 0:
+			try:
+				p2p_server = network.GlibXMLRPCServer(("", port))
+				p2p_server.register_instance(ModelRequestHandler(self))
+				started = True
+			except(socket.error):
+				port = port + 1
+				tries = tries - 1
+		service.set_port(port)

sugar/p2p/model/Makefile.am

@@ -0,0 +1,6 @@
+sugardir = $(pythondir)/sugar/p2p/model
+sugar_PYTHON =			\
+	__init__.py		\
+	LocalModel.py		\
+	RemoteModel.py		\
+	Store.py

sugar/p2p/model/RemoteModel.py

@@ -0,0 +1,17 @@
+import xmlrpclib
+
+from sugar.p2p.Service import Service
+import network
+
+class RemoteModel:
+	def __init__(self, service):
+		self._service = service
+		
+		addr = "http://%s:%d" % (service.get_address(), service.get_port())
+		self._client = xmlrpclib.ServerProxy(addr)
+
+	def get_value(self, key):
+		return self._client.get_value(key)
+		
+	def set_value(self, key, value):
+		self._client.set_value(key, value)

sugar/p2p/model/Store.py

@@ -0,0 +1,22 @@
+from sugar.p2p.model.RemoteModel import RemoteModel
+from sugar.p2p.model.LocalModel import LocalModel
+
+class Store:
+	def __init__(self, group):
+		self._group = group
+		self._local_models = {}
+	
+	def create_model(self, model_id):
+		model = LocalModel(self._group, model_id)
+		self._local_models[model_id] = model
+		return model
+	
+	def get_model(self, model_id):
+		if self._local_models.has_key(model_id):
+			return self._local_models(model_id)
+		else:
+			service = self._group.get_service(model_id, MODEL_SERVICE_TYPE)
+			if service:
+				return RemoteModel(service)
+			else:
+				return None