arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-09-11 17:58:17 +00:00
Code Releases Wiki Activity

[#120 state:fixed] Fixed dangling bogus results after cancelled scan.

Browse Source
This commit is contained in:
Virgil Dupras 2010-12-30 10:24:37 +01:00
parent 45d783ac43
commit 92fadd26b7
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/app.py
View File

@ -353,6 +353,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
if not self.directories.has_any_file(): if not self.directories.has_any_file():
raise NoScannableFileError() raise NoScannableFileError()
self.results.groups = [] self.results.groups = []
self.notify('results_changed')
self._start_job(JOB_SCAN, do) self._start_job(JOB_SCAN, do)
def toggle_selected_mark_state(self): def toggle_selected_mark_state(self):

24
core/tests/app_test.py
View File

@ -16,7 +16,7 @@ from hsutil.path import Path
from hsutil.decorators import log_calls from hsutil.decorators import log_calls
import hsutil.files import hsutil.files
from hscommon.testutil import CallLogger from hscommon.testutil import CallLogger
from jobprogress.job import nulljob from jobprogress.job import nulljob, Job, JobCancelled
from . import data from . import data
from .results_test import GetTestGroups from .results_test import GetTestGroups
@ -28,13 +28,22 @@ from ..gui.result_table import ResultTable
from ..scanner import ScanType from ..scanner import ScanType
class DupeGuru(DupeGuruBase): class DupeGuru(DupeGuruBase):
JOB = nulljob
def __init__(self): def __init__(self):
DupeGuruBase.__init__(self, data, '/tmp') DupeGuruBase.__init__(self, data, '/tmp')
def _start_job(self, jobid, func, *args): def _start_job(self, jobid, func, *args):
func(nulljob, *args) try:
func(self.JOB, *args)
except JobCancelled:
return
def add_fake_files_to_directories(directories, files):
directories.get_files = lambda: iter(files)
directories._dirs.append('this is just so Scan() doesnt return 3')
class TCDupeGuru(TestCase): class TCDupeGuru(TestCase):
cls_tested_module = app cls_tested_module = app
def test_apply_filter_calls_results_apply_filter(self): def test_apply_filter_calls_results_apply_filter(self):
@ -103,8 +112,7 @@ class TCDupeGuru(TestCase):
f1, f2 = [FakeFile('foo') for i in range(2)] f1, f2 = [FakeFile('foo') for i in range(2)]
f1.is_ref, f2.is_ref = (False, False) f1.is_ref, f2.is_ref = (False, False)
assert not (bool(f1) and bool(f2)) assert not (bool(f1) and bool(f2))
app.directories.get_files = lambda: iter([f1, f2]) add_fake_files_to_directories(app.directories, [f1, f2])
app.directories._dirs.append('this is just so Scan() doesnt return 3')
app.start_scanning() # no exception app.start_scanning() # no exception
def test_ignore_hardlink_matches(self): def test_ignore_hardlink_matches(self):
@ -356,6 +364,14 @@ class TCDupeGuruWithResults(TestCase):
self.rtable.select([4]) self.rtable.select([4])
app.add_selected_to_ignore_list() app.add_selected_to_ignore_list()
def test_cancel_scan_with_previous_results(self):
# When doing a scan with results being present prior to the scan, correctly invalidate the
# results table.
app = self.app
app.JOB = Job(1, lambda *args, **kw: False) # Cancels the task
add_fake_files_to_directories(app.directories, self.objects) # We want the scan to at least start
app.start_scanning() # will be cancelled immediately
eq_(len(self.rtable), 0)
class TCDupeGuru_renameSelected(TestCase): class TCDupeGuru_renameSelected(TestCase):
def setUp(self): def setUp(self):