arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2026-01-22 14:41:39 +00:00
Code Releases Wiki Activity

[#169 state:fixed] Ignore filename extension during filename sorting in results.

Browse Source
This commit is contained in:
Virgil Dupras
2011-09-22 12:29:56 -04:00
parent 48e2acf0a2
commit 8102c89802
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/app.py
View File

@@ -20,7 +20,8 @@ from hscommon.reg import RegistrableApplication
from hscommon.notify import Broadcaster
from hscommon.path import Path
from hscommon.conflict import smart_move, smart_copy
from hscommon.util import delete_if_empty, first, escape, nonone, format_time_decimal, allsame
from hscommon.util import (delete_if_empty, first, escape, nonone, format_time_decimal, allsame,
rem_file_ext)
from hscommon.trans import tr, trmsg
from . import directories, results, scanner, export, fs
@@ -66,7 +67,11 @@ def format_perc(p):
def format_dupe_count(c):
return str(c) if c else '---'
def cmp_value(value):
def cmp_value(dupe, column):
if column.attr == 'name':
value = rem_file_ext(dupe.name)
else:
value = getattr(dupe, column.attr, '')
return value.lower() if isinstance(value, str) else value
class DupeGuru(RegistrableApplication, Broadcaster):

6
core/tests/base.py
View File

@@ -63,13 +63,13 @@ class DupeGuru(DupeGuruBase):
]
def _get_dupe_sort_key(self, dupe, get_group, key, delta):
r = cmp_value(getattr(dupe, self.COLUMNS[key].attr))
r = cmp_value(dupe, self.COLUMNS[key])
if delta and (key in self.DELTA_COLUMNS):
r -= cmp_value(getattr(get_group().ref, self.COLUMNS[key].attr))
r -= cmp_value(get_group().ref, self.COLUMNS[key])
return r
def _get_group_sort_key(self, group, key):
return cmp_value(getattr(group.ref, self.COLUMNS[key].attr))
return cmp_value(group.ref, self.COLUMNS[key])
def _prioritization_categories(self):
return prioritize.all_categories()