mdbq 2.7.6__py3-none-any.whl → 2.7.8__py3-none-any.whl

mdbq/clean/clean_upload.py

@@ -439,6 +439,7 @@ class DataClean:
                     # 品销宝
                     sheets4 = ['账户', '推广计划', '推广单元', '创意', '品牌流量包', '定向人群']  # 品销宝
                     file_name4 = os.path.splitext(name)[0]  # 明星店铺报表
+                    new_df = []
                     for sheet4 in sheets4:
                         df = pd.read_excel(os.path.join(root, name), sheet_name=sheet4, header=0, engine='openpyxl')
                         if len(df) == 0:
@@ -452,8 +453,8 @@ class DataClean:
                             shop_name = re.findall(r'明星店铺_([\u4e00-\u9fffA-Za-z]+店)', name)[0]
                             df.insert(loc=1, column='店铺名称', value=shop_name)
                             df.insert(loc=2, column='报表类型', value=sheet4)
-                            if '访客触达率' not in df.columns.tolist():
-                                df['访客触达率'] = '0'
+                            # if '访客触达率' not in df.columns.tolist():
+                            #     df['访客触达率'] = '0'
                             df.fillna(0, inplace=True)
                             df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')  # 转换日期列
                             # min_clm = str(df['日期'].min()).split(' ')[0]
@@ -462,21 +463,12 @@ class DataClean:
                             # 以sheet名进一步创建子文件夹
                             # root_new = os.path.join(self.source_path, '推广报表/品销宝', sheet4)
                             self.save_to_csv(df, upload_path, new_file_name4)
-                        if not db_name or not collection_name:
-                            continue
-                        # 一定要单独处理品销宝报表，因为 1 表包含 6个 sheet，都要添加
-                        self.datas.append(
-                            {
-                                '数据库名': db_name,
-                                '集合名称': collection_name,
-                                '数据主体': df,
-                                '文件名': name,
-                            }
-                        )
+                            new_df.append(df)
+                    df = pd.concat(new_df)  # 品销宝 1 表有 6 个 sheet
                     os.remove(os.path.join(root, name))
 
                 # 将数据传入 self.datas 等待更新进数据库
-                if not db_name or not collection_name or '品销宝' in collection_name:
+                if not db_name or not collection_name:
                     # print(f'db_name/collection_name 不能为空')
                     continue
                 self.datas.append(
@@ -1536,9 +1528,10 @@ def date_table():
     )
 
 
-def main(is_mysql=False):
+def main(is_mysql=False, is_company=False):
     """
     is_mysql: 调试时加，False: 是否后续的聚合数据
+    is_company: 公司电脑不需要移动文件到原始文件
     """
 
     cn = DataClean(
@@ -1556,12 +1549,13 @@ def main(is_mysql=False):
     cn.sp_scene_clean(is_except=['except'])  # 商品素材
     cn.upload_df()  # 上传数据库
 
-    cn.move_sycm(is_except=['临时文件', ])  # 生意参谋，移到文件到原始文件夹
-    cn.move_dmp(is_except=['临时文件', ])  # 达摩盘
-    cn.move_sjy(is_except=['临时文件',])  # 生意经，移到文件到原始文件夹
-    cn.move_jd(is_except=['临时文件', ])  # 京东，移到文件到原始文件夹
-    cn.move_tg_tm(is_except=['临时文件', ])  # 天猫，移到文件到原始文件夹
-    cn.move_tg_tb(is_except=['临时文件', ])  # 淘宝店，移到文件到原始文件夹
+    if not is_company:
+        cn.move_sycm(is_except=['临时文件', ])  # 生意参谋，移到文件到原始文件夹
+        cn.move_dmp(is_except=['临时文件', ])  # 达摩盘
+        cn.move_sjy(is_except=['临时文件',])  # 生意经，移到文件到原始文件夹
+        cn.move_jd(is_except=['临时文件', ])  # 京东，移到文件到原始文件夹
+        cn.move_tg_tm(is_except=['临时文件', ])  # 天猫，移到文件到原始文件夹
+        cn.move_tg_tb(is_except=['临时文件', ])  # 淘宝店，移到文件到原始文件夹
 
     if not is_mysql:
         return

mdbq/company/copysh.py

@@ -358,6 +358,7 @@ def main():
 
             clean_upload.main(
                 is_mysql=True,  # 调试时加，False: 是否后续的聚合数据及清理
+                is_company=True,  # 公司电脑不需要移动文件到原始文件
             )
 
             #

{mdbq-2.7.6.dist-info → mdbq-2.7.8.dist-info}/METADATA

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

{mdbq-2.7.6.dist-info → mdbq-2.7.8.dist-info}/RECORD

@@ -9,10 +9,10 @@ mdbq/aggregation/query_data.py,sha256=QpfIWX197ICqRnRhLZoKgkX9CuWvx_ryfScSaFdDN-
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
-mdbq/clean/clean_upload.py,sha256=Mlt9h31Wa_VHhTG40jWioRqk8ELZxDEHMurLalYAJ-o,83627
+mdbq/clean/clean_upload.py,sha256=rNiv_7wcOgYfks1wK2sLHWNyi7jProCZgHZSGjC7IlQ,83318
 mdbq/clean/data_clean.py,sha256=ucfslhqXVZoH2QaXHSAWDky0GhIvH9f4GeNaHg4SrFE,104790
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=4VOAvHZfnhsKdeKL0Ho6q2x1OkD6nsZXRLyYdu8YAaE,18011
+mdbq/company/copysh.py,sha256=E8OmCpXAIXwyfcgoT_H9aDf2bqod-gxjvBnOG0rkSss,18097
 mdbq/company/copysh_bak.py,sha256=NvlXCBZBcO2GIT5nLRYYqhOyHWM1-1RE7DHvgbj6jmQ,19723
 mdbq/company/home_sh.py,sha256=42CZ2tZIXHLl2mOl2gk2fZnjH2IHh1VJ1s3qHABjonY,18021
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -45,7 +45,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=4Y5zd64hZUFtll8AdpUc2napDas-La-A6XzAhb2mLv0,17157
-mdbq-2.7.6.dist-info/METADATA,sha256=g9yVclBoUQygTKxK2ciOGKeyaHjDsdw0um9CiD-HA-k,243
-mdbq-2.7.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.7.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.7.6.dist-info/RECORD,,
+mdbq-2.7.8.dist-info/METADATA,sha256=bE6NNrtpM5wLHfYaQ3jTj4AplgS8laGquzmAYHlp3iI,243
+mdbq-2.7.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.7.8.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.7.8.dist-info/RECORD,,