blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

截图改为必须传入路径

Browse Source
This commit is contained in:
g1879 2020-06-10 16:50:21 +08:00
parent 122cc43ced
commit 8c02cb99f8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DrissionPage/driver_element.py
View File

@ -15,8 +15,7 @@ from selenium.webdriver.support import expected_conditions as ec
from selenium.webdriver.support.select import Select from selenium.webdriver.support.select import Select
from selenium.webdriver.support.wait import WebDriverWait from selenium.webdriver.support.wait import WebDriverWait
from .common import DrissionElement, get_loc_from_str, translate_loc_to_xpath from .common import DrissionElement, get_loc_from_str, translate_loc_to_xpath, avoid_duplicate_name
from .config import OptionsManager
class DriverElement(DrissionElement): class DriverElement(DrissionElement):
@ -201,12 +200,10 @@ class DriverElement(DrissionElement):
"""元素坐标""" """元素坐标"""
return self.inner_ele.location return self.inner_ele.location
def screenshot(self, path: str = None, filename: str = None) -> str: def screenshot(self, path: str, filename: str = None) -> str:
"""元素截图""" """元素截图"""
name = filename or self.tag name = filename or self.tag
path = path or OptionsManager().get_value('paths', 'global_tmp_path') name = avoid_duplicate_name(path, f'{name}.png')
if not path:
raise IOError('No path specified.')
Path(path).mkdir(parents=True, exist_ok=True) Path(path).mkdir(parents=True, exist_ok=True)
# 等待元素加载完成 # 等待元素加载完成
if self.tag == 'img': if self.tag == 'img':
@ -214,7 +211,7 @@ class DriverElement(DrissionElement):
'&& arguments[0].naturalWidth > 0' '&& arguments[0].naturalWidth > 0'
while not self.run_script(js): while not self.run_script(js):
pass pass
img_path = f'{path}\\{name}.png' img_path = f'{path}\\{name}'
self.inner_ele.screenshot(img_path) self.inner_ele.screenshot(img_path)
return img_path return img_path