flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed several minor bugs in buildcache...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-12-28 08:36:05 +04:00
parent 2d8ce14616
commit 16ef5b2f07
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
buildcache.py
View File

@ -2,7 +2,7 @@
#======================================================================= #=======================================================================
__version__ = '''0.0.01''' __version__ = '''0.0.01'''
__sub_version__ = '''20131228075624''' __sub_version__ = '''20131228083526'''
__copyright__ = '''(c) Alex A. Naanou 2011''' __copyright__ = '''(c) Alex A. Naanou 2011'''
@ -652,6 +652,8 @@ def build_data(images, path, config=CONFIG):
images_index[gid] = image images_index[gid] = image
ribbon += [gid] ribbon += [gid]
# remove duplicate gids...
ribbon = list(set(ribbon))
ribbon.sort(lambda a, b: cmp(images_index[b]['ctime'], images_index[a]['ctime'])) ribbon.sort(lambda a, b: cmp(images_index[b]['ctime'], images_index[a]['ctime']))
data['ribbons'] = [ribbon] data['ribbons'] = [ribbon]
@ -734,16 +736,23 @@ def build_cache(path, config=CONFIG, gid_generator=hash_gid,
_images.update(images) _images.update(images)
# update ribbons... # update ribbons...
new, data = data['ribbons'][0], files[data_file] new, data = data['ribbons'][0], files[data_file]
data['ribbons'][base_ribbon] += new l = len(data['ribbons'][base_ribbon])
data['ribbons'][base_ribbon].sort( data['ribbons'][base_ribbon] = list(set(data['ribbons'][base_ribbon] + new))
lambda a, b:
cmp(_images[b]['ctime'], _images[a]['ctime'])) # if length did not change then nothing new is found...
# update and resort order... if l == len(data['ribbons'][base_ribbon]):
data['order'] = _images.keys() data = None
data['order'].sort(
lambda a, b: else:
cmp(_images[b]['ctime'], _images[a]['ctime'])) data['ribbons'][base_ribbon].sort(
data_file = pathjoin(cache_dir, config['data-diff'] % {'date': d}) lambda a, b:
cmp(_images[b]['ctime'], _images[a]['ctime']))
# update and resort order...
data['order'] = _images.keys()
data['order'].sort(
lambda a, b:
cmp(_images[b]['ctime'], _images[a]['ctime']))
data_file = pathjoin(cache_dir, config['data-diff'] % {'date': d})
else: else:
images = None images = None
data = None data = None
@ -753,22 +762,31 @@ def build_cache(path, config=CONFIG, gid_generator=hash_gid,
marked_file = pathjoin(cache_dir, config['marked-diff'] % {'date': d}) marked_file = pathjoin(cache_dir, config['marked-diff'] % {'date': d})
# buld the tags... # buld the tags...
# XXX do we need to sort the tags??? if images != None and config['tags'] != []:
if images != None and config['tags'] != files[tags_file]:
tags = files[tags_file] tags = files[tags_file]
order = data['order'] if tags != {}:
tags_file = pathjoin(cache_dir, config['tags-diff'] % {'date': d})
if data == None:
order = files[data_file]['order']
else:
order = data['order']
new_gids = images.keys() new_gids = images.keys()
new_tags = dict([ (tag, new_gids) for tag in config['tags'] ]) new_tags = dict([ (tag, new_gids) for tag in config['tags'] ])
no_change = 0
for t, l in new_tags.items(): for t, l in new_tags.items():
if t in tags: if t in tags:
# merge the tagged gids... # merge the tagged gids...
l = tags[t] = list(set(tags[t] + l)) l = list(set(tags[t] + l))
if len(tags[t]) == len(l):
no_change += 1
continue
tags[t] = l
else: else:
tags[t] = l tags[t] = l
# sort... # sort...
l.sort(lambda a, b: cmp(order.index(a), order.index(b))) l.sort(lambda a, b: cmp(order.index(a), order.index(b)))
if files[tags_file] != {}: if no_change == len(new_tags):
tags_file = pathjoin(cache_dir, config['tags-diff'] % {'date': d}) tags = None
else: else:
tags = None tags = None