From db90d4a209587e7d35d36c7d3974b144aeec97c3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 23 Jun 2006 13:13:28 -0400 Subject: [PATCH] Use random port for local models, clean up some model code, and don't double-register models when we hear our own announcement --- activities/browser/BrowserActivity.py | 3 +-- sugar/p2p/model/LocalModel.py | 3 +-- sugar/p2p/model/RemoteModel.py | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index e49cfb4c..168ad86e 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -44,7 +44,7 @@ class BrowserActivity(Activity): if self._mode != BrowserActivity.LEADING: self._model_service = service - if self._notif_service and self._model_service: + if not self._model and self._notif_service and self._model_service: self._model = RemoteModel(self._model_service, self._notif_service) self._model.add_listener(self.__shared_location_changed_cb) @@ -58,7 +58,6 @@ class BrowserActivity(Activity): self._model.set_value('title', title) def __notif_bar_action_cb(self, bar, action_id): - print action_id if action_id == 'set_shared_location': self._update_shared_location() elif action_id == 'goto_shared_location': diff --git a/sugar/p2p/model/LocalModel.py b/sugar/p2p/model/LocalModel.py index f293ef3f..21ee9dfe 100644 --- a/sugar/p2p/model/LocalModel.py +++ b/sugar/p2p/model/LocalModel.py @@ -17,7 +17,6 @@ class ModelRequestHandler(object): class LocalModel(AbstractModel): SERVICE_TYPE = "_olpc_model._tcp" - SERVICE_PORT = 6300 def __init__(self, activity, pservice, service): AbstractModel.__init__(self) @@ -40,7 +39,7 @@ class LocalModel(AbstractModel): def _setup_service(self): service = self._pservice.share_activity(self._activity, stype = LocalModel.SERVICE_TYPE, - address = '', port = LocalModel.SERVICE_PORT) + address = '') self._setup_server(service) # FIXME this is duplicated with StreamReader diff --git a/sugar/p2p/model/RemoteModel.py b/sugar/p2p/model/RemoteModel.py index 00b3cb6a..28de2ae3 100644 --- a/sugar/p2p/model/RemoteModel.py +++ b/sugar/p2p/model/RemoteModel.py @@ -24,6 +24,5 @@ class RemoteModel(AbstractModel): self._client.set_value(key, value) def _setup_notification_listener(self): - name = self._service.get_name() self._notification = NotificationListener(self._notification_service) self._notification.add_listener(self._notify_model_change)