Merge branch 'master' into price_optimize

service/esi.py

@@ -13,9 +13,11 @@ from eos.enum import Enum
 from eos.saveddata.ssocharacter import SsoCharacter
 from service.esiAccess import APIException, SsoMode
 import gui.globalEvents as GE
+from gui.ssoLogin import SsoLogin, SsoLoginServer
 from service.server import StoppableHTTPServer, AuthHandler
 from service.settings import EsiSettings
 from service.esiAccess import EsiAccess
+import gui.mainFrame
 
 from requests import Session
 
@@ -104,19 +106,21 @@ class Esi(EsiAccess):
         self.fittings_deleted.add(fittingID)
 
     def login(self):
-        serverAddr = None
         # always start the local server if user is using client details. Otherwise, start only if they choose to do so.
         if self.settings.get('ssoMode') == SsoMode.CUSTOM or self.settings.get('loginMode') == LoginMethod.SERVER:
-            # random port, or if it's custom application, use a defined port
-            serverAddr = self.startServer(6461 if self.settings.get('ssoMode') == SsoMode.CUSTOM else 0)
-        uri = self.getLoginURI(serverAddr)
-        webbrowser.open(uri)
-        wx.PostEvent(self.mainFrame, GE.SsoLoggingIn(sso_mode=self.settings.get('ssoMode'), login_mode=self.settings.get('loginMode')))
+            dlg = gui.ssoLogin.SsoLoginServer(6461 if self.settings.get('ssoMode') == SsoMode.CUSTOM else 0)
+            dlg.ShowModal()
+        else:
+            dlg = gui.ssoLogin.SsoLogin()
+
+            if dlg.ShowModal() == wx.ID_OK:
+                self.handleLogin({'SSOInfo': [dlg.ssoInfoCtrl.Value.strip()]})
 
     def stopServer(self):
         pyfalog.debug("Stopping Server")
-        self.httpd.stop()
-        self.httpd = None
+        if self.httpd:
+            self.httpd.stop()
+            self.httpd = None
 
     def startServer(self, port):  # todo: break this out into two functions: starting the server, and getting the URI
         pyfalog.debug("Starting server")

service/jargon/loader.py

@@ -43,9 +43,9 @@ class JargonLoader(object):
                 self.jargon_mtime != self._get_jargon_file_mtime())
 
     def _load_jargon(self):
-        jargondata = yaml.load(DEFAULT_DATA)
+        jargondata = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
         with open(JARGON_PATH) as f:
-            userdata = yaml.load(f)
+            userdata = yaml.load(f, Loader=yaml.FullLoader)
         jargondata.update(userdata)
         self.jargon_mtime = self._get_jargon_file_mtime()
         self._jargon = Jargon(jargondata)
@@ -57,7 +57,7 @@ class JargonLoader(object):
 
     @staticmethod
     def init_user_jargon(jargon_path):
-        values = yaml.load(DEFAULT_DATA)
+        values = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
 
         # Disabled for issue/1533; do not overwrite existing user config
         # if os.path.exists(jargon_path):

service/server.py

@@ -117,13 +117,7 @@ class StoppableHTTPServer(socketserver.TCPServer):
 
         # self.settings = CRESTSettings.getInstance()
 
-        # Allow listening for x seconds
-        sec = 120
-        pyfalog.debug("Running server for {0} seconds", sec)
-
         self.socket.settimeout(1)
-        self.max_tries = sec / self.socket.gettimeout()
-        self.tries = 0
         self.run = True
 
     def get_request(self):
@@ -140,13 +134,6 @@ class StoppableHTTPServer(socketserver.TCPServer):
         pyfalog.warning("Setting pyfa server to stop.")
         self.run = False
 
-    def handle_timeout(self):
-        pyfalog.debug("Number of tries: {0}", self.tries)
-        self.tries += 1
-        if self.tries == self.max_tries:
-            pyfalog.debug("Server timed out waiting for connection")
-            self.stop()
-
     def serve(self, callback=None):
         self.callback = callback
         while self.run: