integrate inputstream.helper

plugin.video.amazon-test/addon.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.amazon-test"
        name="Amazon VOD"
-       version="0.4.7"
+       version="0.4.8~beta"
        provider-name="Sandmann79">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup" version="3.2.1"/>
     <import addon="script.module.mechanize" version="0.2.6"/>
     <import addon="script.module.pydes" version="2.0.1"/>
     <import addon="script.module.pyxbmct" version="1.1.7"/>
+    <import addon="script.module.inputstreamhelper" version="0.2.4"/>
   </requires>
   <extension point="xbmc.python.pluginsource"
              library="default.py">

plugin.video.amazon-test/default.py

@@ -7,6 +7,7 @@
 from sqlite3 import dbapi2 as sqlite
 from random import randint
 from base64 import b64encode, b64decode
+from inputstreamhelper import Helper
 import uuid
 import cookielib
 import mechanize
@@ -90,6 +91,7 @@
 AgeRating = ['FSK ', '', '', '', ''][country]
 menuFile = os.path.join(DataPath, 'menu-%s.db' % MarketID)
 CookieFile = os.path.join(DataPath, 'cookie-%s.lwp' % MarketID)
+is_addon = 'inputstream.adaptive'
 na = 'not available'
 watchlist = 'watchlist'
 library = 'video-library'
@@ -1123,10 +1125,10 @@ def IStreamPlayback(asin, name, trailer, isAdult, extern):
     mpaa_str = RestrAges + getString(30171)
     drm_check = addon.getSetting("drm_check") == 'true'
     at_check = addon.getSetting("at_check") == 'true'
+    inputstream_helper = Helper('mpd', drm='com.widevine.alpha')
 
-    if not is_addon:
+    if not inputstream_helper.check_inputstream():
         Log('No Inputstream Addon found or activated')
-        Dialog.notification(getString(30203), 'No Inputstream Addon found or activated', xbmcgui.NOTIFICATION_ERROR)
         playDummyVid()
         return True
 
@@ -2511,13 +2513,6 @@ def submit(self):
         self.close()
 
 
-if AddonEnabled('inputstream.adaptive'):
-    is_addon = 'inputstream.adaptive'
-elif AddonEnabled('inputstream.mpd'):
-    is_addon = 'inputstream.mpd'
-else:
-    is_addon = ''
-
 if not getConfig('UserAgent'):
     getUA()
 

plugin.video.amazon/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.amazon"
        name="Amazon"
-       version="1.9.0"
+       version="1.9.1~beta"
        provider-name="Sandmann79 + BlueCop + Romans I XVI">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
@@ -11,6 +11,7 @@
     <import addon="script.module.pydes" version="2.0.1"/>
     <import addon="script.module.pyxbmct" version="1.1.7"/>
     <import addon="script.module.myconnpy" version="1.1.7"/>
+    <import addon="script.module.inputstreamhelper" version="0.2.4"/>
   </requires>
   <extension point="xbmc.python.pluginsource"
              library="default.py">

plugin.video.amazon/resources/lib/common.py

@@ -53,6 +53,7 @@
 multiuser = addon.getSetting('multiuser') == 'true'
 Dialog = xbmcgui.Dialog()
 socket.setdefaulttimeout(30)
+is_addon = 'inputstream.adaptive'
 regex_ovf = "((?i)(\[|\()(omu|ov).*(\)|\]))|\sOmU"
 
 try:
@@ -1019,13 +1020,6 @@ def jsonRPC(method, props='', param=None):
     return res['result'].get(props, res['result'])
 
 
-if AddonEnabled('inputstream.adaptive'):
-    is_addon = 'inputstream.adaptive'
-elif AddonEnabled('inputstream.mpd'):
-    is_addon = 'inputstream.mpd'
-else:
-    is_addon = ''
-
 if not getConfig('UserAgent'):
     getUA()
 

plugin.video.amazon/resources/lib/play.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 from BeautifulSoup import BeautifulStoneSoup
 from common import *
+from inputstreamhelper import Helper
 import subprocess
 import threading
 import codecs
@@ -171,10 +172,10 @@ def check_output(*popenargs, **kwargs):
 def IStreamPlayback(trailer, isAdult, extern):
     drm_check = addon.getSetting("drm_check") == 'true'
     at_check = addon.getSetting("at_check") == 'true'
+    inputstream_helper = Helper('mpd', drm='com.widevine.alpha')
 
-    if not is_addon:
+    if not inputstream_helper.check_inputstream():
         Log('No Inputstream Addon found or activated')
-        Dialog.notification(getString(30203), 'No Inputstream Addon found or activated', xbmcgui.NOTIFICATION_ERROR)
         return True
 
     cookie = mechanizeLogin()