Merge lp:~mandel/ubuntuone-windows-installer/u1sync_long_paths into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Allow u1sync to use long pats by using \\?\

=== modified file 'src/u1sync/client.py'
--- src/u1sync/client.py	2010-09-27 17:33:52 +0000
+++ src/u1sync/client.py	2010-11-02 21:57:45 +0000
@@ -565,15 +565,15 @@
         """Downloads a file from the server."""
         # file names have to be quoted to make sure that no issues occur when
         # spaces exist
-        partial_filename = "%s.u1partial" % filename
-        output = open(partial_filename, "w")
+        partial_filename = "\\\\?\\%s.u1partial" % filename
+        output = open(partial_filename, "wb")
 
         @log_timing
         def rename_file():
             """Renames the temporary file to the final name."""
             output.close()
             print "Finished downloading %s" % filename
-            os.rename(partial_filename, filename)
+            os.rename(partial_filename, "\\\\?\\" + filename)
 
         @log_timing
         def delete_file():
@@ -688,9 +688,9 @@
                 self.compressed_size += len(compressed_bytes)
                 self.stream.write(compressed_bytes)
 
-        with open(unique_filename, "w+") as compressed:
-            os.unlink(unique_filename)
-            with open(filename, "r") as original:
+        
+        with open("\\\\?\\" + unique_filename, "wb+") as compressed:
+            with open("\\\\?\\" + filename, "rb") as original:
                 staging = StagingFile(compressed)
                 shutil.copyfileobj(original, staging)
             staging.finish()
@@ -701,6 +701,7 @@
                                    staging.crc32,
                                    staging.size, staging.compressed_size,
                                    compressed)
+        os.unlink("\\\\?\\" + unique_filename)
 
     @log_timing
     def move(self, share_uuid, parent_uuid, name, node_uuid):
 
=== modified file 'src/u1sync/merge.py'
--- src/u1sync/merge.py	2010-08-27 14:43:32 +0000
+++ src/u1sync/merge.py	2010-11-02 21:57:45 +0000
@@ -42,7 +42,7 @@
         old_local_node, local_node, old_remote_node, remote_node = nodes
         # pylint: disable-msg=W0612
         (parent_path, parent_type) = partial_parent
-        path = os.path.join(parent_path, name.encode("utf-8"))
+        path = os.path.join(parent_path, name)
         node_type = merge_action.get_node_type(old_local_node=old_local_node,
                                                local_node=local_node,
                                                old_remote_node=old_remote_node,
 
=== modified file 'src/u1sync/metadata.py'
--- src/u1sync/metadata.py	2010-08-27 14:43:32 +0000
+++ src/u1sync/metadata.py	2010-11-02 21:57:45 +0000
@@ -116,7 +116,7 @@
 def read_string_file(filename, default_value=None):
     """Reads a string from a file, discarding the final character."""
     try:
-        with open(filename, "r") as stream:
+        with open(filename, "rb") as stream:
             return stream.read()[:-1]
     except IOError, e:
         if e.errno != ENOENT:
@@ -126,7 +126,7 @@
 def read_uuid_file(filename, default_value=None):
     """Reads a UUID from a file."""
     try:
-        with open(filename, "r") as stream:
+        with open(filename, "rb") as stream:
             return uuid.UUID(stream.read()[:-1])
     except IOError, e:
         if e.errno != ENOENT:
@@ -138,8 +138,12 @@
     """Returns a context manager for atomically updating a file."""
     temp_filename = "%s.%s" % (filename, uuid.uuid4())
     try:
-        with open(temp_filename, "w") as stream:
+        with open(temp_filename, "wb") as stream:
             yield stream
+        if os.path.exists(filename):
+            # windows does not have atomic updates 
+            # of files
+            os.remove(filename)
         os.rename(temp_filename, filename)
     finally:
         safe_unlink(temp_filename)
 
=== modified file 'src/u1sync/scan.py'
--- src/u1sync/scan.py	2010-08-27 14:43:32 +0000
+++ src/u1sync/scan.py	2010-11-02 21:57:45 +0000
@@ -75,13 +75,13 @@
         return MergeNode(node_type=SYMLINK, content_hash=content_hash)
     elif child_names is not None:
         # directory
-        child_names = [n for n in child_names if should_sync(n.decode("utf-8"))]
+        child_names = [n for n in child_names if should_sync(n)]
         child_paths = [(os.path.join(path, child_name),
                         os.path.join(display_path, child_name)) \
                        for child_name in child_names]
         children = [scan_directory(child_path, child_display_path, quiet) \
                     for (child_path, child_display_path) in child_paths]
-        unicode_child_names = [n.decode("utf-8") for n in child_names]
+        unicode_child_names = [n for n in child_names]
         children = dict(zip(unicode_child_names, children))
         return MergeNode(node_type=DIRECTORY, children=children)
     else:
@@ -96,7 +96,7 @@
                 sum.update(bytes)
 
 
-        with open(path, "r") as stream:
+        with open("\\\\?\\" + path, "rb") as stream:
             shutil.copyfileobj(stream, HashStream())
         content_hash = "sha1:%s" % sum.hexdigest()
         return MergeNode(node_type=FILE, content_hash=content_hash)
 
=== modified file 'src/u1sync/sync.py'
--- src/u1sync/sync.py	2010-08-27 14:43:32 +0000
+++ src/u1sync/sync.py	2010-11-02 21:57:45 +0000
@@ -75,7 +75,7 @@
         (parent_path, parent_display_path, parent_uuid, parent_synced) \
             = partial_parent
 
-        utf8_name = name.encode("utf-8")
+        utf8_name = name
         path = os.path.join(parent_path, utf8_name)
         display_path = os.path.join(parent_display_path, utf8_name)
         node_uuid = None