Use proper locking, and other minor fixes.

[audio.git] / src / archive / utils.py

diff --git a/src/archive/utils.py b/src/archive/utils.py
index 3e89a8b..476d506 100644 (file)
--- a/src/archive/utils.py
+++ b/src/archive/utils.py
@@ -25,13 +25,13 @@ class OverwriteStorage(FileSystemStorage):
             self.delete(name)
         return super(OverwriteStorage, self)._save(name, content)
 
-    def get_available_name(self, name):
+    def get_available_name(self, name, max_length):
         return name
 
 
 def sha1_file(f):
     sha = sha1()
-    for piece in iter(lambda: f.read(1024*1024), ''):
+    for piece in iter(lambda: f.read(1024*1024), b''):
         sha.update(piece)
     return sha.hexdigest()
 
@@ -39,6 +39,6 @@ def sha1_file(f):
 def all_files(root_path):
     root_len = len(root_path)
     for path, dirs, files in os.walk(root_path):
-       for fname in files:
-           yield os.path.join(path, fname)[root_len:].lstrip('/')
+        for fname in files:
+            yield os.path.join(path, fname)[root_len:].lstrip('/')