dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Adds network toggling to the preferences, as well as a few tweaks to network service

Browse Source
This commit is contained in:
blitzmann
2014-08-15 01:00:31 -04:00
parent fa5edbb804
commit 0686b602c6
4 changed files with 86 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
gui/builtinPreferenceViews/pyfaNetworkPreferences.py
View File

@@ -12,14 +12,10 @@ class PFNetworkPref ( PreferenceView):
def populatePanel( self, panel ):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.networkSettings = service.settings.NetworkSettings.getInstance()
self.settings = service.settings.NetworkSettings.getInstance()
self.network = service.Network.getInstance()
self.dirtySettings = False
self.nMode = self.networkSettings.getMode()
self.nAddr = self.networkSettings.getAddress()
self.nPort = self.networkSettings.getPort()
self.nType = self.networkSettings.getType()
mainSizer = wx.BoxSizer( wx.VERTICAL )
self.stTitle = wx.StaticText( panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -31,6 +27,42 @@ class PFNetworkPref ( PreferenceView):
self.m_staticline1 = wx.StaticLine( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
mainSizer.Add( self.m_staticline1, 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5 )
self.cbEnableNetwork = wx.CheckBox( panel, wx.ID_ANY, u"Enable Network", wx.DefaultPosition, wx.DefaultSize, 0 )
mainSizer.Add( self.cbEnableNetwork, 0, wx.ALL|wx.EXPAND, 5 )
subSizer = wx.BoxSizer( wx.VERTICAL )
self.cbEve = wx.CheckBox( panel, wx.ID_ANY, u"EVE Servers (API && CREST import)", wx.DefaultPosition, wx.DefaultSize, 0 )
subSizer.Add( self.cbEve, 0, wx.ALL|wx.EXPAND, 5 )
self.cbPricing = wx.CheckBox( panel, wx.ID_ANY, u"Pricing updates", wx.DefaultPosition, wx.DefaultSize, 0 )
subSizer.Add( self.cbPricing, 0, wx.ALL|wx.EXPAND, 5 )
self.cbPyfaUpdate = wx.CheckBox( panel, wx.ID_ANY, u"Pyfa Update checks", wx.DefaultPosition, wx.DefaultSize, 0 )
subSizer.Add( self.cbPyfaUpdate, 0, wx.ALL|wx.EXPAND, 5 )
mainSizer.Add( subSizer, 0, wx.LEFT|wx.EXPAND, 30 )
self.cbEnableNetwork.SetValue(self.settings.isEnabled(self.network.ENABLED))
self.cbEve.SetValue(self.settings.isEnabled(self.network.EVE))
self.cbPricing.SetValue(self.settings.isEnabled(self.network.PRICES))
self.cbPyfaUpdate.SetValue(self.settings.isEnabled(self.network.UPDATE))
self.cbEnableNetwork.Bind(wx.EVT_CHECKBOX, self.OnCBEnableChange)
self.cbEve.Bind(wx.EVT_CHECKBOX, self.OnCBEveChange)
self.cbPricing.Bind(wx.EVT_CHECKBOX, self.OnCBPricingChange)
self.cbPyfaUpdate.Bind(wx.EVT_CHECKBOX, self.OnCBUpdateChange)
self.toggleNetworks(self.cbEnableNetwork.GetValue())
#---------------
# Proxy
#---------------
self.nMode = self.settings.getMode()
self.nAddr = self.settings.getAddress()
self.nPort = self.settings.getPort()
self.nType = self.settings.getType()
ptypeSizer = wx.BoxSizer( wx.HORIZONTAL )
self.stPType = wx.StaticText( panel, wx.ID_ANY, u"Mode:", wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -79,13 +111,13 @@ class PFNetworkPref ( PreferenceView):
btnSizer = wx.BoxSizer( wx.HORIZONTAL )
btnSizer.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 )
self.btnApply = wx.Button( panel, wx.ID_ANY, u"Apply", wx.DefaultPosition, wx.DefaultSize, 0 )
self.btnApply = wx.Button( panel, wx.ID_ANY, u"Apply Proxy Settings", wx.DefaultPosition, wx.DefaultSize, 0 )
btnSizer.Add( self.btnApply, 0, wx.ALL, 5 )
mainSizer.Add(btnSizer, 0, wx.EXPAND,5)
proxy = self.networkSettings.autodetect()
proxy = self.settings.autodetect()
if proxy is not None:
addr,port = proxy
@@ -113,6 +145,24 @@ class PFNetworkPref ( PreferenceView):
panel.SetSizer( mainSizer )
panel.Layout()
def toggleNetworks(self, toggle):
self.cbEve.Enable(toggle)
self.cbPricing.Enable(toggle)
self.cbPyfaUpdate.Enable(toggle)
def OnCBEnableChange(self, event):
self.settings.toggleAccess(self.network.ENABLED, self.cbEnableNetwork.GetValue())
self.toggleNetworks(self.cbEnableNetwork.GetValue())
def OnCBUpdateChange(self, event):
self.settings.toggleAccess(self.network.UPDATE, self.cbPyfaUpdate.GetValue())
def OnCBPricingChange(self, event):
self.settings.toggleAccess(self.network.PRICES, self.cbPricing.GetValue())
def OnCBEveChange(self, event):
self.settings.toggleAccess(self.network.EVE, self.cbEve.GetValue())
def OnEditPSAddrText(self, event):
self.nAddr = self.editProxySettingsAddr.GetValue()
self.dirtySettings = True
@@ -129,10 +179,10 @@ class PFNetworkPref ( PreferenceView):
self.SaveSettings()
def SaveSettings(self):
self.networkSettings.setMode(self.nMode)
self.networkSettings.setAddress(self.nAddr)
self.networkSettings.setPort(self.nPort)
self.networkSettings.setType(self.nType)
self.settings.setMode(self.nMode)
self.settings.setAddress(self.nAddr)
self.settings.setPort(self.nPort)
self.settings.setType(self.nType)
def UpdateApplyButtonState(self):
if self.dirtySettings:

4
gui/characterEditor.py
View File

@@ -640,11 +640,11 @@ class APIView (wx.Panel):
try:
list = sChar.charList(self.Parent.Parent.getActiveCharacter(), self.inputID.GetLineText(0), self.inputKey.GetLineText(0))
except service.network.AuthenticationError, e:
self.stStatus.SetLabel("%s\nAuthentication failure. Please check keyID and vCode combination."%e)
self.stStatus.SetLabel("Authentication failure. Please check keyID and vCode combination.")
except service.network.TimeoutError, e:
self.stStatus.SetLabel("Request timed out. Please check network connectivity and/or proxy settings.")
except Exception, e:
self.stStatus.SetLabel("Error:\n%s"%e)
self.stStatus.SetLabel("Error:\n%s"%e.message)
else:
self.charChoice.Clear()
for charName in list:

18
service/network.py
View File

@@ -28,8 +28,8 @@ timeout = 3
socket.setdefaulttimeout(timeout)
class Error(StandardError):
def __init__(self, error):
self.error = error
def __init__(self, msg=None):
self.message = msg
class RequestError(StandardError):
pass
@@ -59,7 +59,7 @@ class Network():
return cls._instance
def request(self, url, type=None, postData=None):
def request(self, url, type, postData=None):
# URL is required to be https as of right now
print "Starting request: %s\n\tType: %s\n\tPost Data: %s"%(url,type,postData)
@@ -67,9 +67,9 @@ class Network():
# Make sure request is enabled
access = NetworkSettings.getInstance().getAccess()
if not type or not type & access: # @todo: check if enabled
if not self.ENABLED & access or not type & access:
print "\tType not enabled"
return # @todo: throw exception
raise Error("Access not enabled - please enable in Preferences > Network")
# Set up some things for the request
versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName, config.expansionVersion)
@@ -89,13 +89,13 @@ class Network():
return data
except urllib2.HTTPError, error:
if error.code == 404:
raise RequestError(error)
raise RequestError()
elif error.code == 403:
raise AuthenticationError(error)
raise AuthenticationError()
elif error.code >= 500:
raise ServerError(error)
raise ServerError()
except urllib2.URLError, error:
if "timed out" in error.reason:
raise TimeoutError(error)
raise TimeoutError()
else:
raise Error(error)

13
service/settings.py
View File

@@ -130,6 +130,19 @@ class NetworkSettings():
self.serviceNetworkSettings = SettingsProvider.getInstance().getSettings("pyfaServiceNetworkSettings", serviceNetworkDefaultSettings)
def isEnabled(self, type):
if type & self.serviceNetworkSettings["access"]:
return True
return False
def toggleAccess(self, type, toggle=True):
bitfield = self.serviceNetworkSettings["access"]
if toggle: # Turn bit on
self.serviceNetworkSettings["access"] = type | bitfield
else: # Turn bit off
self.serviceNetworkSettings["access"] = ~type & bitfield
def getMode(self):
return self.serviceNetworkSettings["mode"]