From e21627bbdec257deef7581cb55db8e2cd4ea389e Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 21 Sep 2011 10:35:34 -0400
Subject: [PATCH] Got rid of some code duplication in Cocoa interface.

---
 cocoa/me/dg_cocoa.py | 5 -----
 cocoa/pe/dg_cocoa.py | 6 +-----
 cocoa/se/dg_cocoa.py | 5 -----
 core/app_cocoa.py    | 4 ++++
 core_me/app.py       | 2 ++
 core_pe/app.py       | 2 ++
 core_se/app.py       | 2 ++
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/cocoa/me/dg_cocoa.py b/cocoa/me/dg_cocoa.py
index 67775404..3fa8ba02 100644
--- a/cocoa/me/dg_cocoa.py
+++ b/cocoa/me/dg_cocoa.py
@@ -11,7 +11,6 @@ from hscommon.cocoa import signature
 
 from core.app_cocoa import PyDupeGuruBase, PyDetailsPanel
 from core_me.app_cocoa import DupeGuruME
-from core_me import __appname__
 from core.scanner import ScanType
 
 class PyDupeGuru(PyDupeGuruBase):
@@ -60,7 +59,3 @@ class PyDupeGuru(PyDupeGuruBase):
         else:
             self.py.scanner.scanned_tags.discard(scan_tag)
     
-    #---Registration
-    def appName(self):
-        return __appname__
-    
diff --git a/cocoa/pe/dg_cocoa.py b/cocoa/pe/dg_cocoa.py
index 520f06fb..ccd1a5f4 100644
--- a/cocoa/pe/dg_cocoa.py
+++ b/cocoa/pe/dg_cocoa.py
@@ -8,7 +8,7 @@ from hscommon.trans import install_cocoa_trans
 install_cocoa_trans()
 
 from core.app_cocoa import PyDupeGuruBase, PyDetailsPanel
-from core_pe import app_cocoa as app_pe_cocoa, __appname__
+from core_pe import app_cocoa as app_pe_cocoa
 from core.scanner import ScanType
 
 class PyDupeGuru(PyDupeGuruBase):
@@ -43,7 +43,3 @@ class PyDupeGuru(PyDupeGuruBase):
     def setMinMatchPercentage_(self,percentage):
         self.py.scanner.threshold = int(percentage)
     
-    #---Registration
-    def appName(self):
-        return __appname__
-    
diff --git a/cocoa/se/dg_cocoa.py b/cocoa/se/dg_cocoa.py
index 910ae688..eae8255d 100644
--- a/cocoa/se/dg_cocoa.py
+++ b/cocoa/se/dg_cocoa.py
@@ -12,7 +12,6 @@ from hscommon.cocoa import signature
 from core.scanner import ScanType
 from core.app_cocoa import PyDupeGuruBase, PyDetailsPanel
 from core_se.app_cocoa import DupeGuru
-from core_se import __appname__
 
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
@@ -44,7 +43,3 @@ class PyDupeGuru(PyDupeGuruBase):
     def setSizeThreshold_(self, size_threshold):
         self.py.scanner.size_threshold = size_threshold
     
-    #---Registration
-    def appName(self):
-        return __appname__
-    
diff --git a/core/app_cocoa.py b/core/app_cocoa.py
index 08582394..83457152 100644
--- a/core/app_cocoa.py
+++ b/core/app_cocoa.py
@@ -180,6 +180,10 @@ class PyDupeGuruBase(PyFairware):
     def jobCompleted_(self, jobid):
         self.py._job_completed(jobid)
     
+    #---Registration
+    def appName(self):
+        return self.py.NAME
+    
     #--- model --> view
     def open_path(self, path):
         NSWorkspace.sharedWorkspace().openFile_(str(path))
diff --git a/core_me/app.py b/core_me/app.py
index f4aa3171..3f067064 100644
--- a/core_me/app.py
+++ b/core_me/app.py
@@ -11,10 +11,12 @@ from hscommon.util import format_size
 from core.app import (DupeGuru as DupeGuruBase, Column, format_time, format_timestamp,
     format_perc, format_words, format_dupe_count, cmp_value)
 from . import prioritize
+from . import __appname__
 
 tr = lambda s: trbase(s, 'columns')
 
 class DupeGuru(DupeGuruBase):
+    NAME = __appname__
     COLUMNS = [
         Column('name', tr("Filename")),
         Column('folder_path', tr("Folder")),
diff --git a/core_pe/app.py b/core_pe/app.py
index e5f383d3..94edfa44 100644
--- a/core_pe/app.py
+++ b/core_pe/app.py
@@ -11,6 +11,7 @@ from hscommon.util import format_size
 from core.app import (DupeGuru as DupeGuruBase, Column, format_timestamp, format_perc,
     format_dupe_count, cmp_value)
 from . import prioritize
+from . import __appname__
 
 tr = lambda s: trbase(s, 'columns')
 
@@ -21,6 +22,7 @@ def get_delta_dimensions(value, ref_value):
     return (value[0]-ref_value[0], value[1]-ref_value[1])
 
 class DupeGuru(DupeGuruBase):
+    NAME = __appname__
     COLUMNS = [
         Column('name', tr("Filename")),
         Column('folder_path', tr("Folder")),
diff --git a/core_se/app.py b/core_se/app.py
index 9c0bab33..3d5594d9 100644
--- a/core_se/app.py
+++ b/core_se/app.py
@@ -11,10 +11,12 @@ from hscommon.util import format_size
 from core.app import (DupeGuru as DupeGuruBase, Column, format_timestamp, format_perc,
     format_words, format_dupe_count, cmp_value)
 from core import prioritize
+from . import __appname__
 
 tr = lambda s: trbase(s, 'columns')
 
 class DupeGuru(DupeGuruBase):
+    NAME = __appname__
     COLUMNS = [
         Column('name', tr("Filename")),
         Column('folder_path', tr("Folder")),