涌益咨询二期

yongyi_pig/yongyi_pig_manual.py

@@ -26,20 +26,20 @@ def rename_week_file(new_dir, rar_name):
             for f in os.listdir(file_path):
                 print("f.title()" + f.title())
                 if f.title().find("周度数据") != -1:
-                    file_name = f.title().split('/')[-1]
-                    new_name = f'{new_dir}/{file_name}'
+                    file_name = os.path.basename(f.title())
+                    new_name = os.path.join(new_dir, file_name)
+                    file_name = file_name.lower()
                     old_name = os.path.join(file_path, f)
-                    new_name = new_name.lower()
                     # os.rename(old_name, new_name)
-                    shutil.copy(old_name, new_name)
+                    shutil.move(old_name, new_name)
                     print(f'周度数据文件重命名成功, 旧文件名{old_name} 新文件名{new_name}')
                 elif f.title().find("周度图表版图") != -1:
-                    file_name = f.title().split('/')[-1]
-                    new_name = f'{new_dir}/{file_name}'
+                    file_name = os.path.basename(f.title())
+                    file_name = file_name.lower()
+                    new_name = os.path.join(new_dir, file_name)
                     old_name = os.path.join(file_path, f)
-                    new_name = new_name.lower()
                     # os.rename(old_name, new_name)
-                    shutil.copy(old_name, new_name)
+                    shutil.move(old_name, new_name)
                     print(f'周度图表版图文件重命名成功, 旧文件名{old_name} 新文件名{new_name}')
         else:
             print(dir.title() + "不是一个文件夹")
@@ -72,7 +72,6 @@ def get_yongyi_driver():
     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:/eta/chromedriver-win64/chromedriver.exe')
     driver = webdriver.Chrome(service=s, options=options)
     driver.get('https://data.yongyizixun888.com/')
@@ -88,7 +87,7 @@ def yongyi_download(dayFlag, weekFlag):
     save_to_dir = r'D:/eta/yongyi_data/download'
     # 获取当前时间，并将其格式化为指定的形式
     # new_dir = '/Users/xiexiaoyuan/Downloads/yongyi/unread'
-    new_dir = r'D:\eta\yongyi_data\unread'
+    new_dir = r'D:\eta\yongyi_data\yongyi\unread'
     try:
         try:
             driver = get_yongyi_driver()
@@ -144,12 +143,14 @@ def yongyi_download(dayFlag, weekFlag):
         if dayFlag == '1':
             if day_file != "":
                 print(day_file.title())
-                # 获取文件名
-                file_name = day_file.title().split('/')[-1]
-                new_name = f'{new_dir}/{file_name}'
-                new_name = new_name.lower()
+                file_name = os.path.basename(day_file.title())
+                file_name = file_name.lower()
+                new_name = os.path.join(new_dir,file_name)
+                print(f'新文件名{new_name}')
+                print(f'旧文件名{day_file.title()}')
+
                 # os.rename(day_file.title(), new_name)
-                shutil.copy(day_file.title(), new_name)
+                shutil.move(day_file.title(), new_name)
                 print(f'日度文件重命名成功, 旧文件名{day_file.title()} 新文件名{new_name}')
             else:
                 print("未找到日度下载文件")