Merge lp:~facundo/u1sync/more-generations into lp:u1sync

[Facundo Batista]

Get the content of the dir not using GetContent.

Get the content of the dir not using GetContent.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

=== modified file 'u1sync/client.py'
--- u1sync/client.py	2013-05-27 14:22:00 +0000
+++ u1sync/client.py	2013-06-06 19:12:23 +0000
@@ -1,11 +1,4 @@
-# u1sync.client
-#
-# Client/protocol end of u1sync
-#
-# Author: Lucio Torre <[e-mail]>
-# Author: Tim Cole <[e-mail]>
-#
-# Copyright 2009 Canonical Ltd.
+# Copyright 2009-2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -18,6 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Pretty API for protocol client."""
 
 from __future__ import with_statement
@@ -45,8 +39,9 @@
 from ubuntuone.storageprotocol.client import (
     StorageClientFactory, StorageClient)
 from ubuntuone.storageprotocol import request, volumes
-from ubuntuone.storageprotocol.dircontent_pb2 import \
-    DirectoryContent, DIRECTORY
+from ubuntuone.storageprotocol.delta import DIRECTORY as delta_DIR
+from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, FILE
+
 import uuid
 import logging
 from logging.handlers import RotatingFileHandler
@@ -458,9 +453,7 @@
                 content_hash = hashes.get(root_uuid, None)
                 if content_hash is None:
                     raise KeyError, "Content hash not available"
-                entries = yield self._get_raw_dir_entries(share_uuid,
-                                                          root_uuid,
-                                                          content_hash)
+                entries = yield self._get_dir_entries(share_uuid, root_uuid)
                 match_name = name.decode('utf-8')
                 match = None
                 for entry in entries:
@@ -526,9 +519,7 @@
             immediate children.
 
             """
-            entries = yield self._get_raw_dir_entries(share_uuid,
-                                                      parent_uuid,
-                                                      parent_content_hash)
+            entries = yield self._get_dir_entries(share_uuid, parent_uuid)
             children = {}
             for entry in entries:
                 if should_sync(entry.name):
@@ -556,21 +547,20 @@
         return root
 
     @log_timing
-    def _get_raw_dir_entries(self, share_uuid, node_uuid, content_hash):
-        """Gets raw dir entries for the given directory."""
-        d = self.factory.current_protocol.get_content(share_str(share_uuid),
-                                                      str(node_uuid),
-                                                      content_hash)
-        d.addCallback(lambda c: zlib.decompress(c.data))
-
-        def _parse_content(raw_content):
-            """Parses directory content into a list of entry objects."""
-            unserialized_content = DirectoryContent()
-            unserialized_content.ParseFromString(raw_content)
-            return list(unserialized_content.entries)
-
-        d.addCallback(_parse_content)
-        return d
+    @defer.inlineCallbacks
+    def _get_dir_entries(self, share_uuid, node_uuid):
+        """Get raw dir entries for the given directory."""
+        result = yield self.factory.current_protocol.get_delta(
+                share_str(share_uuid), from_scratch=True)
+        node_uuid = share_str(node_uuid)
+        children = []
+        for n in result.response:
+            if n.parent_id == node_uuid:
+                # adapt here some attrs so we don't need to change ALL the code
+                n.node_type = DIRECTORY if n.file_type == delta_DIR else FILE
+                n.node = n.node_id
+                children.append(n)
+        defer.returnValue(children)
 
     @log_timing
     def download_string(self, share_uuid, node_uuid, content_hash):