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

4.0.0get_frame()序号改成从0开始；页面save()增加as_pdf参数；修复一些小问题

Browse Source
This commit is contained in:
g1879 2024-01-08 18:04:59 +08:00
parent bff8d6ba73
commit c3b58bc90d
72 changed files with 369 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DrissionPage/__init__.py
View File

@ -1,9 +1,10 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
# 常用页面类
from ._pages.chromium_page import ChromiumPage from ._pages.chromium_page import ChromiumPage
from ._pages.session_page import SessionPage from ._pages.session_page import SessionPage
from ._pages.web_page import WebPage from ._pages.web_page import WebPage
@ -13,4 +14,4 @@ from ._configs.chromium_options import ChromiumOptions
from ._configs.session_options import SessionOptions from ._configs.session_options import SessionOptions
__all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__'] __all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__']
__version__ = '4.0.0b35' __version__ = '4.0.0'

6
DrissionPage/_base/base.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from abc import abstractmethod from abc import abstractmethod
from re import sub from re import sub

6
DrissionPage/_base/base.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from abc import abstractmethod from abc import abstractmethod
from typing import Union, Tuple, List, Any from typing import Union, Tuple, List, Any

17
DrissionPage/_base/browser.py
View File

@ -1,12 +1,16 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from shutil import rmtree from shutil import rmtree
from time import sleep, perf_counter from time import sleep, perf_counter
from websocket import WebSocketBadStatusException
from .driver import BrowserDriver, Driver from .driver import BrowserDriver, Driver
from .._functions.tools import stop_process_on_port, raise_error from .._functions.tools import stop_process_on_port, raise_error
from .._units.downloader import DownloadManager from .._units.downloader import DownloadManager
@ -70,8 +74,11 @@ class Browser(object):
"""标签页创建时执行""" """标签页创建时执行"""
if (kwargs['targetInfo']['type'] in ('page', 'webview') if (kwargs['targetInfo']['type'] in ('page', 'webview')
and not kwargs['targetInfo']['url'].startswith('devtools://')): and not kwargs['targetInfo']['url'].startswith('devtools://')):
self._drivers[kwargs['targetInfo']['targetId']] = Driver(kwargs['targetInfo']['targetId'], try:
'page', self.address) self._drivers[kwargs['targetInfo']['targetId']] = Driver(kwargs['targetInfo']['targetId'],
'page', self.address)
except WebSocketBadStatusException:
pass
def _onTargetDestroyed(self, **kwargs): def _onTargetDestroyed(self, **kwargs):
"""标签页关闭时执行""" """标签页关闭时执行"""
@ -205,5 +212,5 @@ class Browser(object):
try: try:
rmtree(path) rmtree(path)
break break
except (PermissionError, FileNotFoundError): except (PermissionError, FileNotFoundError, OSError):
pass pass

6
DrissionPage/_base/browser.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import List, Optional, Union from typing import List, Optional, Union

6
DrissionPage/_base/driver.py
View File

@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from json import dumps, loads, JSONDecodeError from json import dumps, loads, JSONDecodeError
from queue import Queue, Empty from queue import Queue, Empty

6
DrissionPage/_base/driver.pyi
View File

@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from queue import Queue from queue import Queue
from threading import Thread, Event from threading import Thread, Event

6
DrissionPage/_configs/chromium_options.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from re import search from re import search

6
DrissionPage/_configs/chromium_options.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from threading import Lock from threading import Lock

6
DrissionPage/_configs/options_manage.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from configparser import RawConfigParser, NoSectionError, NoOptionError from configparser import RawConfigParser, NoSectionError, NoOptionError
from pathlib import Path from pathlib import Path

6
DrissionPage/_configs/options_manage.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from configparser import RawConfigParser from configparser import RawConfigParser
from typing import Any from typing import Any

6
DrissionPage/_configs/session_options.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path

6
DrissionPage/_configs/session_options.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Any, Union, Tuple, Optional from typing import Any, Union, Tuple, Optional

6
DrissionPage/_elements/chromium_element.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from os.path import basename, sep from os.path import basename, sep
from pathlib import Path from pathlib import Path

6
DrissionPage/_elements/chromium_element.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union, Tuple, List, Any, Literal from typing import Union, Tuple, List, Any, Literal

6
DrissionPage/_elements/none_element.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from ..errors import ElementNotFoundError from ..errors import ElementNotFoundError

6
DrissionPage/_elements/session_element.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from html import unescape from html import unescape
from re import match, sub, DOTALL from re import match, sub, DOTALL

6
DrissionPage/_elements/session_element.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union, List, Tuple, Optional from typing import Union, List, Tuple, Optional

6
DrissionPage/_functions/browser.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from json import load, dump, JSONDecodeError from json import load, dump, JSONDecodeError
from os import popen from os import popen

6
DrissionPage/_functions/browser.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union from typing import Union

8
DrissionPage/_functions/by.py
View File

@ -1,4 +1,12 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
"""
class By: class By:
ID = 'id' ID = 'id'
XPATH = 'xpath' XPATH = 'xpath'

6
DrissionPage/_functions/cli.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from click import command, option from click import command, option

6
DrissionPage/_functions/keys.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from ..errors import AlertExistsError from ..errors import AlertExistsError

6
DrissionPage/_functions/keys.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Tuple, Dict, Union, Any from typing import Tuple, Dict, Union, Any

6
DrissionPage/_functions/locator.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from re import split from re import split
from .by import By from .by import By

6
DrissionPage/_functions/locator.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union from typing import Union

6
DrissionPage/_functions/settings.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """

6
DrissionPage/_functions/tools.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from platform import system from platform import system

6
DrissionPage/_functions/tools.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from os import popen from os import popen
from pathlib import Path from pathlib import Path

6
DrissionPage/_functions/web.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from datetime import datetime from datetime import datetime
from html import unescape from html import unescape

6
DrissionPage/_functions/web.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from http.cookiejar import Cookie from http.cookiejar import Cookie
from typing import Union from typing import Union

45
DrissionPage/_pages/chromium_base.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from json import loads, JSONDecodeError from json import loads, JSONDecodeError
from os.path import sep from os.path import sep
@ -651,7 +653,7 @@ class ChromiumBase(BasePage):
self.run_cdp('DOM.removeNode', nodeId=ele._node_id) self.run_cdp('DOM.removeNode', nodeId=ele._node_id)
def get_frame(self, loc_ind_ele, timeout=None): def get_frame(self, loc_ind_ele, timeout=None):
"""获取页面中一个frame对象，可传入定位符、iframe序号、ChromiumFrame对象，序号从1开始 """获取页面中一个frame对象，可传入定位符、iframe序号、ChromiumFrame对象，序号从0开始
:param loc_ind_ele: 定位符、iframe序号、ChromiumFrame对象 :param loc_ind_ele: 定位符、iframe序号、ChromiumFrame对象
:param timeout: 查找元素超时时间（秒） :param timeout: 查找元素超时时间（秒）
:return: ChromiumFrame对象 :return: ChromiumFrame对象
@ -674,9 +676,9 @@ class ChromiumBase(BasePage):
r = ele r = ele
elif isinstance(loc_ind_ele, int): elif isinstance(loc_ind_ele, int):
if loc_ind_ele < 1: if loc_ind_ele < 0:
raise ValueError('序号必须大于0。') raise ValueError('序号必须大于等于0。')
xpath = f'xpath:(//*[name()="frame" or name()="iframe"])[{loc_ind_ele}]' xpath = f'xpath:(//*[name()="frame" or name()="iframe"])[{loc_ind_ele + 1}]'
r = self._ele(xpath, timeout=timeout) r = self._ele(xpath, timeout=timeout)
elif str(type(loc_ind_ele)).endswith(".ChromiumFrame'>"): elif str(type(loc_ind_ele)).endswith(".ChromiumFrame'>"):
@ -1135,7 +1137,7 @@ def get_mhtml(page, path=None, name=None):
"""把当前页面保存为mhtml文件，如果path和name参数都为None，只返回mhtml文本 """把当前页面保存为mhtml文件，如果path和name参数都为None，只返回mhtml文本
:param page: 要保存的页面对象 :param page: 要保存的页面对象
:param path: 保存路径，为None且name不为None时保存在当前路径 :param path: 保存路径，为None且name不为None时保存在当前路径
:param name: 文件名，为None且path不为None时用title属性值 :param name: 文件名，为None且path不为None时用title属性值
:return: mhtml文本 :return: mhtml文本
""" """
r = page.run_cdp('Page.captureSnapshot')['data'] r = page.run_cdp('Page.captureSnapshot')['data']
@ -1147,3 +1149,32 @@ def get_mhtml(page, path=None, name=None):
with open(f'{path}{sep}{name}.mhtml', 'w', encoding='utf-8') as f: with open(f'{path}{sep}{name}.mhtml', 'w', encoding='utf-8') as f:
f.write(r) f.write(r)
return r return r
def get_pdf(page, path=None, name=None, kwargs=None):
"""把当前页面保存为pdf文件，如果path和name参数都为None，只返回字节
:param page: 要保存的页面对象
:param path: 保存路径，为None且name不为None时保存在当前路径
:param name: 文件名，为None且path不为None时用title属性值
:param kwargs: pdf生成参数
:return: pdf文本
"""
if not kwargs:
kwargs = {}
kwargs['transferMode'] = 'ReturnAsBase64'
if 'printBackground' not in kwargs:
kwargs['printBackground'] = True
try:
r = page.run_cdp('Page.printToPDF', **kwargs)['data']
except:
raise RuntimeError('保存失败，可能浏览器版本不支持。')
from base64 import b64decode
r = b64decode(r)
if path is None and name is None:
return r
path = path or '.'
Path(path).mkdir(parents=True, exist_ok=True)
name = make_valid_name(name or page.title)
with open(f'{path}{sep}{name}.pdf', 'wb') as f:
f.write(r)
return r

15
DrissionPage/_pages/chromium_base.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union, Tuple, List, Any, Optional, Literal from typing import Union, Tuple, List, Any, Optional, Literal
@ -270,4 +272,11 @@ class Alert(object):
self.auto: Optional[bool] = ... self.auto: Optional[bool] = ...
def get_mhtml(page: Union[ChromiumPage, ChromiumTab], path: Union[str, Path] = None, name: str = None) -> str: ... def get_mhtml(page: Union[ChromiumPage, ChromiumTab],
path: Union[str, Path] = None,
name: str = None) -> str: ...
def get_pdf(page: Union[ChromiumPage, ChromiumTab],
path: Union[str, Path] = None,
name: str = None, kwargs: dict=None) -> bytes: ...

6
DrissionPage/_pages/chromium_frame.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from copy import copy from copy import copy
from re import search, findall, DOTALL from re import search, findall, DOTALL

6
DrissionPage/_pages/chromium_frame.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union, Tuple, List, Any from typing import Union, Tuple, List, Any

18
DrissionPage/_pages/chromium_page.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from time import sleep, perf_counter from time import sleep, perf_counter
@ -11,7 +13,7 @@ from requests import get
from .._base.browser import Browser from .._base.browser import Browser
from .._functions.browser import connect_browser from .._functions.browser import connect_browser
from .._configs.chromium_options import ChromiumOptions, PortFinder from .._configs.chromium_options import ChromiumOptions, PortFinder
from .._pages.chromium_base import ChromiumBase, get_mhtml, Timeout from .._pages.chromium_base import ChromiumBase, get_mhtml, get_pdf, Timeout
from .._pages.chromium_tab import ChromiumTab from .._pages.chromium_tab import ChromiumTab
from .._units.setter import ChromiumPageSetter from .._units.setter import ChromiumPageSetter
from .._units.waiter import PageWaiter from .._units.waiter import PageWaiter
@ -146,13 +148,15 @@ class ChromiumPage(ChromiumBase):
"""返回浏览器进程id""" """返回浏览器进程id"""
return self.browser.process_id return self.browser.process_id
def save(self, path=None, name=None): def save(self, path=None, name=None, as_pdf=False, **kwargs):
"""把当前页面保存为mhtml文件，如果path和name参数都为None，只返回mhtml文本 """把当前页面保存为文件，如果path和name参数都为None，只返回文本
:param path: 保存路径，为None且name不为None时保存在当前路径 :param path: 保存路径，为None且name不为None时保存在当前路径
:param name: 文件名，为None且path不为None时用title属性值 :param name: 文件名，为None且path不为None时用title属性值
:return: mhtml文本 :param as_pdf: 为Ture保存为pdf，否则为mhtml且忽略kwargs参数
:param kwargs: pdf生成参数
:return: as_pdf为True时返回bytes，否则返回文件文本
""" """
return get_mhtml(self, path, name) return get_pdf(self, path, name, kwargs)if as_pdf else get_mhtml(self, path, name)
def get_tab(self, id_or_num=None): def get_tab(self, id_or_num=None):
"""获取一个标签页对象 """获取一个标签页对象

27
DrissionPage/_pages/chromium_page.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union, Tuple, List, Optional from typing import Union, Tuple, List, Optional
@ -55,7 +57,26 @@ class ChromiumPage(ChromiumBase):
@property @property
def set(self) -> ChromiumPageSetter: ... def set(self) -> ChromiumPageSetter: ...
def save(self, path: Union[str, Path] = None, name: str = None) -> str: ... def save(self,
path: Union[str, Path] = None,
name: str = None,
as_pdf: bool = False,
landscape: bool = ...,
displayHeaderFooter: bool = ...,
printBackground: bool = ...,
scale: float = ...,
paperWidth: float = ...,
paperHeight: float = ...,
marginTop: float = ...,
marginBottom: float = ...,
marginLeft: float = ...,
marginRight: float = ...,
pageRanges: str = ...,
headerTemplate: str = ...,
footerTemplate: str = ...,
preferCSSPageSize: bool = ...,
generateTaggedPDF: bool = ...,
generateDocumentOutline: bool = ...) -> Union[bytes, str]: ...
def get_tab(self, tab_id: Union[str, ChromiumTab, int] = None) -> ChromiumTab: ... def get_tab(self, tab_id: Union[str, ChromiumTab, int] = None) -> ChromiumTab: ...

6
DrissionPage/_pages/chromium_tab.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from copy import copy from copy import copy

6
DrissionPage/_pages/chromium_tab.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union, Tuple, Any, List, Optional from typing import Union, Tuple, Any, List, Optional

6
DrissionPage/_pages/session_page.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from re import search, DOTALL from re import search, DOTALL

6
DrissionPage/_pages/session_page.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Any, Union, Tuple, List, Optional from typing import Any, Union, Tuple, List, Optional

6
DrissionPage/_pages/web_page.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from .chromium_page import ChromiumPage from .chromium_page import ChromiumPage
from .chromium_tab import WebPageTab from .chromium_tab import WebPageTab

6
DrissionPage/_pages/web_page.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union, Tuple, List, Any from typing import Union, Tuple, List, Any

6
DrissionPage/_units/actions.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from time import sleep, perf_counter from time import sleep, perf_counter

6
DrissionPage/_units/actions.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union, Tuple, Any, Literal from typing import Union, Tuple, Any, Literal

6
DrissionPage/_units/clicker.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from time import perf_counter, sleep from time import perf_counter, sleep

6
DrissionPage/_units/clicker.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union, Optional from typing import Union, Optional

6
DrissionPage/_units/cookies_setter.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from http.cookiejar import Cookie from http.cookiejar import Cookie

6
DrissionPage/_units/cookies_setter.pyi
View File

@ -1,4 +1,10 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
"""
from http.cookiejar import Cookie from http.cookiejar import Cookie
from typing import Union from typing import Union

6
DrissionPage/_units/downloader.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from os.path import sep from os.path import sep
from pathlib import Path from pathlib import Path

6
DrissionPage/_units/downloader.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Dict, Optional, Union, Literal from typing import Dict, Optional, Union, Literal

6
DrissionPage/_units/listener.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from base64 import b64decode from base64 import b64decode
from json import JSONDecodeError, loads from json import JSONDecodeError, loads

6
DrissionPage/_units/listener.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from queue import Queue from queue import Queue
from typing import Union, Dict, List, Iterable, Optional, Literal from typing import Union, Dict, List, Iterable, Optional, Literal

6
DrissionPage/_units/rect.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """

6
DrissionPage/_units/rect.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Tuple, Union, List from typing import Tuple, Union, List

6
DrissionPage/_units/screencast.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from base64 import b64decode from base64 import b64decode
from os.path import sep from os.path import sep

6
DrissionPage/_units/screencast.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union from typing import Union

6
DrissionPage/_units/scroller.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from time import sleep, perf_counter from time import sleep, perf_counter

6
DrissionPage/_units/scroller.pyi
View File

@ -1,4 +1,10 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
"""
from typing import Union from typing import Union
from .._elements.chromium_element import ChromiumElement from .._elements.chromium_element import ChromiumElement

6
DrissionPage/_units/selector.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from time import perf_counter from time import perf_counter

6
DrissionPage/_units/selector.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union, Tuple, List from typing import Union, Tuple, List

6
DrissionPage/_units/setter.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path

6
DrissionPage/_units/setter.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from pathlib import Path from pathlib import Path
from typing import Union, Tuple, Literal, Any, Optional from typing import Union, Tuple, Literal, Any, Optional

6
DrissionPage/_units/states.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from .._functions.web import location_in_viewport from .._functions.web import location_in_viewport
from ..errors import CDPError, NoRectError, PageDisconnectedError, ElementLostError from ..errors import CDPError, NoRectError, PageDisconnectedError, ElementLostError

6
DrissionPage/_units/states.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union, Tuple, List, Optional, Literal from typing import Union, Tuple, List, Optional, Literal

6
DrissionPage/_units/waiter.py
View File

@ -1,4 +1,10 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
"""
from time import sleep, perf_counter from time import sleep, perf_counter
from .._functions.settings import Settings from .._functions.settings import Settings

6
DrissionPage/_units/waiter.pyi
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from typing import Union from typing import Union

6
DrissionPage/common.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """
from ._elements.session_element import make_session_ele from ._elements.session_element import make_session_ele
from ._functions.by import By from ._functions.by import By

6
DrissionPage/errors.py
View File

@ -1,7 +1,9 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
""" """
@Author : g1879 @Author : g1879
@Contact : g1879@qq.com @Contact : g1879@qq.com
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
@License : BSD 3-Clause.
""" """

4
README.md
View File

@ -22,7 +22,7 @@ DrissionPage 是一个基于 python 的网页自动化工具。
支持系统：Windows、Linux、Mac 支持系统：Windows、Linux、Mac
python 版本：3.6 及以上 python 版本：3.8 及以上
支持浏览器：Chromium 内核浏览器(如 Chrome 和 Edge)，electron 应用 支持浏览器：Chromium 内核浏览器(如 Chrome 和 Edge)，electron 应用
@ -108,7 +108,7 @@ python 版本：3.6 及以上
# 🔖 版本历史 # 🔖 版本历史
[点击查看版本历史](https://g1879.gitee.io/drissionpagedocs/history/) [点击查看版本历史](https://g1879.gitee.io/drissionpagedocs/history/introduction/)
--- ---

2
requirements.txt
View File

@ -1,7 +1,7 @@
requests requests
lxml lxml
cssselect cssselect
DownloadKit>=2.0.0b5 DownloadKit>=2.0.0
websocket-client>=1.7.0 websocket-client>=1.7.0
click click
tldextract tldextract

4
setup.py
View File

@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
setup( setup(
name="DrissionPage", name="DrissionPage",
version="4.0.0b35", version="4.0.0",
author="g1879", author="g1879",
author_email="g1879@qq.com", author_email="g1879@qq.com",
description="Python based web automation tool. It can control the browser and send and receive data packets.", description="Python based web automation tool. It can control the browser and send and receive data packets.",
@ -22,7 +22,7 @@ setup(
'lxml', 'lxml',
'requests', 'requests',
'cssselect', 'cssselect',
'DownloadKit>=2.0.0b5', 'DownloadKit>=2.0.0',
'websocket-client>=1.7.0', 'websocket-client>=1.7.0',
'click', 'click',
'tldextract', 'tldextract',