mdbq 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

mdbq/company/copysh.py

@@ -339,8 +339,8 @@ def main():
             dp.upload_df(service_databases=[{'company': 'mysql'}])
 
             # 此操作用于修改 .copysh_conf 文件，将 ch_record 改为 false (更新完成)
-            w = update_conf.UpdateConf(filename='.copysh_conf')
-            w.update_config(option='ch_record', new_value='False')
+            w = update_conf.UpdateConf()
+            w.update_config(filename='.copysh_conf', option='ch_record', new_value='False')
             time.sleep(60)
             op_data(days=3650)  # 数据清理和聚合
 

mdbq/config/update_conf.py

@@ -4,6 +4,10 @@ import getpass
 import configparser
 import os
 from urllib import parse
+"""
+文件被 copysh.py / all-datas.py  调用, update_config 函数
+更新完成后修改 conf 中值为 True
+"""
 
 
 class UpdateConf:
@@ -11,31 +15,56 @@ class UpdateConf:
     读取配置文件信息
     理论上，在本程序的根目录需要有一个文件夹 support/.myconf 配置文件放在其下
     """
-    def __init__(self, filename):
+    def __init__(self):
         if platform.system() == 'Darwin':
-            path = os.path.join('/Users', getpass.getuser(), '数据中心/自动0备份/py/数据更新/support')
+            self.path = os.path.join('/Users', getpass.getuser(), '数据中心/自动0备份/py/数据更新/support')
         elif platform.system() == 'Windows':
-            path = os.path.join('C:\\同步空间\\BaiduSyncdisk\\自动0备份\\py\\数据更新\\support')
+            self.path = os.path.join('C:\\同步空间\\BaiduSyncdisk\\自动0备份\\py\\数据更新\\support')
         else:
-            path = os.path.join('/Users', getpass.getuser(), 'support')
-        self.path = path
-        self.filename = filename
-        self.conf_file = os.path.join(self.path, self.filename)
+            self.path = os.path.join('/Users', getpass.getuser(), 'support')
+        self.section = 'database'  # 默认 文件头标记
+        self.filename = None
+        self.conf_file = None
         self.config = None
-        self.section = 'database'
 
+    def read_txt(self, filename, option=None):
+        self.filename = filename
+        self.conf_file = os.path.join(self.path, self.filename)
+        if not os.path.exists(self.conf_file):
+            print(f'缺少配置文件: {self.conf_file}')
+            return
+        with open(self.conf_file, 'r', encoding='utf-8') as f:
+            content = f.readlines()
+            content = [item.strip() for item in content if not item.strip().startswith('#') and not item.strip().startswith('[')]
+            pbix_list = [item for item in content if item]
+        return pbix_list  # ['推广数据.pbix', '市场数据新.pbix']
 
-    def read_conf(self, option, value):
+    def read_conf(self, filename, option=None):
+        self.filename = filename
+        self.conf_file = os.path.join(self.path, self.filename)
         if not os.path.exists(self.conf_file):
-            print(f'缺少配置文件')
+            print(f'缺少配置文件: {self.conf_file}')
             return
         self.config = configparser.ConfigParser()
         self.config.read(self.conf_file, 'UTF-8')
-        res = self.config.get('database', option)
-        print(res)
+        if not option:
+            results = []
+            for option in self.config.options(self.section):
+                results.append({option: self.config.get(self.section, option)})
+            return results
+        else:
+            if option not in self.config.options(self.section):
+                print(f'不存在的配置项: {option}，文件: {self.conf_file}')
+            else:
+                return self.config.get(self.section, option)
 
-    def update_config(self, option, new_value):
-        """ 更新配置文件 """
+    def update_config(self, filename, option, new_value):
+        """
+        更新配置文件
+        copysh.py / all-datas.py 调用
+        """
+        self.filename = filename
+        self.conf_file = os.path.join(self.path, self.filename)
         with open(self.conf_file, 'r', encoding='utf-8') as file:
             lines = file.readlines()
         config = configparser.ConfigParser(allow_no_value=True)  # 读取配置（不包括注释和空白行）
@@ -67,7 +96,12 @@ class UpdateConf:
                     file.write(f"\n[{self.section}]\n{option} = {new_value}\n")
 
 
-if __name__ == '__main__':
-    # w = UpdateConf(filename='.copysh_conf')
-    # w.update_config(option='ch_record', new_value='false')
+def main():
     pass
+
+
+if __name__ == '__main__':
+    w = UpdateConf()
+    # w.update_config(filename='.copysh_conf', option='ch_record', new_value='false')
+    res = w.read_txt(filename='tb_list.txt')
+    print(res)

mdbq/mysql/data_types.py

@@ -69,7 +69,7 @@ class DataTypes:
         """ 更新 dataframe 的 dtypes 信息到 json 文件 """
         if not os.path.exists(path):
             os.makedirs(path)
-        json_file = os.path.join(path, 'df_dtypes.json')
+        json_file = os.path.join(path, 'mysql_types.json')
         if os.path.isfile(json_file):
             self.json_before(json_file=json_file)  # 更新本地json信息到 self.datas
 
@@ -143,7 +143,7 @@ class DataTypes:
         if os.path.isfile(path):
             self.json_before(json_file=path)  # 更新本地json信息到 self.datas
         elif os.path.isdir(path):
-            json_file = os.path.join(path, 'df_dtypes.json')
+            json_file = os.path.join(path, 'mysql_types.json')
             if os.path.isfile(json_file):
                 self.json_before(json_file=json_file)
             else:

mdbq/mysql/mysql.py

@@ -196,7 +196,7 @@ class MysqlUpload:
             path = os.path.join('C:\\同步空间\\BaiduSyncdisk\\自动0备份\\py\\数据更新\\support')
         else:
             path = os.path.join('/Users', getpass.getuser(), 'support')
-        # json_file = os.path.join(path, 'df_dtypes.json')
+        # json_file = os.path.join(path, 'mysql_types.json')
         # if os.path.isfile(json_file):
         d = data_types.DataTypes()
         # 从本地文件中读取 dtype 信息

mdbq/pbix/refresh_all.py

@@ -27,7 +27,7 @@ class RefreshAll:
             return
         with open(self.pbix_path, 'r', encoding='utf-8') as f:
             content = f.readlines()
-            content = [item.strip() for item in content if not item.strip().startswith('#')]
+            content = [item.strip() for item in content if not item.strip().startswith('#') and not item.strip().startswith('[')]
             pbix_list = [item for item in content if item]
 
         if not pbix_list:

{mdbq-0.3.4.dist-info → mdbq-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 0.3.4
+Version: 0.3.6
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-0.3.4.dist-info → mdbq-0.3.6.dist-info}/RECORD

@@ -9,11 +9,11 @@ mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
 mdbq/clean/data_clean.py,sha256=33OmeQFl9AW21P5EOay52W_S8DF96H5oHwCg4fSuBxA,85359
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=ANpwPLtw1PLH9U2EdzQAavA83QHPmAcSbtrbot4I1MQ,17024
+mdbq/company/copysh.py,sha256=kJCvFym4eu8r8kesKlAgO_T-popl3_WdvN6pasihph8,17026
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=9v3xebfcS1tptxpvk3_tGxfXjAehGVCveYe4iRUzLQQ,6372
 mdbq/config/products.py,sha256=tFqSfFSXyZXcof0gAeHq0Ftn4F5i9ucoMyIqZ1H_D2Q,4260
-mdbq/config/update_conf.py,sha256=YjGjjRchu5BcrmLJkoLjHEF2TbGOmsgCWX4LroXOYWQ,3455
+mdbq/config/update_conf.py,sha256=8uOiV7CY5HCzg2PVjuKHNqYJNwJR0M7B-a7egta3wWw,4952
 mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
 mdbq/dataframe/converter.py,sha256=h_BDc6oNmMCVFOUzZJq4nXNGDyJFJyycpWqlyrv7U04,3089
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
@@ -21,8 +21,8 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=q0B4wXDSTtXg_vMN7MPh6zdxl6tT68tM74LmdVNQQek,31892
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/data_types.py,sha256=JhKhSoj1FihCl_8yfjVqWOlISJ0hx6tBQR0qE7n-Z3U,11153
-mdbq/mysql/mysql.py,sha256=42IJOAWiSoic4m_u3_875F2IzKHIW-2dNWx7OYZ0Ub4,33901
+mdbq/mysql/data_types.py,sha256=Heb_bccgi2RL8YEwIxg7jyVdjdWuBN4n2J_5Uz_S-GQ,11157
+mdbq/mysql/mysql.py,sha256=QghST_eVHRn6HmDnBr6J5LFiGkp8qVHvqdYpFifEoqw,33903
 mdbq/mysql/s_query.py,sha256=6-8O9MHhi3-7n3isJ7t2kTCYL2mSBC_HrxSQmXM5UtI,7901
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -31,9 +31,9 @@ mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
 mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
-mdbq/pbix/refresh_all.py,sha256=wulHs4rivf4Mi0Pii2QR5Nk9-TBcvSwnCB_WH9QULKE,5939
+mdbq/pbix/refresh_all.py,sha256=USe3s5ws2Q-Gp9yUoFOAXJ4t0KVaekFULtAJaZkp448,5976
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-0.3.4.dist-info/METADATA,sha256=1X2UtJWoF55a1DM5zI15bmKJ0-JC3-Vf0YSwHXIxuYE,245
-mdbq-0.3.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-0.3.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-0.3.4.dist-info/RECORD,,
+mdbq-0.3.6.dist-info/METADATA,sha256=CYRuia-lwJyJd1vXa7XdTQcidETWAbKSo_Atu5U4tDk,245
+mdbq-0.3.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-0.3.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-0.3.6.dist-info/RECORD,,