summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorDuda Dornelles <ddornell@thoughtworks.com>2014-10-21 14:59:45 +0200
committerDuda Dornelles <ddornell@thoughtworks.com>2014-10-21 14:59:50 +0200
commit4782ec70a4f70b7735bb9cb3ef0207448229c02a (patch)
treedfcd90a16e98bc291303627f288c9bebbf24d259 /service
parentd2c4f711da1ddb0e28bc0868e4c33c1aa1aadc26 (diff)
Adding sync_info controller for #117
Diffstat (limited to 'service')
-rw-r--r--service/pixelated/config/app_factory.py9
-rw-r--r--service/pixelated/controllers/__init__.py1
-rw-r--r--service/pixelated/controllers/sync_info_controller.py42
-rw-r--r--service/test/unit/controllers/sync_info_controller_test.py50
4 files changed, 100 insertions, 2 deletions
diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py
index 1d006506..9ea00bb9 100644
--- a/service/pixelated/config/app_factory.py
+++ b/service/pixelated/config/app_factory.py
@@ -30,6 +30,7 @@ from leap.common.events import (
register,
events_pb2 as proto
)
+from pixelated.controllers import sync_info_controller
def init_index_and_delete_duplicate_inboxes(querier, search_engine, mail_service):
@@ -40,7 +41,7 @@ def init_index_and_delete_duplicate_inboxes(querier, search_engine, mail_service
return wrapper
-def _setup_routes(app, home_controller, mails_controller, tags_controller, features_controller):
+def _setup_routes(app, home_controller, mails_controller, tags_controller, features_controller, sync_info_controller):
# home
app.add_url_rule('/', methods=['GET'], view_func=home_controller.home)
# mails
@@ -59,6 +60,8 @@ def _setup_routes(app, home_controller, mails_controller, tags_controller, featu
app.add_url_rule('/tags', methods=['GET'], view_func=tags_controller.tags)
# features
app.add_url_rule('/features', methods=['GET'], view_func=features_controller.features)
+ # sync info
+ app.add_url_rule('/sync_info', methods=['GET'], view_func=sync_info_controller.sync_info)
def create_app(debug_enabled, app):
@@ -85,13 +88,15 @@ def create_app(debug_enabled, app):
draft_service=draft_service,
search_engine=search_engine)
tags_controller = TagsController(search_engine=search_engine)
+ sync_info_controller = SyncInfoController()
+ register(signal=proto.SOLEDAD_SYNC_RECEIVE_STATUS, callback=sync_info_controller.set_sync_info)
register(signal=proto.SOLEDAD_DONE_DATA_SYNC,
callback=init_index_and_delete_duplicate_inboxes(querier=soledad_querier,
search_engine=search_engine,
mail_service=mail_service))
- _setup_routes(app, home_controller, mails_controller, tags_controller, features_controller)
+ _setup_routes(app, home_controller, mails_controller, tags_controller, features_controller, sync_info_controller)
app.run(host=app.config['HOST'], debug=debug_enabled,
port=app.config['PORT'], use_reloader=False)
diff --git a/service/pixelated/controllers/__init__.py b/service/pixelated/controllers/__init__.py
index 969e8e6f..2976b8cb 100644
--- a/service/pixelated/controllers/__init__.py
+++ b/service/pixelated/controllers/__init__.py
@@ -29,3 +29,4 @@ from home_controller import HomeController
from mails_controller import MailsController
from tags_controller import TagsController
from features_controller import FeaturesController
+from sync_info_controller import SyncInfoController \ No newline at end of file
diff --git a/service/pixelated/controllers/sync_info_controller.py b/service/pixelated/controllers/sync_info_controller.py
new file mode 100644
index 00000000..5adfcd48
--- /dev/null
+++ b/service/pixelated/controllers/sync_info_controller.py
@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2014 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+from pixelated.controllers import respond_json
+
+
+class SyncInfoController:
+
+ def __init__(self):
+ self.current = 0
+ self.total = 0
+
+ def _get_progress(self):
+ if self.total == 0:
+ return 0
+ return self.current/float(self.total)
+
+ def set_sync_info(self, soledad_sync_status):
+ self.current, self.total = map(int, soledad_sync_status.content.split('/'))
+
+ def sync_info(self):
+ _sync_info = {
+ 'is_syncing': self.current != self.total,
+ 'count': {
+ 'current': self.current,
+ 'total': self.total,
+ 'progress': self._get_progress()
+ }
+ }
+ return respond_json(_sync_info) \ No newline at end of file
diff --git a/service/test/unit/controllers/sync_info_controller_test.py b/service/test/unit/controllers/sync_info_controller_test.py
new file mode 100644
index 00000000..d3bf1190
--- /dev/null
+++ b/service/test/unit/controllers/sync_info_controller_test.py
@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2014 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+import unittest
+from pixelated.controllers import SyncInfoController
+from mockito import *
+import json
+
+
+class SyncInfoControllerTest(unittest.TestCase):
+
+ def setUp(self):
+ self.controller = SyncInfoController()
+
+ def _set_count(self, current, total):
+ soledad_sync_data = mock()
+ soledad_sync_data.content = "%s/%s" % (current, total)
+ self.controller.set_sync_info(soledad_sync_data)
+
+ def get_sync_info(self):
+ return json.loads(self.controller.sync_info().data)
+
+ def test_is_not_syncing_if_total_is_equal_to_current(self):
+ self._set_count(total=0, current=0)
+
+ sync_info = self.get_sync_info()
+
+ self.assertFalse(sync_info['is_syncing'])
+
+ def test_is_syncing_if_total_is_not_equal_to_current_and_adds_count(self):
+ self._set_count(total=10, current=5)
+
+ sync_info = self.get_sync_info()
+
+ self.assertTrue(sync_info['is_syncing'])
+ self.assertEquals(5, sync_info['count']['current'])
+ self.assertEquals(10, sync_info['count']['total'])
+ self.assertEquals(0.5, sync_info['count']['progress'])