X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=service.py;h=cb5c7a796b34217e99afad62bf3b7ada80e82d73;hp=584360115ee568c6d881c8970447d770ef5d14ee;hb=8ba617cc3e63a64aabd1eb98aebafcff85f540db;hpb=5356f32f540542f5d62d3e93ea4692613a90ee42 diff --git a/service.py b/service.py index 5843601..cb5c7a7 100644 --- a/service.py +++ b/service.py @@ -5,9 +5,8 @@ import threading import SocketServer -import xbmc import socket -from xbmcaddon import Addon +from xbmc import Monitor from resources.lib.KodiHelper import KodiHelper from resources.lib.MSLHttpRequestHandler import MSLHttpRequestHandler from resources.lib.NetflixHttpRequestHandler import NetflixHttpRequestHandler @@ -15,22 +14,21 @@ from resources.lib.NetflixHttpRequestHandler import NetflixHttpRequestHandler # helper function to select an unused port on the host machine def select_unused_port(): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.bind(('localhost', 0)) + sock.bind(('127.0.0.1', 0)) addr, port = sock.getsockname() sock.close() return port -addon = Addon() kodi_helper = KodiHelper() # pick & store a port for the MSL service msl_port = select_unused_port() -addon.setSetting('msl_service_port', str(msl_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() -addon.setSetting('netflix_service_port', str(ns_port)) +kodi_helper.set_setting('netflix_service_port', str(ns_port)) kodi_helper.log(msg='[NS] Picked Port: ' + str(ns_port)) # server defaults @@ -47,7 +45,7 @@ nd_server.server_activate() nd_server.timeout = 1 if __name__ == '__main__': - monitor = xbmc.Monitor() + monitor = Monitor() # start thread for MLS servie msl_thread = threading.Thread(target=msl_server.serve_forever)