From: Scott Gasch <scott@gasch.org>
Date: Tue, 12 Oct 2021 02:21:19 +0000 (-0700)
Subject: Adds logging in light stuff, minor changes in config/string.
X-Git-Url: https://wannabe.guru.org/gitweb/?a=commitdiff_plain;h=9484900f080e16f118806fe54973e69d36b043e8;p=python_utils.git

Adds logging in light stuff, minor changes in config/string.
---

diff --git a/config.py b/config.py
index fc19f3d..b6262ad 100644
--- a/config.py
+++ b/config.py
@@ -89,7 +89,7 @@ args = argparse.ArgumentParser(
     description=None,
     formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     fromfile_prefix_chars="@",
-    epilog=f'------------------------------------------------------------------------------\n{program_name} uses config.py ({__file__}) for global, cross-module configuration setup and parsing.\n------------------------------------------------------------------------------'
+    epilog=f'{program_name} uses config.py ({__file__}) for global, cross-module configuration setup and parsing.'
 )
 
 # Keep track of if we've been called and prevent being called more
diff --git a/light_utils.py b/light_utils.py
index bd73ee3..8101a32 100644
--- a/light_utils.py
+++ b/light_utils.py
@@ -48,13 +48,16 @@ def tplink_light_command(command: str) -> bool:
     result = os.system(command)
     signal = result & 0xFF
     if signal != 0:
+        logger.warning(f'{command} died with signal {signal}')
         logging_utils.hlog("%s died with signal %d" % (command, signal))
         return False
     else:
         exit_value = result >> 8
         if exit_value != 0:
+            logger.warning(f'{command} failed, exited {exit_value}')
             logging_utils.hlog("%s failed, exit %d" % (command, exit_value))
             return False
+    logger.debug(f'{command} succeeded.')
     return True
 
 
@@ -212,6 +215,7 @@ class TPLinkLight(Light):
         cmd = self.get_cmdline(child) + f"-c {cmd}"
         if extra_args is not None:
             cmd += f" {extra_args}"
+        logger.debug(f'About to execute {cmd}')
         return tplink_light_command(cmd)
 
     def turn_on(self, child: str = None) -> bool:
diff --git a/string_utils.py b/string_utils.py
index 623ae45..a6a2da3 100644
--- a/string_utils.py
+++ b/string_utils.py
@@ -1461,10 +1461,14 @@ def to_bitstring(txt: str, *, delimiter='', encoding='utf-8', errors='surrogatep
     >>> to_bitstring('test', delimiter=' ')
     '01110100 01100101 01110011 01110100'
 
+    >>> to_bitstring(b'test')
+    '01110100011001010111001101110100'
+
     """
+    etxt = to_ascii(txt)
     bits = bin(
         int.from_bytes(
-            txt.encode(encoding, errors),
+            etxt,
             'big'
         )
     )