优化涌益生猪

yongyi_pig/yongyi_pig_manual.py

@@ -1,5 +1,6 @@
 # coding:utf-8
 import os
+import shutil
 from time import sleep
 import datetime
 import openpyxl
@@ -16,20 +17,27 @@ from selenium.webdriver.support.wait import WebDriverWait
 
 from imgcode_ak import image_code
 
+
 def rename_week_file(new_dir, current_time, rar_name):
     files = os.listdir(rar_name)
     for dir in files:
-        print(dir.title())
-        if os.path.isdir(dir.title()):
-            dir_list = os.listdir(rar_name + "/" + dir.title())
-            for f in dir_list:
-                print(f.title())
+        file_path = os.path.join(rar_name, dir)
+        if os.path.isdir(file_path):
+            for f in os.listdir(file_path):
+                print("f.title()"+f.title())
                 if f.title().find("周度数据") != -1:
                     new_name = f'{new_dir}/{current_time}_week.xlsx'
-                    os.rename(rar_name + "/" + dir.title() + "/" + f.title(), new_name)
+                    old_name = os.path.join(file_path, f)
+                    # os.rename(old_name, new_name)
+                    shutil.copy(old_name, new_name)
+                    print(f'周度文件重命名成功, 旧文件名{old_name} 新文件名{new_name}')
                     return
+        else:
+            print(dir.title()+"不是一个文件夹")
+            return
     return
 
+
 if __name__ == "__main__":
     # python+selunium定位已打开的浏览器
     # 创建一个 Chrome WebDriver 实例
@@ -50,23 +58,17 @@ if __name__ == "__main__":
     options.add_experimental_option("debuggerAddress", "127.0.0.1:9222")
     # 修改下载地址
     # save_to_dir = '/Users/xiexiaoyuan/Downloads'
-    save_to_dir = r'D:\download\excel'
-    options.add_argument("--download.default_directory="+save_to_dir)
+    save_to_dir = r'D:/download'
+    options.add_argument("--download.default_directory=" + save_to_dir)
     options.add_argument('--user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, '
-                          'like Gecko) Chrome/118.0.5993.70 Safari/537.36')
+                         'like Gecko) Chrome/118.0.5993.70 Safari/537.36')
     options.add_argument(" window-size=1920,1080")
 
     # s = Service(executable_path='/Users/xiexiaoyuan/chromedriver_mac64_114/chromedriver')
-    s = Service(executable_path='D:\download\chromedriver119-win64\chromedriver.exe')
+    # s = Service(executable_path='D:/download/chromedriver119-win64/chromedriver.exe')
+    s = Service(executable_path='E:/chromedriver-win64/chromedriver.exe')
     driver = webdriver.Chrome(service=s, options=options)
     # driver.maximize_window()
-    driver.execute_cdp_cmd("Page.addScriptToEvaluateOnNewDocument", {
-        "source": """
-                            Object.defineProperty(navigator, 'webdriver', {
-                              get: () => undefined
-                            })
-                          """
-    })
     driver.get('https://data.yongyizixun888.com/')
     sleep(3)
 
@@ -87,29 +89,37 @@ if __name__ == "__main__":
     sleep(30)
 
     # 获取当前时间，并将其格式化为指定的形式
+    # new_dir = '/Users/xiexiaoyuan/Downloads/yongyi'
+    new_dir = r'D:\data\eta\yongyi'
     current_time = datetime.datetime.now().strftime("%Y-%m-%d")
     # 查找文件并重命名
     os.chdir(save_to_dir)
     files = filter(os.path.isfile, os.listdir(save_to_dir))
     files = [os.path.join(save_to_dir, f) for f in files]  # add path to each file
     files.sort(key=lambda x: os.path.getmtime(x))
-    day_file = files[-1]
-    # new_dir = '/Users/xiexiaoyuan/Downloads/yongyi'
-    new_dir = r'D:\data\yongyi'
-    if day_file.title().find("日度") == -1:
-        day_file = files[-2]
+    day_file = ""
+    week_file = ""
+    for file in files:
+        if file.title().find("涌益咨询日度数据") != -1:
+            if day_file == "":
+                day_file = file
+        if file.title().find("涌益咨询周度数据") != -1:
+            if week_file == "":
+                week_file = file
+        if day_file != "" and week_file != "":
+            break
 
-    if day_file.title().find("日度") != -1:
+    if day_file != "":
+        print(day_file.title())
         new_name = f'{new_dir}/{current_time}_day.xlsx'
-        os.rename(day_file.title(), new_name)
+        # os.rename(day_file.title(), new_name)
+        shutil.copy(day_file.title(), new_name)
+        print(f'日度文件重命名成功, 旧文件名{day_file.title()} 新文件名{new_name}')
     else:
         print("未找到日度下载文件")
 
-    week_file = files[-2]
-    if week_file.title().find("周度") == -1:
-        week_file = files[-1]
-    print(week_file.title())
-    if week_file.title().find("周度") != -1:
+    if week_file != "":
+        print(week_file.title())
         filename = week_file.title()
         index = filename.find(".Rar")
         rar_name = filename[:index]
@@ -117,7 +127,6 @@ if __name__ == "__main__":
         rar_file = rarfile.RarFile(filename, 'r')
         rar_file.extractall(rar_name)
         rar_file.close()
-
         rename_week_file(new_dir, current_time, rar_name)
     else:
         print("未找到周度下载文件")