Merge lp:~facundo/ubuntuone-client/no-more-initial-empty-files into lp:ubuntuone-client

[Facundo Batista]

Locally there're no more zero size files when waiting for be filled with a download.

[Facundo Batista (facundo)]

Locally there're no more zero size files when waiting for be filled with a download.

So I just removed the code that was producing them.

Also, found, fixed and tested a small corruption issue that is fixed right here.

[John O'Brien (jdobrien)]

great fix

review: Approve

[Guillermo Gonzalez (verterok)]

review: Approve

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2009-09-22 15:56:46 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2009-09-28 18:10:35 +0000
@@ -889,18 +889,6 @@
 
         return open(self.get_abspath(mdobj['share_id'], mdobj['path']))
 
-    def create_file(self, mdid):
-        '''create the file.'''
-        mdobj = self.fs[mdid]
-        path = self.get_abspath(mdobj['share_id'], mdobj['path'])
-        with self._enable_share_write(mdobj['share_id'], path):
-            if mdobj["is_dir"]:
-                os.mkdir(path)
-            else:
-                # use os.open so this wont raise IN_CLOSE_WRITE
-                fd = os.open(path, os.O_CREAT)
-                os.close(fd)
-
     def _share_relative_path(self, share_id, path):
         """ returns the relative path from the share_id. """
         share = self._get_share(share_id)

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2009-09-22 15:19:25 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2009-09-28 18:10:35 +0000
@@ -58,8 +58,15 @@
         log_info("start scan all shares")
         to_scan = self._get_shares()
         for share in to_scan:
-            mdobj = self.fsm.get_by_path(share.path)
-            self._queue.appendleft((share, share.path, True, mdobj.mdid))
+            try:
+                mdobj = self.fsm.get_by_path(share.path)
+            except KeyError:
+                # this could happen in a strange corruption situation where FSM
+                # lost the share information, so we remove it, because VM will
+                # download it again
+                self.vm.share_deleted(share.id)
+            else:
+                self._queue.appendleft((share, share.path, True, mdobj.mdid))
         d = self._queue_scan()
         d.addCallback(self._process_trash)
         return d

=== modified file 'ubuntuone/syncdaemon/sync.py'
--- ubuntuone/syncdaemon/sync.py	2009-09-22 15:19:25 +0000
+++ ubuntuone/syncdaemon/sync.py	2009-09-28 18:10:35 +0000
@@ -221,10 +221,6 @@
         except Exception:
             return default
 
-    def make_file(self):
-        "create the local empty file"
-        self.fs.create_file(self.get_mdid())
-
 
 def loglevel(lvl):
     """Make a function that logs at lvl log level."""
@@ -441,14 +437,12 @@
     def file_conflict(self, event, params, hash, crc32, size, stat):
         """This file is in conflict."""
         self.key.move_to_conflict()
-        self.key.make_file()
 
     def local_file_conflict(self, event, params, hash):
         """This file is in conflict."""
         self.key.move_to_conflict()
         self.m.action_q.cancel_upload(share_id=self.key['share_id'],
                             node_id=self.key['node_id'])
-        self.key.make_file()
         self.get_file(event, params, hash)
 
     def merge_directory(self, event, params, hash):
@@ -553,7 +547,6 @@
         self.key.set(server_hash="")
         self.key.set(local_hash="")
         self.key.sync()
-        self.key.make_file()
         self.m.action_q.query([(share_id, node_id, "")])
 
     def new_file_on_server_with_local(self, event, params, share_id,