Răsfoiți Sursa

更新工具类

dongzhaorui 1 an în urmă
părinte
comite
f9803d817a
2 a modificat fișierele cu 24 adăugiri și 19 ștergeri
  1. 5 5
      ybw/utils/log.py
  2. 19 14
      ybw/utils/tools.py

+ 5 - 5
ybw/utils/log.py

@@ -1,12 +1,12 @@
-from pathlib import Path
-
 from loguru import logger
 
-_absolute = Path(__file__).absolute().parent.parent
-_log_path = (_absolute / 'logs/crawl-{time:YYYY-MM-DD}.log').resolve()
+import setting
+
+_log_path = (setting.ROOT_PATH / 'logs/log_{time:YYYYMMDD}.log').resolve()
+_log_fmt = '{time:YYYY-MM-DD HH:mm:ss} - {thread.name} - {level} - {function}:{line} - {message}'
 logger.add(
     _log_path,
-    format='{time:YYYY-MM-DD HH:mm:ss} - {level} - {message}',
+    format=_log_fmt,
     level='INFO',
     rotation='00:00',
     retention='1 week',

+ 19 - 14
ybw/utils/tools.py

@@ -1,7 +1,15 @@
+# -*- coding: utf-8 -*-
+"""
+Created on 2024-02-28
+---------
+@summary:  工具库
+---------
+@author: jy
+"""
+
+import re
 import socket
-import hashlib
 import time
-import re
 
 
 def clean_title(title):
@@ -27,18 +35,15 @@ def get_host_ip():
     return ip
 
 
-def sha1(text: str):
-    """
-    十六进制数字字符串形式摘要值
-
-    @param text: 字符串文本
-    @return: 摘要值
-    """
-    _sha1 = hashlib.sha1()
-    _sha1.update(text.encode("utf-8"))
-    return _sha1.hexdigest()
-
-
 def wait(interval=None):
     _interval = (interval or 600)
     time.sleep(_interval)
+
+
+def date_to_timestamp(date, time_format="%Y-%m-%d %H:%M:%S"):
+    timestamp = time.mktime(time.strptime(date, time_format))
+    return int(timestamp)
+
+
+def get_current_timestamp():
+    return int(time.time())