[plugin.video.ustvnow] 2017.8.23 (#1378)

4 files changed, 32 insertions, 13 deletions

diff --git a/plugin.video.ustvnow/addon.xml b/plugin.video.ustvnow/addon.xml
index 473d8a3..9df31a6 100644
--- a/plugin.video.ustvnow/addon.xml
+++ b/plugin.video.ustvnow/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.ustvnow" name="USTVnow" provider-name="Lunatixz" version="2017.8.5">
+<addon id="plugin.video.ustvnow" name="USTVnow" provider-name="Lunatixz" version="2017.8.23">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>  
         <import addon="script.module.simplecache" version="1.0.0"/>
@@ -15,7 +15,7 @@
         <source>https://github.com/Lunatixz/XBMC_Addons/tree/master/plugin.video.ustvnow</source>
         <website>http://ustvnow.com</website>
         <forum>http://forum.kodi.tv/showthread.php?tid=233135</forum>
-        <news>[CR]2017.8.5[CR]- Fixed encoding error.[CR]2017.8.2[CR]- Fixed paid subscription channels and dvr control.[CR]2017.7.31[CR]- Fixed login issues.[CR]- Added fallback token generation[CR]- Added initial support for uEPG module.[CR]2017.7.26[CR]- Corrected version format.[CR]- Changed "Featured" and "Guide" click behavior.[CR]- Improved Error handling.[CR]2017.4.7a[CR]- Added "Featured"[CR]- Fixed DVR support.2017.4.7[CR]-100% new code base, written from scratch for your enjoy!!, DVR Recording and Playback Untested.</news>
+        <news>[CR]2017.8.23[CR]- Added Preferred Playback Method and Stream Quality settings.[CR]2017.8.5[CR]- Fixed encoding error.[CR]2017.8.2[CR]- Fixed paid subscription channels and dvr control.[CR]2017.7.31[CR]- Fixed login issues.[CR]- Added fallback token generation[CR]- Added initial support for uEPG module.[CR]2017.7.26[CR]- Corrected version format.[CR]- Changed "Featured" and "Guide" click behavior.[CR]- Improved Error handling.[CR]2017.4.7a[CR]- Added "Featured"[CR]- Fixed DVR support.2017.4.7[CR]-100% new code base, written from scratch for your enjoy!!, DVR Recording and Playback Untested.</news>
         <assets>
             <icon>resources/images/icon.png</icon>
             <fanart>resources/images/fanart.jpg</fanart>
diff --git a/plugin.video.ustvnow/default.py b/plugin.video.ustvnow/default.py
index 91f24b4..aacf5f3 100644
--- a/plugin.video.ustvnow/default.py
+++ b/plugin.video.ustvnow/default.py
@@ -55,7 +55,8 @@ IMG_CHLOGO   = 'http://m.ustvnow.com/images/%s.png'
 COOKIE_JAR   = xbmc.translatePath(os.path.join(SETTINGS_LOC, "cookiejar.lwp"))
 MEDIA_TYPES  = {'SP':'video','SH':'episode','EP':'episode','MV':'movie'}
 FREE_CHANS   = ['CW','ABC','FOX','PBS','CBS','NBC','MY9']
-
+URL_TYPE     = {0:'m3u8',1:'mp4'}[int(REAL_SETTINGS.getSetting('URL_Type'))]
+URL_QUALITY  = int(REAL_SETTINGS.getSetting('URL_Quality')) + 1
 CHAN_NAMES   = {'ABC':'ABC','AMC':'AMC','Animal Planet':'Animal Planet','Bravo':'Bravo','CBS':'CBS','CNBC':'CNBC','CW':'CW','Comedy Central':'Comedy Central','Discovery Channel':'Discovery Channel','ESPN':'ESPN',
                 'FOX':'FOX','FX':'FX','Fox News Channel':'Fox News','Freeform':'Freeform','MSNBC':'MSNBC','NBC':'NBC','National Geographic Channel':'National Geographic','Nickelodeon':'Nickelodeon','PBS':'PBS',
                 'SPIKE TV':'SPIKE TV','SundanceTV':'SundanceTV','Syfy':'Syfy','AE':'A&E','My9':'MY9','BBCA':'BBC America','ESPN2':'ESPN 2','NBCSNHD':'NBCSN','The Learning Channel':'TLC','Universal HD':'Universal',
@@ -512,8 +513,12 @@ class USTVnow():
                         urllink = json.loads(self.net.http_POST(BASEURL + 'stream/1/dvr/play', form_data={'token':self.token,'key':self.passkey,'scheduleid':channel['scheduleid']}, headers=self.buildHeader()).content.encode("utf-8").rstrip())
                         '''{u'pr': u'll', u'domain': u'ilvc02.ll.ustvnow.com',u'stream': u'http://ilvc02.ll.ustvnow.com/ilv10/pr/xxl/smil:0B64AWHTMUSTVNOW/playlist.m3u8?', 
                             u'streamname': u'0B64AWHTMUSTVNOW', u'tr': u'', u'up': 1, u'pd': 0, u'pl': u'vjs'}'''
-                        if urllink and 'stream' in urllink:
-                            return urllink['stream']
+                        if URL_TYPE == 'm3u8':
+                            stream = urllink['stream']
+                        else:
+                            stream = (urllink['stream'].replace('smil:','mp4:').replace('USTVNOW','USTVNOW%d'%URL_QUALITY))
+                        log('resolveURL, url = ' + stream)
+                        return stream
                     except Exception,e:
                         if channel and channel['scheduleid']:
                             self.replaceToken(url, dvr)
@@ -524,8 +529,12 @@ class USTVnow():
                         urllink = json.loads(self.net.http_POST(BASEURL + 'stream/1/live/view', form_data={'token':self.token,'key':self.passkey,'scode':channel['scode']}, headers=self.buildHeader()).content.encode("utf-8").rstrip())
                         '''{u'pr': u'll', u'domain': u'ilvc02.ll.ustvnow.com',u'stream': u'http://ilvc02.ll.ustvnow.com/ilv10/pr/xxl/smil:0B64AWHTMUSTVNOW/playlist.m3u8?', 
                             u'streamname': u'0B64AWHTMUSTVNOW', u'tr': u'', u'up': 1, u'pd': 0, u'pl': u'vjs'}'''
-                        if urllink and 'stream' in urllink:
-                            return urllink['stream']
+                        if URL_TYPE == 'm3u8':
+                            stream = urllink['stream']
+                        else:
+                            stream = (urllink['stream'].replace('smil:','mp4:').replace('USTVNOW','USTVNOW%d'%URL_QUALITY))
+                        log('resolveURL, stream = ' + stream)
+                        return stream
                     except Exception,e:
                         if channel and channel['scode']:
                             self.replaceToken(url, dvr)
diff --git a/plugin.video.ustvnow/resources/language/resource.language.en_gb/strings.po b/plugin.video.ustvnow/resources/language/resource.language.en_gb/strings.po
index 01f21c7..b0a035a 100644
--- a/plugin.video.ustvnow/resources/language/resource.language.en_gb/strings.po
+++ b/plugin.video.ustvnow/resources/language/resource.language.en_gb/strings.po
@@ -114,4 +114,12 @@ msgstr ""
 
 msgctxt "#30024"
 msgid "%s Recording Successful"
-msgstr ""
\ No newline at end of file
+msgstr ""
+
+msgctxt "#30025"
+msgid "Preferred Playback Method"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Preferred Stream Quality"
+msgstr ""
diff --git a/plugin.video.ustvnow/resources/settings.xml b/plugin.video.ustvnow/resources/settings.xml
index 66f133f..51b30b1 100644
--- a/plugin.video.ustvnow/resources/settings.xml
+++ b/plugin.video.ustvnow/resources/settings.xml
@@ -2,10 +2,12 @@
 <settings>
     <setting id="Enable_Debugging" type="bool"   label="30000" default="false" />
     <setting id="User_Email"       type="text"   label="30001" default="" />
-    <setting id="User_Password"    type="text"   label="30002" default="" option="hidden"/>
+    <setting id="User_Password"    type="text"   label="30002" default=""  option="hidden"/>
+    <setting id="URL_Type"         type="enum"   label="30025" default="0" values="M3U8|MP4" />
+    <setting id="URL_Quality"      type="enum"   label="30026" default="1" values="Low|Medium|High" visible="eq(-1,1)" subsetting="true"/>
     <setting                       type="lsep"   label="30017"/>
-    <setting id="User_Plan"        type="text"   label="30020" default="" enable="false"/>
-    <setting id="User_Expires"     type="text"   label="30018" default="" enable="false"/>
-    <setting id="User_Token"       type="text"   label="30002" default="" visible="false"/>
-    <setting id="User_Paskey"      type="text"   label="30002" default="" visible="false"/>
+    <setting id="User_Plan"        type="text"   label="30020" default=""  enable="false"/>
+    <setting id="User_Expires"     type="text"   label="30018" default=""  enable="false"/>
+    <setting id="User_Token"       type="text"   label="30002" default=""  visible="false"/>
+    <setting id="User_Paskey"      type="text"   label="30002" default=""  visible="false"/>
 </settings>