addon.py

diff --git a/addon.py b/addon.py
index 0fa3e7c72149c8c309b9f7946739ce034f001509..61d375e030495a19f7ec04020e5c665fe2ce3d7b 100644 (file)
--- a/addon.py
+++ b/addon.py
@@ -6,7 +6,6 @@
 
 import sys
 import os
-import urllib.request
 import re,json
 import youtube_dl
 
@@ -27,7 +26,21 @@ def get_params():
                param[splitparams[0]] = splitparams[1]
        return param
 
+
+def resolve_url(url):
+       duration=7500 #in milliseconds
+       message = "Cannot Play URL"
+       stream_url = urlresolver.HostedMediaFile(url=url).resolve()
+       # If urlresolver returns false then the video url was not resolved.
+       if not stream_url:
+               dialog = xbmcgui.Dialog()
+               dialog.notification("URL Resolver Error", message, xbmcgui.NOTIFICATION_INFO, duration)
+               return False
+       else: 
+               return stream_url
+
 def getUrl(url):
+       import urllib.request
        req = urllib.request.Request(
          url, 
          data=None, 
@@ -116,7 +129,8 @@ if not TEST:
 
 content = getUrl('https://news.nbdom.net/videos/kodi/')
 for row in json.loads(content):
-       row['link'] = ytUrl(row['id'])
+       #row['link'] = ytUrl(row['id'])
+       row['link'] = resolve_url(row['link'])
        if TEST:
                print('\t'.join([
                        row['lang'],