mdbq 2.0.4__tar.gz → 2.0.5__tar.gz

{mdbq-2.0.4 → mdbq-2.0.5}/PKG-INFO

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

{mdbq-2.0.4 → mdbq-2.0.5}/mdbq/aggregation/aggregation.py

@@ -39,10 +39,11 @@ class DatabaseUpdate:
         self.datas: list = []  # 带更新进数据库的数据集合
         self.start_date = '2022-01-01'  # 日期表的起始日期
 
-    def cleaning(self, is_move=True):
+    def cleaning(self, is_move=True, is_except=[]):
         """
         数据清洗, 返回包含 数据库名, 集合名称, 和 df 主体
         修改 cleaning 时，要同步 support 下的 标题对照表.csv
+        is_except: 需要排除不做处理的文件或文件夹
         """
         if not os.path.exists(self.path):
             print(f'1.1.0 初始化时传入了不存在的目录: {self.path}')
@@ -62,6 +63,16 @@ class DatabaseUpdate:
                 check_remove_file = False  # 设置这个参数的目的: 避免误删其他文件， 不是本程序数据清洗覆盖的文件不做干预
                 if '~$' in name or '.DS' in name or '.localized' in name or '.ini' in name or '$RECYCLE.BIN' in name or 'Icon' in name:
                     continue
+                is_continue = False
+                if is_except:
+                    for item in is_except:
+                        if item in os.path.join(root, name):
+                            # print(name)
+                            is_continue = True
+                            break
+                if is_continue:  # 需要排除不做处理的文件或文件夹
+                    continue
+
                 db_name = None  # 初始化/重置变量，避免进入下一个循环
                 collection_name = None
                 for data in datas:  # 根据标题对照表适配 db_name 和 collection_name
@@ -755,7 +766,15 @@ class DatabaseUpdate:
             for name in files:
                 if '~$' in name or '.DS' in name or '.localized' in name or '.jpg' in name or '.png' in name:
                     continue
-
+                is_continue = False
+                if is_except:
+                    for item in is_except:
+                        if item in os.path.join(root, name):
+                            # print(name)
+                            is_continue = True
+                            break
+                if is_continue:  # 需要排除不做处理的文件或文件夹
+                    continue
                 db_name = None  # 初始化/重置变量，避免进入下一个循环
                 collection_name = None
                 for data in datas:  # 根据标题对照表适配 db_name 和 collection_name

{mdbq-2.0.4 → mdbq-2.0.5}/mdbq/clean/data_clean.py

@@ -67,7 +67,7 @@ class DataClean:
         _df.to_csv(os.path.join(_save_paths, filenames), encoding=encoding, index=False, header=True)
 
     # @try_except
-    def change_and_sort(self, path=None):
+    def change_and_sort(self, path=None, is_except=[]):
         """数据转换"""
         if not path:
             path = self.path
@@ -87,6 +87,16 @@ class DataClean:
                 if '~$' in name or '.DS' in name or '.localized' in name or '.jpg' in name or '.png' in name:
                     continue
 
+                is_continue = False
+                if is_except:
+                    for item in is_except:
+                        if item in os.path.join(root, name):
+                            # print(name)
+                            is_continue = True
+                            break
+                if is_continue:  # 需要排除不做处理的文件或文件夹
+                    continue
+
                 try:
                     encoding = self.get_encoding(file_path=pathlib.Path(root, name))
                     # ----------------- 推广报表 分割线 -----------------

{mdbq-2.0.4 → mdbq-2.0.5}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.0.4 → mdbq-2.0.5}/setup.py

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