addon.py

diff --git a/addon.py b/addon.py
index dff860177c226b4a2a671f3e9762623462e7438b..19f479f5edd39483e765c4bb2ae619e846292243 100644 (file)
--- a/addon.py
+++ b/addon.py
@@ -107,27 +107,14 @@ def getUrl(url):
 #from kodiswift import Plugin
 #plugin = Plugin()
 #@plugin.route('/')
-def index():
+def getVideos(url):
        if not TEST:
                import xbmcgui
-               import xbmcplugin
-               import xbmcaddon
-# NB 24.04.19          addon         = xbmcaddon.Addon('plugin.video.news.nbdom.net')
-               addon         = xbmcaddon.Addon()
-               #__language__  = addon.getLocalizedString
-       # NB 22.04.19   __icon__ = addon.getAddonInfo('icon')
-       # NB 22.04.19   __fanart__ = addon.getAddonInfo('fanart')
-               fanart = addon.getAddonInfo('fanart')
-               addon_handle = int(sys.argv[1])
-               sys.stderr = open(os.devnull, "w")
-
-       url = 'https://news.nbdom.net/videos/kodi/'
+       list = []
 
        #count = getUrl(url+'/count/')
        
        content = getUrl(url)
-       defaultImage = 'DefaultVideo.png'
-       list = []
        #list.append(['url',xbmcgui.ListItem('Hello'),True])
        for row in json.loads(content):
                #row['link'] = ytUrl(row['id'])
@@ -206,12 +193,28 @@ def index():
 
                        #li.addContextMenuItems([('Context', 'XBMC.RunScript()',),])
                        list.append([info['link'],li])
-                       # NB 04.07.19: Use xbmcplugin.addDirectoryItems, suppose to be faster 
-                       #xbmcplugin.addDirectoryItem(handle=addon_handle,url=info['link'],listitem=li)
+       return list
+
+def index():
+       if not TEST:
+               import xbmcgui
+               import xbmcplugin
+               import xbmcaddon
+# NB 24.04.19          addon         = xbmcaddon.Addon('plugin.video.news.nbdom.net')
+               addon         = xbmcaddon.Addon()
+               #__language__  = addon.getLocalizedString
+       # NB 22.04.19   __icon__ = addon.getAddonInfo('icon')
+       # NB 22.04.19   __fanart__ = addon.getAddonInfo('fanart')
+               fanart = addon.getAddonInfo('fanart')
+               addon_handle = int(sys.argv[1])
+               sys.stderr = open(os.devnull, "w")
+
+       url = 'https://news.nbdom.net/videos/kodi/'
+       list = getVideos(url)
 
        if not TEST:
                xbmcplugin.setContent(addon_handle, 'videos')
-               #xbmcplugin.addDirectoryItem(addon_handle,'',xbmcgui.ListItem('Hello', defaultImage),True)
+               #xbmcplugin.addDirectoryItem(addon_handle,'',xbmcgui.ListItem('Hello', 'DefaultVideo.png'),True)
                xbmcplugin.addDirectoryItems(addon_handle,list,len(list))
                xbmcplugin.endOfDirectory(addon_handle)