mdbq 0.3.4__tar.gz → 0.3.5__tar.gz

{mdbq-0.3.4 → mdbq-0.3.5}/PKG-INFO

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

{mdbq-0.3.4 → mdbq-0.3.5}/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-0.3.4 → mdbq-0.3.5}/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-0.3.4 → mdbq-0.3.5}/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 → mdbq-0.3.5}/mdbq.egg-info/PKG-INFO

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

{mdbq-0.3.4 → mdbq-0.3.5}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='0.3.4',
+      version='0.3.5',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',