X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=service.py;h=501643486673eb0bdb56f50fdd3e404711e0f343;hb=ffd4aa3d7edc7f9cab576ae69d3a64d3389d9db9;hp=ed573fc13736ef58c56a46392ac7d9c0ccaf66a3;hpb=8eeebc7e22e95acf7d6cb5ea897450a72c2efe60;p=plugin.video.netflix.git

diff --git a/service.py b/service.py
index ed573fc..5016434 100644
--- a/service.py
+++ b/service.py
@@ -1,45 +1,66 @@
 import threading
 import SocketServer
 import xbmc
-import xbmcaddon
 import socket
+from xbmcaddon import Addon
 from resources.lib.KodiHelper import KodiHelper
 from resources.lib.MSLHttpRequestHandler import MSLHttpRequestHandler
+from resources.lib.NetflixHttpRequestHandler import NetflixHttpRequestHandler
 
 def select_unused_port():
-  s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-  s.bind(('localhost', 0))
-  addr, port = s.getsockname()
-  s.close()
-  return port
-
-addon = xbmcaddon.Addon()
-kodi_helper = KodiHelper(
-    plugin_handle=None,
-    base_url=None
-)
-
-PORT = select_unused_port()
-addon.setSetting('msl_service_port', str(PORT))
-kodi_helper.log(msg='Picked Port: ' + str(PORT))
-Handler = MSLHttpRequestHandler
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.bind(('localhost', 0))
+    addr, port = sock.getsockname()
+    sock.close()
+    return port
+
+addon = Addon()
+kodi_helper = KodiHelper()
+
+msl_port = select_unused_port()
+addon.setSetting('msl_service_port', str(msl_port))
+kodi_helper.log(msg='[MSL] Picked Port: ' + str(msl_port))
+
+ns_port = select_unused_port()
+addon.setSetting('netflix_service_port', str(ns_port))
+kodi_helper.log(msg='[NS] Picked Port: ' + str(ns_port))
+
+# server defaults
 SocketServer.TCPServer.allow_reuse_address = True
-server = SocketServer.TCPServer(('127.0.0.1', PORT), Handler)
-server.server_activate()
-server.timeout = 1
+
+# configure the MSL Server
+msl_server = SocketServer.TCPServer(('127.0.0.1', msl_port), MSLHttpRequestHandler)
+msl_server.server_activate()
+msl_server.timeout = 1
+
+# configure the Netflix Data Server
+nd_server = SocketServer.TCPServer(('127.0.0.1', ns_port), NetflixHttpRequestHandler)
+nd_server.server_activate()
+nd_server.timeout = 1
 
 if __name__ == '__main__':
     monitor = xbmc.Monitor()
-    thread = threading.Thread(target=server.serve_forever)
-    thread.daemon = True
-    thread.start()
+
+    msl_thread = threading.Thread(target=msl_server.serve_forever)
+    msl_thread.daemon = True
+    msl_thread.start()
+
+    nd_thread = threading.Thread(target=nd_server.serve_forever)
+    nd_thread.daemon = True
+    nd_thread.start()
 
     while not monitor.abortRequested():
         if monitor.waitForAbort(5):
-            server.shutdown()
+            msl_server.shutdown()
+            nd_server.shutdown()
             break
 
-    server.server_close()
-    server.socket.close()
-    server.shutdown()
+    msl_server.server_close()
+    msl_server.socket.close()
+    msl_server.shutdown()
     kodi_helper.log(msg='Stopped MSL Service')
+
+    nd_server.server_close()
+    nd_server.socket.close()
+    nd_server.shutdown()
+    kodi_helper.log(msg='Stopped HTTP Service')