Merge branch 'development' into LogBook_v2

Conflicts:
	config.py
	eos/saveddata/fit.py
	gui/bitmapLoader.py
	gui/graphFrame.py
	gui/utils/exportHtml.py
	pyfa.py
	service/crest.py
	service/price.py
	service/server.py

service/server.py

@@ -1,12 +1,9 @@
 import BaseHTTPServer
 import urlparse
 import socket
-import thread
+import threading
 from logbook import Logger
 
-# noinspection PyPackageRequirements
-import wx
-
 from service.settings import CRESTSettings
 pyfalog = Logger(__name__)
 
@@ -19,12 +16,13 @@ HTML = '''
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
     <title>pyfa Local Server</title>
     <style type="text/css">
-        body { text-align: center; padding: 150px; }
-        h1 { font-size: 40px; }
-        body { font: 20px Helvetica, sans-serif; color: #333; }
-        #article { display: block; text-align: left; width: 650px; margin: 0 auto; }
-        a { color: #dc8100; text-decoration: none; }
-        a:hover { color: #333; text-decoration: none; }
+        body {{ text-align: center; padding: 150px; }}
+        h1 {{ font-size: 40px; }}
+        h2 {{ font-size: 32px; }}
+        body {{ font: 20px Helvetica, sans-serif; color: #333; }}
+        #article {{ display: block; text-align: left; width: 650px; margin: 0 auto; }}
+        a {{ color: #dc8100; text-decoration: none; }}
+        a:hover {{ color: #333; text-decoration: none; }}
     </style>
 </head>
 
@@ -33,26 +31,36 @@ HTML = '''
 <!-- Layout from Short Circuit's CREST login. Shout out! https://github.com/farshield/shortcircuit -->
 <div id="article">
     <h1>pyfa</h1>
-    <div>
-        <p>If you see this message then it means you should be logged into CREST. You may close this window and return to the application.</p>
-    </div>
+    {0}
 </div>
+
 <script type="text/javascript">
-function extractFromHash(name, hash) {
+function extractFromHash(name, hash) {{
     var match = hash.match(new RegExp(name + "=([^&]+)"));
     return !!match && match[1];
-}
+}}
 
 var hash = window.location.hash;
 var token = extractFromHash("access_token", hash);
+var step2 = extractFromHash("step2", hash);
 
-if (token){
-    var redirect = window.location.origin.concat('/?', window.location.hash.substr(1));
-    window.location = redirect;
-}
-else {
-    console.log("do nothing");
-}
+function doRedirect() {{
+    if (token){{
+        // implicit authentication
+        var redirect = window.location.origin.concat('/?', window.location.hash.substr(1), '&step=2');
+        window.location = redirect;
+    }}
+    else {{
+        // user-defined
+        var redirect = window.location.href + '&step=2';
+        window.location = redirect;
+    }}
+}}
+
+// do redirect if we are not already on step 2
+if (window.location.href.indexOf('step=2') == -1) {{
+    setTimeout(doRedirect(), 1000);
+}}
 </script>
 </body>
 </html>
@@ -64,13 +72,30 @@ class AuthHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def do_GET(self):
         if self.path == "/favicon.ico":
             return
+
         parsed_path = urlparse.urlparse(self.path)
         parts = urlparse.parse_qs(parsed_path.query)
-        self.send_response(200)
-        self.end_headers()
-        self.wfile.write(HTML)
+        msg = ""
 
-        wx.CallAfter(self.server.callback, parts)
+        step2 = 'step' in parts
+
+        try:
+            if step2:
+                self.server.callback(parts)
+                msg = "If you see this message then it means you should be logged into CREST. You may close this window and return to the application."
+            else:
+                # For implicit mode, we have to serve up the page which will take the hash and redirect useing a querystring
+                msg = "Processing response from EVE Online"
+        except Exception, ex:
+            msg = "<h2>Error</h2>\n<p>{}</p>".format(ex.message)
+        finally:
+            self.send_response(200)
+            self.end_headers()
+            self.wfile.write(HTML.format(msg))
+
+        if step2:
+            # Only stop once if we've received something in the querystring
+            self.server.stop()
 
     def log_message(self, format, *args):
         return
@@ -86,7 +111,7 @@ class StoppableHTTPServer(BaseHTTPServer.HTTPServer):
         sec = self.settings.get('timeout')
         pyfalog.debug("Running server for {0} seconds", sec)
 
-        self.socket.settimeout(0.5)
+        self.socket.settimeout(1)
         self.max_tries = sec / self.socket.gettimeout()
         self.tries = 0
         self.run = True
@@ -111,7 +136,7 @@ class StoppableHTTPServer(BaseHTTPServer.HTTPServer):
             pyfalog.debug("Server timed out waiting for connection")
             self.stop()
 
-    def serve(self, callback):
+    def serve(self, callback=None):
         self.callback = callback
         while self.run:
             try:
@@ -119,11 +144,12 @@ class StoppableHTTPServer(BaseHTTPServer.HTTPServer):
             except TypeError:
                 pyfalog.debug("Caught exception in serve")
                 pass
+
         self.server_close()
 
 
 if __name__ == "__main__":
     httpd = StoppableHTTPServer(('', 6461), AuthHandler)
-    thread.start_new_thread(httpd.serve, ())
+    t = threading.Thread(target=httpd.serve)
     raw_input("Press <RETURN> to stop server\n")
     httpd.stop()