feat(msl): Move functionality from common.py to KodiHelper.py & remove common.py

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

diff --git a/service.py b/service.py
index 8600979b65e1d5b78324cf9f1afbb195e49e2c94..12d8ab833c3e828e26525307d2420e356fe9916f 100644 (file)
--- a/service.py
+++ b/service.py
@@ -1,10 +1,30 @@
 import threading
 import SocketServer
 import xbmc
-from resources.lib.common import log
+import xbmcaddon
+import socket
+from resources.lib.KodiHelper import KodiHelper
 from resources.lib.MSLHttpRequestHandler import MSLHttpRequestHandler
 
-PORT = 8000
+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
+
+plugin_handle = int(sys.argv[1])
+base_url = sys.argv[0]
+addon = xbmcaddon.Addon()
+
+kodi_helper = KodiHelper(
+    plugin_handle=plugin_handle,
+    base_url=base_url
+)
+
+PORT = select_unused_port()
+addon.setSetting('msl_service_port', str(PORT))
+kodi_helper.log(msg='Picked Port: ' + str(PORT))
 Handler = MSLHttpRequestHandler
 SocketServer.TCPServer.allow_reuse_address = True
 server = SocketServer.TCPServer(('127.0.0.1', PORT), Handler)
@@ -25,4 +45,4 @@ if __name__ == '__main__':
     server.server_close()
     server.socket.close()
     server.shutdown()
-    log("Stopped MSL Service")
+    kodi_helper.log(msg='Stopped MSL Service')