Merge pull request pyfa-org#99 from Pyfa-fit/catchup_bugfixes

Catchup: Bugfixes
w9jds · May 21, 2017 · c1542a3 · c1542a3
2 parents 181fb37 + e828eb4
commit c1542a3
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 29 deletions.
diff --git a/eos/db/migrations/upgrade17.py b/eos/db/migrations/upgrade17.py
@@ -16,23 +16,27 @@ def upgrade(saveddata_engine):
           JOIN wings w on w.ID = s.wingID
           JOIN gangs g on g.ID = w.gangID
           """
-
-    results = saveddata_session.execute(sql)
-
-    inserts = []
-
-    for row in results:
-        boosted = row["boostedFit"]
-        types = ("squad", "wing", "gang")
-        for x in types:
-            value = row["{}Boost".format(x)]
-            if value is None:
-                continue
-
-            inserts.append({"boosterID": value, "boostedID": boosted, "active": 1})
-            try:
-                saveddata_session.execute(commandFits_table.insert(),
-                                          {"boosterID": value, "boostedID": boosted, "active": 1})
-            except Exception:
-                pass
-    saveddata_session.commit()
+    try:
+        results = saveddata_session.execute(sql)
+
+        inserts = []
+
+        for row in results:
+            boosted = row["boostedFit"]
+            types = ("squad", "wing", "gang")
+            for x in types:
+                value = row["{}Boost".format(x)]
+                if value is None:
+                    continue
+
+                inserts.append({"boosterID": value, "boostedID": boosted, "active": 1})
+                try:
+                    saveddata_session.execute(commandFits_table.insert(),
+                                              {"boosterID": value, "boostedID": boosted, "active": 1})
+                except Exception:
+                    pass
+        saveddata_session.commit()
+    except:
+        # Shouldn't fail unless you have updated database without the old fleet schema and manually modify the database version
+        # If it does, simply fail. Fleet data migration isn't critically important here
+        pass
diff --git a/eos/db/migrations/upgrade6.py b/eos/db/migrations/upgrade6.py
@@ -6,6 +6,12 @@
 
 
 def upgrade(saveddata_engine):
-    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
-    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)',
-                             (1, "Uniform", 25, 25, 25, 25, None))
+    try:
+        saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
+        saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)',
+                                 (1, "Uniform", 25, 25, 25, 25, None))
+    except:
+        # Most likely using the newer DB schema (migration 22).  Go ahead and account for that.
+        saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
+        saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
+                                 (1, "Uniform", 25, 25, 25, 25, None, None, None))
diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py
@@ -111,7 +111,7 @@ def refreshPanelPrices(self, fit=None):
 
             if fit.fighters:
                 for fighter in fit.fighters:
-                    fighter_price += fighter.item.price.price * fighter.amount
+                    fighter_price += fighter.item.price.price * fighter.amountActive
 
             if fit.cargo:
                 for cargo in fit.cargo:

diff --git a/gui/builtinStatsViews/priceViewMinimal.py b/gui/builtinStatsViews/priceViewMinimal.py
@@ -105,7 +105,7 @@ def refreshPanelPrices(self, fit=None):
 
             if fit.fighters:
                 for fighter in fit.fighters:
-                    fighter_price += fighter.item.price.price * fighter.amount
+                    fighter_price += fighter.item.price.price * fighter.amountActive
 
             if fit.cargo:
                 for cargo in fit.cargo:

diff --git a/gui/commandView.py b/gui/commandView.py
@@ -214,5 +214,7 @@ def remove(self, event):
             if col != self.getColIndex(State):
                 fitID = self.mainFrame.getActiveFit()
                 sFit = Fit.getInstance()
-                sFit.removeCommand(fitID, self.get(row))
-                wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+                thing = self.get(row)
+                if thing:  # thing doesn't exist if it's the dummy value
+                    sFit.removeCommand(fitID, thing)
+                    wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
diff --git a/gui/projectedView.py b/gui/projectedView.py
@@ -298,5 +298,7 @@ def remove(self, event):
             if col != self.getColIndex(State):
                 fitID = self.mainFrame.getActiveFit()
                 sFit = Fit.getInstance()
-                sFit.removeProjected(fitID, self.get(row))
-                wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+                thing = self.get(row)
+                if thing:  # thing doesn't exist if it's the dummy value
+                    sFit.removeProjected(fitID, thing)
+                    wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))