Moved column information in new edition-specific core result_table units.

core_pe/app.py

@@ -7,17 +7,14 @@
 
 import os.path as op
 
-from hscommon.trans import trget
 from hscommon.util import format_size
-from hscommon.gui.column import Column
 
 from core.app import (DupeGuru as DupeGuruBase, format_timestamp, format_perc,
     format_dupe_count, cmp_value)
 from .scanner import ScannerPE
 from . import prioritize
 from . import __appname__
-
-coltr = trget('columns')
+from .result_table import ResultTable
 
 def format_dimensions(dimensions):
     return '%d x %d' % (dimensions[0], dimensions[1])
@@ -27,27 +24,14 @@ def get_delta_dimensions(value, ref_value):
 
 class DupeGuru(DupeGuruBase):
     NAME = __appname__
-    COLUMNS = [
-        Column('marked', ''),
-        Column('name', coltr("Filename")),
-        Column('folder_path', coltr("Folder"), optional=True),
-        Column('size', coltr("Size (KB)"), optional=True),
-        Column('extension', coltr("Kind"), visible=False, optional=True),
-        Column('dimensions', coltr("Dimensions"), optional=True),
-        Column('mtime', coltr("Modification"), visible=False, optional=True),
-        Column('percentage', coltr("Match %"), optional=True),
-        Column('dupe_count', coltr("Dupe Count"), visible=False, optional=True),
-    ]
     DELTA_COLUMNS = {2, 4, 5}
     METADATA_TO_READ = ['size', 'mtime', 'dimensions']
-    FOLDER_COL = 1
-    MATCHPERC_COL = 6
-    DUPECOUNT_COL = 7
     
     def __init__(self, view, appdata):
         DupeGuruBase.__init__(self, view, appdata)
         self.scanner = ScannerPE()
         self.scanner.cache_path = op.join(self.appdata, 'cached_pictures.db')
+        self.result_table = ResultTable(self)
     
     def _get_display_info(self, dupe, group, delta):
         size = dupe.size
@@ -78,17 +62,17 @@ class DupeGuru(DupeGuruBase):
         }
     
     def _get_dupe_sort_key(self, dupe, get_group, key, delta):
-        if key == self.MATCHPERC_COL:
+        if key == 'percentage':
             m = get_group().get_match_of(dupe)
             return m.percentage
-        if key == self.DUPECOUNT_COL:
+        if key == 'dupe_count':
             return 0
-        if key == self.FOLDER_COL:
+        if key == 'folder_path':
             dupe_folder_path = getattr(dupe, 'display_folder_path', dupe.folder_path)
             return str(dupe_folder_path).lower()
-        r = cmp_value(dupe, self.COLUMNS[key])
+        r = cmp_value(dupe, key)
         if delta and (key in self.DELTA_COLUMNS):
-            ref_value = cmp_value(get_group().ref, self.COLUMNS[key])
+            ref_value = cmp_value(get_group().ref, key)
             if key == 4: # dimensions
                 r = get_delta_dimensions(r, ref_value)
             else:
@@ -96,14 +80,14 @@ class DupeGuru(DupeGuruBase):
         return r
     
     def _get_group_sort_key(self, group, key):
-        if key == self.MATCHPERC_COL:
+        if key == 'percentage':
             return group.percentage
-        if key == self.DUPECOUNT_COL:
+        if key == 'dupe_count':
             return len(group)
-        if key == self.FOLDER_COL:
+        if key == 'folder_path':
             dupe_folder_path = getattr(group.ref, 'display_folder_path', group.ref.folder_path)
             return str(dupe_folder_path).lower()
-        return cmp_value(group.ref, self.COLUMNS[key])
+        return cmp_value(group.ref, key)
     
     def _prioritization_categories(self):
         return prioritize.all_categories()

core_pe/result_table.py

@@ -0,0 +1,26 @@
+# Created On: 2011-11-27
+# Copyright 2011 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+from hscommon.gui.column import Column
+from hscommon.trans import trget
+
+from core.gui.result_table import ResultTable as ResultTableBase
+
+coltr = trget('columns')
+
+class ResultTable(ResultTableBase):
+    COLUMNS = [
+        Column('marked', ''),
+        Column('name', coltr("Filename")),
+        Column('folder_path', coltr("Folder"), optional=True),
+        Column('size', coltr("Size (KB)"), optional=True),
+        Column('extension', coltr("Kind"), visible=False, optional=True),
+        Column('dimensions', coltr("Dimensions"), optional=True),
+        Column('mtime', coltr("Modification"), visible=False, optional=True),
+        Column('percentage', coltr("Match %"), optional=True),
+        Column('dupe_count', coltr("Dupe Count"), visible=False, optional=True),
+    ]