byzh-core 0.0.2.8__tar.gz → 0.0.2.9__tar.gz

{byzh_core-0.0.2.8 → byzh_core-0.0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: byzh_core
-Version: 0.0.2.8
+Version: 0.0.2.9
 Summary: byzh_core是byzh系列的核心库，包含了一些常用的工具函数和类。
 Author: byzh_rc
 License: MIT

{byzh_core-0.0.2.8 → byzh_core-0.0.2.9}/byzh_core/Bbasic/text_style.py

@@ -1,5 +1,6 @@
+from enum import Enum
 # 字体颜色
-class B_Color:
+class B_Color(Enum):
     RESET = "\033[0m"
 
     BLACK = "\033[30m"      # 黑
@@ -12,7 +13,7 @@ class B_Color:
     SILVER = "\033[37m"      # 灰/银
 
 # 背景颜色
-class B_Background:
+class B_Background(Enum):
     RESET = "\033[0m"
 
     BLACK = "\033[40m"      # 黑
@@ -25,7 +26,7 @@ class B_Background:
     SILVER = "\033[47m"      # 灰/银
 
 # 效果
-class B_Appearance:
+class B_Appearance(Enum):
     RESET = "\033[0m"
 
     HIGHLIGHT = "\033[1m"  # 高亮

byzh_core-0.0.2.9/byzh_core/Bwriter/writer.py

@@ -0,0 +1,107 @@
+from pathlib import Path
+from typing import Literal
+import time
+import os
+
+from ..Bbasic import B_Color
+
+class B_Writer:
+    def __init__(
+        self,
+        path:Path,
+        mode:Literal["w", "a"] = "w",
+        time_file:bool = False,
+        color:B_Color = B_Color.RESET,
+    ):
+        '''
+        :param path: 日志保存路径
+        :param time_file: 是否输出时间
+        '''
+        super().__init__()
+        self.path = Path(path)
+        self.mode = mode
+        self.time_file = time_file
+
+        self.color = color.value
+
+        self.f = None
+        self.setFile(self.path, self.mode, self.time_file)
+
+    def setFile(self, file: Path, mode: Literal["w", "a"] = "w", ifTime=False):
+        '''
+        设置 file的path 以及 writer的ifTime
+        :param file: 设置log路径
+        :param ifTime:
+        :return:
+        '''
+        if self.f is not None:
+            self.f.close()
+        self.path = Path(file)
+        self.time_file = ifTime
+        self.__createDir(self.path)
+        self.f = open(self.path, mode, encoding="utf-8")
+
+    def clearFile(self):
+        '''
+        清空内容
+        '''
+        assert self.f is not None, "请先调用setFile方法"
+        self.f.close()
+        self.f = open(self.path, 'w', encoding="utf-8")
+
+    def closeFile(self):
+        '''
+        关闭log
+        '''
+        if self.f:
+            self.f.close()
+            self.f = None
+
+    def toCmd(self, string:str, ifTime:bool=False, color:B_Color = None):
+        '''
+        打印到terminal
+        '''
+        t = ''
+        if ifTime:
+            t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
+
+        if color is None:
+            print(self.color + t + str(string) + B_Color.RESET.value)
+        else:
+            print(color.value + t + str(string) + B_Color.RESET.value)
+
+    def toFile(self, string:str, ifTime:bool=None):
+        '''
+        写入到文件内
+        '''
+        assert self.f is not None, "请先调用setFile方法"
+
+        t = ''
+        if ifTime == False: # 为了使False时不管self.time_file
+            pass
+        elif ifTime==True or self.time_file==True:
+            t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
+
+        self.f.write(str(string+t))
+        self.f.write("\n")
+        self.f.flush()
+
+    def toBoth(self, string:str, file_time:bool=None, cmd_time:bool=False, color:B_Color = None):
+        '''
+        同时写入到文件和terminal
+        :param string:
+        :param color:
+        :return:
+        '''
+        self.toFile(str(string), file_time)
+        self.toCmd(str(string), cmd_time, color)
+    def __call__(self, string:str, file_time:bool=None, cmd_time:bool=False, color:B_Color = None):
+        self.toBoth(string, file_time, cmd_time, color)
+
+    def __createDir(self, path):
+        # 获取到该文件的文件夹
+        dir = path.parents[0]
+        os.makedirs(dir, exist_ok=True)
+
+    def __exit__(self):
+        self.closeFile()

{byzh_core-0.0.2.8 → byzh_core-0.0.2.9}/byzh_core/__init__.py

@@ -2,4 +2,4 @@
 # class      以"B_"开头
 # function   以"b_"开头
 
-__version__ = '0.0.2.8'
+__version__ = '0.0.2.9'

{byzh_core-0.0.2.8 → byzh_core-0.0.2.9}/byzh_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: byzh_core
-Version: 0.0.2.8
+Version: 0.0.2.9
 Summary: byzh_core是byzh系列的核心库，包含了一些常用的工具函数和类。
 Author: byzh_rc
 License: MIT

byzh_core-0.0.2.8/byzh_core/Bwriter/writer.py

@@ -1,138 +0,0 @@
-from pathlib import Path
-from typing import Literal
-import time
-import os
-
-from ..Bbasic import B_Color
-
-COLOR_DICT = {
-    "default": B_Color.RESET,
-
-    "black": B_Color.BLACK,
-    "red": B_Color.RED,
-    "green": B_Color.GREEN,
-    "yellow": B_Color.YELLOW,
-    "blue": B_Color.BLUE,
-    "purple": B_Color.PURPLE,
-    "cyan": B_Color.CYAN,
-    "silver": B_Color.SILVER
-}
-Color_Literal = Literal["default", "black", "red", "green", "yellow", "blue", "purple", "cyan", "silver"]
-
-class B_Writer:
-    def __init__(
-            self,
-            path: Path,
-            ifTime: bool = False,
-            color: Color_Literal = 'default',
-    ):
-        '''
-        :param path: 日志保存路径
-        :param ifTime: 是否输出时间
-        '''
-        super().__init__()
-        self.path = Path(path)
-        self.ifTime = ifTime
-        self.toWant_file = False
-        self.toWant_cmd = False
-
-        self.__checkColor(color)
-        self.color = color
-
-        self.f = None
-        self.setFile(self.path, self.ifTime)
-
-    def setFile(self, file: Path, ifTime=False):
-        '''
-        设置 file的path 以及 writer的ifTime
-        :param file: 设置log路径
-        :param ifTime:
-        :return:
-        '''
-        if self.f is not None:
-            self.f.close()
-        self.path = Path(file)
-        self.ifTime = ifTime
-        self.__createDir(self.path)
-        self.f = open(self.path, "a", encoding="utf-8")
-
-    def clearFile(self):
-        '''
-        清空内容
-        '''
-        assert self.f is not None, "请先调用setFile方法"
-        self.f.close()
-        self.f = open(self.path, 'w', encoding="utf-8")
-
-    def closeFile(self):
-        '''
-        关闭log
-        '''
-        if self.f:
-            self.f.close()
-            self.f = None
-
-    def toCmd(self, string, color: Color_Literal = None):
-        '''
-        打印到terminal
-        '''
-        # 检查color是否在字典中
-        if color is None:
-            print(COLOR_DICT.get(self.color) + str(string) + B_Color.RESET)
-        else:
-            assert color in COLOR_DICT, f"color参数错误，请输入{COLOR_DICT.keys()}"
-            print(COLOR_DICT.get(color) + str(string) + B_Color.RESET)
-
-    def toFile(self, string, ifTime:bool=None):
-        '''
-        写入到文件内
-        '''
-        assert self.f is not None, "请先调用setFile方法"
-
-        if ifTime == False:
-            pass
-        elif ifTime==True or self.ifTime==True:
-            t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
-            self.f.write(t)
-
-        self.f.write(str(string))
-        self.f.write("\n")
-        self.f.flush()
-
-    def toBoth(self, string, ifTime:bool=None, color: Color_Literal = None):
-        '''
-        同时写入到文件和terminal
-        :param string:
-        :param color:
-        :return:
-        '''
-        self.toFile(str(string), ifTime)
-        self.toCmd(str(string), color)
-
-    def setWant(self, toCmd=False, toFile=False):
-        '''
-        toWant的全局选项设置
-        '''
-        self.toWant_cmd = toCmd
-        self.toWant_file = toFile
-
-    def toWant(self, string, ifTime:bool=None, color: Color_Literal = None):
-        '''
-        使用前先调用setWant方法
-        '''
-        if self.toWant_cmd and self.toWant_file:
-            self.toBoth(string, ifTime, color)
-        elif self.toWant_cmd:
-            self.toCmd(string, color)
-        elif self.toWant_file:
-            self.toFile(string, ifTime)
-        else:
-            raise Exception("请先调用setWant方法, 设置toCmd或toFile为True")
-
-    def __checkColor(self, color):
-        assert color in COLOR_DICT, f"color参数错误，请输入{list(COLOR_DICT.keys())}"
-
-    def __createDir(self, path):
-        # 获取到该文件的文件夹
-        dir = path.parents[0]
-        os.makedirs(dir, exist_ok=True)