diff --git a/r2/r2/lib/static.py b/r2/r2/lib/static.py index 3a34a6269..d00be7689 100755 --- a/r2/r2/lib/static.py +++ b/r2/r2/lib/static.py @@ -6,13 +6,17 @@ import json import base64 import shutil -def generate_static_name(name, base=None, shorthash=None): +def generate_static_name(name, base=None): """Generate a unique filename. Unique filenames are generated by base 64 encoding the first 64 bits of the SHA1 hash. This hash string is added to the filename before the extension. """ - if base: path = os.path.join(base, name) + if base: + path = os.path.join(base, name) + else: + path = name + sha = hashlib.sha1(open(path).read()).digest() shorthash = base64.urlsafe_b64encode(sha[0:8]).rstrip("=") name, ext = os.path.splitext(name)