atomicshop 2.16.27__py3-none-any.whl → 2.16.28__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.16.27'
+__version__ = '2.16.28'

atomicshop/print_api.py

@@ -2,6 +2,7 @@ import sys
 import logging
 
 from .basics.ansi_escape_codes import ColorsBasic, get_colors_basic_dict
+from .wrappers.loggingw import handlers
 from .basics import tracebacks
 
 
@@ -125,14 +126,16 @@ def print_api(
                 original_formatter = None
 
                 # Find the stream handler and change its formatter
+                # noinspection PyUnresolvedReferences
                 for handler in logger.handlers:
                     if isinstance(handler, logging.StreamHandler):
                         # Save the original formatter
                         original_formatter = handler.formatter
+                        original_formatter_string = handlers.get_formatter_string(handler)
 
                         # Create a colored formatter for errors
                         color_formatter = logging.Formatter(
-                            get_colors_basic_dict(color) + original_formatter + ColorsBasic.END)
+                            get_colors_basic_dict(color) + original_formatter_string + ColorsBasic.END)
                         handler.setFormatter(color_formatter)
 
         # If 'online' is set to 'True', we'll output message as oneline.
@@ -151,6 +154,7 @@ def print_api(
 
             if stdcolor:
                 # Restore the original formatter after logging
+                # noinspection PyUnresolvedReferences
                 for handler in logger.handlers:
                     if isinstance(handler, logging.StreamHandler):
                         handler.setFormatter(original_formatter)

atomicshop/wrappers/loggingw/formatters.py

@@ -155,3 +155,15 @@ def get_logging_formatter_from_string(
         return NanosecondsFormatter(formatter, style=style, datefmt=datefmt, use_nanoseconds=use_nanoseconds)
     else:
         return logging.Formatter(formatter, style=style, datefmt=datefmt)
+
+
+def get_formatter_string(formatter) -> str:
+    """
+    Function to get the formatter string from the 'logging.Formatter'.
+
+    :param formatter: logging.Formatter, formatter to convert to string.
+    :return: str, formatter string.
+    """
+
+    # noinspection PyProtectedMember
+    return formatter._fmt

atomicshop/wrappers/loggingw/handlers.py

@@ -472,3 +472,13 @@ def add_filter_to_handler(handler: logging.Handler, filter_object: logging.Filte
     """
 
     handler.addFilter(filter_object)
+
+
+def get_formatter_string(handler: logging.Handler) -> str:
+    """
+    Function to get the formatter string from the handler.
+    :param handler: Handler to get the formatter from.
+    :return: Formatter string.
+    """
+
+    return formatters.get_formatter_string(handler.formatter)

atomicshop/wrappers/loggingw/loggingw.py

@@ -317,7 +317,8 @@ class ExceptionCsvLogger:
     def write(
             self,
             message: Union[str, Exception] = None,
-            custom_csv_string: str = None
+            custom_csv_string: str = None,
+            stdout: bool = True
     ):
         """
         Write the message to the log file.
@@ -330,6 +331,7 @@ class ExceptionCsvLogger:
             Meaning, that you need to provide the 'custom_header' during the initialization of the object.
             Off course, you can use as many commas as you need in the 'custom_csv_string': "custom1,custom2,custom3".
             This need to be mirrored in the 'custom_header' as well: "custom1,custom2,custom3".
+        :param stdout: If set to True, the exception will be printed to the console.
         """
 
         if message is None or isinstance(message, Exception):
@@ -348,7 +350,9 @@ class ExceptionCsvLogger:
                 "Number of cells in the 'output_csv_line' doesn't match the number of cells in the 'header'.")
 
         self.logger.info(output_csv_line)
-        print_api('', error_type=True, color="red", traceback_string=True)
+
+        if stdout:
+            print_api('', error_type=True, color="red", traceback_string=True)
 
     def get_logger(self):
         return self.logger

{atomicshop-2.16.27.dist-info → atomicshop-2.16.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.16.27
+Version: 2.16.28
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.16.27.dist-info → atomicshop-2.16.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=uvGTfzSHIYxELvSkSy25hxKozcYi2WpTk6bDs1_wXVs,124
+atomicshop/__init__.py,sha256=RKrFOzhIp5E7tjs7oJStRgnGRfLQJGazFO71-p0tK_o,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -25,7 +25,7 @@ atomicshop/ip_addresses.py,sha256=Hvi4TumEFoTEpKWaq5WNF-YzcRzt24IxmNgv-Mgax1s,11
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
 atomicshop/on_exit.py,sha256=Rpg2SaF0aginuO7JYwA49YJYnS8F6K2jUqhjH65WzuU,6889
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
-atomicshop/print_api.py,sha256=37zugPqm04XFLmMnXxNo0bJtv1ImNSDHosPTlOuYyhw,12760
+atomicshop/print_api.py,sha256=Bny4BpkD9dwa8FRTKAibTLMWJp38M9BsVrOpJNFSWTw,13010
 atomicshop/process.py,sha256=PeLvyixXaCfftdUF3oMbohI1L4MdLtvQVDx2V1Tz_Rk,16662
 atomicshop/python_file_patcher.py,sha256=-uhbUX-um5k-If_XXuOfCr8wMzZ3QE6h9N8xGWw6W_o,5486
 atomicshop/python_functions.py,sha256=zJg4ogUwECxrDD7xdDN5JikIUctITM5lsyabr_ZNsRw,4435
@@ -246,10 +246,10 @@ atomicshop/wrappers/fibratusw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 atomicshop/wrappers/fibratusw/install.py,sha256=PLVymDe0HuOvU0r2lje8BkQAgtiOWEeRO7n-1zKuL7A,3287
 atomicshop/wrappers/loggingw/consts.py,sha256=JWiUJEydjhwatBxtIJsGTmDUSTLbmIRidtR6qRLMaIY,1608
 atomicshop/wrappers/loggingw/filters.py,sha256=CMs5PAMb68zxJgBcQobaOFDG5kLJBOVYnoBHjDgksO8,2859
-atomicshop/wrappers/loggingw/formatters.py,sha256=7XUJvlB0CK4DCkEp8NTL0S0dkyrZD0UTADgEwkStKOY,5483
-atomicshop/wrappers/loggingw/handlers.py,sha256=hAPFJQ-wFoNO8QzGrJRSvyuP09Q1F0Dl9_w7zzlgcW0,18155
+atomicshop/wrappers/loggingw/formatters.py,sha256=ZY12IokVY1G_Wzn2Zlv9qjK-e8CtIK6yUgUfPHvH2BU,5802
+atomicshop/wrappers/loggingw/handlers.py,sha256=AsltQH17cAhgexVaR2TJtSaD2Xlw8QNiv_hKIo6ZF7s,18450
 atomicshop/wrappers/loggingw/loggers.py,sha256=mmM__XR3W4QC82wbsDRG_M4_0JYGGEP0Qn0WCOSp-go,2910
-atomicshop/wrappers/loggingw/loggingw.py,sha256=oqH_u1AFyu4YG468ZDnCalRNNu2438AEYZa2MFB9iqg,16143
+atomicshop/wrappers/loggingw/loggingw.py,sha256=OTar1pwc-qxPal2yMjMvK1rzvtpcQzVwTxSckt-90_Q,16289
 atomicshop/wrappers/loggingw/reading.py,sha256=ERBSiQbEksySKpXpu2E_6k9dZ6MPH95ZIsmdjWW9MUE,16436
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/mongodbw/install_mongodb.py,sha256=3ZPqrXxj3lC-PnAKGXclylLuOqsbyXYeUpb5iGjdeUU,6626
@@ -309,8 +309,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=w1AH-zf4mBuT4euf28UKij9ihM-b1BRU9Qfby0QDdqI,2957
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.27.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.27.dist-info/METADATA,sha256=JD7sHdbqBZwiuJmXdvhYXs4qgSy5S5riQpv0m6lAMKU,10473
-atomicshop-2.16.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.27.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.27.dist-info/RECORD,,
+atomicshop-2.16.28.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.28.dist-info/METADATA,sha256=dd_ZbiMXylLwEVatyDQXjaRPx_RJRFbOtELFjVKRYzk,10473
+atomicshop-2.16.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.28.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.28.dist-info/RECORD,,