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_pe/app.py

@@ -7,21 +7,13 @@
 
 import os.path as op
 
-from hscommon.util import format_size
-
-from core.app import (DupeGuru as DupeGuruBase, format_timestamp, format_perc,
-    format_dupe_count, cmp_value)
+from core.app import DupeGuru as DupeGuruBase, cmp_value
 from .scanner import ScannerPE
 from . import prioritize
 from . import __appname__
+from .fs import get_delta_dimensions
 from .result_table import ResultTable
 
-def format_dimensions(dimensions):
-    return '%d x %d' % (dimensions[0], dimensions[1])
-
-def get_delta_dimensions(value, ref_value):
-    return (value[0]-ref_value[0], value[1]-ref_value[1])
-
 class DupeGuru(DupeGuruBase):
     NAME = __appname__
     METADATA_TO_READ = ['size', 'mtime', 'dimensions', 'exif_timestamp']
@@ -31,35 +23,6 @@ class DupeGuru(DupeGuruBase):
         self.scanner = ScannerPE()
         self.scanner.cache_path = op.join(self.appdata, 'cached_pictures.db')
     
-    def _get_display_info(self, dupe, group, delta):
-        size = dupe.size
-        mtime = dupe.mtime
-        dimensions = dupe.dimensions
-        m = group.get_match_of(dupe)
-        if m:
-            percentage = m.percentage
-            dupe_count = 0
-            if delta:
-                r = group.ref
-                size -= r.size
-                mtime -= r.mtime
-                dimensions = get_delta_dimensions(dimensions, r.dimensions)
-        else:
-            percentage = group.percentage
-            dupe_count = len(group.dupes)
-        dupe_folder_path = getattr(dupe, 'display_folder_path', dupe.folder_path)
-        return {
-            'name': dupe.name,
-            'folder_path': str(dupe_folder_path),
-            'size': format_size(size, 0, 1, False),
-            'extension': dupe.extension,
-            'dimensions': format_dimensions(dimensions),
-            'exif_timestamp': dupe.exif_timestamp,
-            'mtime': format_timestamp(mtime, delta and m),
-            'percentage': format_perc(percentage),
-            'dupe_count': format_dupe_count(dupe_count),
-        }
-    
     def _get_dupe_sort_key(self, dupe, get_group, key, delta):
         if key == 'folder_path':
             dupe_folder_path = getattr(dupe, 'display_folder_path', dupe.folder_path)

core_pe/photo.py

@@ -7,10 +7,19 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 import logging
-from hscommon.util import get_file_ext
+from hscommon.util import get_file_ext, format_size
+
+from core.app import format_timestamp, format_perc, format_dupe_count
 from core import fs
 from . import exif
 
+def format_dimensions(dimensions):
+    return '%d x %d' % (dimensions[0], dimensions[1])
+
+def get_delta_dimensions(value, ref_value):
+    return (value[0]-ref_value[0], value[1]-ref_value[1])
+
+
 class Photo(fs.File):
     INITIAL_INFO = fs.File.INITIAL_INFO.copy()
     INITIAL_INFO.update({
@@ -44,6 +53,35 @@ class Photo(fs.File):
     def can_handle(cls, path):
         return fs.File.can_handle(path) and get_file_ext(path[-1]) in cls.HANDLED_EXTS
     
+    def get_display_info(self, group, delta):
+        size = self.size
+        mtime = self.mtime
+        dimensions = self.dimensions
+        m = group.get_match_of(self)
+        if m:
+            percentage = m.percentage
+            dupe_count = 0
+            if delta:
+                r = group.ref
+                size -= r.size
+                mtime -= r.mtime
+                dimensions = get_delta_dimensions(dimensions, r.dimensions)
+        else:
+            percentage = group.percentage
+            dupe_count = len(group.dupes)
+        dupe_folder_path = getattr(self, 'display_folder_path', self.folder_path)
+        return {
+            'name': self.name,
+            'folder_path': str(dupe_folder_path),
+            'size': format_size(size, 0, 1, False),
+            'extension': self.extension,
+            'dimensions': format_dimensions(dimensions),
+            'exif_timestamp': self.exif_timestamp,
+            'mtime': format_timestamp(mtime, delta and m),
+            'percentage': format_perc(percentage),
+            'dupe_count': format_dupe_count(dupe_count),
+        }
+    
     def _read_info(self, field):
         fs.File._read_info(self, field)
         if field == 'dimensions':