Jafner/calibre-web
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Do not append query string if file_hash is not found

Browse Source
This commit is contained in:
Jonathan Rehm 2017-08-19 09:09:12 -07:00
parent 13c2a53c0f
commit 8cbd6a8431
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cps/cache_buster.py
View File

@ -25,12 +25,12 @@ def init_cache_busting(app):
# compute version component # compute version component
rooted_filename = os.path.join(dirpath, filename) rooted_filename = os.path.join(dirpath, filename)
with open(rooted_filename, 'r') as f: with open(rooted_filename, 'r') as f:
version = hashlib.md5(f.read()).hexdigest()[:7] file_hash = hashlib.md5(f.read()).hexdigest()[:7]
# save version to tables # save version to tables
file_path = rooted_filename.replace(static_folder, "") file_path = rooted_filename.replace(static_folder, "")
file_path = file_path.replace("\\", "/") # Convert Windows path to web path file_path = file_path.replace("\\", "/") # Convert Windows path to web path
hash_table[file_path] = version hash_table[file_path] = file_hash
app.logger.debug('Finished computing cache-busting values') app.logger.debug('Finished computing cache-busting values')
def bust_filename(filename): def bust_filename(filename):
@ -44,8 +44,10 @@ def init_cache_busting(app):
""" """
Make `url_for` produce busted filenames when using the 'static' endpoint. Make `url_for` produce busted filenames when using the 'static' endpoint.
""" """
if endpoint == 'static': if endpoint == "static":
values["q"] = bust_filename(values['filename']) file_hash = bust_filename(values["filename"])
if file_hash:
values["q"] = file_hash
def debusting_static_view(filename): def debusting_static_view(filename):
""" """
@ -54,5 +56,5 @@ def init_cache_busting(app):
return original_static_view(filename=unbust_filename(filename)) return original_static_view(filename=unbust_filename(filename))
# Replace the default static file view with our debusting view. # Replace the default static file view with our debusting view.
original_static_view = app.view_functions['static'] original_static_view = app.view_functions["static"]
app.view_functions['static'] = debusting_static_view app.view_functions["static"] = debusting_static_view