From ea8a4c01cb952773bc92beb6ca8bacb78bbf9820 Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Fri, 2 Dec 2016 12:50:49 -0800
Subject: [PATCH] Eliminate export calling fit.py (no need)

Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated.  Also spotted an
import reference that got missed.
---
 gui/mainFrame.py | 30 +++++++++++++++++-------------
 service/fit.py   | 28 +---------------------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 480d50681..ad7a4a39d 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -68,6 +68,9 @@ from service.update import Update
 # import this to access override setting
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
+from eos import db
+from service.port import Port
+from service.settings import HTMLExportSettings
 
 from time import gmtime, strftime
 
@@ -665,28 +668,29 @@ class MainFrame(wx.Frame):
             self.marketBrowser.search.Focus()
 
     def clipboardEft(self):
-        sFit = Fit.getInstance()
-        toClipboard(sFit.exportFit(self.getActiveFit()))
+        fit = db.getFit(self.getActiveFit())
+        toClipboard(Port.exportEft(fit))
 
     def clipboardEftImps(self):
-        sFit = Fit.getInstance()
-        toClipboard(sFit.exportEftImps(self.getActiveFit()))
+        fit = db.getFit(self.getActiveFit())
+        toClipboard(Port.exportEftImps(fit))
 
     def clipboardDna(self):
-        sFit = Fit.getInstance()
-        toClipboard(sFit.exportDna(self.getActiveFit()))
+        fit = db.getFit(self.getActiveFit())
+        toClipboard(Port.exportDna(fit))
 
     def clipboardCrest(self):
-        sFit = Fit.getInstance()
-        toClipboard(sFit.exportCrest(self.getActiveFit()))
+        fit = db.getFit(self.getActiveFit())
+        toClipboard(Port.exportCrest(fit))
 
     def clipboardXml(self):
-        sFit = Fit.getInstance()
-        toClipboard(sFit.exportXml(None, self.getActiveFit()))
+        fitIDs = self.getActiveFit()
+        fits = map(lambda fitID: db.getFit(fitID), fitIDs)
+        toClipboard(Port.exportXml(None, *fits))
 
     def clipboardMultiBuy(self):
-        sFit = Fit.getInstance()
-        toClipboard(sFit.exportMultiBuy(self.getActiveFit()))
+        fit = db.getFit(self.getActiveFit())
+        toClipboard(Port.exportMultiBuy(fit))
 
     def importFromClipboard(self, event):
         sFit = Fit.getInstance()
@@ -786,7 +790,7 @@ class MainFrame(wx.Frame):
     def exportHtml(self, event):
         from gui.utils.exportHtml import exportHtml
         sFit = Fit.getInstance()
-        settings = service.settings.HTMLExportSettings.getInstance()
+        settings = HTMLExportSettings.getInstance()
 
         max = sFit.countAllFits()
         path = settings.getPath()
diff --git a/service/fit.py b/service/fit.py
index 16e52ab82..57c72ac31 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -960,33 +960,7 @@ class Fit(object):
         fit.damagePattern = dp
         self.recalc(fit)
 
-    # TODO: port this to port.py
-    '''
-    def exportFit(self, fitID):
-        fit = eos.db.getFit(fitID)
-        return Port.exportEft(fit)
-
-    def exportEftImps(self, fitID):
-        fit = eos.db.getFit(fitID)
-        return Port.exportEftImps(fit)
-
-    def exportDna(self, fitID):
-        fit = eos.db.getFit(fitID)
-        return Port.exportDna(fit)
-
-    def exportCrest(self, fitID, callback=None):
-        fit = eos.db.getFit(fitID)
-        return Port.exportCrest(fit, callback)
-
-    def exportXml(self, callback=None, *fitIDs):
-        fits = map(lambda fitID: eos.db.getFit(fitID), fitIDs)
-        return Port.exportXml(callback, *fits)
-
-    def exportMultiBuy(self, fitID):
-        fit = eos.db.getFit(fitID)
-        return Port.exportMultiBuy(fit)
-    '''
-
+    # TODO: Should move all the backup/import stuff out of here
     def backupFits(self, path, callback):
         thread = FitBackupThread(path, callback)
         thread.start()