mdbq 2.8.1__tar.gz → 2.8.3__tar.gz

{mdbq-2.8.1 → mdbq-2.8.3}/PKG-INFO

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

{mdbq-2.8.1 → mdbq-2.8.3}/mdbq/aggregation/query_data.py

@@ -2315,7 +2315,7 @@ def main():
 
 if __name__ == '__main__':
     data_aggregation(
-        months=15,
+        months=24,
         is_juhe=True,  # 生成聚合表
         # less_dict=['多店推广场景_按日聚合'],  # 单独聚合某一个数据库
     )

{mdbq-2.8.1 → mdbq-2.8.3}/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 socket.gethostname() != 'company':
-        print(f'只可以在 company 运行')
-        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,  # 公司电脑不需要移动文件到原始文件
             )
 
@@ -365,17 +366,51 @@ def main():
             # # 3. 数据清理和聚合
             # op_data(days=100)
 
-            # 此处不可以使用 data 更新，要使用具体键值，否则数据有覆盖
-            conf['Windows']['company'].update(
-                {
-                    'is_download': False  # 更新完成，下次需 all-datas.py 修改或者手动修改
-                }
-            )
-            # print(conf)
-            myconfig.write_back(datas=conf)  # 写回文件生效
+            if socket.gethostname() == 'company':
+                # 此处不可以使用 data 更新，要使用具体键值，否则数据有覆盖
+                conf['Windows']['company'].update(
+                    {
+                        'is_download': False  # 更新完成，下次需 all-datas.py 修改或者手动修改
+                    }
+                )
+                # print(conf)
+                myconfig.write_back(datas=conf)  # 写回文件生效
+            elif socket.gethostname() == 'xigua1':
+                conf['Windows']['xigua1'].update(
+                    {
+                        'is_download': False  # 更新完成，下次需 all-datas.py 修改或者手动修改
+                    }
+                )
+                # print(conf)
+                myconfig.write_back(datas=conf)  # 写回文件生效
+            elif socket.gethostname() == 'xigua_lx':
+                conf['Windows']['xigua_lx'].update(
+                    {
+                        'is_download': False  # 更新完成，下次需 all-datas.py 修改或者手动修改
+                    }
+                )
+                # print(conf)
+                myconfig.write_back(datas=conf)  # 写回文件生效
+            elif socket.gethostname() == 'Mac2.local':
+                conf['Darwin']['Mac2.local'].update(
+                    {
+                        'is_download': False  # 更新完成，下次需 all-datas.py 修改或者手动修改
+                    }
+                )
+                # print(conf)
+                myconfig.write_back(datas=conf)  # 写回文件生效
+            elif socket.gethostname() == 'MacBookPro':
+                conf['Darwin']['MacBookPro'].update(
+                    {
+                        'is_download': False  # 更新完成，下次需 all-datas.py 修改或者手动修改
+                    }
+                )
+                # print(conf)
+                myconfig.write_back(datas=conf)  # 写回文件生效
 
         t.sleep_minutes = 5  # 同步前休眠时间
-        t.tb_file()
+        if socket.gethostname() == 'company' or socket.gethostname() == 'Mac2.local':
+            t.tb_file()
         time.sleep(600)  # 检测间隔
 
 

{mdbq-2.8.1 → mdbq-2.8.3}/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.1 → mdbq-2.8.3}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.8.1 → mdbq-2.8.3}/setup.py

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