From fbf35edae2f9417bb2b044760b479888fce50b27 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 26 Feb 2017 11:09:56 -0800 Subject: [PATCH] Fix capitalization and set up some logging to help catch errors. --- .../targetingMiscViewMinimal.py | 2 +- gui/statsPane.py | 23 +++++++++++-------- gui/statsView.py | 2 +- service/settings.py | 8 +++++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gui/builtinStatsViews/targetingMiscViewMinimal.py b/gui/builtinStatsViews/targetingMiscViewMinimal.py index 0c9ae5004..458a3ab64 100644 --- a/gui/builtinStatsViews/targetingMiscViewMinimal.py +++ b/gui/builtinStatsViews/targetingMiscViewMinimal.py @@ -29,7 +29,7 @@ except ImportError: class TargetingMiscViewMinimal(StatsView): - name = "targetingmiscViewMinimal" + name = "targetingMiscViewMinimal" def __init__(self, parent): StatsView.__init__(self) diff --git a/gui/statsPane.py b/gui/statsPane.py index c7d92bea3..59aa0aea0 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -29,6 +29,9 @@ import gui.globalEvents as GE from gui.statsView import StatsView from gui.contextMenu import ContextMenu from gui.pyfatogglepanel import TogglePanel +from logbook import Logger + +pyfalog = Logger(__name__) class StatsPane(wx.Panel): @@ -38,7 +41,7 @@ class StatsPane(wx.Panel): "recharge", "firepower", "capacitor", - "targetingmisc", + "targetingMisc", "price", ] @@ -55,14 +58,14 @@ class StatsPane(wx.Panel): for aView in AVAILIBLE_VIEWS: if settings.get(aView) == 2: DEFAULT_VIEWS.extend(["%sViewFull" % aView]) - - if settings.get(aView) == 1: + pyfalog.debug("Setting full view for: {0}", aView) + elif settings.get(aView) == 1: DEFAULT_VIEWS.extend(["%sViewMinimal" % aView]) - - # If it's 0, it's disabled and we don't do anything. - - # TODO - # Add logging + pyfalog.debug("Setting minimal view for: {0}", aView) + elif settings.get(aView) == 0: + pyfalog.debug("Setting disabled view for: {0}", aView) + else: + pyfalog.error("Unknown setting for view: {0}", aView) def fitChanged(self, event): sFit = Fit.getInstance() @@ -97,9 +100,9 @@ class StatsPane(wx.Panel): try: view = StatsView.getView(viewName)(self) + pyfalog.debug("Load view: {0}", viewName) except KeyError: - # View doesn't exist. Skip to next view - continue + pyfalog.error("Attempted to load an invalid view: {0}", viewName) self.nameViewMap[viewName] = view self.views.append(view) diff --git a/gui/statsView.py b/gui/statsView.py index 773063ca4..1be2d8b8d 100644 --- a/gui/statsView.py +++ b/gui/statsView.py @@ -50,6 +50,6 @@ from gui.builtinStatsViews import ( # noqa: E402, F401 miningyieldViewFull, capacitorViewFull, rechargeViewFull, - targetingMiscViewFull, + targetingMiscViewMinimal, priceViewFull, ) diff --git a/service/settings.py b/service/settings.py index aa795e065..8c058e203 100644 --- a/service/settings.py +++ b/service/settings.py @@ -22,6 +22,9 @@ import os.path import urllib2 import config +from logbook import Logger + +pyfalog = Logger(__name__) class SettingsProvider(object): @@ -87,7 +90,8 @@ class Settings(object): def __getitem__(self, k): try: return self.info[k] - except KeyError: + except KeyError as e: + pyfalog.warning("Failed to get setting for '{0}'. Exception: {1}", k, e) return None def __setitem__(self, k, v): @@ -363,7 +367,7 @@ class StatViewSettings(object): "recharge" : 2, "firepower" : 2, "capacitor" : 2, - "targetingmisc": 1, + "targetingMisc": 1, "price" : 2, "miningyield" : 2, "drones" : 2