Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
This commit is contained in:
@@ -144,6 +144,7 @@ class WindowAPI:
|
|||||||
)
|
)
|
||||||
return result[0] if result else ''
|
return result[0] if result else ''
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
def upload_file_to_java(self, file_path, relative_path=None):
|
def upload_file_to_java(self, file_path, relative_path=None):
|
||||||
"""按本地路径读取文件并上传到 Java 后端临时目录。"""
|
"""按本地路径读取文件并上传到 Java 后端临时目录。"""
|
||||||
if not file_path or not str(file_path).strip():
|
if not file_path or not str(file_path).strip():
|
||||||
@@ -167,6 +168,8 @@ class WindowAPI:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
return {'success': False, 'error': str(e)}
|
return {'success': False, 'error': str(e)}
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 574b372f425e4b0a35d1b371580628c4cfbcc45d
|
||||||
def save_file_from_url(self, url, default_filename='download.zip'):
|
def save_file_from_url(self, url, default_filename='download.zip'):
|
||||||
"""弹窗选择保存位置,从 url 下载文件并保存。用于品牌任务结果 zip 等。"""
|
"""弹窗选择保存位置,从 url 下载文件并保存。用于品牌任务结果 zip 等。"""
|
||||||
if not url or not url.strip():
|
if not url or not url.strip():
|
||||||
|
|||||||
Reference in New Issue
Block a user