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

grouping appears to be working correctly. still need more tests and to check for corner cases...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2011-11-10 19:38:43 +04:00
parent a419d706d7
commit f15a19ffa0
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
index.py
View File

@ -1,7 +1,7 @@
#======================================================================= #=======================================================================
__version__ = '''0.0.01''' __version__ = '''0.0.01'''
__sub_version__ = '''20111110191552''' __sub_version__ = '''20111110193800'''
__copyright__ = '''(c) Alex A. Naanou 2011''' __copyright__ = '''(c) Alex A. Naanou 2011'''
@ -86,12 +86,13 @@ def list_files(root, sub_trees=SUBTREE_CLASSES, type=ITEM):
# XXX need to split duplicate named raw files and corresponding # XXX need to split duplicate named raw files and corresponding
# previews... # previews...
# XXX we are loosing the real extension here...
def index_by_name(file_list, types=TYPES.items()): def index_by_name(file_list, types=TYPES.items()):
''' '''
format: format:
{ {
<name>: { <name>: {
<ext>: [ <type>: [
<path>, <path>,
... ...
], ],
@ -103,7 +104,7 @@ def index_by_name(file_list, types=TYPES.items()):
res = {} res = {}
for path, name, ext in file_list: for path, name, ext in file_list:
# normalize extension... # normalize extension...
ext = types[types.index((ANY, ext))][0] orig_ext, ext = ext, types[types.index((ANY, ext))][0]
if name not in res: if name not in res:
# create a name... # create a name...
res[name] = {} res[name] = {}
@ -112,7 +113,8 @@ def index_by_name(file_list, types=TYPES.items()):
res[name][ext] = [] res[name][ext] = []
# general case... # general case...
## res[name][ext] += [(path, name, ext)] ## res[name][ext] += [(path, name, ext)]
res[name][ext] += [path] res[name][ext] += [(path, orig_ext)]
## res[name][ext] += [path]
return res return res
@ -185,11 +187,10 @@ def split_images(index):
# - use a different strategy for files that are above # - use a different strategy for files that are above
# the subtrees... # the subtrees...
common = split_common(raw) common = split_common([r for r, e in raw])
# prepare the return structure... # prepare the return structure...
res = [] res = []
## pprint(raw)
for path in raw: for path in raw:
##!!! ##!!!
res += [{ res += [{
@ -198,14 +199,14 @@ def split_images(index):
'raw': [path], 'raw': [path],
}] }]
# start splitting the data... # start splitting the data...
for ext, paths in data.items(): for t, paths in data.items():
# skip non-type fields... # skip non-type fields...
if ext not in TYPES: if t not in TYPES:
continue continue
if ext == 'raw': if t == 'raw':
continue continue
# start the work... # start the work...
for path in paths: for path, ext in paths:
matches = [] matches = []
for i, c in enumerate(common): for i, c in enumerate(common):
# use matching path head to match targets... # use matching path head to match targets...
@ -213,6 +214,7 @@ def split_images(index):
matches += [(len(c), i)] matches += [(len(c), i)]
# multiple matches... # multiple matches...
if len(matches) > 1: if len(matches) > 1:
# longest match wins...
matches.sort(key=lambda e: e[0]) matches.sort(key=lambda e: e[0])
if matches[0][0] == matches[1][0]: if matches[0][0] == matches[1][0]:
# XXX we could try and use a different # XXX we could try and use a different
@ -223,18 +225,13 @@ def split_images(index):
if len(matches) == 1: if len(matches) == 1:
i = matches[0][1] i = matches[0][1]
# we found a location... # we found a location...
if ext not in res[i]: if t not in res[i]:
res[i][ext] = [] res[i][t] = []
res[i][ext] += [path] res[i][t] += [(path, ext)]
else: else:
##!!! XXX ungrouped files... ##!!! XXX ungrouped files...
print '!!!!', path, name, ext
raise Exception, 'still got ungrouped files...' raise Exception, 'still got ungrouped files...'
## print len(res)
## pprint(res)
## raise SystemExit
# yield the results... # yield the results...
for e in res: for e in res:
yield e['gid'], e yield e['gid'], e