fix(kodihelper): Fixes problems with url encoding the tvshowtitle

[plugin.video.netflix.git] / service.py

diff --git a/service.py b/service.py
index ed573fc13736ef58c56a46392ac7d9c0ccaf66a3..cb5c7a796b34217e99afad62bf3b7ada80e82d73 100644 (file)
--- a/service.py
+++ b/service.py
@@ -1,45 +1,77 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Module: service
+# Created on: 26.01.2017
+
 import threading
 import SocketServer
-import xbmc
-import xbmcaddon
 import socket
+from xbmc import Monitor
 from resources.lib.KodiHelper import KodiHelper
 from resources.lib.MSLHttpRequestHandler import MSLHttpRequestHandler
+from resources.lib.NetflixHttpRequestHandler import NetflixHttpRequestHandler
 
+# helper function to select an unused port on the host machine
 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(('127.0.0.1', 0))
+    addr, port = sock.getsockname()
+    sock.close()
+    return port
+
+kodi_helper = KodiHelper()
+
+# pick & store a port for the MSL service
+msl_port = select_unused_port()
+kodi_helper.set_setting('msl_service_port', str(msl_port))
+kodi_helper.log(msg='[MSL] Picked Port: ' + str(msl_port))
+
+# pick & store a port for the internal Netflix HTTP proxy service
+ns_port = select_unused_port()
+kodi_helper.set_setting('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()
+    monitor = Monitor()
+
+    # start thread for MLS servie
+    msl_thread = threading.Thread(target=msl_server.serve_forever)
+    msl_thread.daemon = True
+    msl_thread.start()
 
+    # start thread for Netflix HTTP service
+    nd_thread = threading.Thread(target=nd_server.serve_forever)
+    nd_thread.daemon = True
+    nd_thread.start()
+
+    # kill the services if kodi monitor tells us to
     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 service shutdown sequence
+    msl_server.server_close()
+    msl_server.socket.close()
+    msl_server.shutdown()
     kodi_helper.log(msg='Stopped MSL Service')
+
+    # Netflix service shutdown sequence
+    nd_server.server_close()
+    nd_server.socket.close()
+    nd_server.shutdown()
+    kodi_helper.log(msg='Stopped HTTP Service')