align with leia official release

im85288 · Dec 9, 2018 · d766ba1 · d766ba1
1 parent a768d97
commit d766ba1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id="service.upnext" name="Up Next" provider-name="im85288" version="0.1.8">
+<addon id="service.upnext" name="Up Next" provider-name="im85288" version="1.0.0">
     <requires>
         <import addon="script.module.requests" version="2.9.1"/>
+        <import addon="xbmc.python" version="2.26.0"/>
     </requires>
     <extension library="service.py" point="xbmc.service"/>
     <extension point="xbmc.addon.metadata">
-        <summary lang="en">Provides a netflix style pop up notification for watching the next episode with fancy/simple
+        <summary lang="en_GB">Provides a netflix style pop up notification for watching the next episode with fancy/simple
             modes.
         </summary>
-        <description lang="en">Provides a netflix style pop up notification for watching the next episode with
+        <description lang="en_GB">Provides a netflix style pop up notification for watching the next episode with
             fancy/simple modes. A prompt to check if your still watching also occurs after a few automatically watched
             shows in a row.
         </description>
         <platform>all</platform>
-        <language/>
         <assets>
             <icon>icon.png</icon>
             <fanart>fanart.jpg</fanart>

diff --git a/resources/lib/developer.py b/resources/lib/developer.py
@@ -24,7 +24,8 @@ def developer_play_back():
             still_watching_page_simple.show()
         utils.window('service.upnext.dialog', 'true')
 
-        while (xbmc.Player().isPlaying() and not next_up_page.isCancel() and
+        player = xbmc.Player()
+        while (player.isPlaying() and not next_up_page.isCancel() and
                 not next_up_page.isWatchNow() and not still_watching_page.isStillWatching() and
                 not still_watching_page.isCancel()):
             xbmc.sleep(100)

diff --git a/resources/lib/utils.py b/resources/lib/utils.py
@@ -6,24 +6,20 @@
 import json
 
 
-def addon_id():
-    return "service.upnext"
-
-
 def addon_path():
-    return xbmcaddon.Addon(addon_id()).getAddonInfo('path')
+    return xbmcaddon.Addon().getAddonInfo('path')
 
 
 def kodi_version():
     return xbmc.getInfoLabel('System.BuildVersion')[:2]
 
 
 def addon_name():
-    return xbmcaddon.Addon(addon_id()).getAddonInfo('name').upper()
+    return xbmcaddon.Addon().getAddonInfo('name').upper()
 
 
 def addon_version():
-    return xbmcaddon.Addon(addon_id()).getAddonInfo('version')
+    return xbmcaddon.Addon().getAddonInfo('version')
 
 
 def window(key, value=None, clear=False, window_id=10000):
@@ -57,7 +53,7 @@ def window(key, value=None, clear=False, window_id=10000):
 
 def settings(setting, value=None):
 
-    addon = xbmcaddon.Addon(addon_id())
+    addon = xbmcaddon.Addon()
 
     if value is not None:
         if setting.endswith('.bool'):