py2docfx 0.1.9.dev1927042__py3-none-any.whl → 0.1.9.dev1927662__py3-none-any.whl

py2docfx/__main__.py

@@ -362,7 +362,7 @@ def main(argv) -> int:
     warning_count, error_count = get_warning_error_count()
     output_log_by_log_level()
     print(f"Warning count: {warning_count}, Error count: {error_count}")
-    
+    logging.shutdown()
     return 0
 
 if __name__ == "__main__":

py2docfx/docfx_yaml/logger.py

@@ -1,7 +1,6 @@
 import os
 import logging
 import subprocess
-import shutil
 
 def get_log_level():
     if os.environ.get('LOG_LEVEL') == 'WARNING':
@@ -24,7 +23,7 @@ def check_log_file_exists(log_file_path):
 def setup_log_handlers(logger, log_file_name):
     check_log_file_exists(log_file_name)
     file_handler = logging.FileHandler(filename=log_file_name, mode='a')
-    file_handler.setFormatter(logging.Formatter('%(name)s - %(levelname)s - %(message)s'))
+    file_handler.setFormatter(logging.Formatter('%(levelname)s - %(name)s - %(message)s'))
     
     logger.addHandler(file_handler)
     
@@ -67,12 +66,7 @@ def log_subprocess_ouput(subprocess_out: subprocess.CompletedProcess, logger: lo
         for msg in msgs:
             if msg is None or msg == "":
                 continue
-            if "WARNING:" in msg:
-                logger.warning(msg)
-            elif "ERROR:" in msg:
-                logger.error(msg)
-            else:
-                logger.info(msg)
+            logger.warning(msg)
     if subprocess_out.returncode != 0:
         logger.error(f"Subprocess failed with return code {subprocess_out.returncode}")
         raise RuntimeError()
@@ -83,9 +77,9 @@ def counts_errors_warnings(log_file_path):
     with open(log_file_path, 'r', encoding='utf-8') as f:
         lines = f.readlines()
         for line in lines:
-            if "- ERROR -" in line:
+            if line.startswith("ERROR -"):
                 error_count += 1
-            elif "- WARNING -" in line:
+            elif line.startswith("WARNING -"):
                 warning_count += 1
     return warning_count, error_count
 
@@ -109,18 +103,18 @@ def parse_log(log_file_path):
     with open(log_file_path, 'r', encoding='utf-8') as f:
         lines = f.readlines()
         for line in lines:
-            if "- ERROR -" in line:
+            if line.startswith("ERROR -"):
                 level = logging.INFO
-            elif "- WARNING -" in line:
+            elif line.startswith("WARNING -"):
                 level = logging.WARNING
-            elif "- INFO -" in line:
+            elif line.startswith("INFO -"):
                 level = logging.INFO
             else:
                 # put everything to the previous message
                 log_list[-1]['message'] += line
                 continue
             temp_info = line.split(" - ")
-            logger_name = temp_info[0]
+            logger_name = temp_info[1]
             message = temp_info[2]
             log_list.append({'name': logger_name, 'level': level, 'message': message})
     return log_list

{py2docfx-0.1.9.dev1927042.dist-info → py2docfx-0.1.9.dev1927662.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2docfx
-Version: 0.1.9.dev1927042
+Version: 0.1.9.dev1927662
 Summary: A package built based on Sphinx which download source code package and generate yaml files supported by docfx.
 Author: Microsoft Corporation
 License: MIT License

{py2docfx-0.1.9.dev1927042.dist-info → py2docfx-0.1.9.dev1927662.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py2docfx/__init__.py,sha256=kPRhPGPC1JknDotkksG428c1iIgfFr_4_7Jm-llrowY,72
-py2docfx/__main__.py,sha256=FPlWF4X6lM6xoDh3m0KKg1mQ6JbGd2fnnkAmB-yJ1Kk,14438
+py2docfx/__main__.py,sha256=UvFVxhJNQCn9EHyDfHPwDqJrlqGpoadFVIvDavaYpiI,14456
 py2docfx/convert_prepare/__init__.py,sha256=XxtxrP0kmW3ZBHIAoxsPDEHzcgeC0WSnole8Lk6CjKs,11
 py2docfx/convert_prepare/constants.py,sha256=RC5DqNkqWvx4hb91FrajZ1R9dBFLxcPyoEJ43jdm36E,102
 py2docfx/convert_prepare/environment.py,sha256=7EmlodXVG0S5wnn0_VFPwPJ_3OHfJfGpN33SUL3HSRI,7233
@@ -63,7 +63,7 @@ py2docfx/docfx_yaml/convert_enum.py,sha256=QH0OkZq8pFi_nAXem6ddkO_7TSsoY2tz7_wxI
 py2docfx/docfx_yaml/convert_module.py,sha256=GptO1MRwaQ2Qbu724F0kCDDQQTZe7mWOtrOp3Rzgl-I,2259
 py2docfx/docfx_yaml/convert_package.py,sha256=Ep7PmvoLInDvY6OU5dveR6iVwyzGRkW3q6lX7yGJ0JE,2109
 py2docfx/docfx_yaml/directives.py,sha256=zVVuNM_6AU9G6sbqL1UAyHHgPe7bkBWbthXI-PO5ez0,879
-py2docfx/docfx_yaml/logger.py,sha256=gkyJtJcllbyItIH8OCy4Klmr4HBojZUjLIEVYQDJ1f4,5092
+py2docfx/docfx_yaml/logger.py,sha256=_XZRN43HfFhoi-1Kk0VztAUlzKRe-wuT4W85GAERRnE,4950
 py2docfx/docfx_yaml/miss_reference.py,sha256=Btoj9wAvA4u_wU7JHH0Cei3910N8a7MS34OUqJvXAd4,2443
 py2docfx/docfx_yaml/nodes.py,sha256=tBDi35jLJArlobl07DKOkmH2qz7dudXLp_kTUfR_r2w,412
 py2docfx/docfx_yaml/parameter_utils.py,sha256=zGSIQrUfbXf9PUK-W_1K83Uo5Zk797Zlze6aMurbHIA,8706
@@ -4176,7 +4176,7 @@ py2docfx/venv/venv1/Lib/site-packages/win32comext/taskscheduler/test/test_addtas
 py2docfx/venv/venv1/Lib/site-packages/win32comext/taskscheduler/test/test_localsystem.py,sha256=08ojAS48W6RLsUbRD45j0SJhg_Y2NFHZT6qjT4Vrig0,75
 py2docfx/venv/venv1/Scripts/pywin32_postinstall.py,sha256=u95n7QQUxpCjrZistYE-3gN451zXzopuJna8cXRQ4Jw,28115
 py2docfx/venv/venv1/Scripts/pywin32_testall.py,sha256=-6yvZmd2lPQc4e8i6PgLsr_totF6mScvoq0Jqr0V2fM,3844
-py2docfx-0.1.9.dev1927042.dist-info/METADATA,sha256=sxPzk_6S7qwW1qZjvoPrJlmvILtYmy8PaBgt_FiAHxA,600
-py2docfx-0.1.9.dev1927042.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-py2docfx-0.1.9.dev1927042.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
-py2docfx-0.1.9.dev1927042.dist-info/RECORD,,
+py2docfx-0.1.9.dev1927662.dist-info/METADATA,sha256=P_XMnj_2hUmGQfQ2Q0YaydAkyKbWiJR-ADOLE67CEdA,600
+py2docfx-0.1.9.dev1927662.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+py2docfx-0.1.9.dev1927662.dist-info/top_level.txt,sha256=5dH2uP81dczt_qQJ38wiZ-gzoVWasfiJALWRSjdbnYU,9
+py2docfx-0.1.9.dev1927662.dist-info/RECORD,,