v.0.5.5

PseudoTV · Oct 12, 2024 · 656a746 · 656a746
1 parent 33699c4
commit 656a746
Show file tree

Hide file tree

Showing 56 changed files with 1,569 additions and 1,409 deletions.
diff --git a/addons.xml b/addons.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
-<addon id="plugin.video.pseudotv.live" version="0.5.4q" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.5" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>
         <import addon="script.module.six" version="1.0.0"/>
         <import addon="script.module.kodi-six" version="0.1.3.1"/>
-        <import addon="script.module.infotagger" version="0.0.5" />
+        <import addon="script.module.infotagger" version="0.0.5"/>
         <import addon="script.module.simplecache" version="1.0.0"/>
-        <import addon="script.module.requests" version="0.0.1" />
+        <import addon="script.module.requests" version="0.0.1"/>
         <import addon="script.module.pyqrcode" version="1.2.1+matrix.1"/>
-        <import addon="plugin.library.node.editor" version="0.0.1" />
+        <import addon="plugin.library.node.editor" version="0.0.1"/>
         <import addon="resource.images.studios.white" version="0.0.1"/>
         <import addon="resource.images.musicgenreicons.text" version="0.0.1"/>
         <import addon="resource.images.moviegenreicons.transparent" version="0.0.1"/>
@@ -22,7 +22,7 @@
         <import addon="resource.videos.ratings.mpaa.classic" optional="true" version="0.0.4"/>
         <import addon="plugin.video.ispot.tv" optional="true" version="0.0.1"/>
         <import addon="plugin.video.imdb.trailers" optional="true" version="0.0.1"/>
-        <import addon="script.module.youtube.dl"  optional="true" version="23.04.01+matrix.1"/>
+        <import addon="script.module.youtube.dl" optional="true" version="23.04.01+matrix.1"/>
         <import addon="script.module.pil" optional="true" version="5.1.0"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="resources/lib/default.py">
@@ -31,43 +31,43 @@
     <extension point="xbmc.service" library="resources/lib/service.py"/>
     <extension point="xbmc.python.module" library="resources/lib/"/>
     <extension point="kodi.context.item">
-    <menu id="kodi.core.main">
-        <menu>
-            <label>PseudoTV Live</label>
-            <item library="resources/lib/context_record.py" args="add">
-                <label>30115</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>
-            <item library="resources/lib/context_record.py" args="del">
-                <label>30117</label>
-                <visible>[String.StartsWith(ListItem.PVRInstanceName, PseudoTV Live) + Window.IsVisible(tvrecordings)]</visible>
-            </item>
-            <item library="resources/lib/context_play.py" args="playlist">
-                <label>30076</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>
-            <item library="resources/lib/context_info.py" args="info">
-                <label>30075</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>
-            <item library="resources/lib/context_info.py" args="match">
-                <label>30091</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>
-            <item library="resources/lib/context_info.py" args="browse">
-                <label>30087</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>
-            <item library="resources/lib/context_create.py">
-                <label>30114</label>
-                <visible>[!ListItem.IsPlayable + ListItem.IsFolder] + [!String.IsEmpty(ListItem.Label)]</visible>
-            </item>
-            <item library="resources/lib/context_create.py" args="manage">
-                <label>30107</label>
-                <visible>[String.Contains(ListItem.Plot,"item=")] + [Window.IsVisible(tvchannels)]</visible>
-            </item>
+        <menu id="kodi.core.main">
+            <menu>
+                <label>PseudoTV Live</label>
+                <item library="resources/lib/context_record.py" args="add">
+                    <label>30115</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_record.py" args="del">
+                    <label>30117</label>
+                    <visible>[String.StartsWith(ListItem.PVRInstanceName, PseudoTV Live) + Window.IsVisible(tvrecordings)]</visible>
+                </item>
+                <item library="resources/lib/context_play.py" args="playlist">
+                    <label>30076</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_info.py" args="info">
+                    <label>30075</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_info.py" args="match">
+                    <label>30091</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_info.py" args="browse">
+                    <label>30087</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_create.py">
+                    <label>30114</label>
+                    <visible>[!ListItem.IsPlayable + ListItem.IsFolder] + [!String.IsEmpty(ListItem.Label)]</visible>
+                </item>
+                <item library="resources/lib/context_create.py" args="manage">
+                    <label>30107</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=")] + [Window.IsVisible(tvchannels)]</visible>
+                </item>
+            </menu>
         </menu>
-    </menu>
     </extension>
     <extension point="xbmc.addon.metadata">
         <summary lang="en_GB">PseudoTV Live acts like a set-top box for Kodi!</summary>

diff --git a/addons.xml.md5 b/addons.xml.md5
@@ -1 +1 @@
-0102287ad35eaf1efcf21fed8946aded
+c96490572b16d3f6738f3bbb407e8f1c
diff --git a/plugin.video.pseudotv.live/addon.xml b/plugin.video.pseudotv.live/addon.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.pseudotv.live" version="0.5.4q" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.5" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>
         <import addon="script.module.six" version="1.0.0"/>
         <import addon="script.module.kodi-six" version="0.1.3.1"/>
-        <import addon="script.module.infotagger" version="0.0.5" />
+        <import addon="script.module.infotagger" version="0.0.5"/>
         <import addon="script.module.simplecache" version="1.0.0"/>
-        <import addon="script.module.requests" version="0.0.1" />
+        <import addon="script.module.requests" version="0.0.1"/>
         <import addon="script.module.pyqrcode" version="1.2.1+matrix.1"/>
-        <import addon="plugin.library.node.editor" version="0.0.1" />
+        <import addon="plugin.library.node.editor" version="0.0.1"/>
         <import addon="resource.images.studios.white" version="0.0.1"/>
         <import addon="resource.images.musicgenreicons.text" version="0.0.1"/>
         <import addon="resource.images.moviegenreicons.transparent" version="0.0.1"/>
@@ -21,7 +21,7 @@
         <import addon="resource.videos.ratings.mpaa.classic" optional="true" version="0.0.4"/>
         <import addon="plugin.video.ispot.tv" optional="true" version="0.0.1"/>
         <import addon="plugin.video.imdb.trailers" optional="true" version="0.0.1"/>
-        <import addon="script.module.youtube.dl"  optional="true" version="23.04.01+matrix.1"/>
+        <import addon="script.module.youtube.dl" optional="true" version="23.04.01+matrix.1"/>
         <import addon="script.module.pil" optional="true" version="5.1.0"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="resources/lib/default.py">
@@ -30,43 +30,43 @@
     <extension point="xbmc.service" library="resources/lib/service.py"/>
     <extension point="xbmc.python.module" library="resources/lib/"/>
     <extension point="kodi.context.item">
-    <menu id="kodi.core.main">
-        <menu>
-            <label>PseudoTV Live</label>
-            <item library="resources/lib/context_record.py" args="add">
-                <label>30115</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>              
-            <item library="resources/lib/context_record.py" args="del">
-                <label>30117</label>
-                <visible>[String.StartsWith(ListItem.PVRInstanceName, PseudoTV Live) + Window.IsVisible(tvrecordings)]</visible>
-            </item>
-            <item library="resources/lib/context_play.py" args="playlist">
-                <label>30076</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>  
-            <item library="resources/lib/context_info.py" args="info">
-                <label>30075</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item> 
-            <item library="resources/lib/context_info.py" args="match">
-                <label>30091</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>      
-            <item library="resources/lib/context_info.py" args="browse">
-                <label>30087</label>
-                <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
-            </item>      
-            <item library="resources/lib/context_create.py">
-                <label>30114</label>
-                <visible>[!ListItem.IsPlayable + ListItem.IsFolder] + [!String.IsEmpty(ListItem.Label)]</visible>
-            </item>
-            <item library="resources/lib/context_create.py" args="manage">
-                <label>30107</label>
-                <visible>[String.Contains(ListItem.Plot,"item=")] + [Window.IsVisible(tvchannels)]</visible>
-            </item>  
+        <menu id="kodi.core.main">
+            <menu>
+                <label>PseudoTV Live</label>
+                <item library="resources/lib/context_record.py" args="add">
+                    <label>30115</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_record.py" args="del">
+                    <label>30117</label>
+                    <visible>[String.StartsWith(ListItem.PVRInstanceName, PseudoTV Live) + Window.IsVisible(tvrecordings)]</visible>
+                </item>
+                <item library="resources/lib/context_play.py" args="playlist">
+                    <label>30076</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_info.py" args="info">
+                    <label>30075</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_info.py" args="match">
+                    <label>30091</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_info.py" args="browse">
+                    <label>30087</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=") + ListItem.HasEpg] + [Window.IsVisible(tvguide)|Window.IsVisible(tvsearch)|Window.IsVisible(tvchannels)]</visible>
+                </item>
+                <item library="resources/lib/context_create.py">
+                    <label>30114</label>
+                    <visible>[!ListItem.IsPlayable + ListItem.IsFolder] + [!String.IsEmpty(ListItem.Label)]</visible>
+                </item>
+                <item library="resources/lib/context_create.py" args="manage">
+                    <label>30107</label>
+                    <visible>[String.Contains(ListItem.Plot,"item=")] + [Window.IsVisible(tvchannels)]</visible>
+                </item>
+            </menu>
         </menu>
-    </menu>
     </extension>
     <extension point="xbmc.addon.metadata">
         <summary lang="en_GB">PseudoTV Live acts like a set-top box for Kodi!</summary>

diff --git a/plugin.video.pseudotv.live/changelog.txt b/plugin.video.pseudotv.live/changelog.txt
@@ -1,5 +1,10 @@
 v.0.5.5
--Settings reordered and cleaned in preparation for Kodi repository submission. 
+-Added robust debugging with easy log submission and user U.I. (W.I.P).
+ - Minimum Debug level setting - Filter less important entries to reduce file size.
+ - QR-Code PseudoTV Live Forums.
+ - QR-Code Snapshot UI (Unfiltered)
+ - QR-Code "Submit Snapshot" Upload to paste.kodi.tv (filtered, sensitive information stripped before upload).
+-Improved settings; reordered and cleaned in preparation for Kodi repository submission.
  - Debugging now disabled by default.
  - Automatic IPTV-Simple PVR Refresh / Configuration disabled by default.
 -Added QR-Code dialog.

diff --git a/plugin.video.pseudotv.live/remotes/m3u.json b/plugin.video.pseudotv.live/remotes/m3u.json
@@ -1,10 +1,11 @@
 {
-    "items": {
+    "item": {
         "id": "",
         "number": 0,
         "name": "",
         "logo": "",
-        "group": [],
+        "group": [
+        ],
         "catchup": "vod",
         "radio": false,
         "favorite": false,
@@ -16,6 +17,7 @@
         "x-tvg-url": "",
         "media-dir": "",
         "media-size": "",
+        "media-type": "",
         "catchup-source": "",
         "catchup-days": "",
         "catchup-correction": "",
@@ -25,14 +27,16 @@
         "provider-countries": "",
         "provider-languages": "",
         "x-playlist-type": "",
-        "kodiprops": []
+        "kodiprops": [
+        ]
     },
     "required": {
         "id": "",
         "number": 0,
         "name": "",
         "logo": "",
-        "group": [],
+        "group": [
+        ],
         "catchup": "vod",
         "radio": false,
         "label": "",

diff --git a/plugin.video.pseudotv.live/resources/language/resource.language.en_gb/strings.po b/plugin.video.pseudotv.live/resources/language/resource.language.en_gb/strings.po
@@ -682,7 +682,11 @@ msgid "Adverts & Trailers"
 msgstr ""
 
 msgctxt "#30165"
-msgid "Instance Status"
+msgid "View snapshot"
+msgstr ""
+
+msgctxt "#30166"
+msgid "Submit Snapshot"
 msgstr ""
 
 # Skin - strings 31000 thru 31999 reserved for skins
@@ -1319,7 +1323,7 @@ msgid "Would you like to Install %s?"
 msgstr ""
 
 msgctxt "#32157"
-msgid "Pending Changes..."
+msgid "Changes Detected!"
 msgstr ""
 
 msgctxt "#32158"
@@ -1438,6 +1442,22 @@ msgctxt "#32186"
 msgid "Unable to automatically configure IPTV-Simple, Please check user configurations."
 msgstr ""
 
+msgctxt "#32187"
+msgid "No errors found in debug snapshot!"
+msgstr ""
+
+msgctxt "#32188"
+msgid "Snapshot uploaded to [B]https://paste.kodi.tv/[/B][CR]Sensitive information removed before upload.[CR]Continue?"
+msgstr ""
+
+msgctxt "#32189"
+msgid "Post this url or QRcode for your snapshot, together with a problem description, on the Kodi forum: %s"
+msgstr ""
+
+msgctxt "#32190"
+msgid "Error posting snapshot[CR]%s"
+msgstr ""
+
 
 # Help - strings 33000 thru 33999 reserved for common strings used in add-ons
 
@@ -1749,6 +1769,18 @@ msgctxt "#33160"
 msgid "Select one or more logo resource packs."
 msgstr ""
 
+msgctxt "#33161"
+msgid "QRCode - Visit Kodi.TV PseudoTV Live Support Forum"
+msgstr ""
+
+msgctxt "#33165"
+msgid "QRCode - View Instance Snapshot."
+msgstr ""
+
+msgctxt "#33166"
+msgid "QRCode - Submit Instance Snapshot for debugging."
+msgstr ""
+
 msgctxt "#33170"
 msgid "Delete channel Path"
 msgstr ""
@@ -1764,3 +1796,15 @@ msgstr ""
 msgctxt "#33182"
 msgid "When [COLOR=orange][B]Idle[/B][/COLOR] click to begin beacon; Within 15mins start another Kodi instance w/PseudoTV Live installed\nThe two instances will pair, enabled in Select Server list."
 msgstr ""
+
+msgctxt "#33308"
+msgid "Install Log Uploader."
+msgstr ""
+
+msgctxt "#33309"
+msgid "Submit debugging log for review."
+msgstr ""
+
+msgctxt "#33202"
+msgid "Minimum Debugging Level [LOGERROR - Default]"
+msgstr ""
diff --git a/plugin.video.pseudotv.live/resources/lib/backup.py b/plugin.video.pseudotv.live/resources/lib/backup.py
@@ -90,7 +90,7 @@ def recoverChannels(self, file: str=CHANNELFLE_BACKUP) -> bool:
                     library = Library()
                     library.resetLibrary()
                     del library
-                    return setPendingRestart()
+                    return PROPERTIES.setPendingRestart()
 
 
     def run(self):  

diff --git a/plugin.video.pseudotv.live/resources/lib/constants.py b/plugin.video.pseudotv.live/resources/lib/constants.py
@@ -20,7 +20,7 @@
 
 import os
 
-from kodi_six    import xbmc, xbmcaddon
+from kodi_six      import xbmc, xbmcaddon
 
 #info
 ADDON_ID            = 'plugin.video.pseudotv.live'
@@ -34,6 +34,10 @@
 ADDON_URL           = 'https://raw.githubusercontent.com/PseudoTV/PseudoTV_Live/master/plugin.video.pseudotv.live/addon.xml'
 LANGUAGE            = REAL_SETTINGS.getLocalizedString
 
+#api
+MONITOR             = xbmc.Monitor
+PLAYER              = xbmc.Player
+
 #constants
 OVERLAY_DELAY       = 5     #secs
 DISCOVERY_TIMER     = 60    #secs
@@ -130,6 +134,7 @@
 XMLTVFLE            = 'pseudotv.xml'
 GENREFLE            = 'genres.xml'
 REMOTEFLE           = 'remote.json'
+BONJOURFLE          = 'bonjour.json'
 SERVERFLE           = 'servers.json'
 CHANNELFLE          = 'channels.json'
 LIBRARYFLE          = 'library.json'