[sponskrub] Better debug output and error message

youtube_dlc/postprocessor/common.py

@@ -40,9 +40,10 @@ class PostProcessor(object):
         name = cls.__name__[:-2]
         return compat_str(name[6:]) if name[:6].lower() == 'ffmpeg' else name
 
-    def to_screen(self, text, *args, **kwargs):
+    def to_screen(self, text, prefix=True, *args, **kwargs):
+        tag = '[%s] ' % self.PP_NAME if prefix else ''
         if self._downloader:
-            return self._downloader.to_screen('[%s] %s' % (self.PP_NAME, text), *args, **kwargs)
+            return self._downloader.to_screen('%s%s' % (tag, text), *args, **kwargs)
 
     def report_warning(self, text, *args, **kwargs):
         if self._downloader:
@@ -52,9 +53,10 @@ class PostProcessor(object):
         if self._downloader:
             return self._downloader.report_error(text, *args, **kwargs)
 
-    def write_debug(self, text, *args, **kwargs):
+    def write_debug(self, text, prefix=True, *args, **kwargs):
+        tag = '[debug] ' if prefix else ''
         if self.get_param('verbose', False):
-            return self._downloader.to_screen('[debug] %s' % text, *args, **kwargs)
+            return self._downloader.to_screen('%s%s' % (tag, text), *args, **kwargs)
 
     def get_param(self, name, default=None, *args, **kwargs):
         if self._downloader:

youtube_dlc/postprocessor/sponskrub.py

@@ -82,9 +82,8 @@ class SponSkrubPP(PostProcessor):
         elif p.returncode == 3:
             self.to_screen('No segments in the SponsorBlock database')
         else:
-            stderr = stderr.decode('utf-8', 'replace')
+            msg = stderr.decode('utf-8', 'replace').strip() or stdout.decode('utf-8', 'replace').strip()
-            msg = stderr.strip()
+            self.write_debug(msg, prefix=False)
-            if not self.get_param('verbose', False):
             msg = msg.split('\n')[-1]
-            raise PostProcessingError(msg if msg else 'sponskrub failed with error code %s!' % p.returncode)
+            raise PostProcessingError(msg if msg else 'sponskrub failed with error code %s' % p.returncode)
         return [], information