diff --git a/.temp_to_pub/.gitignore b/.temp_to_pub/.gitignore index 08f1d7d..90d8558 100644 --- a/.temp_to_pub/.gitignore +++ b/.temp_to_pub/.gitignore @@ -13,3 +13,4 @@ mysql_config.json **/user_data **/tasks **/execution_instances +**/TempUserDataFolder diff --git a/ElectronJS/EasySpider_en.crx b/ElectronJS/EasySpider_en.crx new file mode 100644 index 0000000..e274612 Binary files /dev/null and b/ElectronJS/EasySpider_en.crx differ diff --git a/ElectronJS/EasySpider_zh.crx b/ElectronJS/EasySpider_zh.crx new file mode 100644 index 0000000..efae668 Binary files /dev/null and b/ElectronJS/EasySpider_zh.crx differ diff --git a/ElectronJS/src/index.html b/ElectronJS/src/index.html index 575aeae..3a06dc9 100644 --- a/ElectronJS/src/index.html +++ b/ElectronJS/src/index.html @@ -80,7 +80,7 @@ For individual users, EasySpider is a completely free and ad-free open-source so

View/Manage/Invoke + style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;color:white">View/Manage/Execute Tasks

Browse official website to watch tutorials diff --git a/ElectronJS/src/taskGrid/executeTask.html b/ElectronJS/src/taskGrid/executeTask.html index a95603e..0d13152 100644 --- a/ElectronJS/src/taskGrid/executeTask.html +++ b/ElectronJS/src/taskGrid/executeTask.html @@ -243,6 +243,7 @@

+

{{`要想过Cloudflare验证,需要以下目录存在115版本的Chrome Beta版浏览器,注意是Beta版不是正式版:C:\\Program Files\\Google\\Chrome Beta。如果Beta版本不是115,请在软件下载目录中找到Chrome_Beta_115_win64.7z压缩包,然后解压并复制(覆盖)为C:\\Program Files\\Google\\Chrome Beta目录即可。~To pass the Cloudflare verification, you need the following directory to exist in the 115 version of Chrome Beta, note that it is the Beta version not the official version: C:\\Program Files\\Google\\Chrome Beta, @@ -302,6 +303,7 @@ show: false, //是否渲染 ID: "", lang: getUrlParam("lang"), + type: getUrlParam("type"), tip: "The parameter values in the Excel file have been successfully imported into the corresponding field text box~Excel文件中的参数值已成功导入到对应字段文本框中", file:null, user_data_folder:"", diff --git a/ExecuteStage/easyspider_executestage.py b/ExecuteStage/easyspider_executestage.py index e760a48..d62ced9 100644 --- a/ExecuteStage/easyspider_executestage.py +++ b/ExecuteStage/easyspider_executestage.py @@ -2258,13 +2258,21 @@ if __name__ == '__main__': tmp_user_data_folder = os.path.join(tmp_user_folder_parent, "user_data_" + str(id) + "_" + str(time.time()).replace(".","") + "_" + random_string) tmp_options[i]["tmp_user_data_folder"] = tmp_user_data_folder if os.path.exists(tmp_user_data_folder): - shutil.rmtree(tmp_user_data_folder) + try: + shutil.rmtree(tmp_user_data_folder) + except: + pass print(f"Copying user data folder to: {tmp_user_data_folder}, please wait...") print(f"正在复制用户信息目录到: {tmp_user_data_folder},请稍等...") if os.path.exists(absolute_user_data_folder): - shutil.copytree(absolute_user_data_folder, tmp_user_data_folder) - print("User data folder copied successfully, if you exit the program before it finishes, please delete the temporary user data folder manually.") - print("用户信息目录复制成功,如果程序在运行过程中被手动退出,请手动删除临时用户信息目录。") + try: + shutil.copytree(absolute_user_data_folder, tmp_user_data_folder) + print("User data folder copied successfully, if you exit the program before it finishes, please delete the temporary user data folder manually.") + print("用户信息目录复制成功,如果程序在运行过程中被手动退出,请手动删除临时用户信息目录。") + except: + tmp_user_data_folder = absolute_user_data_folder + print("Copy user data folder failed, use the original folder.") + print("复制用户信息目录失败,使用原始目录。") else: tmp_user_data_folder = absolute_user_data_folder print("Cannot find user data folder, create a new folder.")