initial nexus staging

addon.xml

@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="6.8.25" provider-name="anxdpanic, bromix">
+<addon id="plugin.video.youtube" name="YouTube" version="7.0.0~alpha1" provider-name="anxdpanic, bromix">
     <requires>
-        <import addon="xbmc.python" version="2.20.0"/>
+        <import addon="xbmc.python" version="3.0.1"/>
         <import addon="script.module.six" version="1.11.0"/>
         <import addon="script.module.requests" version="2.12.4"/>
         <import addon="script.module.inputstreamhelper" version="0.2.2" optional="true"/>
+        <import addon="script.module.infotagger" version="0.0.5"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="resources/lib/default.py">
         <provides>video</provides>
     </extension>
-    <extension point="xbmc.service" library="resources/lib/startup.py" start="login"/>
+    <extension point="xbmc.service" library="resources/lib/startup.py"/>
     <extension point="xbmc.python.module" library="resources/lib/"/>
     <extension point="xbmc.addon.metadata">
         <news>
-[fix] Nexus compatibility with InfoTagVideo |contrib: jurialmunkey|
-[chg] make httpd /api url case insensitive due to skin choice of uppercase settings text
-[chg] use listitem property for Inputstream Adaptive headers instead of url piped on Nexus+
+[chg] add-on is now Nexus+ compatible, removed compatibility with older versions of Kodi
 [upd] Translations updated from Kodi Weblate
         </news>
         <assets>

resources/lib/youtube_plugin/kodion/impl/abstract_settings.py

@@ -63,7 +63,7 @@ def get_bool(self, setting_id, default_value):
         return value == 'true'
 
     def get_items_per_page(self):
-        return self.get_int(constants.setting.ITEMS_PER_PAGE, 50, lambda x: (x + 1) * 5)
+        return self.get_int(constants.setting.ITEMS_PER_PAGE, 50)
 
     def get_video_quality(self, quality_map_override=None):
         vq_dict = {0: 240,

resources/lib/youtube_plugin/kodion/impl/xbmc/xbmc_items.py

@@ -10,6 +10,8 @@
 
 import xbmcgui
 
+from infotagger.listitem import ListItemInfoTag
+
 from ...items import VideoItem, AudioItem, UriItem
 from ... import utils
 from . import info_labels
@@ -33,7 +35,6 @@ def to_play_item(context, play_item):
     else:
         list_item = xbmcgui.ListItem(label=utils.to_unicode(title))
     if major_version >= 20:
-        from ....external.listitem import ListItemInfoTag
         info_tag = ListItemInfoTag(list_item, tag_type='video')
 
     if not is_strm:
@@ -121,7 +122,6 @@ def to_video_item(context, video_item):
     else:
         item = xbmcgui.ListItem(label=utils.to_unicode(title))
     if major_version >= 20:
-        from ....external.listitem import ListItemInfoTag
         info_tag = ListItemInfoTag(item, tag_type='video')
     if video_item.get_fanart() and settings.show_fanart():
         fanart = video_item.get_fanart()
@@ -196,7 +196,6 @@ def to_audio_item(context, audio_item):
     else:
         item = xbmcgui.ListItem(label=utils.to_unicode(title))
     if major_version >= 20:
-        from ....external.listitem import ListItemInfoTag
         info_tag = ListItemInfoTag(item, tag_type='music')
     if audio_item.get_fanart() and settings.show_fanart():
         fanart = audio_item.get_fanart()

resources/lib/youtube_plugin/kodion/impl/xbmc/xbmc_runner.py

@@ -11,6 +11,8 @@
 import xbmcgui
 import xbmcplugin
 
+from infotagger.listitem import ListItemInfoTag
+
 from ..abstract_provider_runner import AbstractProviderRunner
 from ...exceptions import KodionException
 from ...items import *
@@ -98,7 +100,6 @@ def _add_directory(self, context, directory_item, item_count=0):
         else:
             item = xbmcgui.ListItem(label=directory_item.get_name())
         if major_version >= 20:
-            from ....external.listitem import ListItemInfoTag
             info_tag = ListItemInfoTag(item, tag_type='video')
 
         # only set fanart is enabled