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 2023-12-26 17:11:48 +08:00
parent 23881d03a3
commit 8c870c1c3e
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/_base/browser.py
View File

@ -123,7 +123,7 @@ class Browser(object):
:param url: 要匹配url的文本 :param url: 要匹配url的文本
:param tab_type: tab类型，可用列表输入多个 :param tab_type: tab类型，可用列表输入多个
:param single: 是否返回首个结果的id，为False返回所有信息 :param single: 是否返回首个结果的id，为False返回所有信息
:return: tab id或tab dict :return: tab id或tab列表
""" """
tabs = self._driver.get(f'http://{self.address}/json').json() # 不要改用cdp tabs = self._driver.get(f'http://{self.address}/json').json() # 不要改用cdp

5
DrissionPage/_pages/chromium_base.py
View File

@ -5,6 +5,7 @@
""" """
from json import loads, JSONDecodeError from json import loads, JSONDecodeError
from os.path import sep from os.path import sep
from pathlib import Path
from re import findall, match from re import findall, match
from threading import Thread from threading import Thread
from time import perf_counter, sleep from time import perf_counter, sleep
@ -16,7 +17,7 @@ from .._elements.none_element import NoneElement
from .._elements.session_element import make_session_ele from .._elements.session_element import make_session_ele
from .._functions.locator import get_loc, is_loc from .._functions.locator import get_loc, is_loc
from .._functions.settings import Settings from .._functions.settings import Settings
from .._functions.tools import get_usable_path, raise_error from .._functions.tools import raise_error
from .._functions.web import location_in_viewport from .._functions.web import location_in_viewport
from .._units.actions import Actions from .._units.actions import Actions
from .._units.listener import Listener from .._units.listener import Listener
@ -1021,7 +1022,7 @@ class ChromiumBase(BasePage):
name = f'{name}.jpg' name = f'{name}.jpg'
path = f'{path}{sep}{name}' path = f'{path}{sep}{name}'
path = get_usable_path(path) path = Path(path)
pic_type = path.suffix.lower() pic_type = path.suffix.lower()
pic_type = 'jpeg' if pic_type == '.jpg' else pic_type[1:] pic_type = 'jpeg' if pic_type == '.jpg' else pic_type[1:]

2
DrissionPage/_pages/chromium_page.py
View File

@ -162,7 +162,7 @@ class ChromiumPage(ChromiumBase):
:param url: 要匹配url的文本 :param url: 要匹配url的文本
:param tab_type: tab类型，可用列表输入多个 :param tab_type: tab类型，可用列表输入多个
:param single: 是否返回首个结果的id，为False返回所有信息 :param single: 是否返回首个结果的id，为False返回所有信息
:return: tab id或tab dict :return: tab id或tab列表
""" """
return self._browser.find_tabs(title, url, tab_type, single) return self._browser.find_tabs(title, url, tab_type, single)

4
DrissionPage/_units/screencast.py
View File

@ -33,7 +33,9 @@ class Screencast(object):
self.set_save_path(save_path) self.set_save_path(save_path)
if self._path is None: if self._path is None:
raise ValueError('save_path必须设置。') raise ValueError('save_path必须设置。')
clean_folder(self._path) tmp = self._path / 'tmp'
tmp.mkdir(parents=True, exist_ok=True)
clean_folder(tmp)
if self._mode.startswith('frugal'): if self._mode.startswith('frugal'):
self._page.driver.set_callback('Page.screencastFrame', self._onScreencastFrame) self._page.driver.set_callback('Page.screencastFrame', self._onScreencastFrame)
self._page.run_cdp('Page.startScreencast', everyNthFrame=1, quality=100) self._page.run_cdp('Page.startScreencast', everyNthFrame=1, quality=100)