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

buildcache now updates the index by default and in a non-destructive way...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-10-15 02:58:55 +04:00
parent becca31986
commit 27e7a077db
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
buildcache.py
View File

@ -1,7 +1,7 @@
#======================================================================= #=======================================================================
__version__ = '''0.0.01''' __version__ = '''0.0.01'''
__sub_version__ = '''20131014184410''' __sub_version__ = '''20131015025118'''
__copyright__ = '''(c) Alex A. Naanou 2011''' __copyright__ = '''(c) Alex A. Naanou 2011'''
@ -553,7 +553,7 @@ def build_data(images, path, config=CONFIG):
data['ribbons'] = [ribbon] data['ribbons'] = [ribbon]
data['order'] = ribbon[:] data['order'] = ribbon[:]
data['current'] = ribbon[0] data['current'] = ribbon[0] if len(ribbon) > 0 else None
return data, images_index, marked return data, images_index, marked
@ -565,6 +565,8 @@ def build_data(images, path, config=CONFIG):
def build_cache(path, config=CONFIG, gid_generator=hash_gid, def build_cache(path, config=CONFIG, gid_generator=hash_gid,
report_progress=report_progress, dry_run=False, images_only=False, verbosity=0): report_progress=report_progress, dry_run=False, images_only=False, verbosity=0):
''' '''
NOTE: when updating existing cache, this will re-sort the images.
''' '''
cache_dir = config['cache-dir'] cache_dir = config['cache-dir']
absolute_path = config['absolute-path'] absolute_path = config['absolute-path']
@ -573,7 +575,7 @@ def build_cache(path, config=CONFIG, gid_generator=hash_gid,
build_cache_dirs(path, config, dry_run, verbosity) build_cache_dirs(path, config, dry_run, verbosity)
if report_progress == None: if report_progress == None:
report_progress = lambda a, b: a report_progress = lambda a, b: a, b
images_file = pathjoin(cache_dir, config['images']) images_file = pathjoin(cache_dir, config['images'])
data_file = pathjoin(cache_dir, config['data']) data_file = pathjoin(cache_dir, config['data'])
@ -588,11 +590,16 @@ def build_cache(path, config=CONFIG, gid_generator=hash_gid,
_images = {} if files[images_file] == None else files[images_file] _images = {} if files[images_file] == None else files[images_file]
# build the data... # build the data...
##!!! get all updated images...
data, images, marked = build_data( data, images, marked = build_data(
(report_progress( (i for i, status in (report_progress(
*build_previews(img, path, config, dry_run=dry_run, verbosity=verbosity))[0] *build_previews(img, path, config, dry_run=dry_run, verbosity=verbosity))
for img in build_images(path, config, gid_generator, verbosity=verbosity)), for img in build_images(path, config, gid_generator, verbosity=verbosity))
# get the image if at least one preview got updated,
# the image did not exist in index before or its
# previews changed...
if True in status
or i['id'] not in _images
or i['preview'] != _images[i['id']]['preview']),
path, config) path, config)
##!!! do we still need this??? ##!!! do we still need this???
@ -600,18 +607,16 @@ def build_cache(path, config=CONFIG, gid_generator=hash_gid,
# get the new images... # get the new images...
new_images = set(images).difference(_images) new_images = set(images).difference(_images)
##!!! updated_images = set(images).difference(new_images)
updated_images = []
# if there is no difference in images then no data updates need to # if there is no difference in images then no data updates need to
# be done... # be done...
if len(new_images) > 0: if len(new_images) > 0:
# add new images... # add new images...
new_images = dict( (k, images[k]) for k in new_images) new_images = dict( (k, images[k]) for k in new_images)
##!!! add updated images...
for k in updated_images: for k in updated_images:
img = new_images[k] = _images[k] img = new_images[k] = _images[k]
img['previews'].update(images[k]['previews']) img['preview'].update(images[k]['preview'])
images = new_images images = new_images
# update filenames if we are updating... # update filenames if we are updating...
@ -627,9 +632,15 @@ def build_cache(path, config=CONFIG, gid_generator=hash_gid,
data['ribbons'][base_ribbon].sort( data['ribbons'][base_ribbon].sort(
lambda a, b: lambda a, b:
cmp(_images[b]['ctime'], _images[a]['ctime'])) 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}) data_file = pathjoin(cache_dir, config['data-diff'] % {'date': d})
else: else:
images = None images = None
data = None
# update marks only if the new marks are not empty... # update marks only if the new marks are not empty...
if files[marked_file] != [] and marked != None: if files[marked_file] != [] and marked != None: