SF-5746 use project icon file hash for cache busting
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index a2384bd..26380b2 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -335,7 +335,7 @@
c.project.removal_changed_date = datetime.utcnow()
if 'delete_icon' in kw:
M.ProjectFile.query.remove(dict(project_id=c.project._id, category=re.compile(r'^icon')))
- c.project.set_tool_data('allura', icon_original_size=None)
+ c.project.set_tool_data('allura', icon_original_size=None, icon_sha256=None)
M.AuditLog.log('remove project icon')
g.post_event('project_updated')
redirect('overview')
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 68585b7..5819a8f 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -21,6 +21,8 @@
import logging
from calendar import timegm
from collections import Counter, OrderedDict
+from hashlib import sha256
+
from datetime import datetime
from copy import deepcopy
import six.moves.urllib.request
@@ -380,8 +382,18 @@
)
# store the dimensions so we don't have to read the whole image each time we need to know
icon_orig_img = PIL.Image.open(icon_orig.rfile())
+
self.set_tool_data('allura', icon_original_size=icon_orig_img.size)
+ try:
+ # calc and save icon file hash, for better cache busting purposes
+ file_input.seek(0)
+ file_bytes = file_input.read()
+ file_sha256 = sha256(file_bytes).hexdigest()
+ self.set_tool_data('allura', icon_sha256=file_sha256)
+ except Exception as ex:
+ log.exception('Failed to calculate sha256 for icon file for {}'.format(self.shortname))
+
@property
def icon(self):
return self.icon_sized(DEFAULT_ICON_WIDTH)
