diff options
Diffstat (limited to 'activities/web/linkscontroller.py')
-rw-r--r-- | activities/web/linkscontroller.py | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/activities/web/linkscontroller.py b/activities/web/linkscontroller.py index 109c7bb..417b37a 100644 --- a/activities/web/linkscontroller.py +++ b/activities/web/linkscontroller.py @@ -2,29 +2,43 @@ from sugar.p2p.Stream import Stream from sugar.presence import PresenceService class _Marshaller(object): - def marshal(self, title, address): - return title + '\n' + address + def __init__(self, title, address): + pservice = PresenceService.get_instance() + name = pservice.get_owner().get_name() + self._message = name + '\n' + title + '\n' + address - def demarshal(self, message): - return message.split('\n') + def get_message(self): + return self._message + +class _Demarshaller(object): + def __init__(self, message): + self._pservice = PresenceService.get_instance() + self._split_msg = message.split('\n') + + def get_buddy(self): + return self._pservice.get_buddy_by_name(self._split_msg[0]) + + def get_title(self): + return self._split_msg[1] + + def get_address(self): + return self._split_msg[2] class LinksController(object): def __init__(self, service, model): self._model = model - self._pservice = PresenceService.get_instance() - self._marshaller = _Marshaller() - self._stream = Stream.new_from_service(service) self._stream.set_data_listener(self._recv_message) self._stream_writer = self._stream.new_writer() def post_link(self, title, address): - message = self._marshaller.marshal(title, address) - self._stream_writer.write(message) + marshaller = _Marshaller(title, address) + self._stream_writer.write(marshaller.get_message()) def _recv_message(self, address, msg): - buddy = self._pservice.get_buddy_by_address(address) + demarshaller = _Demarshaller(msg) + buddy = demarshaller.get_buddy() if buddy: - link = self._marshaller.demarshal(msg) - self._model.add_link(buddy, *link) + self._model.add_link(buddy, demarshaller.get_title(), + demarshaller.get_address()) |