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

Refactoring: Moved some code from app.DupeGuru to fs.File.

Moved DupeGuru._get_display_info() to File.get_display_info().
This method used none of the app's global state or methods
and had nothing to do there.
This commit is contained in:
Virgil Dupras
2013-07-14 17:43:58 -04:00
parent bdd5f0a515
commit 7891fb5396
9 changed files with 150 additions and 133 deletions

View File

@@ -62,19 +62,6 @@ class DupeGuru(DupeGuruBase):
def __init__(self):
DupeGuruBase.__init__(self, DupeGuruView(), '/tmp')
def _get_display_info(self, dupe, group, delta):
size = dupe.size
m = group.get_match_of(dupe)
if m and delta:
r = group.ref
size -= r.size
return {
'name': dupe.name,
'folder_path': str(dupe.folder_path),
'size': format_size(size, 0, 1, False),
'extension': dupe.extension if hasattr(dupe, 'extension') else '---',
}
def _get_dupe_sort_key(self, dupe, get_group, key, delta):
r = cmp_value(dupe, key)
if delta and (key in self.result_table.DELTA_COLUMNS):
@@ -107,6 +94,19 @@ class NamedObject:
def __bool__(self):
return False #Make sure that operations are made correctly when the bool value of files is false.
def get_display_info(self, group, delta):
size = self.size
m = group.get_match_of(self)
if m and delta:
r = group.ref
size -= r.size
return {
'name': self.name,
'folder_path': str(self.folder_path),
'size': format_size(size, 0, 1, False),
'extension': self.extension if hasattr(self, 'extension') else '---',
}
@property
def path(self):
return self._folder + self.name