From 208148b670e7eb0ecfea9871a13bc6bbdc3b9bb4 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Fri, 2 Jun 2017 00:30:58 -0400 Subject: [PATCH 1/4] Fix issue with fit deletion (#1211) * bump dev * Fix issue with deleted fit not being removed from database cache (#1207). Also, include some error handling around the our commit stuff --- config.py | 4 ++-- eos/db/saveddata/queries.py | 11 +++++++++-- service/fit.py | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index 098f2bebd..74df5d1b9 100644 --- a/config.py +++ b/config.py @@ -19,8 +19,8 @@ debug = False saveInRoot = False # Version data -version = "1.29.3" -tag = "Stable" +version = "1.29.4" +tag = "git" expansionName = "YC119.5" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/eos/db/saveddata/queries.py b/eos/db/saveddata/queries.py index 4817b89e1..fd8ae93db 100644 --- a/eos/db/saveddata/queries.py +++ b/eos/db/saveddata/queries.py @@ -17,6 +17,8 @@ # along with eos. If not, see . # =============================================================================== +import sys + from sqlalchemy.sql import and_ from sqlalchemy import desc, select @@ -539,5 +541,10 @@ def remove(stuff): def commit(): with sd_lock: - saveddata_session.commit() - saveddata_session.flush() + try: + saveddata_session.commit() + saveddata_session.flush() + except Exception: + saveddata_session.rollback() + exc_info = sys.exc_info() + raise exc_info[0], exc_info[1], exc_info[2] diff --git a/service/fit.py b/service/fit.py index 896ca689d..706fc41cc 100644 --- a/service/fit.py +++ b/service/fit.py @@ -185,7 +185,7 @@ class Fit(object): if booster.boosted_fit != fit and booster.boosted_fit in eos.db.saveddata_session: # GH issue #359 refreshFits.add(booster.boosted_fit) - eos.db.saveddata_session.delete(fit) + eos.db.remove(fit) pyfalog.debug(" Need to refresh {} fits: {}", len(refreshFits), refreshFits) for fit in refreshFits: From d319b74d7a6c32717af3fabbc1b74335d7b15d32 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Thu, 8 Jun 2017 21:58:20 -0400 Subject: [PATCH 2/4] Fix exception when double clicking CREST fit browser hull (#1226) --- gui/crestFittings.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gui/crestFittings.py b/gui/crestFittings.py index 0f1911206..c02801268 100644 --- a/gui/crestFittings.py +++ b/gui/crestFittings.py @@ -407,7 +407,13 @@ class FittingsTreeView(wx.Panel): def displayFit(self, event): selection = self.fittingsTreeCtrl.GetSelection() - fit = json.loads(self.fittingsTreeCtrl.GetPyData(selection)) + data = self.fittingsTreeCtrl.GetPyData(selection) + + if data is None: + event.Skip() + return + + fit = json.loads(data) list = [] for item in fit['items']: From 94256876e47e2876f1d044378d3a715bac44593b Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Thu, 8 Jun 2017 22:13:46 -0400 Subject: [PATCH 3/4] Add tooltip for alpha clones to explain functionality (#1227) See #1219 --- gui/characterEditor.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 6cd5d6761..ca3aacb70 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -297,6 +297,9 @@ class SkillTreeView(wx.Panel): self.clonesChoice.Bind(wx.EVT_CHOICE, self.cloneChanged) + self.clonesChoice.SetToolTip( + wx.ToolTip("Setting an Alpha clone does not replace the character's skills, but rather caps them to Alpha levels.")) + pmainSizer.Add(hSizer, 0, wx.EXPAND | wx.ALL, 5) # Set up timer for skill search From a79257271e68a4a19da8401d3a0f49a44a06e17a Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Thu, 8 Jun 2017 22:22:30 -0400 Subject: [PATCH 4/4] bump to stable 1.29.4 (#1228) --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 74df5d1b9..7f4dde2a2 100644 --- a/config.py +++ b/config.py @@ -20,7 +20,7 @@ saveInRoot = False # Version data version = "1.29.4" -tag = "git" +tag = "Stable" expansionName = "YC119.5" expansionVersion = "1.0" evemonMinVersion = "4081"