v.0.4.6e

PseudoTV · Mar 25, 2024 · 1806ee1 · 1806ee1
1 parent c6bc776
commit 1806ee1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/addons.xml b/addons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
-<addon id="plugin.video.pseudotv.live" version="0.4.6d" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.4.6e" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>

diff --git a/addons.xml.md5 b/addons.xml.md5
@@ -1 +1 @@
-fb26230a02ae4a12cb2625438e566e17
+64aab4a09034c9ba398a59803c72bde2
diff --git a/plugin.video.pseudotv.live/addon.xml b/plugin.video.pseudotv.live/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.pseudotv.live" version="0.4.6d" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.4.6e" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>

diff --git a/plugin.video.pseudotv.live/resources/lib/overlay.py b/plugin.video.pseudotv.live/resources/lib/overlay.py
@@ -56,8 +56,8 @@ def onInit(self):
             citem = self.player.sysInfo.get('citem',{})
             self.runActions(RULES_ACTION_BACKGROUND_OPEN, citem, inherited=self)
             self.getControl(40001).setVisible(self.showStatic)
-            self.getControl(40002).setImage(citem.get('logo',COLOR_LOGO))
-            self.getControl(40003).setText(LANGUAGE(32104)%(citem.get('name',ADDON_NAME)))
+            self.getControl(40002).setImage(citem.get('logo',(BUILTIN.getInfoLabel('Art(icon)','Player') or  COLOR_LOGO)))
+            self.getControl(40003).setText(LANGUAGE(32104)%(citem.get('name',(BUILTIN.getInfoLabel('ChannelName','VideoPlayer') or ADDON_NAME))))
         except:
             self.runActions(RULES_ACTION_BACKGROUND_CLOSE, citem, inherited=self)
             self.close()
@@ -258,8 +258,7 @@ def getWait(state):
                     self._addControl(self._channelBug)
                     self._channelBug.setEnableCondition('[Player.Playing]')
 
-                citem = self.player.sysInfo.get('citem',{})
-                logo  = citem.get('logo',LOGO)
+                logo = self.player.sysInfo.get('citem',{}).get('logo',(BUILTIN.getInfoLabel('Art(icon)','Player') or  LOGO))
                 self.log('toggleBug, channelbug logo = %s)'%(logo))
 
                 if   SETTINGS.getSettingBool('Force_Diffuse'): self._channelBug.setColorDiffuse(self.channelBugColor)
@@ -316,8 +315,8 @@ def getOnNextInterval(interval=3):
                     self._addControl(self._onNext)
                     self._onNext.setEnableCondition('[Player.Playing]')
 
-                onNow  = '%s on %s'%(BUILTIN.getInfoLabel('Title','VideoPlayer'), citem.get('name',ADDON_NAME))
-                onNext = BUILTIN.getInfoLabel('NextTitle','VideoPlayer')
+                onNow  = '%s on %s'%(BUILTIN.getInfoLabel('Title','VideoPlayer'),BUILTIN.getInfoLabel('ChannelName','VideoPlayer')) if BUILTIN.getInfoLabel('ChannelName','VideoPlayer') not in BUILTIN.getInfoLabel('Title','VideoPlayer') else BUILTIN.getInfoLabel('Title','VideoPlayer')
+                onNext = '%s @ %s'%(BUILTIN.getInfoLabel('NextTitle','VideoPlayer'),BUILTIN.getInfoLabel('NextStartTime','VideoPlayer'))
                 self._onNext.setText('%s\n%s'%(LANGUAGE(32104)%(onNow),LANGUAGE(32116)%(onNext)))
                 self._onNext.setAnimations([('Conditional', 'effect=fade start=0 end=100 time=2000 delay=1000 condition=True reversible=True')])
                 self._onNext.autoScroll(6000, 3000, 5000)

diff --git a/plugin.video.pseudotv.live/resources/lib/plugin.py b/plugin.video.pseudotv.live/resources/lib/plugin.py
@@ -43,6 +43,7 @@ def __init__(self, sysARG=sys.argv):
 
         try:    self.sysInfo  = dict(urllib.parse.parse_qsl(sysARG[2][1:].replace('.pvr','')))
         except: self.sysInfo  = {}
+
         self.sysInfo.update({"name"      : (unquoteString(self.sysInfo.get('name',''))  or BUILTIN.getInfoLabel('ChannelName')),
                              "title"     : (unquoteString(self.sysInfo.get('title','')) or BUILTIN.getInfoLabel('label')),
                              "vid"       : decodeString(self.sysInfo.get('vid','')),

diff --git a/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.4.6e.zip b/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.4.6e.zip
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fb26230a02ae4a12cb2625438e566e17
		64aab4a09034c9ba398a59803c72bde2