Merge lp:~verterok/ubuntuone-client/dont-delete-child-partials into lp:ubuntuone-client

[Guillermo Gonzalez]

Check if the file ever existed (facundo's patch), fix partial parent path comparsion and remove extra check_stat.

[Guillermo Gonzalez (verterok)]

Check if the file ever existed (facundo's patch) and fix partial parent path comparsion and remove extra check_stat as we don't have 0 bytes files anymore

[Elliot Murphy (statik)]

It definitely works, was reviewed by facundo and lucio, and tested by kenvandine and joshuahoover.

review: Approve

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2009-10-29 01:12:56 +0000
+++ tests/syncdaemon/test_localrescan.py	2009-10-29 07:50:23 +0000
@@ -1136,7 +1136,7 @@
                                 mdid + ".u1partial." + os.path.basename(path))
         self.fsm.set_node_id(path, "uuid")
 
-        # start the download, never complet it
+        # start the download, never complete it
         self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
         self.fsm.create_partial("uuid", self.share.id)
         fh = self.fsm.get_partial_for_writing("uuid", self.share.id)
@@ -1162,7 +1162,7 @@
                                 mdid + ".u1partial." + os.path.basename(path))
         self.fsm.set_node_id(path, "uuid")
 
-        # start the download, never complet it
+        # start the download, never complete it
         self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
         self.fsm.create_partial("uuid", self.share.id)
         fh = self.fsm.get_partial_for_writing("uuid", self.share.id)
@@ -1193,7 +1193,7 @@
                                 mdid + ".u1partial." + os.path.basename(path))
         self.fsm.set_node_id(path, "uuid")
 
-        # start the download, never complet it
+        # start the download, never complete it
         self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
         self.fsm.create_partial("uuid", self.share.id)
         fh = self.fsm.get_partial_for_writing("uuid", self.share.id)
@@ -1263,7 +1263,7 @@
         mdid = self.fsm.create(path, self.share.id, is_dir=True)
         self.fsm.set_node_id(path, "uuid")
 
-        # start the download, never complet it
+        # start the download, never complete it
         self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
         self.fsm.create_partial("uuid", self.share.id)
         fh = self.fsm.get_partial_for_writing("uuid", self.share.id)
@@ -1442,6 +1442,56 @@
         self.startTest(check)
         return self.deferred
 
+    def test_remove_only_partial_of_childs(self):
+        '''We were downloading the file, but it was interrupted.
+        and we have a partial of another fiel in a subdir.'''
+        # create the file in metadata
+        path = os.path.join(self.share.path, "a")
+        mdid = self.fsm.create(path, self.share.id, is_dir=False)
+        partial_path = os.path.join(self.fsm.partials_dir,
+                                mdid + ".u1partial." + os.path.basename(path))
+        self.fsm.set_node_id(path, "uuid")
+
+        # start the download, never complete it
+        self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
+        self.fsm.create_partial("uuid", self.share.id)
+        fh = self.fsm.get_partial_for_writing("uuid", self.share.id)
+        fh.write("foobar")
+        self.assertTrue(os.path.exists(partial_path))
+
+        # create another file with a partial, but one level deeper
+        dir = os.path.join(self.share.path, "dir")
+        os.mkdir(dir)
+        path_b = os.path.join(self.share.path, "dir", "b")
+        open(path_b, "w").close()
+        mdid_dir = self.fsm.create(dir, self.share.id, is_dir=True)
+        self.fsm.set_node_id(dir, "uuid2")
+
+        mdid_b = self.fsm.create(path_b, self.share.id, is_dir=False)
+        partial_path_b = os.path.join(self.fsm.partials_dir,
+                                mdid_b + ".u1partial." + os.path.basename(path_b))
+        self.fsm.set_node_id(path_b, "uuid1")
+
+
+        # start the download, never complete it
+        self.fsm.set_by_mdid(mdid_b, server_hash="blah-hash-blah-b")
+        self.fsm.create_partial("uuid1", self.share.id)
+        fh = self.fsm.get_partial_for_writing("uuid1", self.share.id)
+        fh.write("foobar")
+        self.assertTrue(os.path.exists(partial_path_b))
+
+        def check(_):
+            '''arrange the metadata so later server_rescan will do ok'''
+            mdobj = self.fsm.get_by_mdid(mdid)
+            self.assertFalse(mdobj.info.is_partial)
+            self.assertEqual(mdobj.server_hash, mdobj.local_hash)
+            self.assertFalse(os.path.exists(partial_path))
+            self.assertFalse(os.path.exists(partial_path_b))
+            self.assertTrue(os.path.exists(path_b))
+
+        self.startTest(check)
+        return self.deferred
+
 
 class TrashTests(TwistedBase):
     '''Test handling trash.'''

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2009-10-29 01:12:56 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2009-10-29 07:50:23 +0000
@@ -244,7 +244,7 @@
         for dname in dirnames:
             fullname = os.path.join(dirpath, dname)
             if dname in shouldbe:
-                is_dir, statinfo, changed = shouldbe.pop(dname)
+                is_dir, statinfo, changed, _ = shouldbe.pop(dname)
                 if not is_dir:
                     # it's there, but it's a file!
                     log_debug("comp yield: file %r became a dir!", fullname)
@@ -277,7 +277,7 @@
         for fname in filenames:
             fullname = os.path.join(dirpath, fname)
             if fname in shouldbe:
-                is_dir, statinfo, changed = shouldbe.pop(fname)
+                is_dir, statinfo, changed, _ = shouldbe.pop(fname)
                 if is_dir:
                     log_debug("comp yield: dir %r became a file!", fullname)
                     # it's there, but it's a directory!
@@ -327,7 +327,7 @@
                         os.remove(fullname)
                         continue
 
-                    is_dir, statinfo, changed = shouldbe.pop(realname)
+                    is_dir, statinfo, changed, _ = shouldbe.pop(realname)
                     if is_dir:
                         m = ".partial of a file that MD says it's a dir: %r"
                         despair(m, realfullname, also_remove=fullname)
@@ -382,7 +382,7 @@
             else:
                 realfullname = self.fsm.get_abspath(mdobj.share_id, mdobj.path)
 
-            if not realfullname.startswith(dirpath):
+            if os.path.dirname(realfullname) != dirpath:
                 # if this partial isn't for the current dirpath, ignore it!
                 continue
             if realfullname == dirpath:
@@ -394,7 +394,7 @@
                 despair(m, realfullname, also_remove=partial_path)
                 continue
 
-            is_dir, statinfo, changed = shouldbe.pop(realname)
+            is_dir, statinfo, changed, _ = shouldbe.pop(realname)
             if is_dir:
                 m = ".partial of a file that MD says it's a dir: %r"
                 despair(m, realfullname, also_remove=partial_path)
@@ -408,10 +408,9 @@
                 self.fsm.set_by_mdid(mdobj.mdid,
                                      server_hash=mdobj.local_hash)
                 self.fsm.remove_partial(mdobj.node_id, mdobj.share_id)
-                check_stat(realfullname, statinfo)
 
         # all these don't exist anymore
-        for name, (is_dir, statinfo, changed) in shouldbe.iteritems():
+        for name, (is_dir, statinfo, changed, lhash) in shouldbe.iteritems():
             fullname = os.path.join(dirpath, name)
             if is_dir:
                 if changed not in ("SERVER", "NONE"):
@@ -453,8 +452,11 @@
                     self.fsm.delete_metadata(fullname)
                     continue
 
-                log_debug("comp yield: file %r is gone!", fullname)
-                events.append(('FS_FILE_DELETE', fullname))
+                # if it had content somewhen, now is gone (otherwise it was
+                # never really created in the disk)
+                if lhash:
+                    log_debug("comp yield: file %r is gone!", fullname)
+                    events.append(('FS_FILE_DELETE', fullname))
         return events, to_scan_later
 
     def _paths_filter(self, shrinfo, dirpath, len_shr_path):
@@ -489,7 +491,7 @@
                     self.fsm.set_by_path(parent, server_hash="", local_hash="")
 
                 else:
-                    filesdirs[fname] = is_dir, statinfo, changed
+                    filesdirs[fname] = is_dir, statinfo, changed, lhash
         return filesdirs
 
     def _scan_one_dir(self, scan_info):