arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

[#108 state:fixed] Fixed column mess after the earlier removal of the ctime col.

Browse Source
This commit is contained in:
Virgil Dupras 2010-10-04 10:01:52 +02:00
parent a50a3b0123
commit d574bc611b
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core_me/data.py
View File

@ -31,6 +31,9 @@ COLUMNS = [
{'attr':'dupe_count','display':'Dupe Count'}, {'attr':'dupe_count','display':'Dupe Count'},
] ]
MATCHPERC_COL = 15
DUPECOUNT_COL = 17
METADATA_TO_READ = ['size', 'mtime', 'duration', 'bitrate', 'samplerate', 'title', 'artist', METADATA_TO_READ = ['size', 'mtime', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
'album', 'genre', 'year', 'track', 'comment'] 'album', 'genre', 'year', 'track', 'comment']
@ -76,19 +79,19 @@ def GetDisplayInfo(dupe, group, delta):
] ]
def GetDupeSortKey(dupe, get_group, key, delta): def GetDupeSortKey(dupe, get_group, key, delta):
if key == 16: if key == MATCHPERC_COL:
m = get_group().get_match_of(dupe) m = get_group().get_match_of(dupe)
return m.percentage return m.percentage
if key == 18: if key == DUPECOUNT_COL:
return 0 return 0
r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], '')) r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
if delta and (key in (2, 3, 4, 7, 8)): if delta and (key in {2, 3, 4, 7}):
r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], '')) r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
return r return r
def GetGroupSortKey(group, key): def GetGroupSortKey(group, key):
if key == 16: if key == MATCHPERC_COL:
return group.percentage return group.percentage
if key == 18: if key == DUPECOUNT_COL:
return len(group) return len(group)
return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], '')) return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))

13
core_pe/data.py
View File

@ -23,6 +23,9 @@ COLUMNS = [
{'attr':'dupe_count','display':'Dupe Count'}, {'attr':'dupe_count','display':'Dupe Count'},
] ]
MATCHPERC_COL = 6
DUPECOUNT_COL = 7
METADATA_TO_READ = ['size', 'mtime', 'dimensions'] METADATA_TO_READ = ['size', 'mtime', 'dimensions']
def GetDisplayInfo(dupe,group,delta=False): def GetDisplayInfo(dupe,group,delta=False):
@ -54,20 +57,20 @@ def GetDisplayInfo(dupe,group,delta=False):
] ]
def GetDupeSortKey(dupe, get_group, key, delta): def GetDupeSortKey(dupe, get_group, key, delta):
if key == 7: if key == MATCHPERC_COL:
m = get_group().get_match_of(dupe) m = get_group().get_match_of(dupe)
return m.percentage return m.percentage
if key == 8: if key == DUPECOUNT_COL:
return 0 return 0
r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], '')) r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
if delta and (key in (2, 5, 6)): if delta and (key in {2, 5}):
r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], '')) r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
return r return r
def GetGroupSortKey(group, key): def GetGroupSortKey(group, key):
if key == 7: if key == MATCHPERC_COL:
return group.percentage return group.percentage
if key == 8: if key == DUPECOUNT_COL:
return len(group) return len(group)
return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], '')) return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))

13
core_se/data.py
View File

@ -21,6 +21,9 @@ COLUMNS = [
{'attr':'dupe_count','display':'Dupe Count'}, {'attr':'dupe_count','display':'Dupe Count'},
] ]
MATCHPERC_COL = 5
DUPECOUNT_COL = 7
METADATA_TO_READ = ['size', 'mtime'] METADATA_TO_READ = ['size', 'mtime']
def GetDisplayInfo(dupe, group, delta): def GetDisplayInfo(dupe, group, delta):
@ -49,19 +52,19 @@ def GetDisplayInfo(dupe, group, delta):
] ]
def GetDupeSortKey(dupe, get_group, key, delta): def GetDupeSortKey(dupe, get_group, key, delta):
if key == 6: if key == MATCHPERC_COL:
m = get_group().get_match_of(dupe) m = get_group().get_match_of(dupe)
return m.percentage return m.percentage
if key == 8: if key == DUPECOUNT_COL:
return 0 return 0
r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], '')) r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
if delta and (key in (2, 4, 5)): if delta and (key in {2, 4}):
r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], '')) r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
return r return r
def GetGroupSortKey(group, key): def GetGroupSortKey(group, key):
if key == 6: if key == MATCHPERC_COL:
return group.percentage return group.percentage
if key == 8: if key == DUPECOUNT_COL:
return len(group) return len(group)
return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], '')) return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))