fix(service): Add dynamic port resolution for netflix service

diff --git a/resources/lib/Navigation.py b/resources/lib/Navigation.py
index db025988987ace9464430374689ba252d49421de..f36cd29674b49f835a4f5482f3343df79b3801a5 100644 (file)
--- a/resources/lib/Navigation.py
+++ b/resources/lib/Navigation.py
@@ -35,7 +35,7 @@ class Navigation:
         self.log = log_fn
 
     def get_netflix_service_url (self):
-        return 'http://localhost:7005'
+        return 'http://localhost:' + str(self.kodi_helper.addon.getSetting('netflix_service_port'))
 
     def call_netflix_service (self, params):
         url_values = urllib.urlencode(params)

diff --git a/service.py b/service.py
index a45340a35146a550271b9c2bfbbde7cb2193e39b..501643486673eb0bdb56f50fdd3e404711e0f343 100644 (file)
--- a/service.py
+++ b/service.py
@@ -17,20 +17,24 @@ def select_unused_port():
 addon = Addon()
 kodi_helper = KodiHelper()
 
-port = select_unused_port()
-addon.setSetting('msl_service_port', str(port))
-kodi_helper.log(msg='Picked Port: ' + str(port))
+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
 
 # configure the MSL Server
-msl_server = SocketServer.TCPServer(('127.0.0.1', port), MSLHttpRequestHandler)
+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', 7005), NetflixHttpRequestHandler)
+nd_server = SocketServer.TCPServer(('127.0.0.1', ns_port), NetflixHttpRequestHandler)
 nd_server.server_activate()
 nd_server.timeout = 1