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.

core/app.py

@@ -128,9 +128,6 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             child.connect()
     
     #--- Virtual
-    def _get_display_info(self, dupe, group, delta):
-        raise NotImplementedError()
-    
     def _prioritization_categories(self):
         raise NotImplementedError()
     
@@ -389,7 +386,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         if (dupe is None) or (group is None):
             return empty_data()
         try:
-            return self._get_display_info(dupe, group, delta)
+            return dupe.get_display_info(group, delta)
         except Exception as e:
             logging.warning("Exception on GetDisplayInfo for %s: %s", str(dupe.path), str(e))
             return empty_data()

core/fs.py

@@ -145,6 +145,11 @@ class File:
             raise OperationError(self)
         self.path = destpath
     
+    def get_display_info(self, group, delta):
+        """Returns a display-ready dict of dupe's data.
+        """
+        raise NotImplementedError()
+    
     #--- Properties
     @property
     def extension(self):

core/tests/base.py

@@ -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