tweaks to logging

pytube/cipher.py

@@ -18,9 +18,11 @@ signature and decoding it.
 from __future__ import absolute_import
 
 import logging
+import pprint
 import re
 from itertools import chain
 
+from pytube.exceptions import RegexMatchError
 from pytube.helpers import memoize
 from pytube.helpers import regex_search
 
@@ -173,7 +175,10 @@ def map_functions(js_func):
     for pattern, fn in mapper:
         if re.search(pattern, js_func):
             return fn
-    # TODO(nficano): raise error
+    raise RegexMatchError(
+        'could not find python equivalent function for: ',
+        js_func,
+    )
 
 
 def parse_function(js_func):
@@ -218,7 +223,13 @@ def get_signature(js, ciphered_signature):
         name, argument = parse_function(js_func)
         signature = tmap[name](signature, int(argument))
         logger.debug(
-            'getting signature: %s(sig, %s) => %s', name, argument,
-            ''.join(signature),
+            'applied transform function\n%s', pprint.pformat(
+                {
+                    'output': ''.join(signature),
+                    'js_function': name,
+                    'argument': int(argument),
+                    'function': tmap[name],
+                }, indent=2,
+            ),
         )
     return ''.join(signature)

pytube/helpers.py

@@ -9,8 +9,8 @@ Various helper functions implemented by pytube.
 from __future__ import absolute_import
 
 import functools
-import json
 import logging
+import pprint
 import re
 
 from pytube.exceptions import RegexMatchError
@@ -35,7 +35,7 @@ def regex_search(pattern, string, groups=False, group=None, flags=0):
     results = regex.search(string)
     logger.debug(
         'finished regex search: %s',
-        json.dumps(
+        pprint.pprint(
             {
                 'pattern': pattern,
                 'results': results.group(0),

pytube/logging.py

@@ -11,8 +11,9 @@ import logging
 
 
 def create_logger(level=logging.DEBUG):
-    fmt = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-    formatter = logging.Formatter(fmt)
+    fmt = '[%(asctime)s] %(levelname)s in %(module)s: %(message)s'
+    date_fmt = '%H:%M:%S'
+    formatter = logging.Formatter(fmt, datefmt=date_fmt)
 
     handler = logging.StreamHandler()
     handler.setFormatter(formatter)

pytube/mixins.py

@@ -8,8 +8,8 @@ Applies in-place data mutations.
 """
 from __future__ import absolute_import
 
-import json
 import logging
+import pprint
 
 from pytube import cipher
 from pytube.compat import parse_qsl
@@ -46,7 +46,7 @@ def apply_signature(config_args, fmt, js):
 
         logger.debug(
             'finished descrambling signature for itag=%s\n%s',
-            stream['itag'], json.dumps(
+            stream['itag'], pprint.pprint(
                 {
                     's': stream['s'],
                     'signature': signature,
@@ -69,3 +69,4 @@ def apply_descrambler(stream_data, key):
         {k: unquote(v) for k, v in parse_qsl(i)}
         for i in stream_data[key].split(',')
     ]
+    logger.debug('applying descrambler\n%s', pprint.pprint(stream_data[key]))

pytube/streams.py

@@ -10,9 +10,9 @@ separately).
 """
 from __future__ import absolute_import
 
-import json
 import logging
 import os
+import pprint
 
 from pytube import extract
 from pytube import request
@@ -181,8 +181,8 @@ class Stream(object):
         """
         file_handler.write(chunk)
         logger.debug(
-            'download progress %s',
-            json.dumps(
+            'download progress\n%s',
+            pprint.pprint(
                 {
                     'chunk_size': len(chunk),
                     'bytes_remaining': bytes_remaining,