mdbq 2.1.9__py3-none-any.whl → 2.2.1__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -88,7 +88,7 @@ class DatabaseUpdate:
                 df = pd.DataFrame()  # 初始化 df
                 encoding = self.get_encoding(file_path=os.path.join(root, name))  # 用于处理 csv 文件
                 tg_names = [
-                    '账户报表',  # 旧版，后来改成 营销场景报表了，C 店还是旧版
+                    # '账户报表',  # 旧版，后来改成 营销场景报表了，C 店还是旧版
                     '营销场景报表',
                     '计划报表',
                     '单元报表',

mdbq/company/copysh.py

@@ -255,19 +255,18 @@ class TbFiles:
         # 刷新共享位置的指定文件/文件夹
         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 name:
+            if '~' in file or 'DS_Store' in file or 'baidu' in file or 'xunlei' in file:
                 continue
-            if file.endswith('.xlsx'):
-                # now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                # print(f'{now}正在刷新 excel: {file}')
-                r.refresh_excel2(excel_file=os.path.join(excel_path, file))
-            time.sleep(10)
+            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-电商周报-每周五更新\\WLM 周报-模版V1.xlsx'
-        r.refresh_excel2(excel_file=excel_file)
+        r.refresh_excel(file=excel_file)
 
         self.before_max_time = self.check_change()  # 重置值, 避免重复同步
 

mdbq/pbix/refresh_all.py

@@ -2,115 +2,90 @@ import os
 import sys
 import win32com.client
 import time
-import multiprocessing
 import psutil
 from pywinauto.application import Application
 import warnings
-from mdbq.config import set_support
+# from mdbq.config import set_support
 
 warnings.filterwarnings('ignore')
-top_path = os.path.realpath(os.path.dirname(sys.argv[0]))  # 程序运行目录, 打包时使用
-sys.path.append(top_path)
+# top_path = os.path.realpath(os.path.dirname(sys.argv[0]))  # 程序运行目录, 打包时使用
+# sys.path.append(top_path)
 
 
 class RefreshAll:
     def __init__(self):
-        self.my_conf = os.path.join(set_support.SetSupport(dirname='support').dirname, '.my_conf')
-        self.pbix_path = os.path.join(set_support.SetSupport(dirname='support').dirname, 'ref_list.txt')
-        self.excel_path = os.path.join(set_support.SetSupport(dirname='support').dirname, 'ref_list.txt')
-        self.run_py_path = 'run_py'
+        # self.my_conf = os.path.join(set_support.SetSupport(dirname='support').dirname, '.my_conf')
+        # self.file = None
         self.procname = 'PBIDesktop.exe'
 
-    def refresh_pbix(self):
+    def refresh_pbix(self, file):
         # 刷新 PBI
-        if not os.path.exists(self.pbix_path):
-            print(f'{self.pbix_path}: PBIxx file not found. ')
+        if not os.path.isfile(file):
+            print(f'{file} ->  文件不存在')
             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('#') and not item.strip().startswith('[')]
-            pbix_list = [item for item in content if item]
+        # 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('#') and not item.strip().startswith('[')]
+        #     pbix_list = [item for item in content if item]
 
-        if not pbix_list:
+        # if not pbix_list:
+        #     return
+        # for filename in pbix_list:
+        if not file.endswith('.pbix'):
             return
-        for filename in pbix_list:
-            if filename.endswith('.pbix'):
-                newfile = os.path.join(self.run_py_path, filename)
-                """刷新程序"""
-                for es in range(4):
-                    try:
-                        print(f'正在刷新 >>>{filename}')
-                        self.pbi(path=newfile)
-                        print('文件刷新 >>>' + filename)
-                        break
-                    except Exception as e:
-                        print(e)
-                        print('报错的文件 >>>' + filename + ' >> ' + str(es + 1))
-
-    def refresh_excel(self):
-        # 刷新 excel
-        if not os.path.exists(self.excel_path):
-            print(f'{self.excel_path}: Excel file not found. ')
-            return
-        with open(self.excel_path, 'r', encoding='utf-8') as f:
-            content = f.readlines()
-            content = [item.strip() for item in content if not item.strip().startswith('#')]
-            excel_list = [item for item in content if item]
 
-        if not excel_list:
-            return
-        for filename in excel_list:
-            if filename.endswith('.xlsx'):
-                try:
-                    print(f'正在刷新 >>>{filename}')
-                    path = os.path.join(top_path, self.run_py_path, filename)  # 拼接文件路径
-                    xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
-                    xlapp.Visible = False  # 窗口是否可见
-                    xlapp.DisplayAlerts = False  # 是否显示警告信息
-                    wb = xlapp.Workbooks.Open(path)
-                    conjuncts = wb.Connections.Count  # 统计工作簿含有多少外部链接
-                    if conjuncts == 0:
-                        wb.Close(SaveChanges=False)
-                        xlapp.Quit()
-                    else:
-                        time.sleep(2)
-                        wb.RefreshAll()
-                        xlapp.CalculateUntilAsyncQueriesDone()
-                        time.sleep(2)
-                        wb.Save()
-                        wb.Close(SaveChanges=True)
-                        xlapp.Quit()
-                    print('文件刷新 >>>' + filename)
-                except Exception as e:
-                    print(e)
-
-    def refresh_excel2(self, excel_file):
-        # 刷新 excel
-        if excel_file.endswith('.xlsx'):
+        """刷新程序"""
+        for es in range(4):
             try:
-                print(f'正在刷新 >>>{excel_file}')
-                xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
-                xlapp.Visible = False  # 窗口是否可见
-                xlapp.DisplayAlerts = False  # 是否显示警告信息
-                wb = xlapp.Workbooks.Open(excel_file)
-                conjuncts = wb.Connections.Count  # 统计工作簿含有多少外部链接
-                if conjuncts == 0:
-                    wb.Close(SaveChanges=False)
-                    xlapp.Quit()
-                else:
-                    time.sleep(2)
-                    wb.RefreshAll()
-                    xlapp.CalculateUntilAsyncQueriesDone()
-                    time.sleep(2)
-                    wb.Save()
-                    wb.Close(SaveChanges=True)
-                    xlapp.Quit()
-                print('文件刷新 >>>' + excel_file)
+                print(f'正在刷新 >>>{file}')
+                self.pbi(path=file)
+                print('文件已刷新!')
+                break
             except Exception as e:
                 print(e)
+                print('报错的文件 >>>' + file + ' >> ' + str(es + 1))
+
+    def refresh_excel(self, file):
+        # 刷新 excel
+        if not os.path.isfile(file):
+            print(f'{file} ->  文件不存在')
+            return
+        if not file.endswith('.xlsx') and not file.endswith('.xls'):
+            return
+
+        # with open(self.excel_path, 'r', encoding='utf-8') as f:
+        #     content = f.readlines()
+        #     content = [item.strip() for item in content if not item.strip().startswith('#')]
+        #     excel_list = [item for item in content if item]
+        #
+        # if not excel_list:
+        #     return
+        try:
+            print(f'正在刷新 >>>{file}')
+            xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
+            xlapp.Visible = False  # 窗口是否可见
+            xlapp.DisplayAlerts = False  # 是否显示警告信息
+            wb = xlapp.Workbooks.Open(file)
+            conjuncts = wb.Connections.Count  # 统计工作簿含有多少外部链接
+            if conjuncts == 0:
+                wb.Close(SaveChanges=False)
+                xlapp.Quit()
+            else:
+                time.sleep(2)
+                wb.RefreshAll()
+                xlapp.CalculateUntilAsyncQueriesDone()
+                time.sleep(2)
+                wb.Save()
+                wb.Close(SaveChanges=True)
+                xlapp.Quit()
+            print('文件已刷新!')
+        except Exception as e:
+            print(file, e)
+
 
     def pbi(self, path, _timeout=300):
         """
+        会被 refresh_pbix 函数调用
         这是原本属于独立的库模块:  pbix_refresh
         path: pbi文件路径
         _timeout: 刷新等待时间
@@ -171,7 +146,7 @@ class RefreshAll:
 
 
 if __name__ == '__main__':
-    r = RefreshAll()
-    # r.refresh_pbix()
-    r.refresh_excel()
+    # r = RefreshAll()
+    # # r.refresh_pbix()
+    # r.refresh_excel()
     pass

mdbq/pbix/refresh_all_old.py

@@ -0,0 +1,177 @@
+import os
+import sys
+import win32com.client
+import time
+import multiprocessing
+import psutil
+from pywinauto.application import Application
+import warnings
+from mdbq.config import set_support
+
+warnings.filterwarnings('ignore')
+top_path = os.path.realpath(os.path.dirname(sys.argv[0]))  # 程序运行目录, 打包时使用
+sys.path.append(top_path)
+
+
+class RefreshAll:
+    def __init__(self):
+        self.my_conf = os.path.join(set_support.SetSupport(dirname='support').dirname, '.my_conf')
+        self.pbix_path = os.path.join(set_support.SetSupport(dirname='support').dirname, 'ref_list.txt')
+        self.excel_path = os.path.join(set_support.SetSupport(dirname='support').dirname, 'ref_list.txt')
+        self.run_py_path = 'run_py'
+        self.procname = 'PBIDesktop.exe'
+
+    def refresh_pbix(self):
+        # 刷新 PBI
+        if not os.path.exists(self.pbix_path):
+            print(f'{self.pbix_path}: PBIxx file not found. ')
+            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('#') and not item.strip().startswith('[')]
+            pbix_list = [item for item in content if item]
+
+        if not pbix_list:
+            return
+        for filename in pbix_list:
+            if filename.endswith('.pbix'):
+                newfile = os.path.join(self.run_py_path, filename)
+                """刷新程序"""
+                for es in range(4):
+                    try:
+                        print(f'正在刷新 >>>{filename}')
+                        self.pbi(path=newfile)
+                        print('文件刷新 >>>' + filename)
+                        break
+                    except Exception as e:
+                        print(e)
+                        print('报错的文件 >>>' + filename + ' >> ' + str(es + 1))
+
+    def refresh_excel(self):
+        # 刷新 excel
+        if not os.path.exists(self.excel_path):
+            print(f'{self.excel_path}: Excel file not found. ')
+            return
+        with open(self.excel_path, 'r', encoding='utf-8') as f:
+            content = f.readlines()
+            content = [item.strip() for item in content if not item.strip().startswith('#')]
+            excel_list = [item for item in content if item]
+
+        if not excel_list:
+            return
+        for filename in excel_list:
+            if filename.endswith('.xlsx'):
+                try:
+                    print(f'正在刷新 >>>{filename}')
+                    path = os.path.join(top_path, self.run_py_path, filename)  # 拼接文件路径
+                    xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
+                    xlapp.Visible = False  # 窗口是否可见
+                    xlapp.DisplayAlerts = False  # 是否显示警告信息
+                    wb = xlapp.Workbooks.Open(path)
+                    conjuncts = wb.Connections.Count  # 统计工作簿含有多少外部链接
+                    if conjuncts == 0:
+                        wb.Close(SaveChanges=False)
+                        xlapp.Quit()
+                    else:
+                        time.sleep(2)
+                        wb.RefreshAll()
+                        xlapp.CalculateUntilAsyncQueriesDone()
+                        time.sleep(2)
+                        wb.Save()
+                        wb.Close(SaveChanges=True)
+                        xlapp.Quit()
+                    print('文件刷新 >>>' + filename)
+                except Exception as e:
+                    print(e)
+
+    def refresh_excel2(self, excel_file):
+        # 刷新 excel
+        if excel_file.endswith('.xlsx'):
+            try:
+                print(f'正在刷新 >>>{excel_file}')
+                xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
+                xlapp.Visible = False  # 窗口是否可见
+                xlapp.DisplayAlerts = False  # 是否显示警告信息
+                wb = xlapp.Workbooks.Open(excel_file)
+                conjuncts = wb.Connections.Count  # 统计工作簿含有多少外部链接
+                if conjuncts == 0:
+                    wb.Close(SaveChanges=False)
+                    xlapp.Quit()
+                else:
+                    time.sleep(2)
+                    wb.RefreshAll()
+                    xlapp.CalculateUntilAsyncQueriesDone()
+                    time.sleep(2)
+                    wb.Save()
+                    wb.Close(SaveChanges=True)
+                    xlapp.Quit()
+                print('文件刷新 >>>' + excel_file)
+            except Exception as e:
+                print(e)
+
+    def pbi(self, path, _timeout=300):
+        """
+        这是原本属于独立的库模块:  pbix_refresh
+        path: pbi文件路径
+        _timeout: 刷新等待时间
+        如果连接失败，请将 power bi 文件名的特殊字符(空格等)去掉或改为英文文件名试试
+        """
+        # 关闭已打开的 power bi进程
+        for proc in psutil.process_iter():
+            if proc.name() == self.procname:
+                proc.kill()
+        time.sleep(1)
+
+        # 启动 Power bi
+        os.system('start "" "' + path + '"')
+        time.sleep(5)
+
+        # 通过 connect 方法连接进程
+        app = Application(backend='uia').connect(path=self.procname)
+        # title_re可以通过正则表达式连接：".*Power BI Desktop", 仅限 2023年9月之前的 Power bi版本
+        # 2023年10月之后的版本没有此窗口后缀, 因此需用文件名找窗口
+        # 如果同时打开了其他同名的文件（非 power bi文件时）, 可能会引发错误
+        _filename = os.path.splitext(os.path.basename(path))[0]  # 文件名不含后缀
+        win = app.window(title_re=f'{_filename}.*?')  # 连接 pbi 窗口
+        time.sleep(10)
+        # win.print_control_identifiers()  # 打印窗口全部信息, 推荐使用 inspect 开发工具查询窗口句柄信息
+        num = 0
+        while True:
+            try:
+                win['刷新'].wait("enabled", timeout=_timeout)
+                time.sleep(3)
+                win['刷新'].click()
+                break
+            except:
+                print(f'{path}, 未识别窗口句柄, 连接超时')
+                num += 1
+                if num > 1:
+                    break
+
+        num = 0
+        while True:
+            try:
+                win['保存'].wait("enabled", timeout=_timeout)  # timeout 通过"保存"按键状态, 等待刷新窗口关闭, 时间不要设置太短
+                time.sleep(3)
+                win['保存'].click()
+                break
+            except:
+                print(f'{path}, 未识别窗口句柄, 文件未保存')
+                num += 1
+                if num > 1:
+                    break
+        # win.type_keys("^s")
+        win.wait("enabled", timeout=15)
+        win.close()
+
+        # 关闭进程
+        for proc in psutil.process_iter():
+            if proc.name() == self.procname:
+                proc.kill()
+
+
+if __name__ == '__main__':
+    # r = RefreshAll()
+    # # r.refresh_pbix()
+    # r.refresh_excel()
+    pass

{mdbq-2.1.9.dist-info → mdbq-2.2.1.dist-info}/METADATA

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

{mdbq-2.1.9.dist-info → mdbq-2.2.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
 mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/aggregation.py,sha256=kJW1RhdIc0b91Ywmx0N3khHHg7ivVEK0RsmuWdWp6zU,75870
+mdbq/aggregation/aggregation.py,sha256=98pECXV6yw7XSjoLnJBgHIQWM2s2aaB8ii5qNebAI7o,75872
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=Wis40oL04M7E1pkvgNPjyVFAUe-zgjimjIVAikxYY8Y,4418
@@ -11,7 +11,7 @@ mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
 mdbq/clean/data_clean.py,sha256=ZJOTT0sNWP85x4pJl39UZBwN4Bnf8Ao-iVOJNiiRPEE,103996
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=3rVfnHvCnqLxSYqF405pRcxcX5cZn-pJfjQf3-K9434,19092
+mdbq/company/copysh.py,sha256=LYMONSIX2EoPyDQqFODRfIZ2TJtNQBKEeWXCbawTraI,19048
 mdbq/company/home_sh.py,sha256=42CZ2tZIXHLl2mOl2gk2fZnjH2IHh1VJ1s3qHABjonY,18021
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=cmNvsyoNa0RbZ9FOTjSd3jyyGwkxjUo0phvdHbGlrms,6010
@@ -35,9 +35,10 @@ mdbq/other/sku_picture.py,sha256=vHHnajaS6Nz2sEduENihEUY_ZMhyBuQO7WuzrXSDSXM,481
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
 mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
-mdbq/pbix/refresh_all.py,sha256=0uAnBKCd5cx5FLTkawN1GV9yi87rfyMgYal5LABtumQ,7186
+mdbq/pbix/refresh_all.py,sha256=M8g42JEJuKnSgugHIG9ZkLXrm3KPHYRKi2Uv0XYlKnE,5499
+mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,7192
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-2.1.9.dist-info/METADATA,sha256=RsEvRwXTMUdl8kdKVPPGjyyCK6s3r6tcDWcgVg1OpNM,245
-mdbq-2.1.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.1.9.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.1.9.dist-info/RECORD,,
+mdbq-2.2.1.dist-info/METADATA,sha256=9k0-Dze1iVspgpsGXhg_EWjKuc2FrKtYFw-mjf1HVSk,245
+mdbq-2.2.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.2.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.2.1.dist-info/RECORD,,