byzh-core 0.0.2.8__py3-none-any.whl → 0.0.2.10__py3-none-any.whl

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/Bwriter/__init__.py

@@ -1,3 +1,5 @@
-from .writer import B_Writer
+from .writer import B_Writer, B_Color
 
-__all__ = ['B_Writer']
+__all__ = [ 'B_Color',
+    'B_Writer'
+]

byzh_core/Bwriter/writer.py

@@ -5,44 +5,29 @@ 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',
+        self,
+        path:Path,
+        mode:Literal["w", "a"] = "w",
+        time_file:bool = False,
+        color:B_Color = B_Color.RESET,
     ):
         '''
         :param path: 日志保存路径
-        :param ifTime: 是否输出时间
+        :param time_file: 是否输出时间
         '''
         super().__init__()
         self.path = Path(path)
-        self.ifTime = ifTime
-        self.toWant_file = False
-        self.toWant_cmd = False
+        self.mode = mode
+        self.time_file = time_file
 
-        self.__checkColor(color)
-        self.color = color
+        self.color = color.value
 
         self.f = None
-        self.setFile(self.path, self.ifTime)
+        self.setFile(self.path, self.mode, self.time_file)
 
-    def setFile(self, file: Path, ifTime=False):
+    def setFile(self, file: Path, mode: Literal["w", "a"] = "w", ifTime=False):
         '''
         设置 file的path 以及 writer的ifTime
         :param file: 设置log路径
@@ -52,9 +37,9 @@ class B_Writer:
         if self.f is not None:
             self.f.close()
         self.path = Path(file)
-        self.ifTime = ifTime
+        self.time_file = ifTime
         self.__createDir(self.path)
-        self.f = open(self.path, "a", encoding="utf-8")
+        self.f = open(self.path, mode, encoding="utf-8")
 
     def clearFile(self):
         '''
@@ -72,67 +57,51 @@ class B_Writer:
             self.f.close()
             self.f = None
 
-    def toCmd(self, string, color: Color_Literal = None):
+    def toCmd(self, string:str, ifTime:bool=False, color:B_Color = None):
         '''
         打印到terminal
         '''
-        # 检查color是否在字典中
+        t = ''
+        if ifTime:
+            t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
+
         if color is None:
-            print(COLOR_DICT.get(self.color) + str(string) + B_Color.RESET)
+            print(self.color + t + str(string) + B_Color.RESET.value)
         else:
-            assert color in COLOR_DICT, f"color参数错误，请输入{COLOR_DICT.keys()}"
-            print(COLOR_DICT.get(color) + str(string) + B_Color.RESET)
+            print(color.value + t + str(string) + B_Color.RESET.value)
 
-    def toFile(self, string, ifTime:bool=None):
+    def toFile(self, string:str, ifTime:bool=None):
         '''
         写入到文件内
         '''
         assert self.f is not None, "请先调用setFile方法"
 
-        if ifTime == False:
+        t = ''
+        if ifTime == False: # 为了使False时不管self.time_file
             pass
-        elif ifTime==True or self.ifTime==True:
+        elif ifTime==True or self.time_file==True:
             t = time.strftime("%Y-%m-%d %H:%M:%S ##### ", time.localtime())
-            self.f.write(t)
 
-        self.f.write(str(string))
+        self.f.write(str(string+t))
         self.f.write("\n")
         self.f.flush()
 
-    def toBoth(self, string, ifTime:bool=None, color: Color_Literal = None):
+    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), 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())}"
+        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)
+        os.makedirs(dir, exist_ok=True)
+
+    def __exit__(self):
+        self.closeFile()

byzh_core/__init__.py

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

{byzh_core-0.0.2.8.dist-info → byzh_core-0.0.2.10.dist-info}/METADATA

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

{byzh_core-0.0.2.8.dist-info → byzh_core-0.0.2.10.dist-info}/RECORD

@@ -1,9 +1,9 @@
 byzh_core/B_os.py,sha256=-6KjK2NzEeF8GiQno0BmbVDei9DDxOaXdaKGqFeL_eY,2372
-byzh_core/__init__.py,sha256=6NxQhYgkeNinqxuU-8uI_EgJ3bPHRGvETr4ceXTsZ6E,110
+byzh_core/__init__.py,sha256=_eON-uVsiKSG-pshFUM-Wh8LwmNJmJp00Eq8Re69fho,111
 byzh_core/Barchive/__init__.py,sha256=wUdz646VS0Uhq9lwMkd3YQHCvQhLDqgADoDjFGMqIn0,65
 byzh_core/Barchive/archive.py,sha256=6uMoOs-lmdcezdOgXr4s9NmjHVRDvG4v_YGQhaPPyGo,2681
 byzh_core/Bbasic/__init__.py,sha256=wr7Y7YJINhgpV5X6BT5DaGJKcHUOZYNerCGXoi2Egac,116
-byzh_core/Bbasic/text_style.py,sha256=JelgL3AgcH607Mr-Bvr4u8Svb0twmNmqwXvOl4hHOSs,3161
+byzh_core/Bbasic/text_style.py,sha256=waaj_DKg6eBEyM3kcdpPJtghLPIR171opIjx4rXrUus,3202
 byzh_core/Bmath/__init__.py,sha256=G3AQug6izkEX3UfzO_mqUNJW88ZKlmYb4Q8CAactK4w,105
 byzh_core/Bmath/divides.py,sha256=dr85IqGSE9NvugQu7az29GLcjRiLjXU_hZTwtNifIXg,1132
 byzh_core/Bmath/get_norm.py,sha256=y1QsCTo7qhtGTXIxpc6JtamLWloC7ENRuVdNtK5yi58,596
@@ -13,16 +13,16 @@ byzh_core/Bterminal/__init__.py,sha256=B6p6mHVhi5LAHKlvqfrv20E6XNqUsfU2xD753V6-Z
 byzh_core/Bterminal/cmd.py,sha256=iK0fwI0D3peEwUYYZWwnl9X8ImFfrBsEq6ySd3DcRdE,3839
 byzh_core/Btqdm/__init__.py,sha256=PQRcUn9WXd1YGyFMEKnJU74mdV695_8NHQ56Nsja0DM,53
 byzh_core/Btqdm/my_tqdm.py,sha256=myyFo3GgyX_wWfSjMWfSTkcnTECf1tqwpXEFpJkzNtw,2878
-byzh_core/Bwriter/__init__.py,sha256=7db9No0yYOW5ZUtFVKWLRZcu_nz3kvw2W25IoiIiilE,54
-byzh_core/Bwriter/writer.py,sha256=7WlQUva_yu8zt0IuvWCJufdpFSkEC33UTxsyJGEaLRo,4019
+byzh_core/Bwriter/__init__.py,sha256=QcHzKs0305Pr78ZvZgcC_4miSYZh8jJQDt5TD0GIeEg,82
+byzh_core/Bwriter/writer.py,sha256=S-tIwBUcU9_qFWP9JdCiFITg_hz76afXrqHWp-0ltIA,3104
 byzh_core/obsolete/__init__.py,sha256=wpfHMPD4awPRDJVYlaiGtkkpjq2srWB7d7LrWhoX5R0,161
 byzh_core/obsolete/auto_table.py,sha256=nC9eHj_IIGVkS2lmN_1gtOyglLCaGlwdoHzPvNNQDEw,13952
 byzh_core/obsolete/row_table.py,sha256=rIX0-Yvb3RnO0RJBkA4m18gux1zYSnEKTy6uQGcWilc,5999
 byzh_core/obsolete/xy_table.py,sha256=-KHK8EUlkJj3Rh0sp_KHI0QFt29AlMASMmR8q8ykUBM,6784
 byzh_core/obsolete/Bconfig/__init__.py,sha256=7lAp7wNetW0AyJcike7ekdY_8wrQQtFjBsi6684t_lU,54
 byzh_core/obsolete/Bconfig/config.py,sha256=TD8CC1P2Zu95Tf8AGK2IHRXjrCCMBA_tdoZsc1Rr0Gk,10953
-byzh_core-0.0.2.8.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
-byzh_core-0.0.2.8.dist-info/METADATA,sha256=spMNZXXqa9GLz-_TgftAMH9NLrbEZ7cxYIPxsO-MeaM,371
-byzh_core-0.0.2.8.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-byzh_core-0.0.2.8.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
-byzh_core-0.0.2.8.dist-info/RECORD,,
+byzh_core-0.0.2.10.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
+byzh_core-0.0.2.10.dist-info/METADATA,sha256=gTKeddJiFqIxgtBtOvu_MI5_VU61LwUn8d1TNTgqxis,372
+byzh_core-0.0.2.10.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+byzh_core-0.0.2.10.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
+byzh_core-0.0.2.10.dist-info/RECORD,,