byzh-core 0.0.2.4__py3-none-any.whl → 0.0.2.6__py3-none-any.whl

byzh_core/Bconfig/config.py

@@ -251,8 +251,8 @@ class B_Config:
                         self.dict_lst[i][key] = value
 
     def to_table(self, path):
-        from ..Btable import B_AutoTable
-        my_table = B_AutoTable()
+        from ..Btable import B_Table2d
+        my_table = B_Table2d()
         for index, group in enumerate(self.group_lst):
             for key, value in self.dict_lst[index].items():
                 my_table[group][key] = value

byzh_core/Btable/auto_table.py

@@ -46,11 +46,9 @@ def strs2matrix(str_lst):
 
     matrix = []
     for i in range(row_cnt):
-        row = []
+        row = str_lst[i].split('|')[1:-1]
         for j in range(col_cnt):
-            start = indexes[j] + 1
-            end = indexes[j+1]
-            row.append(str_lst[i][start:end].strip())
+            row[j] = row[j].strip()
         matrix.append(row)
 
     row_name, col_name = matrix[0][0].split(' \\ ')
@@ -62,7 +60,7 @@ class Matrix2d:
     def __init__(self, row_name='x', col_name='y'):
         self.row_name = row_name
         self.col_name = col_name
-        self.matrix = [[row_name + ' | ' + col_name]]
+        self.matrix = [[row_name + ' \\ ' + col_name]]
 
     def get_rows(self): # 包含left_upper
         if self.matrix == [[]]:
@@ -153,9 +151,14 @@ class Dict1d:
 
     def __getitem__(self, key):
         key = str(key)
-        return self.dict[key]
+        try:
+            return self.dict[key]
+        except KeyError:
+            return None
     def __setitem__(self, key, value): # 用于最底层赋值
         key, value = str(key), str(value)
+        if value == 'None':
+            value = ' '
         self.dict[key] = value
     def set(self, key, value): # 用于非底层赋值（防止把子dict变为str）
         key = str(key)
@@ -216,6 +219,26 @@ class B_Table2d:
         # 判断是否改变
         self.is_changed = False
 
+    def set(self, row, col, content):
+        row, col, content = str(row), str(col), str(content)
+        self[row][col] = content
+
+    def get_str(self, row, col):
+        return self[row][col]
+    def get_int(self, row, col):
+        return int(self[row][col])
+    def get_float(self, row, col):
+        return float(self[row][col])
+    def get_bool(self, row, col):
+        '''
+        如果是字符串"True"或"1"，返回True，否则返回False
+        '''
+        temp = self[row][col]
+        if temp == "True" or temp == "1":
+            return True
+        else:
+            return False
+
     def __getitem__(self, row):
         self.is_changed = True
 
@@ -228,13 +251,19 @@ class B_Table2d:
         row = str(row)
         self.dict2d[row] = new_dict
 
-    def from_txt(self, txt_path, use_txt_name:bool=False):
+    def from_txt(self, txt_path, create:bool=False, use_txt_name:bool=False):
         '''
-
         :param txt_path:
+        :param create: 如果文件不存在，则创建
         :param use_txt_name: 默认使用init时的row_name和col_name
         :return:
         '''
+        if not os.path.exists(txt_path):
+            if create:
+                self.to_txt(txt_path)
+            else:
+                raise FileNotFoundError(f"文件不存在: {txt_path}")
+
         with open(txt_path, 'r', encoding='utf-8') as f:
             lines = f.readlines()
         matrix, row_name, col_name = strs2matrix(lines)
@@ -299,6 +328,51 @@ class B_Table2d:
     def to_str(self):
         return '\n'.join(self.to_strs())
 
+    def to_ini(self, path):
+        '''
+        输出为ini格式
+        :param path:
+        :return:
+        '''
+        if self.is_changed:
+            self.__dict2matrix()
+
+        groups = self.matrix2d.get_rows()[1:]
+        keys = self.matrix2d.get_cols()[1:]
+        with open(path, 'w', encoding='utf-8') as f:
+            for i, group in enumerate(groups):
+                f.write(f"[{group}]\n")
+                for j, key in enumerate(keys):
+                    value = self.matrix2d.get_by_index(i+1, j+1)
+                    f.write(f"{key} = {value}\n")
+                f.write("\n")
+
+    def from_ini(self, path):
+        '''
+        输入为ini格式
+        :param path:
+        :return:
+        '''
+        with open(path, 'r', encoding='utf-8') as f:
+            lines = f.readlines()
+
+        self.dict2d = Dict2d()
+
+        group = None
+        for line in lines:
+            line = line.strip()
+            if line.startswith('[') and line.endswith(']'):
+                group = line[1:-1]
+            elif '=' in line:
+                key, value = line.split('=')
+                key = key.strip()
+                value = value.strip()
+                if value == 'None':
+                    value = None
+                self[group][key] = value
+
+        self.__dict2matrix()
+
     def __str__(self):
         return self.to_str()
 

byzh_core/__init__.py

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

{byzh_core-0.0.2.4.dist-info → byzh_core-0.0.2.6.dist-info}/METADATA

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

{byzh_core-0.0.2.4.dist-info → byzh_core-0.0.2.6.dist-info}/RECORD

@@ -1,11 +1,11 @@
 byzh_core/B_os.py,sha256=VFhqVrhcCSm3_gQ0NULqmygYSgO2sOqSIYIYNjQQ2QY,2237
-byzh_core/__init__.py,sha256=n0Ti6pJ4Uy4_BXQs6bS3Bm1uD3XWElbAhaRdE5r_X7w,110
+byzh_core/__init__.py,sha256=Nr5HYfsPfCNuPTXhAwoSPvWfb6ePd7BqOucEE1qKOBU,110
 byzh_core/Barchive/__init__.py,sha256=wUdz646VS0Uhq9lwMkd3YQHCvQhLDqgADoDjFGMqIn0,65
 byzh_core/Barchive/archive.py,sha256=yIQgef1APUcZdHM_7Pa9rCam-P3PA3pbcSJSaySoUj4,2498
 byzh_core/Bbasic/__init__.py,sha256=wr7Y7YJINhgpV5X6BT5DaGJKcHUOZYNerCGXoi2Egac,116
 byzh_core/Bbasic/text_style.py,sha256=JelgL3AgcH607Mr-Bvr4u8Svb0twmNmqwXvOl4hHOSs,3161
 byzh_core/Bconfig/__init__.py,sha256=7lAp7wNetW0AyJcike7ekdY_8wrQQtFjBsi6684t_lU,54
-byzh_core/Bconfig/config.py,sha256=P9C4kAkxKnIFaJCErBXdABfOyWgFgVHpR-i-fiZXCNs,10956
+byzh_core/Bconfig/config.py,sha256=zfURiqwxXrPo4Pei63GaVvTslHnYTgmleCjeaGBR9K8,10952
 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
@@ -14,7 +14,7 @@ byzh_core/Bos/__init__.py,sha256=mMa6OugZs8gIfZMj7go_wEHZRe0JRffgiyIKTF5I_uc,88
 byzh_core/Bos/make.py,sha256=uGmHc96lXChihJs2jGiXJRp3tU_U5DPCo8jcc-aW6d4,663
 byzh_core/Bos/remove.py,sha256=HuGQlEOz7IZB_c6T9MzR3miRx60IeaBYP-3lp-P20-I,156
 byzh_core/Btable/__init__.py,sha256=NlQBjp_mvObEUm4y6wXbGipkNM2N3uNIUidaJkTwFsw,62
-byzh_core/Btable/auto_table.py,sha256=xc8qcgdmLF2dAihuH21L2N7ZQ-LHuzEZOF2xRIJFWA4,12439
+byzh_core/Btable/auto_table.py,sha256=nc8RvF86laDnITAzX8sVj3l5tbIGflrsstIbSbGDaAI,14747
 byzh_core/Btable/obsolete/__init__.py,sha256=wpfHMPD4awPRDJVYlaiGtkkpjq2srWB7d7LrWhoX5R0,161
 byzh_core/Btable/obsolete/auto_table.py,sha256=nC9eHj_IIGVkS2lmN_1gtOyglLCaGlwdoHzPvNNQDEw,13952
 byzh_core/Btable/obsolete/row_table.py,sha256=rIX0-Yvb3RnO0RJBkA4m18gux1zYSnEKTy6uQGcWilc,5999
@@ -26,8 +26,8 @@ byzh_core/Btqdm/my_tqdm.py,sha256=myyFo3GgyX_wWfSjMWfSTkcnTECf1tqwpXEFpJkzNtw,28
 byzh_core/Bwriter/__init__.py,sha256=KSsbCJZ-1j5wOr-ZbTg8K3A8Du73d22DQVLdmq-3CBo,116
 byzh_core/Bwriter/globalwriter.py,sha256=tSjWxzLylAeZep67n5jbRsjQkXkBKRZLvKXUyGSY92Q,1824
 byzh_core/Bwriter/writer.py,sha256=px0ZNoSuXS_RbwVnYsBx2lYohyhHACfHM8-HBNEflhU,4006
-byzh_core-0.0.2.4.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
-byzh_core-0.0.2.4.dist-info/METADATA,sha256=nkEXXZAcGSzNRChClkbvuHruYDRFZrZ8VNZOopHmV1s,371
-byzh_core-0.0.2.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-byzh_core-0.0.2.4.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
-byzh_core-0.0.2.4.dist-info/RECORD,,
+byzh_core-0.0.2.6.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
+byzh_core-0.0.2.6.dist-info/METADATA,sha256=ira6o6p4YHEW2I2AhxwV0snAJlYbkrVa44hacgpkGmA,371
+byzh_core-0.0.2.6.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+byzh_core-0.0.2.6.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
+byzh_core-0.0.2.6.dist-info/RECORD,,