[plugin.video.psvue] 2017.7.2

3 files changed, 11 insertions, 8 deletions

diff --git a/plugin.video.psvue/addon.xml b/plugin.video.psvue/addon.xml
index 0ec5096..b932f84 100644
--- a/plugin.video.psvue/addon.xml
+++ b/plugin.video.psvue/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.psvue" name="PS Vue" version="2017.7.1" provider-name="eracknaphobia">
+<addon id="plugin.video.psvue" name="PS Vue" version="2017.7.2" provider-name="eracknaphobia">
   <requires>
    <import addon="xbmc.python" version="2.25.0"/>
    <import addon="script.module.requests" version="2.9.1"/>
@@ -13,7 +13,7 @@
     <description lang="en_GB">PlayStation™Vue is a TV service that streams live TV, movies, and sports on a variety of your favorite devices without a cable or satellite subscription.  With powerful features that allow you to save thousands of hours of your favorite shows without recording conflicts, and Premium channels that can be purchased individually or with a multi-channel plan, TV has never been the same. No annual contracts, no conflicts, no problems.</description>
     <disclaimer lang="en_GB">Requires a valid subscription to PS Vue which is currently only available in the US</disclaimer>
     <news>
-- Yet another fix for streams not launching
+- Bug fix
     </news>
     <language>en</language>
     <platform>all</platform>
diff --git a/plugin.video.psvue/resources/lib/ps_vue.py b/plugin.video.psvue/resources/lib/ps_vue.py
index 51b52f4..9a54770 100644
--- a/plugin.video.psvue/resources/lib/ps_vue.py
+++ b/plugin.video.psvue/resources/lib/ps_vue.py
@@ -287,14 +287,14 @@ def get_json(url):
 
 
 def load_cookies():
-    filename = os.path.join(ADDON_PATH_PROFILE, 'cookies.lwp')
-    lwp_cookiejar = cookielib.LWPCookieJar()
+    cookie_file = os.path.join(ADDON_PATH_PROFILE, 'cookies.lwp')
+    cj = cookielib.LWPCookieJar()
     try:
-        lwp_cookiejar.load(filename, ignore_discard=True)
+        cj.load(cookie_file, ignore_discard=True)
     except:
         pass
 
-    return lwp_cookiejar
+    return cj
 
 
 def stringToDate(string, date_format):
@@ -388,7 +388,7 @@ def check_device_id():
     DEVICE_ID = ADDON.getSetting(id='deviceId')
     amazon_device = 'Amazon'
     amazon_device = amazon_device.encode("hex")
-    old_asus = 'ASUS'    
+    old_asus = 'ASUS'
     old_asus = old_asus.encode("hex")
     if amazon_device in DEVICE_ID or old_asus in DEVICE_ID:
         sony = SONY()
diff --git a/plugin.video.psvue/resources/lib/sony.py b/plugin.video.psvue/resources/lib/sony.py
index b8708bc..1c11ad7 100644
--- a/plugin.video.psvue/resources/lib/sony.py
+++ b/plugin.video.psvue/resources/lib/sony.py
@@ -310,7 +310,10 @@ class SONY():
         addon_profile_path = xbmc.translatePath(self.addon.getAddonInfo('profile'))
         cookie_file = os.path.join(addon_profile_path, 'cookies.lwp')
         cj = cookielib.LWPCookieJar()
-        cj.load(cookie_file,ignore_discard=True)
+        try:
+            cj.load(cookie_file,ignore_discard=True)            
+        except:
+            pass
         for c in cookiejar:
             args = dict(vars(c).items())
             args['rest'] = args['_rest']