edward/depicts
1
0
Fork 0
Code Issues 8 Pull requests Packages Projects Releases Wiki Activity

Catch missing image detail and trigger cache refresh.

Browse source
This commit is contained in:
Edward Betts 2019-11-25 10:04:23 +00:00
parent 7de29233e0
commit df8ff30b64
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app.py
View file

@ -630,14 +630,14 @@ def catalog_page():
other=other, other=other,
title=title) title=title)
def get_image_detail_with_cache(items, cache_name, thumbwidth=None): def get_image_detail_with_cache(items, cache_name, thumbwidth=None, refresh=False):
filenames = [cur['image_filename'] for cur in items] filenames = [cur['image_filename'] for cur in items]
if thumbwidth is None: if thumbwidth is None:
thumbwidth = app.config['THUMBWIDTH'] thumbwidth = app.config['THUMBWIDTH']
filename = f'cache/{cache_name}_images.json' filename = f'cache/{cache_name}_images.json'
if os.path.exists(filename): if not refresh and os.path.exists(filename):
detail = json.load(open(filename)) detail = json.load(open(filename))
else: else:
detail = commons.image_detail(filenames, thumbwidth=thumbwidth) detail = commons.image_detail(filenames, thumbwidth=thumbwidth)
@ -686,10 +686,15 @@ def browse_page():
cache_name = f'{flat}_{page}_{page_size}' cache_name = f'{flat}_{page}_{page_size}'
detail = get_image_detail_with_cache(items, cache_name) detail = get_image_detail_with_cache(items, cache_name)
cache_refreshed = False
for item in items: for item in items:
item['url'] = url_for('item_page', item_id=item['item_id']) item['url'] = url_for('item_page', item_id=item['item_id'])
item['image'] = detail[item['image_filename']] image_filename = item['image_filename']
if not cache_refreshed and image_filename not in detail:
detail = get_image_detail_with_cache(items, cache_name, refresh=True)
cache_refreshed = True
item['image'] = detail[image_filename]
title = ' / '.join(find_more_props[pid] + ': ' + item_labels[qid] title = ' / '.join(find_more_props[pid] + ': ' + item_labels[qid]
for pid, qid in params) for pid, qid in params)