pybaseutils 2.4.19__tar.gz → 2.4.22__tar.gz

{pybaseutils-2.4.19 → pybaseutils-2.4.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.4.19
+Version: 2.4.22
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.4.19 → pybaseutils-2.4.22}/pybaseutils/__init__.py

@@ -8,4 +8,4 @@
 # --------------------------------------------------------
 """
 
-__version__ = '2.4.19'
+__version__ = '2.4.22'

{pybaseutils-2.4.19 → pybaseutils-2.4.22}/pybaseutils/cvutils/camera.py

@@ -121,6 +121,7 @@ def get_video_size(video, size=()):
     """
     w, h = None, None
     cap = cv2.VideoCapture(video)
+    size = tuple(size)
     try:
         if not cap.isOpened():
             print(f"无法打开视频设备或文件: {video}")
@@ -131,7 +132,7 @@ def get_video_size(video, size=()):
         w = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
         h = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
         if size and (w, h) != size:
-            print(f"video={video}, 尝试设置视频/摄像头分辨率: {size}-->失败！实际分辨率: {w}x{h}")
+            print(f"video={video}, 尝试设置视频/摄像头分辨率: {size[0]}x{size[1]}-->失败！实际分辨率: {w}x{h}")
         else:
             print(f"video={video}, 视频/摄像头分辨率为: {w}x{h}")
     except Exception as e:

{pybaseutils-2.4.19 → pybaseutils-2.4.22}/pybaseutils/log.py

@@ -12,12 +12,12 @@ import sys
 from loguru import logger
 
 LOG_FORMAT = {
-    "simple":   "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}| {message}</level>",
-    "name":     "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{name} {line}| {message}</level>",  # 打印文件名
-    "module":   "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{module} {line}| {message}</level>",  # 打印模块名
+    "simple": "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}| {message}</level>",
+    "name": "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{name} {line}| {message}</level>",  # 打印文件名
+    "module": "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{module} {line}| {message}</level>",  # 打印模块名
     # "function": "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{function} {line}| {message}</level>",  # 打印函数
     "function": "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{module}.{function} {line}| {message}</level>",  # 打印函数
-    "all":      "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{name}.{module}.{function} {line}| {message}</level>",  # 打印函数
+    "all": "<level>{time:YYYY-MM-DD HH:mm:ss}|{level:7}|{name}.{module}.{function} {line}| {message}</level>",  # 打印函数
 }
 
 
@@ -30,26 +30,18 @@ def set_logger(name=None, level="debug", logfile=None, format="simple", is_main_
     :param is_main_process: 是否是主进程
     :return:
     """
-    format = LOG_FORMAT.get(format, LOG_FORMAT.get("simple"))
+    format = LOG_FORMAT.get(format, LOG_FORMAT.get("line"))
+    logger.remove(0)  # 去除默认的LOG
     if is_main_process:
-        # 打印到控制台，sys.stderr表示控制台
-        h1 = {"sink": sys.stderr,
-              "format": format, "colorize": True, "level": level.upper()}
-        # 输出到文件，文件名app.log
-        h2 = {"sink": logfile,
-              "format": format, "colorize": False, "level": level.upper(), "rotation": "100 MB",
-              "retention": "10 days"} if logfile else None
-        handlers = [h for h in [h1, h2] if h]
-        logger.configure(handlers=handlers)
+        # 每天创建一个新的文件，一个星期定期清理一次
+        if logfile: logger.add(logfile, level=level.upper(), rotation="1 day", retention="7 days", format=format)
+        logger.add(sys.stderr, level=level.upper(), format=format)
     else:
-        logger.configure(handlers=[{"sink": sys.stderr,  # 打印到控制台，sys.stderr表示控制台
-                                    "format": format, "colorize": True, "level": "ERROR"}
-                                   ]
-                         )
+        logger.add(sys.stderr, level="ERROR", format=format)
     return logger
 
 
-def set_logger_v2(name="", level="debug", logfile=None, format=None, is_main_process=True):
+def set_logger_v2(name=None, level="debug", logfile=None, format="simple", is_main_process=True):
     """
     logger = set_logger(level="debug", logfile="log.txt")
     url: https://www.cnblogs.com/shiyitongxue/p/17870527.html
@@ -58,14 +50,22 @@ def set_logger_v2(name="", level="debug", logfile=None, format=None, is_main_pro
     :param is_main_process: 是否是主进程
     :return:
     """
-    format = LOG_FORMAT.get(format, LOG_FORMAT.get("line"))
-    logger.remove(0)  # 去除默认的LOG
+    format = LOG_FORMAT.get(format, LOG_FORMAT.get("simple"))
     if is_main_process:
-        # 每天创建一个新的文件，一个星期定期清理一次
-        logger.add(logfile, level=level.upper(), rotation="1 day", retention="7 days", format=format)
-        logger.add(sys.stderr, level=level.upper(), format=format)
+        # 打印到控制台，sys.stderr表示控制台
+        h1 = {"sink": sys.stderr,
+              "format": format, "colorize": True, "level": level.upper()}
+        # 输出到文件，文件名app.log
+        h2 = {"sink": logfile,
+              "format": format, "colorize": False, "level": level.upper(), "rotation": "1 day",
+              "retention": "7 days"} if logfile else None
+        handlers = [h for h in [h1, h2] if h]
+        logger.configure(handlers=handlers)
     else:
-        logger.add(sys.stderr, level="ERROR", format=format)
+        logger.configure(handlers=[{"sink": sys.stderr,  # 打印到控制台，sys.stderr表示控制台
+                                    "format": format, "colorize": True, "level": "ERROR"}
+                                   ]
+                         )
     return logger
 
 
@@ -84,7 +84,7 @@ def example():
 if __name__ == '__main__':
     logfile = "./log.log"
     # logger = set_logger(logfile=logfile, is_main_process=True, format="function",level="debug")
-    logger = set_logger(name="demo", is_main_process=True, format="function", level="debug")
+    logger = set_logger(name="demo", is_main_process=True, format="function", level="debug", logfile=logfile)
     # logger = set_logger(name="demo", is_main_process=True, format="module", level="debug")
     # logger = get_logger()
     example()

{pybaseutils-2.4.19 → pybaseutils-2.4.22}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.4.19
+Version: 2.4.22
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan