addon.py

diff --git a/addon.py b/addon.py
index 9493dccac929f1c3abf7c970661447144e83a8cf..6a9f263fd6535173f671e210fa99624bb0e8e862 100644 (file)
--- a/addon.py
+++ b/addon.py
@@ -103,60 +103,68 @@ def ytUrl(id):
 
        return video
 
+#from kodiswift import Plugin
+#plugin = Plugin()
+#@plugin.route('/')
+def index():
+       if not TEST:
+               import xbmcgui
+               import xbmcplugin
+       # NB 22.04.19   addon         = xbmcaddon.Addon('plugin.video.news.nbdom.net')
+               #__language__  = addon.getLocalizedString
+       # NB 22.04.19   __icon__ = addon.getAddonInfo('icon')
+       # NB 22.04.19   __fanart__ = addon.getAddonInfo('fanart')
+               addon_handle = int(sys.argv[1])
+               xbmcplugin.setContent(addon_handle, 'movies')
+               sys.stderr = open(os.devnull, "w")
+
+       content = getUrl('https://news.nbdom.net/videos/kodi/')
+       for row in json.loads(content):
+               #row['link'] = ytUrl(row['id'])
+               #row['link'] = resolve_url(row['link'])
+               if 'id' in row:
+                       row['link'] = 'plugin://plugin.video.youtube/play/?video_id='+row['id']
+
+               if TEST:
+                       print('\t'.join([
+                               row['lang'],
+                               row['title'],
+                               row['description'],
+                               row['id'],
+                               row['link'],
+                       ]))
+                       break
+               else:
+                       iconimage = 'https://i1.ytimg.com/vi/' + row['id'] + '/mqdefault.jpg'
+                       title = row['title'] +' - ' + row['description']
+                       li = xbmcgui.ListItem(title, iconImage="DefaultVideo.png", thumbnailImage=iconimage)
+                       #row['link'] = build_url({'mode' :'play', 'playlink' : row['link']})
+                       #li.setProperty('IsPlayable' , 'true')
+                       li.setInfo( 'video', infoLabels={
+                               'title': row['title'],
+                               'plot': row['description']
+                       })
+
+                       xbmcplugin.addDirectoryItem(handle=addon_handle,url=row['link'],listitem=li)
+
+       # NB 17.04.19 url = 'https://nbdom.net/data/en/911-experiments-The_Force_Behind_the_Motion.mp4'
+       # NB 17.04.19 li = xbmcgui.ListItem('My First Video!', iconImage='DefaultVideo.png')
+       # NB 17.04.19 xbmcplugin.addDirectoryItem(handle=addon_handle, url=url, listitem=li)
+
+       if not TEST:
+               xbmcplugin.endOfDirectory(addon_handle)
+
 #
 # Main
 #
 TEST = False
 if len(sys.argv)>1 and sys.argv[1] == '--test':
        TEST = True
+index()
+#if __name__ == '__main__':
+#    plugin.run()
 
 # pyhton2
 #reload(sys)
 #sys.setdefaultencoding("UTF8")
-
-if not TEST:
-       import xbmcgui
-       import xbmcplugin
-# NB 22.04.19  addon         = xbmcaddon.Addon('plugin.video.news.nbdom.net')
-       #__language__  = addon.getLocalizedString
-# NB 22.04.19  __icon__ = addon.getAddonInfo('icon')
-# NB 22.04.19  __fanart__ = addon.getAddonInfo('fanart')
-       addon_handle = int(sys.argv[1])
-       xbmcplugin.setContent(addon_handle, 'movies')
-       sys.stderr = open(os.devnull, "w")
-
-content = getUrl('https://news.nbdom.net/videos/kodi/')
-for row in json.loads(content):
-       #row['link'] = ytUrl(row['id'])
-       #row['link'] = resolve_url(row['link'])
-       row['link'] = 'plugin://plugin.video.youtube/play/?video_id='+row['id']
-       if TEST:
-               print('\t'.join([
-                       row['lang'],
-                       row['title'],
-                       row['description'],
-                       row['id'],
-                       row['link'],
-               ]))
-               break
-       else:
-               iconimage = 'https://i1.ytimg.com/vi/' + row['id'] + '/mqdefault.jpg'
-               title = row['title'] +' - ' + row['description']
-               li = xbmcgui.ListItem(title, iconImage="DefaultVideo.png", thumbnailImage=iconimage)
-               #row['link'] = build_url({'mode' :'play', 'playlink' : row['link']})
-               #li.setProperty('IsPlayable' , 'true')
-               li.setInfo( 'video', infoLabels={
-                       'title': row['title'],
-                       'plot': row['description']
-               })
-
-               xbmcplugin.addDirectoryItem(handle=addon_handle,url=row['link'],listitem=li)
-
-# NB 17.04.19 url = 'https://nbdom.net/data/en/911-experiments-The_Force_Behind_the_Motion.mp4'
-# NB 17.04.19 li = xbmcgui.ListItem('My First Video!', iconImage='DefaultVideo.png')
-# NB 17.04.19 xbmcplugin.addDirectoryItem(handle=addon_handle, url=url, listitem=li)
-
-if not TEST:
-       xbmcplugin.endOfDirectory(addon_handle)
-
 #sys.exit(0)