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

截图左上和右下参数可只接收其中一个；配置对象save()可生成不存在的路径

Browse Source
This commit is contained in:
g1879 2024-01-30 17:05:02 +08:00
parent ec6a2d4494
commit cbec20fc97
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DrissionPage/_configs/chromium_options.py
View File

@ -532,9 +532,9 @@ class ChromiumOptions(object):
path = path / 'config.ini' if path.is_dir() else path path = path / 'config.ini' if path.is_dir() else path
if path.exists(): if path.exists():
om = OptionsManager(str(path)) om = OptionsManager(path)
else: else:
om = OptionsManager(self.ini_path or str(Path(__file__).parent / 'configs.ini')) om = OptionsManager(self.ini_path or (Path(__file__).parent / 'configs.ini'))
# 设置chromium_options # 设置chromium_options
attrs = ('address', 'browser_path', 'arguments', 'extensions', 'user', 'load_mode', attrs = ('address', 'browser_path', 'arguments', 'extensions', 'user', 'load_mode',

3
DrissionPage/_configs/options_manage.py
View File

@ -29,6 +29,8 @@ class OptionsManager(object):
self.ini_path = default_configs self.ini_path = default_configs
elif path == 'default': elif path == 'default':
self.ini_path = default_configs self.ini_path = default_configs
elif isinstance(path, Path):
self.ini_path = path
else: else:
self.ini_path = Path(path) self.ini_path = Path(path)
@ -147,6 +149,7 @@ class OptionsManager(object):
path = Path(path).absolute() path = Path(path).absolute()
path = path / 'config.ini' if path.is_dir() else path path = path / 'config.ini' if path.is_dir() else path
path.parent.mkdir(exist_ok=True, parents=True)
path = str(path) path = str(path)
self._conf.write(open(path, 'w', encoding='utf-8')) self._conf.write(open(path, 'w', encoding='utf-8'))

4
DrissionPage/_configs/options_manage.pyi
View File

@ -7,7 +7,7 @@
""" """
from configparser import RawConfigParser from configparser import RawConfigParser
from pathlib import Path from pathlib import Path
from typing import Any, Optional from typing import Any, Optional, Union
class OptionsManager(object): class OptionsManager(object):
@ -15,7 +15,7 @@ class OptionsManager(object):
file_exists: bool = ... file_exists: bool = ...
_conf: RawConfigParser = ... _conf: RawConfigParser = ...
def __init__(self, path: str = None): ... def __init__(self, path: Union[Path, str] = None): ...
def __getattr__(self, item) -> dict: ... def __getattr__(self, item) -> dict: ...

4
DrissionPage/_configs/session_options.py
View File

@ -377,9 +377,9 @@ class SessionOptions(object):
path = path / 'config.ini' if path.is_dir() else path path = path / 'config.ini' if path.is_dir() else path
if path.exists(): if path.exists():
om = OptionsManager(str(path)) om = OptionsManager(path)
else: else:
om = OptionsManager(self.ini_path or str(Path(__file__).parent / 'configs.ini')) om = OptionsManager(self.ini_path or (Path(__file__).parent / 'configs.ini'))
options = session_options_to_dict(self) options = session_options_to_dict(self)

6
DrissionPage/_pages/chromium_base.py
View File

@ -1064,7 +1064,11 @@ class ChromiumBase(BasePage):
vp = {'x': 0, 'y': 0, 'width': width, 'height': height, 'scale': 1} vp = {'x': 0, 'y': 0, 'width': width, 'height': height, 'scale': 1}
args = {'format': pic_type, 'captureBeyondViewport': True, 'clip': vp} args = {'format': pic_type, 'captureBeyondViewport': True, 'clip': vp}
else: else:
if left_top and right_bottom: if left_top or right_bottom:
if not left_top:
left_top = (0, 0)
if not right_bottom:
right_bottom = self.rect.size
x, y = left_top x, y = left_top
w = right_bottom[0] - x w = right_bottom[0] - x
h = right_bottom[1] - y h = right_bottom[1] - y