diff --git a/addon.xml b/addon.xml index 642715a..411f99f 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -18,6 +18,11 @@ resources/fanart.jpg + v2.1.2-beta2 (2021-06-12) + - Switch to new streamAccess URL + - Remove heartbeat call + v2.1.2-beta1 (2021-05-24) + - get live events from epg v2.1.1 (2021-04-04) - fix bug in auth request v2.1.0 (2021-02-27) diff --git a/default.py b/default.py index 0bb1e9e..9ebb8e8 100644 --- a/default.py +++ b/default.py @@ -40,7 +40,6 @@ base_image_url = "https://www.magentasport.de" oauth_url = "https://accounts.login.idm.telekom.com/oauth2/tokens" jwt_url = "https://www.magentasport.de/service/auth/app/login/jwt" -heartbeat_url = "https://www.magentasport.de/service/heartbeat" stream_url = "https://www.magentasport.de/service/player/v2/streamAccess" main_page = "/page/1" @@ -75,25 +74,6 @@ def get_jwt(username, password): if 'status' in jsonResult and jsonResult['status'] == "success" and 'data' in jsonResult and 'token' in jsonResult['data']: return jsonResult['data']['token'] -def auth_media(jwt, videoid): - try: - response = urllib.request.urlopen(urllib.request.Request(heartbeat_url + '/initialize', json.dumps({"media": videoid}).encode(), {'xauthorization': jwt, 'Content-Type': 'application/json'})).read() - except urllib.error.HTTPError as error: - response = error.read() - - try: - urllib.request.urlopen(urllib.request.Request(heartbeat_url + '/destroy', "".encode(), {'xauthorization': jwt, 'Content-Type': 'application/json'})).read() - except urllib.error.HTTPError as e: - pass - - jsonResult = json.loads(response) - if 'status' in jsonResult and jsonResult['status'] == "success": - return "success" - elif 'status' in jsonResult and jsonResult['status'] == "error": - if 'message' in jsonResult: - return jsonResult['message'] - return __language__(30006) - # plugin call modes def getMain(): @@ -266,16 +246,6 @@ def getvideo(): xbmcgui.Dialog().ok(_addon_name, msg) xbmcplugin.setResolvedUrl(_addon_handler, False, xbmcgui.ListItem()) return - if jwt: - auth_response = auth_media(jwt, videoid) - if auth_response != "success": - xbmcgui.Dialog().ok(_addon_name, auth_response) - xbmcplugin.setResolvedUrl(_addon_handler, False, xbmcgui.ListItem()) - return - else: - xbmcgui.Dialog().ok(_addon_name, __language__(30005)) - xbmcplugin.setResolvedUrl(_addon_handler, False, xbmcgui.ListItem()) - return jwt = jwt or 'empty'