X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/eee35e00bf0d0eb3d2a9f08f72c7052962fecbf6..d59a371f240c5fa1dbce1bd40a61e60c60a19d2a:/src/archive/utils.py diff --git a/src/archive/utils.py b/src/archive/utils.py index 3e89a8b..b8598df 100644 --- a/src/archive/utils.py +++ b/src/archive/utils.py @@ -1,12 +1,12 @@ from hashlib import sha1 import os import os.path +import subprocess from django.core.files.storage import FileSystemStorage from django.core.files.uploadedfile import UploadedFile class ExistingFile(UploadedFile): - def __init__(self, path, *args, **kwargs): self.path = path return super(ExistingFile, self).__init__(*args, **kwargs) @@ -19,19 +19,18 @@ class ExistingFile(UploadedFile): class OverwriteStorage(FileSystemStorage): - def _save(self, name, content): if self.exists(name): 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 +38,5 @@ 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("/")