v.0.5.6m

PseudoTV · Dec 5, 2024 · 8a027fd · 8a027fd
1 parent dcfeb1e
commit 8a027fd
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 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.5.6l" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.6m" 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 @@
-f5ea19f688753e7e3802d38f8c0a1660
+0046eef886cd97efb8daf891ad67eb62
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.5.6l" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.6m" 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/changelog.txt b/plugin.video.pseudotv.live/changelog.txt
@@ -1,4 +1,5 @@
 v.0.5.7
+-Fixed Channel bug and On-Next position not changing based on user settings.
 -Improved Background Interface.
 -Fixed Deadlocking issue when checking multi-room status on startup.
 -Improved URL caching.

diff --git a/plugin.video.pseudotv.live/resources/lib/overlay.py b/plugin.video.pseudotv.live/resources/lib/overlay.py
@@ -153,11 +153,11 @@ def __init__(self, jsonRPC, player=None):
         self.onNextColor        = '0x%s'%((SETTINGS.getSetting('ON_Next_Color')    or 'FFFFFFFF'))
         self.channelBugColor    = '0x%s'%((SETTINGS.getSetting('ChannelBug_Color') or 'FFFFFFFF'))
 
-        try:    self.channelBugX, self.channelBugY = tuple(SETTINGS.getSetting("Channel_Bug_Position_XY")) #user
+        try:    self.channelBugX, self.channelBugY = eval(SETTINGS.getSetting("Channel_Bug_Position_XY")) #user
         except: self.channelBugX, self.channelBugY = (abs(int(self.window_w // 8) - self.window_w) - 128, abs(int(self.window_h // 16) - self.window_h) - 128) #auto
         self._channelBug = xbmcgui.ControlImage(self.channelBugX, self.channelBugY, 128, 128, ' ', aspectRatio=2)
 
-        try:    self.onNextX, self.onNextY = tuple(SETTINGS.getSetting("On_Next_Position_XY")) #user
+        try:    self.onNextX, self.onNextY = eval(SETTINGS.getSetting("On_Next_Position_XY")) #user
         except: self.onNextX, self.onNextY = abs(int(self.window_w // 8)), abs(int(self.window_h // 16) - self.window_h) #auto
         self._onNext = xbmcgui.ControlTextBox(self.onNextX, self.onNextY, abs(int(self.window_w // 2)), abs(int(self.window_h // 32)), 'font12', self.onNextColor)
 
@@ -318,7 +318,7 @@ def _getWait(state, remaining):
 
             elif not self._hasControl(self._channelBug):
                 logo = self.player.sysInfo.get('citem',{}).get('logo',(BUILTIN.getInfoLabel('Art(icon)','Player') or  LOGO))
-                try:    self.channelBugX, self.channelBugY = tuple(SETTINGS.getSetting("Channel_Bug_Position_XY")) #user
+                try:    self.channelBugX, self.channelBugY = eval(SETTINGS.getSetting("Channel_Bug_Position_XY")) #user
                 except: self.channelBugX, self.channelBugY = subZoom(abs(int(self.window_w // 8) - self.window_w) - 128, self._vinViewMode.get('zoom')), subZoom(abs(int(self.window_h // 16) - self.window_h) - 128, self._vinViewMode.get('zoom')) #auto w/ zoom offset
 
                 self._channelBug = xbmcgui.ControlImage(self.channelBugX, self.channelBugY, 128, 128, logo, aspectRatio=2)

diff --git a/plugin.video.pseudotv.live/resources/lib/overlaytool.py b/plugin.video.pseudotv.live/resources/lib/overlaytool.py
@@ -49,12 +49,12 @@ def __init__(self, *args, **kwargs):
 
             self.channelBugDiffuse = '0x%s'%((kwargs.get("ChannelBug_Color") or SETTINGS.getSetting('ChannelBug_Color')))
             self.autoBugX, self.autoBugY = (abs(int(self.window_w // 8) - self.window_w) - 128, abs(int(self.window_h // 16) - self.window_h) - 128)
-            try:    self.channelBugX, self.channelBugY = tuple(kwargs.get("Channel_Bug_Position_XY",SETTINGS.getSetting("Channel_Bug_Position_XY")))
+            try:    self.channelBugX, self.channelBugY = eval(kwargs.get("Channel_Bug_Position_XY",SETTINGS.getSetting("Channel_Bug_Position_XY")))
             except: self.channelBugX, self.channelBugY = self.autoBugX, self.autoBugY
 
             self.onNextColor = '0x%s'%((kwargs.get("ON_Next_Color") or SETTINGS.getSetting("ON_Next_Color")))
             self.autoNextX, self.autoNextY = abs(int(self.window_w // 8)), abs(int(self.window_h // 16) - self.window_h)
-            try:    self.onNextX, self.onNextY = tuple(kwargs.get("On_Next_Position_XY",SETTINGS.getSetting("On_Next_Position_XY")))
+            try:    self.onNextX, self.onNextY = eval(kwargs.get("On_Next_Position_XY",SETTINGS.getSetting("On_Next_Position_XY")))
             except: self.onNextX, self.onNextY = self.autoNextX, self.autoNextY
 
         try: 

diff --git a/plugin.video.pseudotv.live/resources/lib/rules.py b/plugin.video.pseudotv.live/resources/lib/rules.py
@@ -394,7 +394,7 @@ def runAction(self, actionid, citem, parameter, overlay):
 
             overlay.enableChannelBug   = self.optionValues[0]
             overlay.channelBugInterval = self.optionValues[1]
-            overlay.channelBugX, overlay.channelBugY = tuple(self.optionValues[2])
+            overlay.channelBugX, overlay.channelBugY = eval(self.optionValues[2])
             overlay.channelBugColor    = '0x%s'%(self.optionValues[3])
             overlay.channelBugDiffuse  = self.optionValues[4]
             self.log("runAction, setting enableChannelBug = %s, channelBugInterval = %s, channelBugInterval = %s, channelBugColor = %s, channelBugDiffuse = %s"%(overlay.enableChannelBug,overlay.channelBugInterval,(overlay.channelBugX, overlay.channelBugY),overlay.channelBugColor,overlay.channelBugDiffuse))
@@ -465,7 +465,7 @@ def runAction(self, actionid, citem, parameter, overlay):
             self.storedValues[2] = overlay.onNextColor
 
             overlay.enableOnNext             = self.optionValues[0]
-            overlay.onNextX, overlay.onNextY = tuple(self.optionValues[1])
+            overlay.onNextX, overlay.onNextY = eval(self.optionValues[1])
             overlay.onNextColor              = '0x%s'%(self.optionValues[2])
             self.log("runAction, setting enableOnNext = %s, onNextX = %s, onNextY = %s, onNextColor = %s"%(overlay.enableOnNext, overlay.onNextX, overlay.onNextY, overlay.onNextColor))
 

diff --git a/plugin.video.pseudotv.live/resources/lib/utilities.py b/plugin.video.pseudotv.live/resources/lib/utilities.py
@@ -106,7 +106,8 @@ def __postLog(data):
                 self.log('qrDebug, unable to retrieve the paste url')
                 return False, LANGUAGE(30190)
 
-        with BUILTIN.busy_dialog(): payload = SETTINGS.getPayload(inclDebug=True)
+        with BUILTIN.busy_dialog():
+            payload = SETTINGS.getPayload(inclDebug=True)
         if   not payload.get('debug',{}): return DIALOG.notificationDialog(LANGUAGE(32187))
         elif not DIALOG.yesnoDialog(message=LANGUAGE(32188)): return
 

diff --git a/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.5.6m.zip b/zips/plugin.video.pseudotv.live/plugin.video.pseudotv.live-0.5.6m.zip
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f5ea19f688753e7e3802d38f8c0a1660
		0046eef886cd97efb8daf891ad67eb62