Merge pull request #1416 from MoojMidge/v7.4

v7.4.2+beta.1

Author: MoojMidge

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="7.4.1.1" provider-name="anxdpanic, bromix, MoojMidge">
+<addon id="plugin.video.youtube" name="YouTube" version="7.4.2+beta.1" provider-name="anxdpanic, bromix, MoojMidge">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>

changelog.txt

@@ -1,3 +1,22 @@
+## v7.4.2+beta.1
+### Fixed
+- Skip unplayable live manifests #1377
+- Handle inconsistent error codes and names used in Python 2 #1412
+- Simplify byte range to timestamp conversion for compatibility with Python 2 #1412
+- Fix unnecessarily reloading listing when adding items to Bookmarks
+
+### Changed
+- Rework addon debug log settings (Addon > Settings > Advanced > Debug > Enable debug logging) #1385
+  - Allowable values:
+    - Disabled (addon logging output disabled)
+    - Auto (default, addon logging output enabled if Kodi debug logging enabled)
+    - Always enabled (addon logging output enabled)
+    - Verbose (additional addon logging output enabled)
+- Various other improvement to addon logging
+
+### New
+- Update Setup Wizard to account for user possibly using mismatched watch history settings
+
 ## v7.4.1.1
 ### Fixed
 - Address possible race condition resulting in KeyError exception when calling pop() on an empty set

resources/lib/youtube_plugin/kodion/context/abstract_context.py

@@ -709,7 +709,12 @@ def sleep(timeout=None):
     def tear_down(self):
         pass
 
-    def ipc_exec(self, target, timeout=None, payload=None, raise_exc=False):
+    def ipc_exec(self,
+                 target,
+                 timeout=None,
+                 payload=None,
+                 raise_exc=False,
+                 stacklevel=2):
         raise NotImplementedError()
 
     def is_plugin_folder(self, folder_name=None):

resources/lib/youtube_plugin/kodion/context/xbmc/xbmc_context.py

@@ -32,6 +32,7 @@
     CHANNEL_ID,
     CONTENT,
     FOLDER_NAME,
+    FOLDER_URI,
     PLAYLIST_ID,
     PLAY_FORCE_AUDIO,
     SERVICE_IPC,
@@ -1025,13 +1026,18 @@ def tear_down(self):
             except AttributeError:
                 pass
 
-    def ipc_exec(self, target, timeout=None, payload=None, raise_exc=False):
+    def ipc_exec(self,
+                 target,
+                 timeout=None,
+                 payload=None,
+                 raise_exc=False,
+                 stacklevel=2):
         if not XbmcContextUI.get_property(SERVICE_RUNNING_FLAG, as_bool=True):
             msg = 'Service IPC - Monitor has not started'
             XbmcContextUI.set_property(SERVICE_RUNNING_FLAG, BUSY_FLAG)
             if raise_exc:
                 raise RuntimeError(msg)
-            self.log.warning_trace(msg)
+            self.log.warning_trace(msg, stacklevel=stacklevel)
             return None
 
         data = {'target': target, 'response_required': bool(timeout)}
@@ -1047,32 +1053,50 @@ def ipc_exec(self, target, timeout=None, payload=None, raise_exc=False):
         response = IPCMonitor(target, timeout)
         if response.received:
             value = response.value
-            if value:
-                self.log.debug(('Service IPC - Responded',
-                                'Procedure: {target!r}',
-                                'Latency:   {latency:.2f}ms'),
-                               target=target,
-                               latency=response.latency)
-            elif value is False:
-                self.log.error_trace(('Service IPC - Failed',
-                                      'Procedure: {target!r}',
-                                      'Latency:   {latency:.2f}ms'),
-                                     target=target,
-                                     latency=response.latency)
+            if value is False:
+                log_level = logging.ERROR
+                log_value = 'FAILED'
+                stack_info = True
+            else:
+                log_level = logging.DEBUG
+                log_value = value
+                stack_info = False
+            self.log.log(
+                level=log_level,
+                msg='Service IPC <{target}({payload})>:'
+                    ' {value} (in {time_ms:.2f}ms)',
+                target=target,
+                payload=payload,
+                value=log_value,
+                time_ms=response.latency,
+                stack_info=stack_info,
+                stacklevel=stacklevel,
+            )
         else:
             value = None
-            self.log.error_trace(('Service IPC - Timed out',
-                                  'Procedure: {target!r}',
-                                  'Timeout:   {timeout:.2f}s'),
-                                 target=target,
-                                 timeout=timeout)
+            self.log.error_trace(
+                'Service IPC <{target}({payload})>:'
+                ' TIMED OUT (in {time_s:.2f}s)',
+                target=target,
+                payload=payload,
+                time_s=timeout,
+                stacklevel=stacklevel,
+            )
         return value
 
-    def is_plugin_folder(self, folder_name=None):
-        if folder_name is None:
-            folder_name = XbmcContextUI.get_container_info(FOLDER_NAME,
-                                                           container_id=None)
-        return folder_name == self._plugin_name
+    def is_plugin_folder(self, folder_path='', name=False):
+        if name:
+            return XbmcContextUI.get_container_info(
+                FOLDER_NAME,
+                container_id=None,
+            ) == self._plugin_name
+        return self.is_plugin_path(
+            XbmcContextUI.get_container_info(
+                FOLDER_URI,
+                container_id=None,
+            ),
+            folder_path,
+        )
 
     def refresh_requested(self, force=False, on=False, off=False, params=None):
         if params is None:

resources/lib/youtube_plugin/kodion/items/xbmc/xbmc_items.py

@@ -37,7 +37,6 @@
     VIDEO_ID,
 )
 from ...utils.datetime import datetime_to_since, utc_to_local
-from ...utils.redact import redact_ip_in_uri
 from ...utils.system_version import current_system_version
 
 
@@ -429,9 +428,9 @@ def set_info(list_item, item, properties, set_play_count=True, resume=True):
 
 def playback_item(context, media_item, show_fanart=None, **_kwargs):
     uri = media_item.get_uri()
-    logging.debug('Converting %s for playback: %r',
-                  media_item.__class__.__name__,
-                  redact_ip_in_uri(uri))
+    logging.debug('Converting {type} for playback: {uri!u}',
+                  type=media_item.__class__.__name__,
+                  uri=uri)
 
     params = context.get_params()
     settings = context.get_settings()
@@ -485,7 +484,8 @@ def playback_item(context, media_item, show_fanart=None, **_kwargs):
             props['inputstream.adaptive.stream_selection_type'] = 'manual-osd'
         elif 'auto' in stream_select:
             props['inputstream.adaptive.stream_selection_type'] = 'adaptive'
-            props['inputstream.adaptive.chooser_resolution_max'] = 'auto'
+            if current_system_version.compatible(21):
+                props['inputstream.adaptive.chooser_resolution_max'] = 'auto'
 
         if current_system_version.compatible(19):
             props['inputstream'] = 'inputstream.adaptive'

resources/lib/youtube_plugin/kodion/json_store/json_store.py

@@ -106,7 +106,7 @@ def save(self, data, update=False, process=True, ipc=True, stacklevel=2):
                 self._context.get_ui().set_property(
                     '-'.join((FILE_WRITE, filepath)),
                     to_unicode(_data),
-                    log_value='<redacted>',
+                    log_redact='REDACTED',
                 )
                 response = self._context.ipc_exec(
                     FILE_WRITE,
@@ -158,7 +158,7 @@ def load(self, process=True, ipc=True, stacklevel=2):
                 ) is not False:
                     data = self._context.get_ui().get_property(
                         '-'.join((FILE_READ, filepath)),
-                        log_value='<redacted>',
+                        log_redact='REDACTED',
                     )
                 else:
                     raise IOError

resources/lib/youtube_plugin/kodion/logging.py

@@ -20,7 +20,7 @@
 
 from .compatibility import StringIO, string_type, to_str, xbmc
 from .constants import ADDON_ID
-from .utils.convert_format import to_unicode
+from .utils.convert_format import to_unicode, urls_in_text
 from .utils.redact import (
     parse_and_redact_uri,
     redact_auth_header,
@@ -74,24 +74,32 @@ def formatStack(self, stack_info):
 
     def format(self, record):
         record.message = to_unicode(record.getMessage())
+
         if self.usesTime():
             record.asctime = self.formatTime(record, self.datefmt)
+
         s = self.formatMessage(record)
+
+        if record.stack_info:
+            if not record.stack_text:
+                stack_text = self.formatStack(record.stack_info)
+                if getattr(record, '__redact_stack__', False):
+                    stack_text = urls_in_text(stack_text, parse_and_redact_uri)
+                record.stack_text = stack_text
+            if s[-1:] != '\n':
+                s += '\n\n'
+            s += record.stack_text
+
         if record.exc_info:
             if not record.exc_text:
-                record.exc_text = self.formatException(record.exc_info)
-        if record.exc_text:
-            if record.stack_info:
-                if s[-1:] != '\n':
-                    s += '\n\n'
-                s += self.formatStack(record.stack_info)
+                exc_text = self.formatException(record.exc_info)
+                if getattr(record, '__redact_exc__', False):
+                    exc_text = urls_in_text(exc_text, parse_and_redact_uri)
+                record.exc_text = exc_text
             if s[-1:] != '\n':
                 s += '\n\n'
             s += record.exc_text
-        elif record.stack_info:
-            if s[-1:] != '\n':
-                s += '\n\n'
-            s += self.formatStack(record.stack_info)
+
         return s
 
 
@@ -308,8 +316,7 @@ def stack_info(self, value):
 
 class LogRecord(logging.LogRecord):
     def __init__(self, name, level, pathname, lineno, msg, args, exc_info,
-                 func=None, **kwargs):
-        stack_info = kwargs.pop('sinfo', None)
+                 func=None, sinfo=None, extra=None, **kwargs):
         super(LogRecord, self).__init__(name,
                                         level,
                                         pathname,
@@ -319,7 +326,21 @@ def __init__(self, name, level, pathname, lineno, msg, args, exc_info,
                                         exc_info,
                                         func=func,
                                         **kwargs)
-        self.stack_info = stack_info
+        self.message = None
+        self.asctime = None
+        self.stack_info = sinfo
+        self.stack_text = None
+        if extra is not None:
+            attrs = self.__dict__
+            duplicate_attrs = set(extra).intersection(attrs.keys())
+            if duplicate_attrs:
+                raise KeyError(
+                    "Attempt to overwrite LogRecord attributes: ('%s',)" % (
+                        "', '".join(duplicate_attrs)
+                    )
+                )
+            else:
+                attrs.update(extra)
 
     if not current_system_version.compatible(19):
         def getMessage(self):
@@ -423,21 +444,18 @@ def findCaller(self, stack_info=False, stacklevel=1):
 
     def makeRecord(self, name, level, fn, lno, msg, args, exc_info,
                    func=None, extra=None, sinfo=None):
-        rv = LogRecord(name,
-                       level,
-                       fn,
-                       lno,
-                       msg,
-                       args,
-                       exc_info,
-                       func=func,
-                       sinfo=sinfo)
-        if extra is not None:
-            for key in extra:
-                if (key in ["message", "asctime"]) or (key in rv.__dict__):
-                    raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-                rv.__dict__[key] = extra[key]
-        return rv
+        return LogRecord(
+            name,
+            level,
+            fn,
+            lno,
+            msg,
+            args,
+            exc_info,
+            func=func,
+            sinfo=sinfo,
+            extra=extra,
+        )
 
     def exception(self, msg, *args, **kwargs):
         if self.isEnabledFor(ERROR):

resources/lib/youtube_plugin/kodion/monitors/player_monitor.py

@@ -439,7 +439,7 @@ def onAVStarted(self):
 
         player_data = ui.pop_property(PLAYER_DATA,
                                       process=json.loads,
-                                      log_process=redact_params)
+                                      log_redact=True)
         if not player_data:
             return
         self.cleanup_threads()

resources/lib/youtube_plugin/kodion/monitors/service_monitor.py

@@ -213,7 +213,7 @@ def onNotification(self, sender, method, data):
                                 self._context.get_ui().set_property(
                                     '-'.join((FILE_READ, filepath)),
                                     file.read(),
-                                    log_value='<redacted>',
+                                    log_redact='REDACTED',
                                 )
                                 response = True
                         except (IOError, OSError):
@@ -222,7 +222,7 @@ def onNotification(self, sender, method, data):
                         with write_access:
                             content = self._context.get_ui().pop_property(
                                 '-'.join((FILE_WRITE, filepath)),
-                                log_value='<redacted>',
+                                log_redact='REDACTED',
                             )
                             response = None
                             if content:
@@ -338,12 +338,15 @@ def onSettingsChanged(self, force=False):
         log_level = settings.log_level()
         if log_level:
             self.log.debugging = True
+            # Verbose
             if log_level & 2:
                 self.log.stack_info = True
                 self.log.verbose_logging = True
+            # Enabled or Auto on
             else:
                 self.log.stack_info = False
                 self.log.verbose_logging = False
+        # Disabled or Auto off
         else:
             self.log.debugging = False
             self.log.stack_info = False