mdbq 2.8.2__tar.gz → 2.8.4__tar.gz

{mdbq-2.8.2 → mdbq-2.8.4}/PKG-INFO

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

{mdbq-2.8.2 → mdbq-2.8.4}/mdbq/clean/clean_upload.py

@@ -832,6 +832,8 @@ class DataClean:
                     # df = pd.read_excel(os.path.join(root, name), header=0, engine='openpyxl')
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                     new_name = f'py_xg_{name}'
+                    if os.path.isfile(os.path.join(root, new_name)):
+                        os.remove(os.path.join(root, new_name))
                     os.rename(os.path.join(root, name), os.path.join(root, new_name))
                 elif name.endswith('.xlsx') and '京东商智_sku_商品明细' in name:
                     df = pd.read_excel(os.path.join(root, name), header=0, engine='openpyxl')
@@ -950,6 +952,8 @@ class DataClean:
                 elif name.endswith('.csv') and ('商品类目属性' in name or '商品主图视频' in name or '商品sku属性' in name):
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                     new_name = f'py_xg_{os.path.splitext(name)[0]}.csv'
+                    if os.path.isfile(os.path.join(root, new_name)):
+                        os.remove(os.path.join(root, new_name))
                     os.rename(os.path.join(root, name), os.path.join(root, new_name))
 
                 # 将数据传入 self.datas 等待更新进数据库
@@ -1585,7 +1589,7 @@ def main(is_mysql=False, is_company=False):
     # 清理聚合数据, mongodb 中没有聚合数据，所以只需要清理 mysql 即可
     optimize_data.op_data(
         db_name_lists=['聚合数据'],
-        days=3650,
+        days=100,
         is_mongo=False,
         is_mysql=True,
     )

{mdbq-2.8.2 → mdbq-2.8.4}/mdbq/company/copysh.py

@@ -16,13 +16,13 @@ from mdbq.aggregation import optimize_data
 from mdbq.config import set_support
 from mdbq.config import myconfig
 from mdbq.mysql import mysql
-from mdbq.pbix import refresh_all
 from mdbq.clean import clean_upload
 warnings.filterwarnings('ignore')
 
 
 if platform.system() == 'Windows':
     # windows版本
+    from mdbq.pbix import refresh_all
     Data_Path = r'C:\同步空间\BaiduSyncdisk'
     D_PATH = os.path.join(f'C:\\Users\\{getpass.getuser()}\\Downloads')
     Share_Path = os.path.join(r'\\192.168.1.198\时尚事业部\01.运营部\天猫报表')  # 共享文件根目录
@@ -275,25 +275,26 @@ class TbFiles:
                 print(f'{src} 所需同步的文件不存在，请检查：pd_list参数')
 
         # 刷新共享位置的指定文件/文件夹
-        excel_path = os.path.join(self.share_path, 'EXCEL报表')
-        files = os.listdir(excel_path)
-        files = [f'{excel_path}\\{item}' for item in files if item.endswith('.xlsx') or item.endswith('.xls')]
-        r = refresh_all.RefreshAll()
-        for file in files:
-            if '~' in file or 'DS_Store' in file or 'baidu' in file or 'xunlei' in file:
-                continue
-            if file.endswith('.xlsx') or file.endswith('.xls'):
-                r.refresh_excel(file=file)
-            time.sleep(5)
-
-        # 临时加的
-        # excel_file = f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新\\0-WLM_运营周报-1012输出.xlsx'
-        dir_files = f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新'
-        files = os.listdir(dir_files)
-        for file in files:
-            if file.endswith('.xlsx') and file.startswith('0-WLM_运营周报') and '~' not in file and 'baidu' not in file:
-                excel_file = os.path.join(dir_files, file)
-                r.refresh_excel(file=excel_file)
+        if platform.system() == 'Windows':
+            excel_path = os.path.join(self.share_path, 'EXCEL报表')
+            files = os.listdir(excel_path)
+            files = [f'{excel_path}\\{item}' for item in files if item.endswith('.xlsx') or item.endswith('.xls')]
+            r = refresh_all.RefreshAll()
+            for file in files:
+                if '~' in file or 'DS_Store' in file or 'baidu' in file or 'xunlei' in file:
+                    continue
+                if file.endswith('.xlsx') or file.endswith('.xls'):
+                    r.refresh_excel(file=file)
+                time.sleep(5)
+
+            # 临时加的
+            # excel_file = f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新\\0-WLM_运营周报-1012输出.xlsx'
+            dir_files = f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新'
+            files = os.listdir(dir_files)
+            for file in files:
+                if file.endswith('.xlsx') and file.startswith('0-WLM_运营周报') and '~' not in file and 'baidu' not in file:
+                    excel_file = os.path.join(dir_files, file)
+                    r.refresh_excel(file=excel_file)
 
         self.before_max_time = self.check_change()  # 重置值, 避免重复同步
 
@@ -339,9 +340,9 @@ def op_data(days: int =100):
 
 
 def main():
-    if platform.system() != 'Windows':
-        print(f'只可以在 windows 运行')
-        return
+    # if platform.system() != 'Windows':
+    #     print(f'只可以在 windows 运行')
+    #     return
     t = TbFiles()
     while True:
         system = platform.system()  # 本机系统
@@ -357,7 +358,7 @@ def main():
             b.download_dir(local_path=upload_path, remote_path=bd_remoto_path)
 
             clean_upload.main(
-                is_mysql=True,  # 调试时加，False: 是否后续的聚合数据及清理
+                is_mysql=True,  # 调试时加，False: 不进行后续的聚合数据及清理
                 is_company=True,  # 公司电脑不需要移动文件到原始文件
             )
 

{mdbq-2.8.2 → mdbq-2.8.4}/mdbq/pbix/refresh_all.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import win32com.client
 import time
 import psutil
 from pywinauto.application import Application
@@ -51,6 +50,7 @@ class RefreshAll:
 
     def refresh_excel(self, file):
         # 刷新 excel
+        import win32com.client
         if not os.path.isfile(file):
             now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S ')
             print(f'{now}{file} ->  文件不存在')

{mdbq-2.8.2 → mdbq-2.8.4}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.8.2 → mdbq-2.8.4}/setup.py

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