Adding browser key feature, better handling unicode

1 files changed, 9 insertions, 5 deletions

diff --git a/browserlogger.py b/browserlogger.py
index 5466880..1bd216d 100644
--- a/browserlogger.py
+++ b/browserlogger.py
@@ -10,14 +10,18 @@ class MyHandler(BaseHTTPRequestHandler):
 
     def do_POST(self):
         length = int(self.headers['Content-Length'])
-        data = parse_qs(self.rfile.read(length).decode('utf-8'))
-        time = datetime.utcfromtimestamp(int(data["time"][0]) / 1000.)
+        data = parse_qs(self.rfile.read(length))
+        data = {key: data[key][0].decode("utf8") for key in data.iterkeys()}
+        time = datetime.utcfromtimestamp(int(data["time"]) / 1000.)
         if data["url"][0] == "null":
             url, title = None, None
         else:
-            url, title = data["url"][0], data["title"][0]
-        event = BrowserEvent(time=time, url=url,
-                             title=title)
+            try:
+                url, title = (data["url"], data["title"])
+            except KeyError:
+                print data
+        event = BrowserEvent(time=time, url=url, title=title,
+                             browser_key=data["key"])
         self.server.logger.info(event)
         self.send_response(202)
         self.end_headers()