Merge lp:~facundo/ubuntuone-client/lr-this-was-not-deleted-you-fool into lp:ubuntuone-client

[Facundo Batista]

Support a non-content file in LR.

[Facundo Batista (facundo)]

Support a non-content file in LR.

If there's MD in non-content state, converge to safe removing the MD.

Note that the hashed of the parent noded need to be dirtied, otherwise it never will be updated with server stuff by comparison (well, not never, until another change happens).

Tests included. Also needed to fix previous tests that left files in non-content while testing something else.

[Facundo Batista (facundo)]

Oh, also I added a new capability!

[Lucio Torre (lucio.torre)]

clear and tested

review: Approve

[Guillermo Gonzalez (verterok)]

worked like a charm

review: Approve

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2009-10-14 18:38:59 +0000
+++ tests/syncdaemon/test_localrescan.py	2009-10-29 02:10:22 +0000
@@ -120,6 +120,10 @@
 
         self.fsm.create(filepath, which_share.id, is_dir=is_dir)
         self.fsm.set_node_id(filepath, "uuid"+path)
+
+        # for files we put hashes to signal them not non-content
+        if not is_dir:
+            self.fsm.set_by_path(filepath, local_hash="h", server_hash="h")
         return filepath
 
 
@@ -892,6 +896,7 @@
         filepath = os.path.join(self.share.path, "a")
         self.fsm.create(filepath, self.share.id, is_dir=False)
         self.fsm.set_node_id(filepath, "uuid1")
+        self.fsm.set_by_path(filepath, local_hash="hash", server_hash="hash")
 
         def check(_):
             """ asserts that GoodListener was called. """
@@ -1404,17 +1409,35 @@
         # this is a case when a file is written with content, the make_file
         # to the server was ok (we have the file uuid), but before
         # HQ finishes everything is stopped; when started again, it needs
-        # to generate the FILE_CLOSE_WRITE, to start the hash&upload process
-        # again
+        # to generate the corresponding events, to start the hash&upload
+        # process again
         path = os.path.join(self.share.path, "a")
         self.fsm.create(path, self.share.id, is_dir=False)
         self.fsm.set_node_id(path, "uuid")
+        self.fsm.set_by_path(path, local_hash="", server_hash="")
         with open(path, "w") as fh:
             fh.write("foo")
 
         def check(_):
             '''check'''
-            self.assertEqual(self.eq.pushed, [('FS_FILE_CLOSE_WRITE', path)])
+            self.assertEqual(self.eq.pushed, [('FS_FILE_CREATE', path),
+                                              ('FS_FILE_CLOSE_WRITE', path)
+                                             ])
+
+        self.startTest(check)
+        return self.deferred
+
+    def test_notcontent_file(self):
+        '''The file is created but never started to download.'''
+        # create the file in metadata
+        path = os.path.join(self.share.path, "a")
+#        open(path, "w").close()
+        mdid = self.fsm.create(path, self.share.id, is_dir=False, node_id="1")
+
+        def check(_):
+            '''No event, and no MD'''
+            self.assertEqual(self.eq.pushed, [])
+            self.assertFalse(self.fsm.has_metadata(path=path))
 
         self.startTest(check)
         return self.deferred

=== modified file 'ubuntuone/syncdaemon/__init__.py'
--- ubuntuone/syncdaemon/__init__.py	2009-08-26 13:53:20 +0000
+++ ubuntuone/syncdaemon/__init__.py	2009-10-29 02:10:22 +0000
@@ -16,4 +16,8 @@
 """ client module """
 
 # required capabilities
-REQUIRED_CAPS = frozenset(["no-content", "account-info", "resumable-uploads"])
+REQUIRED_CAPS = frozenset(["no-content",
+                           "account-info",
+                           "resumable-uploads",
+                           "fix462230",
+                          ])

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2009-09-28 17:34:38 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2009-10-29 02:10:22 +0000
@@ -153,14 +153,14 @@
 
         reactor.callLater(0, safe_scan)
 
-    def _get_share_dirs(self, share_id, path):
-        '''Get all the directories in a share.'''
-        all_share_dirs = []
+    def _get_share_info(self, share_id, path):
+        '''Get all the objects information for a share.'''
+        share_info = []
         for obj in self.fsm.get_mdobjs_by_share_id(share_id, path):
             changd = self.fsm.changed(mdid=obj.mdid)
-            all_share_dirs.append(
-                    (obj.path, obj.is_dir, obj.stat, changd, obj.node_id))
-        return all_share_dirs
+            share_info.append((obj.path, obj.is_dir, obj.stat, changd,
+                               obj.node_id, obj.local_hash, obj.server_hash))
+        return share_info
 
     def _scan_tree(self, share, path, scan_partials, mdid):
         '''Scans a whole tree, using the received path as root.'''
@@ -205,8 +205,8 @@
         log_debug("comparing directory %r", dirpath)
 
         # get the share info
-        all_share_dirs = self._get_share_dirs(share.id, dirpath)
-        shouldbe = self._paths_filter(all_share_dirs, dirpath, len(share.path))
+        share_info = self._get_share_info(share.id, dirpath)
+        shouldbe = self._paths_filter(share_info, dirpath, len(share.path))
 
         def despair(message, fullname, also_children=False, also_remove=None):
             '''Something went very bad with this node, converge!'''
@@ -429,7 +429,7 @@
                 to_inform = []
 
                 # get all the info inside that dir
-                for shrpath, is_dir, statinfo, _, _ in all_share_dirs:
+                for shrpath, is_dir, statinfo, _, _, _, _ in share_info:
                     if shrpath.startswith(base_path):
                         qparts = len(shrpath.split(os.path.sep))
                         to_inform.append((qparts, shrpath, is_dir))
@@ -457,7 +457,7 @@
                 events.append(('FS_FILE_DELETE', fullname))
         return events, to_scan_later
 
-    def _paths_filter(self, all_share_dirs, dirpath, len_shr_path):
+    def _paths_filter(self, shrinfo, dirpath, len_shr_path):
         '''Returns the paths that belong to this dir.'''
         # paths in shares are relative, remove the first slash
         direct = dirpath[len_shr_path + 1:]
@@ -465,18 +465,31 @@
 
         # build the dict
         filesdirs = {}
-        for shrpath, is_dir, statinfo, changed, node_id in all_share_dirs:
-            base, fname = os.path.split(shrpath)
+        for fpath, is_dir, statinfo, changed, node_id, lhash, shash in shrinfo:
+            base, fname = os.path.split(fpath)
             if base == direct:
                 # if without node_id, remove the metadata, and take it as new
                 if node_id is None:
-                    fullname = os.path.join(basedir, shrpath)
+                    fullname = os.path.join(basedir, fpath)
                     m = "Deleting metadata, because of node_id=None, of %r"
                     log_debug(m, fullname)
                     self.fsm.delete_metadata(fullname)
-                    continue
-
-                filesdirs[fname] = is_dir, statinfo, changed
+
+                # if both hashes aren't set in a file, it's a non-content
+                # situation, remove the metadata
+                elif not is_dir and not lhash and not shash:
+                    fullname = os.path.join(basedir, fpath)
+                    m = "Deleting metadata, both hashes empty, of %r"
+                    log_debug(m, fullname)
+                    self.fsm.delete_metadata(fullname)
+
+                    # also set the parent hashes to "", to force a new scan
+                    parent = os.path.dirname(fullname)
+                    log_debug("Dirtying the parent hashes, path: %r", parent)
+                    self.fsm.set_by_path(parent, server_hash="", local_hash="")
+
+                else:
+                    filesdirs[fname] = is_dir, statinfo, changed
         return filesdirs
 
     def _scan_one_dir(self, scan_info):

=== modified file 'ubuntuone/u1sync/client.py'
--- ubuntuone/u1sync/client.py	2009-09-08 20:14:06 +0000
+++ ubuntuone/u1sync/client.py	2009-10-29 02:10:22 +0000
@@ -178,7 +178,7 @@
 
 class Client(object):
     """U1 storage client facade."""
-    required_caps = frozenset(["no-content"])
+    required_caps = frozenset(["no-content", "fix462230"])
 
     def __init__(self, realm, reactor=reactor):
         """Create the instance."""