[plugin.video.playonbrowser] 2.0.1 (#1379)

2 files changed, 15 insertions, 14 deletions

diff --git a/plugin.video.playonbrowser/addon.xml b/plugin.video.playonbrowser/addon.xml
index a17e6c6..dfebf3f 100644
--- a/plugin.video.playonbrowser/addon.xml
+++ b/plugin.video.playonbrowser/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.playonbrowser" name="PlayOn Browser" version="2.0.0" provider-name="Lunatixz">
+<addon id="plugin.video.playonbrowser" name="PlayOn Browser" version="2.0.1" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
         <import addon="script.module.simplecache" version="1.0.0"/>
@@ -17,7 +17,7 @@
         <forum>http://forum.kodi.tv/showthread.php?tid=233136</forum>
         <website>https://www.playon.tv</website>
         <source>https://github.com/Lunatixz/XBMC_Addons/tree/master/plugin.video.playonbrowser</source>
-        <news>v.2.0.0[CR]- Refactored and optimized Code.[CR]- Added PlayLater Recording via Context Menu.</news>
+        <news>>v.2.0.1[CR]- Fixed PlayLater playback[CR]v.2.0.0[CR]- Refactored and optimized Code.[CR]- Added PlayLater Recording via Context Menu.</news>
         <assets>
             <icon>resources/images/icon.png</icon>
             <fanart>resources/images/fanart.jpg</fanart>
diff --git a/plugin.video.playonbrowser/default.py b/plugin.video.playonbrowser/default.py
index 7c0a0c2..5c206ad 100644
--- a/plugin.video.playonbrowser/default.py
+++ b/plugin.video.playonbrowser/default.py
@@ -42,7 +42,7 @@ BASE_UPNP      = REAL_SETTINGS.getSetting("playonUPNPid").rstrip('/')
 BASE_URL       = REAL_SETTINGS.getSetting("playonserver").rstrip('/')
 DEBUG          =  REAL_SETTINGS.getSetting("debug") == "true"
 KODILIBRARY    = False #todo strm contextMenu
-URLTYPE        = {0:'m3u8',1:'upnp',2:'flv'}[int(REAL_SETTINGS.getSetting('playonmedia'))]
+URLTYPE        = {0:'m3u8',1:'upnp',2:'ext'}[int(REAL_SETTINGS.getSetting('playonmedia'))]
 PTVL_RUNNING   = xbmcgui.Window(10000).getProperty('PseudoTVRunning') == "True"
 
 
@@ -120,7 +120,7 @@ class PlayOn:
             log("openURL Failed! " + str(e), xbmc.LOGERROR)
         except Exception, e:
             log("openURL Failed! " + str(e), xbmc.LOGERROR)
-            xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30010), ICON, 4000)
+            xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30010), ICON, 5000)
 
     
     def chkIP(self, response):
@@ -129,16 +129,16 @@ class PlayOn:
             if 'catalog' in results:
                 try:
                     ServerName = results['catalog']['@name']
-                    ServerVer = '[B]PlayOn[/B] v.%s'%results['catalog']['@server']
-                    ServerMSG = "[B]Connected to[/B] %s %s"%(ServerName,ServerVer)
+                    ServerVer = 'PlayOn v.%s'%results['catalog']['@server']
+                    ServerMSG = "Connected to [B]%s %s[/B]"%(ServerName,ServerVer)
                     log('chkIP, ServerName = ' + ServerName)
                     log('chkIP, ServerVer = ' + ServerVer)
                     REAL_SETTINGS.setSetting("playonServerid",ServerMSG)
-                    xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30011)%ServerName, ICON, 4000)
+                    xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30011)%ServerName, ICON, 5000)
                 except:
                     pass
         else:
-            xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30012), ICON, 4000)
+            xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30012), ICON, 5000)
     
     
     def getUPNP(self):
@@ -168,7 +168,7 @@ class PlayOn:
                 for item in data['result']['files']:
                     if (item['label']).lower().startswith('playon'):
                         REAL_SETTINGS.setSetting("playonUPNPid",item['file'].rstrip('/'))
-                        xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30013), ICON, 4000)
+                        xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30013), ICON, 5000)
                         BASE_UPNP = item['file']
                         REAL_SETTINGS.setSetting("playonUPNPid",BASE_UPNP.rstrip('/'))
             elif PTVL_RUNNING == False:
@@ -176,7 +176,7 @@ class PlayOn:
                 if BASE_UPNP != -1:
                     REAL_SETTINGS.setSetting("playonUPNPid",BASE_UPNP.rstrip('/'))
             else:
-                xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30010), ICON, 1000)
+                xbmcgui.Dialog().notification(ADDON_NAME, LANGUAGE(30010), ICON, 5000)
                 
 
     def buildItemMenu(self, uri=PLAYON_DATA):
@@ -217,7 +217,7 @@ class PlayOn:
             result = dict(response['result'])
             if result['status'] == "true":
                 msg = result['msg'].replace('The media item',name)
-                xbmcgui.Dialog().notification(ADDON_NAME, msg, ICON, 4000)
+                xbmcgui.Dialog().notification(ADDON_NAME, msg, ICON, 5000)
         
    
     def playVideo(self, name, uri):
@@ -237,7 +237,8 @@ class PlayOn:
             label = title
             mType = 'movie'
             if tvshowtitle is not None:
-                label = '%s - %s'%(tvshowtitle,title)
+                if tvshowtitle not in title:
+                    label = '%s - %s'%(tvshowtitle,title)
                 season, episode = parseSEinfo(title)
                 infoList['season']  = int(season)
                 infoList['episode'] = int(episode)
@@ -262,9 +263,9 @@ class PlayOn:
             else:
                 duration = 0 
                 
-            if URLTYPE == 'm3u8':
+            if URLTYPE == 'm3u8' and 'playlaterrecordings' not in result['@href']:
                 url = BASE_VIDEO_URL%(BASE_URL,result['@href'].split('?id=')[1])
-            elif URLTYPE == 'flv':
+            elif URLTYPE == 'ext' or 'playlaterrecordings' in result['@href']:
                 url = BASE_URL + '/' + dict(result['media'])['@src']
             else:
                 url = BASE_UPNP + '/' + dict(result['media'])['@src'].split('.')[0].split('/')[0] + '/'