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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Virgil Dupras 2013-11-09 16:21:59 -05:00
commit 12cf9b800b
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/app.py
View File

@ -182,9 +182,9 @@ class DupeGuru(RegistrableApplication, Broadcaster):
return self.results.is_marked(dupe) return self.results.is_marked(dupe)
if key == 'percentage': if key == 'percentage':
m = get_group().get_match_of(dupe) m = get_group().get_match_of(dupe)
result = m.percentage return m.percentage
elif key == 'dupe_count': elif key == 'dupe_count':
result = 0 return 0
else: else:
result = cmp_value(dupe, key) result = cmp_value(dupe, key)
if delta: if delta:

13
core/tests/app_test.py
View File

@ -400,6 +400,19 @@ class TestCaseDupeGuruWithResults:
eq_(len(self.rtable), 0) eq_(len(self.rtable), 0)
eq_(app.selected_dupes, []) eq_(app.selected_dupes, [])
def test_dont_crash_on_delta_powermarker_dupecount_sort(self, do_setup):
# Don't crash when sorting by dupe count or percentage while delta+powermarker are enabled.
# Ref #238
app = self.app
objects = self.objects
self.rtable.delta_values = True
self.rtable.power_marker = True
self.rtable.sort('dupe_count', False)
# don't crash
self.rtable.sort('percentage', False)
# don't crash
class TestCaseDupeGuru_renameSelected: class TestCaseDupeGuru_renameSelected:
def pytest_funcarg__do_setup(self, request): def pytest_funcarg__do_setup(self, request):
tmpdir = request.getfuncargvalue('tmpdir') tmpdir = request.getfuncargvalue('tmpdir')