Merge lp:~verterok/ubuntuone-client/volumes_for_LR into lp:ubuntuone-client

[Guillermo Gonzalez]

volumes API for LocalRescan and FSM api to get node info for server rescan by path

[Guillermo Gonzalez (verterok)]

This branch is another one of the Volumenanager+UDF support, in this case:
 - new VolumeManager.get_volumes method that returns shares + subscribed UDFs
 - new FilesystemManager.get_for_server_rescan_by_path
 - tests for all this stuff :)

[lp:~verterok/ubuntuone-client/volumes_for_LR]

317. By Guillermo Gonzalez on 2010-01-14

merge with trunk

[Natalia Bidart (nataliabidart)]

Nice! I need this ;-)

review: Approve

[Joshua Blount (jblount)]

review: Approve

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2010-01-14 14:38:22 +0000
+++ contrib/testing/testcase.py	2010-01-14 15:30:27 +0000
@@ -507,11 +507,21 @@
         """
 
     def get_volume(self, id):
+        """Returns a share or a UDF."""
         try:
             return self.shares[id]
         except KeyError:
             return self.udfs[id]
 
+    def get_volumes(self, access_level='Modify'):
+        """Simple get_volumes for FakeVolumeManager."""
+        for share in self.shares.values():
+            if share.access_level == access_level:
+                yield share
+        for udf in self.udfs.values():
+            if udf.subscribed:
+                yield udf
+
 
 # OAuth stubs
 class FakeLoginProcessor(LoginProcessor):

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2009-12-09 14:58:21 +0000
+++ tests/syncdaemon/test_fsm.py	2010-01-14 15:30:27 +0000
@@ -2752,6 +2752,32 @@
         self.assertEqual(expected, sorted(actual))
 
 
+class ServerRescanDataTestCase(FSMTestCase):
+    """Test FSM services to get server rescan data."""
+
+    def test_get_for_server_rescan_by_path(self):
+        """Test FSM.get_for_server_rescan_by_path method"""
+        # create the share fsm object
+        share_mdid = self.fsm.create(self.share_path, self.share.id)
+        self.fsm.set_node_id(self.share_path, "share_uuid")
+        # create a few nodes
+        path1 = os.path.join(self.share_path, "path1")
+        path2 = os.path.join(self.share_path, "path1", "path2")
+        path_out = os.path.join(self.root_dir, "path1")
+        mdid1 = self.fsm.create(path1, "share", is_dir=True)
+        mdid2 = self.fsm.create(path2, "share")
+        mdid_out = self.fsm.create(path_out, "")
+        self.fsm.set_node_id(path1, "uuid1")
+        self.fsm.set_node_id(path2, "uuid2")
+        self.fsm.set_node_id(path_out, "uuid3")
+        data = list(self.fsm.get_for_server_rescan_by_path(self.share.path))
+        self.assertEquals(len(data), 3)
+        self.assertTrue(("share", "uuid1", "") in data)
+        self.assertTrue(("share", "uuid2", "") in data)
+        self.assertTrue(("share", "share_uuid", "") in data)
+        self.assertFalse(("", "uuid3", "") in data)
+
+
 def test_suite():
     # pylint: disable-msg=C0111
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-01-12 15:32:43 +0000
+++ tests/syncdaemon/test_vm.py	2010-01-14 15:30:27 +0000
@@ -1140,6 +1140,39 @@
             self.vm.handle_SV_VOLUME_DELETED(udf_volume.volume_id)
         return d
 
+    def test_get_volumes(self):
+        """Tests for VolumeManager.get_volumes."""
+        share_path = os.path.join(self.shares_dir, 'fake_share')
+        share_modify = Share(share_path, share_id='share_id', access_level='Modify')
+        share_path_view = os.path.join(self.shares_dir, 'fake_share_view')
+        share_view = Share(share_path, share_id='share_id_view', access_level='View')
+        self.vm.add_share(share_modify)
+        self.vm.add_share(share_view)
+        shared_path = os.path.join(self.root_dir, 'fake_shared')
+        shared = Share(shared_path, share_id='shared_id')
+        self.vm.add_shared(shared)
+        suggested_path = "suggested_path"
+        udf_subscribed, _ = self._create_udf(uuid.uuid4(), 'udf_node_id',
+                                       '~/' + suggested_path, subscribed=True)
+        udf_unsubscribed, _ = self._create_udf(uuid.uuid4(), 'udf_node_id',
+                                       '~/' + suggested_path, subscribed=False)
+        self.vm.add_udf(udf_subscribed)
+        self.vm.add_udf(udf_unsubscribed)
+        volumes = list(self.vm.get_volumes())
+        volumes_ids = [v.id for v in volumes]
+        self.assertIn(share_modify.id, volumes_ids)
+        self.assertNotIn(share_view.id, volumes_ids)
+        self.assertNotIn(shared.id, volumes_ids)
+        self.assertIn(udf_subscribed.id, volumes_ids)
+        self.assertNotIn(udf_unsubscribed.id, volumes_ids)
+        volumes_view = list(self.vm.get_volumes(access_level='View'))
+        volumes_view_ids = [v.id for v in volumes_view]
+        self.assertNotIn(share_modify.id, volumes_view_ids)
+        self.assertIn(share_view.id, volumes_view_ids)
+        self.assertNotIn(shared.id, volumes_view_ids)
+        self.assertIn(udf_subscribed.id, volumes_view_ids)
+        self.assertNotIn(udf_unsubscribed.id, volumes_view_ids)
+
 
 class ShareShelfUpgradeTests(BaseTwistedTestCase):
     """ Tests for shares shelf upgrades"""

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2010-01-05 23:36:00 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2010-01-14 15:30:27 +0000
@@ -510,6 +510,22 @@
                         (v['share_id'], v['node_id'], v['server_hash']))
         return all_data
 
+    def get_for_server_rescan_by_path(self, base_path):
+        """
+        Generates all the (share, node, hash) tuples, for the nodes
+        starting with 'path', needed for rescan.
+
+        """
+        all_data = []
+        for path, _ in self.get_paths_starting_with(base_path):
+            mdid = self._idx_path[path]
+            mdobj = self.fs[mdid]
+            if mdobj['node_id']:
+                all_data.append((mdobj['share_id'],
+                                 mdobj['node_id'],
+                                 mdobj['server_hash']))
+        return all_data
+
     def get_by_mdid(self, mdid):
         """Returns the md object according to the mdid."""
         mdobj = self.fs[mdid]

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2009-12-03 21:11:21 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2010-01-14 15:30:27 +0000
@@ -80,11 +80,8 @@
             self.aq.unlink(share_id, parent_id, node_id)
 
     def _get_shares(self, access_level="Modify"):
-        """Get all the shares to compare."""
-        for sid in self.vm.shares:
-            share = self.vm.shares[sid]
-            if share.access_level == access_level:
-                yield share
+        """Get all the shares and udfs to compare."""
+        return self.vm.get_volumes(access_level)
 
     def scan_dir(self, mdid, direct):
         """Compares one directory between metadata and disk."""

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-01-12 20:00:42 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-01-14 15:30:27 +0000
@@ -594,6 +594,19 @@
             raise KeyError(id)
         return volume
 
+    def get_volumes(self, access_level="Modify"):
+        """Return a generator for the list of volumes.
+        This list contains subscribed UDFs and shares with
+        access_level == 'access_level', defaults to 'Modify'.
+
+        """
+        for share_id, share in self.shares.items():
+            if share.access_level == access_level:
+                yield share
+        for udf_id, udf in self.udfs.items():
+            if udf.subscribed:
+                yield udf
+
     def create_udf(self, path):
         """Request the creation of a UDF to AQ."""
         self.log.debug('create udf(%r)', path)