xtn-tools-pro 1.0.0.1.8__py3-none-any.whl → 1.0.0.2.0__py3-none-any.whl

xtn_tools_pro/db/RedisDB.py

@@ -121,6 +121,17 @@ class RedisDBPro:
         """
         return self._redis.spop(table)
 
+    def sget_count(self, table):
+        """
+            获取无序集合数量
+        :param table:
+        :return:
+        """
+        return self._redis.scard(table)
+
+    def get_redis(self):
+        return self._redis
+
     def incr(self, key):
         """
             对一个键的值进行自增操作
@@ -163,6 +174,8 @@ class RedisDBPro:
         return self._redis.delete(table)
 
 
+
+
 if __name__ == '__main__':
     pass
     # r = RedisDBPro(ip="127.0.0.1", port=6379, db=0, user_pass="xtn-kk")

xtn_tools_pro/utils/file_utils.py

@@ -35,6 +35,15 @@ def get_file_check_filename(file_name):
     sanitized_filename = sanitized_filename[:max_length]
     return sanitized_filename
 
+def mkdirs_dir(file_path):
+    """
+        传入一个文件路径创建对应的文件夹，如果某一段不存在则一路创建下去
+    :param file_path:
+    :return:
+    """
+    directory = os.path.dirname(file_path)
+    if not os.path.exists(directory):
+        os.makedirs(directory)
 
 if __name__ == '__main__':
     pass

xtn_tools_pro/utils/log.py

@@ -13,6 +13,7 @@ import sys
 import inspect
 import logging
 from logging.handlers import BaseRotatingHandler
+from xtn_tools_pro.utils.file_utils import mkdirs_dir
 from xtn_tools_pro.utils.time_utils import get_time_timestamp_to_datestr
 
 
@@ -77,7 +78,10 @@ class Log:
                  is_write_to_file=False,
                  color=True,
                  mode='a',
-                 max_bytes=0, backup_count=0, encoding=None):
+                 max_bytes=1024000000,
+                 backup_count=0,
+                 encoding="utf-8",
+                 save_time_log_path=None):
         """
         :param name: log名
         :param path: log文件存储路径 如 D://xxx.log
@@ -89,18 +93,27 @@ class Log:
         :param max_bytes: 每个日志文件的最大字节数
         :param backup_count: 日志文件保留数量
         :param encoding: 日志文件编码
+        :param save_time_log_path: 保存时间日志的路径 './logs'
 
         """
         # 创建logger对象
         self.logger = logging.getLogger(name)
         # 设置日志等级
         self.logger.setLevel(log_level.upper())
+        self.save_time_log_path = save_time_log_path
+        if save_time_log_path:
+            # 记录当前的日期，用于之后检查日期是否已经改变
+            self.current_date = get_time_timestamp_to_datestr(format="%Y_%m_%d")
+            # 记录日志文件的路径模板，用于之后创建新的日志文件
+            self.path_template = self.path_template = f"{save_time_log_path}/{{date}}/{name}.log"
+            path = self.path_template.format(date=self.current_date)
+            mkdirs_dir(self.path_template.format(date=self.current_date))
 
         # 创建日志格式化器
         # formatter = logging.Formatter('[%(now_datestr)s] [%(levelname)s] [%(func_name)s] - %(message)s') # 原
         # formatter = logging.Formatter('\033[1m%(now_datestr)s] [%(levelname)s] [%(func_name)s] - %(message)s\033[0m') #加粗
         formatter = logging.Formatter(
-            '\033[1m[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s\033[0m')  # 加粗对齐
+            '[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s')  # 加粗对齐
 
         # formatter = BoldFormatter('[%(now_datestr)s] [%(levelname)s] [%(func_name)s] - %(message)s') # 加粗
 
@@ -139,31 +152,53 @@ class Log:
                     'CRITICAL': 'bold_red',
                 }
                 color_formatter = ColoredFormatter(
-                    '\033[1m%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s\033[0m',
+                    # '\033[1m%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s\033[0m',
+                    '%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s',
                     log_colors=log_colors)  # 加粗对齐
                 # 设置控制台处理器的格式化器为带颜色的格式化器
                 console_handler.setFormatter(color_formatter)
             except ImportError:
                 pass
 
+    def _get_log_file_path(self):
+        """获取日志文件的路径，如果日期已经改变就创建一个新的日志文件"""
+        if not self.save_time_log_path: return
+        date = get_time_timestamp_to_datestr(format="%Y_%m_%d")
+        if date != self.current_date:
+            # 日期已经改变，更新当前的日期
+            self.current_date = date
+            # 更新文件处理器的文件路径
+            path = self.path_template.format(date=date)
+            mkdirs_dir(path)
+            for handler in self.logger.handlers:
+                if isinstance(handler, RotatingFileHandler):
+                    handler.baseFilename = path
+                    handler.doRollover()
+                    break
+
     def debug(self, message):
         # 记录DEBUG级别的日志
+        self._get_log_file_path()
         self.logger.debug(message, extra=self._get_caller_name_extra())
 
     def info(self, message):
         # 记录INFO级别的日志
+        self._get_log_file_path()
         self.logger.info(message, extra=self._get_caller_name_extra())
 
     def warning(self, message):
         # 记录WARNING级别的日志
+        self._get_log_file_path()
         self.logger.warning(message, extra=self._get_caller_name_extra())
 
     def error(self, message):
         # 记录ERROR级别的日志
+        self._get_log_file_path()
         self.logger.error(message, extra=self._get_caller_name_extra())
 
     def critical(self, message):
         # 记录CRITICAL级别的日志
+        self._get_log_file_path()
         self.logger.critical(message, extra=self._get_caller_name_extra())
 
     def _get_caller_name_extra(self):
@@ -185,8 +220,11 @@ class Log:
 if __name__ == '__main__':
     pass
     logger = Log('mylogger', './xxx.log', log_level='DEBUG', is_write_to_console=True, is_write_to_file=True,
-                 color=True, mode='a', max_bytes=1024, backup_count=3)
-    logger.debug("debug message")
-    logger.info("info level message")
-    logger.warning("warning level message")
-    logger.critical("critical level message")
+                 color=True, mode='a', save_time_log_path='./logs')
+    # import time
+    # while True:
+    #     logger.debug("debug message")
+    #     logger.info("info level message")
+    #     logger.warning("warning level message")
+    #     logger.critical("critical level message 你好")
+    #     time.sleep(1)

{xtn_tools_pro-1.0.0.1.8.dist-info → xtn_tools_pro-1.0.0.2.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.1.8
+Version: 1.0.0.2.0
 Summary: xtn 开发工具
 Author: xtn
-Author-email: czw011122@163.com
+Author-email: czw011122@gmail.com
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3
 Description-Content-Type: text/markdown

{xtn_tools_pro-1.0.0.1.8.dist-info → xtn_tools_pro-1.0.0.2.0.dist-info}/RECORD

@@ -4,21 +4,21 @@ xtn_tools_pro/tools_flie.py,sha256=-FID31G8AnV2u2djRO3Ae3Ei9ld9bSBWgzwqhYzZ5JQ,1
 xtn_tools_pro/tools_time.py,sha256=DMjsw9h4E_mrPsanPA8CEhpUE1AA6Z2FU4OJqJKZc1k,4867
 xtn_tools_pro/db/MongoDB.py,sha256=zQLfZ-mhZWCFgY3dPF3dRAzAR3C8hrXO_yLZw9cUUUY,5573
 xtn_tools_pro/db/MysqlDB.py,sha256=SBJrcjbZdxmtTKPGwl57NthPhs4uX8J3P6o_rK01O4k,13373
-xtn_tools_pro/db/RedisDB.py,sha256=XSdBQKViL4HM1hjI5nYnuUhA6qKB8H5LJjxWMqUfPWg,6228
+xtn_tools_pro/db/RedisDB.py,sha256=YSWxYEPE2jp6r1ZKam2LyPgL0S2S9lGDmt36PLSwThg,6470
 xtn_tools_pro/db/__init__.py,sha256=Zg91UWS02TO0Ba_0AY56s0oabRy93xLNFkpIIL_6mMM,416
 xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJwBeogC_-I,11049
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
 xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
-xtn_tools_pro/utils/file_utils.py,sha256=4Bmb1ISxqQC-7doPXDyY2o-H0m4upj_-hlLrO36sKJg,1509
+xtn_tools_pro/utils/file_utils.py,sha256=EoWz0ULgS1uY86KpsP2Ofxj4BGP2gdHnUrdGAGRmpl0,1813
 xtn_tools_pro/utils/helpers.py,sha256=eHhvhcw_jcUhCA6HwOqpD4XU_V_ZoHDgj3qtLR8yzx8,3812
-xtn_tools_pro/utils/log.py,sha256=8CRMiY7Q9LWGJLhfL0YfpANBwLets9f2qWfMOe5PpNM,8139
+xtn_tools_pro/utils/log.py,sha256=XZChGrKWgAz42o_gFi_d7DL28svF1OvAw7NS_xkIgnQ,10056
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.0.1.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.1.8.dist-info/METADATA,sha256=mkaGze-wjwp0p_fsGoXwFQgQSFB0e_MSYA9ucqSBxAU,453
-xtn_tools_pro-1.0.0.1.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.1.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.1.8.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.2.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.2.0.dist-info/METADATA,sha256=x0QZDrArajGJGb16SkgXrVEbLSQ9zd1kcX5fkTkMUj4,455
+xtn_tools_pro-1.0.0.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.2.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.2.0.dist-info/RECORD,,