mirror of
https://gitee.com/g1879/DrissionPage.git
synced 2024-12-10 04:00:23 +08:00
Compare commits
No commits in common. "master" and "v4.1.0.7" have entirely different histories.
@ -1,15 +1,12 @@
|
||||
在提交issue前，请确认已经给本库点了星星，这对我来说很重要。
|
||||
|
||||
使用方法请查看[使用文档](http://drissionpage.cn)，文档里都有。
|
||||
|
||||
使用问题作者可能不能及时处理，可在知识星球提问，会尽快回复。
|
||||
|
||||
|
||||
也可在QQ群里提问（636361957）。
|
||||
|
||||
请围绕以下内容陈述您的问题：
|
||||
|
||||
1. 遇到了什么问题？什么场景下出现的？如何重现？
|
||||
2. 请附上代码和报错信息
|
||||
2. 请附上代码和报错信息（如有）
|
||||
3. DrissionPage、浏览器、python版本号是多少？
|
||||
4. 有什么意见建议？
|
||||
|
||||
|
||||
@ -2,21 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
|
||||
允许任何人以个人身份使用或分发本项目源代码，但仅限于学习和合法非盈利目的。
|
||||
个人或组织如未获得版权持有人授权，不得将本项目以源代码或二进制形式用于商业行为。
|
||||
|
||||
使用本项目需满足以下条款，如使用过程中出现违反任意一项条款的情形，授权自动失效。
|
||||
* 禁止将DrissionPage应用到任何可能违反当地法律规定和道德约束的项目中
|
||||
* 禁止将DrissionPage用于任何可能有损他人利益的项目中
|
||||
* 禁止将DrissionPage用于攻击与骚扰行为
|
||||
* 遵守Robots协议，禁止将DrissionPage用于采集法律或系统Robots协议不允许的数据
|
||||
|
||||
使用DrissionPage发生的一切行为均由使用人自行负责。
|
||||
因使用DrissionPage进行任何行为所产生的一切纠纷及后果均与版权持有人无关，
|
||||
版权持有人不承担任何使用DrissionPage带来的风险和损失。
|
||||
版权持有人不对DrissionPage可能存在的缺陷导致的任何损失负任何责任。
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from ._base.chromium import Chromium
|
||||
from ._configs.chromium_options import ChromiumOptions
|
||||
@ -25,4 +12,4 @@ from ._pages.chromium_page import ChromiumPage
|
||||
from ._pages.session_page import SessionPage
|
||||
from ._pages.web_page import WebPage
|
||||
|
||||
__version__ = '4.1.0.13'
|
||||
__version__ = '4.1.0.7'
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from ._base.chromium import Chromium
|
||||
from ._configs.chromium_options import ChromiumOptions
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from abc import abstractmethod
|
||||
from copy import copy
|
||||
@ -295,7 +296,7 @@ class BasePage(BaseParser):
|
||||
if self._DownloadKit is None:
|
||||
if not self._session:
|
||||
self._create_session()
|
||||
self._DownloadKit = DownloadKit(driver=self, save_path=self.download_path)
|
||||
self._DownloadKit = DownloadKit(driver=self, goal_path=self.download_path)
|
||||
return self._DownloadKit
|
||||
|
||||
def _before_connect(self, url, retry, interval):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from abc import abstractmethod
|
||||
from typing import Union, Tuple, List, Any, Optional, Dict
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from re import match
|
||||
@ -44,7 +45,7 @@ class Chromium(object):
|
||||
if browser_id in cls._BROWSERS:
|
||||
r = cls._BROWSERS[browser_id]
|
||||
while not hasattr(r, '_driver'):
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
return r
|
||||
r = object.__new__(cls)
|
||||
r._chromium_options = opt
|
||||
@ -63,8 +64,6 @@ class Chromium(object):
|
||||
self._frames = {}
|
||||
self._drivers = {}
|
||||
self._all_drivers = {}
|
||||
self._relation = {}
|
||||
self._newest_tab_id = None
|
||||
|
||||
self._set = None
|
||||
self._wait = None
|
||||
@ -190,32 +189,34 @@ class Chromium(object):
|
||||
def get_tabs(self, title=None, url=None, tab_type='page'):
|
||||
return self._get_tabs(title=title, url=url, tab_type=tab_type, mix=True, as_id=False)
|
||||
|
||||
def close_tabs(self, tabs_or_ids, others=False):
|
||||
def close_tabs(self, tabs_or_ids=None, others=False):
|
||||
all_tabs = set(self.tab_ids)
|
||||
if isinstance(tabs_or_ids, str):
|
||||
tabs = {tabs_or_ids}
|
||||
elif isinstance(tabs_or_ids, ChromiumTab):
|
||||
tabs = {tabs_or_ids.tab_id}
|
||||
elif tabs_or_ids is None:
|
||||
tabs = {self.tab_ids[0]}
|
||||
elif isinstance(tabs_or_ids, (list, tuple)):
|
||||
tabs = set(i.tab_id if isinstance(i, ChromiumTab) else i for i in tabs_or_ids)
|
||||
else:
|
||||
raise TypeError('tabs_or_ids参数只能传入标签页对象或id。')
|
||||
|
||||
all_tabs = set(self.tab_ids)
|
||||
if others:
|
||||
tabs = all_tabs - tabs
|
||||
|
||||
if len(all_tabs - tabs) > 0:
|
||||
for tab in tabs:
|
||||
self._close_tab(tab=tab)
|
||||
else:
|
||||
end_len = len(set(all_tabs) - set(tabs))
|
||||
if end_len <= 0:
|
||||
self.quit()
|
||||
return
|
||||
|
||||
def _close_tab(self, tab):
|
||||
if isinstance(tab, str):
|
||||
tab = self.get_tab(tab)
|
||||
tab._run_cdp('Target.closeTarget', targetId=tab.tab_id)
|
||||
while tab.driver.is_running and tab.tab_id in self._all_drivers:
|
||||
sleep(.01)
|
||||
for tab in tabs:
|
||||
self._onTargetDestroyed(targetId=tab)
|
||||
self._driver.run('Target.closeTarget', targetId=tab)
|
||||
sleep(.2)
|
||||
end_time = perf_counter() + 3
|
||||
while self.tabs_count != end_len and perf_counter() < end_time:
|
||||
sleep(.1)
|
||||
|
||||
def activate_tab(self, id_ind_tab):
|
||||
if isinstance(id_ind_tab, int):
|
||||
@ -293,7 +294,7 @@ class Chromium(object):
|
||||
rmtree(path, True)
|
||||
|
||||
def _new_tab(self, mix=True, url=None, new_window=False, background=False, new_context=False):
|
||||
tab_type = MixTab if mix else ChromiumTab
|
||||
obj = MixTab if mix else ChromiumTab
|
||||
tab = None
|
||||
if new_context:
|
||||
tab = self._run_cdp('Target.createBrowserContext')['browserContextId']
|
||||
@ -307,20 +308,16 @@ class Chromium(object):
|
||||
kwargs['browserContextId'] = tab
|
||||
|
||||
if self.states.is_incognito:
|
||||
return _new_tab_by_js(self, url, tab_type, new_window)
|
||||
return _new_tab_by_js(self, url, obj, new_window)
|
||||
else:
|
||||
try:
|
||||
tab = self._run_cdp('Target.createTarget', **kwargs)['targetId']
|
||||
except CDPError:
|
||||
return _new_tab_by_js(self, url, tab_type, new_window)
|
||||
return _new_tab_by_js(self, url, obj, new_window)
|
||||
|
||||
while self.states.is_alive:
|
||||
if tab in self._drivers:
|
||||
break
|
||||
sleep(.01)
|
||||
else:
|
||||
raise BrowserConnectError('浏览器已关闭')
|
||||
tab = tab_type(self, tab)
|
||||
while tab not in self._drivers:
|
||||
sleep(.1)
|
||||
tab = obj(self, tab)
|
||||
if url:
|
||||
tab.get(url)
|
||||
return tab
|
||||
@ -360,8 +357,7 @@ class Chromium(object):
|
||||
raise TypeError('tab_type只能是set、list、tuple、str、None。')
|
||||
|
||||
tabs = [i for i in tabs if ((title is None or title in i['title']) and (url is None or url in i['url'])
|
||||
and (tab_type is None or i['type'] in tab_type)
|
||||
and i['title'] != 'chrome-extension://neajdppkdcdipfabeoofebfddakdcjhd/audio.html')]
|
||||
and (tab_type is None or i['type'] in tab_type))]
|
||||
if as_id:
|
||||
return [tab['id'] for tab in tabs]
|
||||
with self._lock:
|
||||
@ -373,7 +369,7 @@ class Chromium(object):
|
||||
def _run_cdp(self, cmd, **cmd_args):
|
||||
ignore = cmd_args.pop('_ignore', None)
|
||||
r = self._driver.run(cmd, **cmd_args)
|
||||
return r if __ERROR__ not in r else raise_error(r, self, ignore)
|
||||
return r if __ERROR__ not in r else raise_error(r, ignore)
|
||||
|
||||
def _get_driver(self, tab_id, owner=None):
|
||||
d = self._drivers.pop(tab_id, None)
|
||||
@ -389,12 +385,9 @@ class Chromium(object):
|
||||
and not kwargs['targetInfo']['url'].startswith('devtools://')):
|
||||
try:
|
||||
tab_id = kwargs['targetInfo']['targetId']
|
||||
self._frames[tab_id] = tab_id
|
||||
d = Driver(tab_id, 'page', self.address)
|
||||
self._relation[tab_id] = kwargs['targetInfo'].get('openerId', None)
|
||||
self._drivers[tab_id] = d
|
||||
self._all_drivers.setdefault(tab_id, set()).add(d)
|
||||
self._newest_tab_id = tab_id
|
||||
except WebSocketBadStatusException:
|
||||
pass
|
||||
|
||||
@ -407,7 +400,6 @@ class Chromium(object):
|
||||
d.stop()
|
||||
self._drivers.pop(tab_id, None)
|
||||
self._all_drivers.pop(tab_id, None)
|
||||
self._relation.pop(tab_id, None)
|
||||
|
||||
def _on_disconnect(self):
|
||||
if not self._disconnect_flag:
|
||||
@ -483,8 +475,8 @@ def run_browser(chromium_options):
|
||||
return is_headless, browser_id, is_exists
|
||||
|
||||
|
||||
def _new_tab_by_js(browser: Chromium, url, tab_type, new_window):
|
||||
mix = tab_type == MixTab
|
||||
def _new_tab_by_js(browser: Chromium, url, obj, new_window):
|
||||
mix = isinstance(obj, MixTab)
|
||||
tab = browser._get_tab(mix=mix)
|
||||
if url and not match(r'^.*?://.*', url):
|
||||
raise ValueError(f'url也许需要加上http://？')
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from threading import Lock
|
||||
from typing import List, Optional, Set, Dict, Union, Tuple, Literal, Any
|
||||
@ -11,7 +12,7 @@ from .driver import BrowserDriver, Driver
|
||||
from .._configs.chromium_options import ChromiumOptions
|
||||
from .._configs.session_options import SessionOptions
|
||||
from .._functions.cookies import CookiesList
|
||||
from .._pages.chromium_base import Timeout, ChromiumBase
|
||||
from .._pages.chromium_base import Timeout
|
||||
from .._pages.chromium_tab import ChromiumTab
|
||||
from .._pages.mix_tab import MixTab
|
||||
from .._units.downloader import DownloadManager
|
||||
@ -39,7 +40,6 @@ class Chromium(object):
|
||||
_frames: dict = ...
|
||||
_drivers: Dict[str, Driver] = ...
|
||||
_all_drivers: Dict[str, Set[Driver]] = ...
|
||||
_relation: Dict[str, Optional[str]] = ...
|
||||
_process_id: Optional[int] = ...
|
||||
_dl_mgr: DownloadManager = ...
|
||||
_timeouts: Timeout = ...
|
||||
@ -51,7 +51,6 @@ class Chromium(object):
|
||||
_disconnect_flag: bool = ...
|
||||
_none_ele_return_value: bool = ...
|
||||
_none_ele_value: Any = ...
|
||||
_newest_tab_id: Optional[str] = ...
|
||||
|
||||
def __new__(cls,
|
||||
addr_or_opts: Union[str, int, ChromiumOptions] = None,
|
||||
@ -193,12 +192,6 @@ class Chromium(object):
|
||||
"""
|
||||
...
|
||||
|
||||
def _close_tab(self, tab: Union[ChromiumBase, str]):
|
||||
"""关闭一个标签页
|
||||
:param tab: 标签页对象或id
|
||||
:return: None
|
||||
"""
|
||||
|
||||
def activate_tab(self, id_ind_tab: Union[int, str, ChromiumTab]) -> None:
|
||||
"""使一个标签页显示到前端
|
||||
:param id_ind_tab: 标签页id（str）、Tab对象或标签页序号（int），序号从1开始
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from json import dumps, loads, JSONDecodeError
|
||||
from queue import Queue, Empty
|
||||
@ -198,7 +199,7 @@ class Driver(object):
|
||||
def stop(self):
|
||||
self._stop()
|
||||
while self._handle_event_th.is_alive() or self._recv_th.is_alive():
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
return True
|
||||
|
||||
def _stop(self):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from queue import Queue
|
||||
from threading import Thread
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from re import search
|
||||
@ -335,7 +336,7 @@ class ChromiumOptions(object):
|
||||
return self
|
||||
|
||||
def set_address(self, address):
|
||||
address = address.replace('localhost', '127.0.0.1').lstrip('htps:/')
|
||||
address = address.replace('localhost', '127.0.0.1').lstrip('http://').lstrip('https://')
|
||||
self._address = address
|
||||
return self
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Any, Literal, Optional, Tuple
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from configparser import RawConfigParser, NoSectionError, NoOptionError
|
||||
from pathlib import Path
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from configparser import RawConfigParser
|
||||
from pathlib import Path
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from copy import copy
|
||||
from pathlib import Path
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from http.cookiejar import CookieJar, Cookie
|
||||
from pathlib import Path
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from json import loads
|
||||
from os.path import basename
|
||||
@ -203,8 +204,6 @@ class ChromiumElement(DrissionElement):
|
||||
if (is_checked and uncheck) or (not is_checked and not uncheck):
|
||||
self.click()
|
||||
|
||||
return self
|
||||
|
||||
def parent(self, level_or_loc=1, index=1, timeout=0):
|
||||
return super().parent(level_or_loc, index, timeout=timeout)
|
||||
|
||||
@ -288,7 +287,7 @@ class ChromiumElement(DrissionElement):
|
||||
|
||||
if ele and (loc_data is None or _check_ele(ele, loc_data)):
|
||||
return ele
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
|
||||
return NoneElement(page=self.owner, method='offset()',
|
||||
args={'locator': locator, 'offset_x': x, 'offset_y': y, 'timeout': timeout})
|
||||
@ -400,7 +399,6 @@ class ChromiumElement(DrissionElement):
|
||||
|
||||
def remove_attr(self, name):
|
||||
self._run_js(f'this.removeAttribute("{name}");')
|
||||
return self
|
||||
|
||||
def property(self, name):
|
||||
try:
|
||||
@ -450,7 +448,7 @@ class ChromiumElement(DrissionElement):
|
||||
'&& this.naturalHeight > 0')
|
||||
end_time = perf_counter() + timeout
|
||||
while not self._run_js(js) and perf_counter() < end_time:
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
|
||||
src = self.attr('href') if self.tag == 'link' else self.attr('src')
|
||||
if not src:
|
||||
@ -487,7 +485,7 @@ class ChromiumElement(DrissionElement):
|
||||
break
|
||||
except CDPError:
|
||||
pass
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
|
||||
if not result:
|
||||
return None
|
||||
@ -532,7 +530,7 @@ class ChromiumElement(DrissionElement):
|
||||
'&& typeof this.naturalHeight != "undefined" && this.naturalHeight > 0')
|
||||
end_time = perf_counter() + self.timeout
|
||||
while not self._run_js(js) and perf_counter() < end_time:
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
if scroll_to_center:
|
||||
self.scroll.to_see(center=True)
|
||||
|
||||
@ -557,7 +555,7 @@ class ChromiumElement(DrissionElement):
|
||||
vals = ''.join([str(i) for i in vals])
|
||||
self.set.property('value', str(vals))
|
||||
self._run_js('this.dispatchEvent(new Event("change", {bubbles: true}));')
|
||||
return self
|
||||
return
|
||||
|
||||
self.wait.clickable(wait_moved=False, timeout=.5)
|
||||
if clear and vals not in ('\n', '\ue007'):
|
||||
@ -577,7 +575,7 @@ class ChromiumElement(DrissionElement):
|
||||
if by_js:
|
||||
self._run_js("this.value='';")
|
||||
self._run_js('this.dispatchEvent(new Event("change", {bubbles: true}));')
|
||||
return self
|
||||
return
|
||||
|
||||
self._input_focus()
|
||||
self.input(('\ue009', 'a', '\ue017'), clear=False)
|
||||
@ -649,8 +647,7 @@ class ChromiumElement(DrissionElement):
|
||||
txt1 = '''
|
||||
let i = el.getAttribute("id");
|
||||
if (i){path = '>' + el.tagName.toLowerCase() + "#" + i + path;
|
||||
el = el.parentNode;
|
||||
continue;}
|
||||
break;}
|
||||
'''
|
||||
txt3 = ''
|
||||
txt4 = '''path = '>' + el.tagName.toLowerCase() + ":nth-child(" + nth + ")" + path;'''
|
||||
@ -658,6 +655,7 @@ class ChromiumElement(DrissionElement):
|
||||
|
||||
js = '''function(){
|
||||
function e(el) {
|
||||
//return el;
|
||||
if (!(el instanceof Element)) return;
|
||||
let path = '';
|
||||
while (el.nodeType === Node.ELEMENT_NODE) {
|
||||
@ -904,7 +902,7 @@ class ShadowRoot(BaseElement):
|
||||
end_time = perf_counter() + timeout
|
||||
result = do_find()
|
||||
while result is None and perf_counter() <= end_time:
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
result = do_find()
|
||||
|
||||
if result:
|
||||
@ -1003,7 +1001,7 @@ def find_by_xpath(ele, xpath, index, timeout, relative=True):
|
||||
end_time = perf_counter() + timeout
|
||||
result = do_find()
|
||||
while result is None and perf_counter() < end_time:
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
result = do_find()
|
||||
|
||||
if result:
|
||||
@ -1042,7 +1040,7 @@ def find_by_css(ele, selector, index, timeout):
|
||||
end_time = perf_counter() + timeout
|
||||
result = do_find()
|
||||
while result is None and perf_counter() < end_time:
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
result = do_find()
|
||||
|
||||
if result:
|
||||
@ -1252,13 +1250,7 @@ def parse_js_result(page, ele, result, end_time):
|
||||
r = page._run_cdp('Runtime.getProperties', objectId=result['objectId'], ownProperties=True)['result']
|
||||
return [parse_js_result(page, ele, result=i['value'], end_time=end_time) for i in r if i['name'].isdigit()]
|
||||
|
||||
elif result.get('className') == 'Blob':
|
||||
data = page._run_cdp('IO.read',
|
||||
handle=f"blob:{page._run_cdp('IO.resolveBlob', objectId=result['objectId'])['uuid']}")[
|
||||
'data']
|
||||
return data
|
||||
|
||||
elif 'objectId' in result and result.get('className') == 'Blob':
|
||||
elif 'objectId' in result:
|
||||
timeout = end_time - perf_counter()
|
||||
if timeout < 0:
|
||||
return
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Tuple, List, Any, Literal, Optional
|
||||
@ -376,7 +377,7 @@ class ChromiumElement(DrissionElement):
|
||||
"""
|
||||
...
|
||||
|
||||
def remove_attr(self, name: str) -> ChromiumElement:
|
||||
def remove_attr(self, name: str) -> None:
|
||||
"""删除元素一个attribute属性
|
||||
:param name: 属性名
|
||||
:return: None
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from .._functions.settings import Settings
|
||||
from ..errors import ElementNotFoundError
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Any
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from html import unescape
|
||||
from re import match, sub, DOTALL, search
|
||||
@ -148,20 +149,19 @@ class SessionElement(DrissionElement):
|
||||
path_str = ''
|
||||
ele = self
|
||||
|
||||
if xpath:
|
||||
while ele:
|
||||
while ele:
|
||||
if xpath:
|
||||
brothers = len(ele.eles(f'xpath:./preceding-sibling::{ele.tag}'))
|
||||
path_str = f'/{ele.tag}[{brothers + 1}]{path_str}'
|
||||
ele = ele.parent()
|
||||
|
||||
else:
|
||||
while ele:
|
||||
else:
|
||||
id_ = ele.attr('id')
|
||||
if id_:
|
||||
path_str = f'>{ele.tag}#{id_}{path_str}'
|
||||
else:
|
||||
path_str = f'>{ele.tag}:nth-child({len(ele.eles("xpath:./preceding-sibling::*")) + 1}){path_str}'
|
||||
ele = ele.parent()
|
||||
break
|
||||
brothers = len(ele.eles(f'xpath:./preceding-sibling::*'))
|
||||
path_str = f'>{ele.tag}:nth-child({brothers + 1}){path_str}'
|
||||
|
||||
ele = ele.parent()
|
||||
|
||||
return path_str if xpath else f'{path_str[1:]}'
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union, List, Tuple, Optional
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from json import load, dump, JSONDecodeError
|
||||
from os import environ
|
||||
@ -14,7 +15,6 @@ from time import perf_counter, sleep
|
||||
|
||||
from requests import Session
|
||||
|
||||
from .settings import Settings
|
||||
from .tools import port_is_using
|
||||
from .._configs.options_manage import OptionsManager
|
||||
from ..errors import BrowserConnectError
|
||||
@ -168,8 +168,8 @@ def set_flags(opt):
|
||||
dump(states_dict, f)
|
||||
|
||||
|
||||
def test_connect(ip, port):
|
||||
end_time = perf_counter() + Settings.browser_connect_timeout
|
||||
def test_connect(ip, port, timeout=30):
|
||||
end_time = perf_counter() + timeout
|
||||
s = Session()
|
||||
s.trust_env = False
|
||||
s.keep_alive = False
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from click import command, option
|
||||
|
||||
|
||||
@ -2,14 +2,13 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from datetime import datetime
|
||||
from http.cookiejar import Cookie, CookieJar
|
||||
|
||||
from tldextract import TLDExtract
|
||||
|
||||
from .settings import Settings
|
||||
from tldextract import extract
|
||||
|
||||
|
||||
def cookie_to_dict(cookie):
|
||||
@ -114,8 +113,7 @@ def set_tab_cookies(page, cookies):
|
||||
url = page._browser_url
|
||||
if not url.startswith('http'):
|
||||
raise RuntimeError(f'未设置域名，请设置cookie的domain参数或先访问一个网站。{cookie}')
|
||||
ex_url = TLDExtract(suffix_list_urls=["https://publicsuffix.org/list/public_suffix_list.dat",
|
||||
f"file:///{Settings.suffixes_list_path}"]).extract_str(url)
|
||||
ex_url = extract(url)
|
||||
d_list = ex_url.subdomain.split('.')
|
||||
d_list.append(f'{ex_url.domain}.{ex_url.suffix}' if ex_url.suffix else ex_url.domain)
|
||||
|
||||
@ -181,8 +179,10 @@ def format_cookie(cookie):
|
||||
|
||||
if 'sameSite' in cookie:
|
||||
sameSite = cookie['sameSite']
|
||||
if sameSite in (None, False) or sameSite not in ('None', 'Lax', 'Strict', 'no_restriction'):
|
||||
if sameSite in (None, False):
|
||||
cookie.pop('sameSite')
|
||||
elif sameSite not in ('None', 'Lax', 'Strict'):
|
||||
raise ValueError(f'{cookie}\nsameSite字段必须为"None"、"Lax"、"Strict"之一。')
|
||||
|
||||
if 'priority' in cookie:
|
||||
priority = cookie['priority']
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from http.cookiejar import Cookie
|
||||
from typing import Union
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from time import perf_counter, sleep
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union, List, Optional, Iterable, Dict
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from platform import system
|
||||
|
||||
@ -235,7 +236,7 @@ keyDefinitions = {
|
||||
'\ue020': {'keyCode': 54, 'code': 'Digit6', 'shiftKey': '^', 'key': '6'},
|
||||
'\ue021': {'keyCode': 55, 'code': 'Digit7', 'shiftKey': '&', 'key': '7'},
|
||||
'\ue022': {'keyCode': 56, 'code': 'Digit8', 'shiftKey': '*', 'key': '8'},
|
||||
'\ue023': {'keyCode': 57, 'code': 'Digit9', 'shiftKey': r'\(', 'key': '9'},
|
||||
'\ue023': {'keyCode': 57, 'code': 'Digit9', 'shiftKey': '\(', 'key': '9'},
|
||||
'\ue024': {'keyCode': 106, 'code': 'NumpadMultiply', 'key': '*', 'location': 3},
|
||||
'\ue025': {'keyCode': 107, 'code': 'NumpadAdd', 'key': '+', 'location': 3},
|
||||
'\ue027': {'keyCode': 109, 'code': 'NumpadSubtract', 'key': '-', 'location': 3},
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Tuple, Union, Any
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from re import split
|
||||
from .by import By
|
||||
@ -135,14 +136,14 @@ def str_to_xpath_loc(loc):
|
||||
|
||||
# 根据文本查找
|
||||
elif loc.startswith('text='):
|
||||
loc_str = f'//*[text()={_quotes_escape(loc[5:])}]'
|
||||
loc_str = f'//*[text()={_make_search_str(loc[5:])}]'
|
||||
elif loc.startswith('text:') and loc != 'text:':
|
||||
loc_str = f'//*/text()[contains(., {_quotes_escape(loc[5:])})]/..'
|
||||
loc_str = f'//*/text()[contains(., {_make_search_str(loc[5:])})]/..'
|
||||
elif loc.startswith('text^') and loc != 'text^':
|
||||
loc_str = f'//*/text()[starts-with(., {_quotes_escape(loc[5:])})]/..'
|
||||
loc_str = f'//*/text()[starts-with(., {_make_search_str(loc[5:])})]/..'
|
||||
elif loc.startswith('text$') and loc != 'text$':
|
||||
loc_str = (f'//*/text()[substring(., string-length(.) - string-length({_quotes_escape(loc[5:])}) +1) = '
|
||||
f'{_quotes_escape(loc[5:])}]/..')
|
||||
loc_str = f'//*/text()[substring(., string-length(.) - string-length({_make_search_str(loc[5:])}) +1) = ' \
|
||||
f'{_make_search_str(loc[5:])}]/..'
|
||||
|
||||
# 用xpath查找
|
||||
elif loc.startswith(('xpath:', 'xpath=')) and loc not in ('xpath:', 'xpath='):
|
||||
@ -155,7 +156,7 @@ def str_to_xpath_loc(loc):
|
||||
|
||||
# 根据文本模糊查找
|
||||
elif loc:
|
||||
loc_str = f'//*/text()[contains(., {_quotes_escape(loc)})]/..'
|
||||
loc_str = f'//*/text()[contains(., {_make_search_str(loc)})]/..'
|
||||
else:
|
||||
loc_str = '//*'
|
||||
|
||||
@ -225,30 +226,30 @@ def _make_single_xpath_str(tag: str, text: str) -> tuple:
|
||||
symbol = r[1]
|
||||
if symbol == '=': # 精确查找
|
||||
arg = 'text()' if r[0] in ('@text()', '@tx()') else r[0]
|
||||
arg_str = f'{arg}={_quotes_escape(r[2])}'
|
||||
arg_str = f'{arg}={_make_search_str(r[2])}'
|
||||
|
||||
elif symbol == '^': # 匹配开头
|
||||
if r[0] in ('@text()', '@tx()'):
|
||||
txt_str = f'/text()[starts-with(., {_quotes_escape(r[2])})]/..'
|
||||
txt_str = f'/text()[starts-with(., {_make_search_str(r[2])})]/..'
|
||||
arg_str = ''
|
||||
else:
|
||||
arg_str = f"starts-with({r[0]},{_quotes_escape(r[2])})"
|
||||
arg_str = f"starts-with({r[0]},{_make_search_str(r[2])})"
|
||||
|
||||
elif symbol == '$': # 匹配结尾
|
||||
if r[0] in ('@text()', '@tx()'):
|
||||
txt_str = (f'/text()[substring(., string-length(.) - string-length('
|
||||
f'{_quotes_escape(r[2])}) +1) = {_quotes_escape(r[2])}]/..')
|
||||
txt_str = (f'/text()[substring(., string-length(.) - string-length({_make_search_str(r[2])}) '
|
||||
f'+1) = {_make_search_str(r[2])}]/..')
|
||||
arg_str = ''
|
||||
else:
|
||||
arg_str = (f'substring({r[0]}, string-length({r[0]}) - string-length('
|
||||
f'{_quotes_escape(r[2])}) +1) = {_quotes_escape(r[2])}')
|
||||
arg_str = (f'substring({r[0]}, string-length({r[0]}) - string-length({_make_search_str(r[2])}) '
|
||||
f'+1) = {_make_search_str(r[2])}')
|
||||
|
||||
elif symbol == ':': # 模糊查找
|
||||
if r[0] in ('@text()', '@tx()'):
|
||||
txt_str = f'/text()[contains(., {_quotes_escape(r[2])})]/..'
|
||||
txt_str = f'/text()[contains(., {_make_search_str(r[2])})]/..'
|
||||
arg_str = ''
|
||||
else:
|
||||
arg_str = f"contains({r[0]},{_quotes_escape(r[2])})"
|
||||
arg_str = f"contains({r[0]},{_make_search_str(r[2])})"
|
||||
|
||||
else:
|
||||
raise ValueError(f'符号不正确：{symbol}')
|
||||
@ -312,17 +313,17 @@ def _make_multi_xpath_str(tag: str, text: str) -> tuple:
|
||||
txt = r[2]
|
||||
|
||||
if symbol == '=':
|
||||
arg_str = f'{arg}={_quotes_escape(txt)}'
|
||||
arg_str = f'{arg}={_make_search_str(txt)}'
|
||||
|
||||
elif symbol == ':':
|
||||
arg_str = f'contains({arg},{_quotes_escape(txt)})'
|
||||
arg_str = f'contains({arg},{_make_search_str(txt)})'
|
||||
|
||||
elif symbol == '^':
|
||||
arg_str = f'starts-with({arg},{_quotes_escape(txt)})'
|
||||
arg_str = f'starts-with({arg},{_make_search_str(txt)})'
|
||||
|
||||
elif symbol == '$':
|
||||
arg_str = (f'substring({arg}, string-length({arg}) - string-length('
|
||||
f'{_quotes_escape(txt)}) +1) = {_quotes_escape(txt)}')
|
||||
arg_str = f'substring({arg}, string-length({arg}) - string-length({_make_search_str(txt)}) +1) ' \
|
||||
f'= {_make_search_str(txt)}'
|
||||
|
||||
else:
|
||||
raise ValueError(f'符号不正确：{symbol}')
|
||||
@ -341,14 +342,11 @@ def _make_multi_xpath_str(tag: str, text: str) -> tuple:
|
||||
return 'xpath', f'//*[{arg_str}]' if arg_str else f'//*'
|
||||
|
||||
|
||||
def _quotes_escape(search_str: str) -> str:
|
||||
"""将"转义，不知何故不能直接用 斜杠 来转义
|
||||
def _make_search_str(search_str: str) -> str:
|
||||
"""将"转义，不知何故不能直接用 \ 来转义
|
||||
:param search_str: 查询字符串
|
||||
:return: 把"转义后的字符串
|
||||
"""
|
||||
if '"' not in search_str:
|
||||
return f'"{search_str}"'
|
||||
|
||||
parts = search_str.split('"')
|
||||
parts_num = len(parts)
|
||||
search_str = 'concat('
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union
|
||||
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
class Settings(object):
|
||||
@ -13,14 +13,4 @@ class Settings(object):
|
||||
raise_when_wait_failed = False
|
||||
singleton_tab_obj = True
|
||||
cdp_timeout = 30
|
||||
browser_connect_timeout = 30
|
||||
auto_handle_alert = None
|
||||
_suffixes_list = str(Path(__file__).parent.absolute() / 'suffixes.dat').replace('\\', '/')
|
||||
|
||||
@property
|
||||
def suffixes_list_path(self):
|
||||
return Settings._suffixes_list
|
||||
|
||||
@suffixes_list_path.setter
|
||||
def suffixes_list_path(self, path):
|
||||
Settings._suffixes_list = str(Path(path).absolute()).replace('\\', '/')
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
# -*- coding:utf-8 -*-
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Optional, Union
|
||||
|
||||
|
||||
class Settings(object):
|
||||
raise_when_ele_not_found: bool = ...
|
||||
raise_when_click_failed: bool = ...
|
||||
raise_when_wait_failed: bool = ...
|
||||
singleton_tab_obj: bool = ...
|
||||
cdp_timeout: float = ...
|
||||
browser_connect_timeout: float = ...
|
||||
auto_handle_alert: Optional[bool] = ...
|
||||
_suffixes_list: str = ...
|
||||
|
||||
@property
|
||||
def suffixes_list_path(self) -> str:
|
||||
"""设置用于识别域名后缀的文件路径"""
|
||||
...
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from platform import system
|
||||
@ -156,7 +157,7 @@ def configs_to_here(save_name=None):
|
||||
om.save(save_name)
|
||||
|
||||
|
||||
def raise_error(result, browser, ignore=None, user=False):
|
||||
def raise_error(result, ignore=None, user=False):
|
||||
error = result['error']
|
||||
if error in ('Cannot find context with specified id', 'Inspected target navigated or closed',
|
||||
'No frame with given id found'):
|
||||
@ -182,7 +183,7 @@ def raise_error(result, browser, ignore=None, user=False):
|
||||
elif error == 'Given expression does not evaluate to a function':
|
||||
r = JavaScriptError(f'传入的js无法解析成函数：\n{result["args"]["functionDeclaration"]}')
|
||||
elif error.endswith("' wasn't found"):
|
||||
r = RuntimeError(f'没有找到对应功能，方法错误或你的浏览器太旧。\n浏览器版本：{browser.version}\n方法：{result["method"]}')
|
||||
r = RuntimeError(f'没有找到对应功能，方法错误或你的浏览器太旧。\n方法：{result["method"]}\n参数：{result["args"]}')
|
||||
elif result['type'] == 'timeout':
|
||||
from DrissionPage import __version__
|
||||
txt = f'\n错误：{result["error"]}\n方法：{result["method"]}\n参数：{result["args"]}\n' \
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from os import popen
|
||||
from pathlib import Path
|
||||
from threading import Lock
|
||||
from typing import Union, Tuple
|
||||
|
||||
from .._base.chromium import Chromium
|
||||
from .._pages.chromium_base import ChromiumBase
|
||||
|
||||
|
||||
@ -98,10 +98,9 @@ def configs_to_here(save_name: Union[Path, str] = None) -> None:
|
||||
...
|
||||
|
||||
|
||||
def raise_error(result: dict, browser: Chromium, ignore=None, user: bool = False) -> None:
|
||||
def raise_error(result: dict, ignore=None, user: bool = False) -> None:
|
||||
"""抛出error对应报错
|
||||
:param result: 包含error的dict
|
||||
:param browser: 浏览器对象
|
||||
:param ignore: 要忽略的错误
|
||||
:param user: 是否用户调用的
|
||||
:return: None
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from html import unescape
|
||||
from os.path import sep
|
||||
@ -301,10 +302,10 @@ def tree(ele_or_page, text=False, show_js=False, show_css=False):
|
||||
def format_headers(txt):
|
||||
if isinstance(txt, (dict, CaseInsensitiveDict)):
|
||||
for k, v in txt.items():
|
||||
if v not in (None, False, True):
|
||||
if k in (':method', ':scheme', ':authority', ':path'):
|
||||
txt.pop(k)
|
||||
elif v not in (None, False, True):
|
||||
txt[k] = str(v)
|
||||
for i in (':method', ':scheme', ':authority', ':path'):
|
||||
txt.pop(i, None)
|
||||
return txt
|
||||
headers = {}
|
||||
for header in txt.split('\n'):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Optional, Tuple
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from json import loads, JSONDecodeError
|
||||
from os.path import sep
|
||||
@ -32,7 +33,7 @@ from .._units.scroller import PageScroller
|
||||
from .._units.setter import ChromiumBaseSetter
|
||||
from .._units.states import PageStates
|
||||
from .._units.waiter import BaseWaiter
|
||||
from ..errors import ContextLostError, CDPError, PageDisconnectedError, ElementLostError, JavaScriptError
|
||||
from ..errors import ContextLostError, CDPError, PageDisconnectedError, ElementLostError
|
||||
|
||||
__ERROR__ = 'error'
|
||||
|
||||
@ -149,7 +150,7 @@ class ChromiumBase(BasePage):
|
||||
except:
|
||||
timeout = end_time - perf_counter()
|
||||
timeout = .5 if timeout <= 0 else timeout
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
|
||||
else:
|
||||
result = False
|
||||
@ -222,7 +223,7 @@ class ChromiumBase(BasePage):
|
||||
def _wait_to_stop(self):
|
||||
end_time = perf_counter() + self.timeouts.page_load
|
||||
while perf_counter() < end_time:
|
||||
sleep(.02)
|
||||
sleep(.1)
|
||||
if self._ready_state in ('interactive', 'complete') and self._is_loading:
|
||||
self.stop_loading()
|
||||
|
||||
@ -369,17 +370,17 @@ class ChromiumBase(BasePage):
|
||||
|
||||
def run_cdp(self, cmd, **cmd_args):
|
||||
r = self.driver.run(cmd, **cmd_args)
|
||||
return r if __ERROR__ not in r else raise_error(r, self.browser, user=True)
|
||||
return r if __ERROR__ not in r else raise_error(r, user=True)
|
||||
|
||||
def run_cdp_loaded(self, cmd, **cmd_args):
|
||||
self.wait.doc_loaded()
|
||||
r = self.driver.run(cmd, **cmd_args)
|
||||
return r if __ERROR__ not in r else raise_error(r, self.browser, user=True)
|
||||
return r if __ERROR__ not in r else raise_error(r, user=True)
|
||||
|
||||
def _run_cdp(self, cmd, **cmd_args):
|
||||
ignore = cmd_args.pop('_ignore', None)
|
||||
r = self.driver.run(cmd, **cmd_args)
|
||||
return r if __ERROR__ not in r else raise_error(r, self.browser, ignore)
|
||||
return r if __ERROR__ not in r else raise_error(r, ignore)
|
||||
|
||||
def _run_cdp_loaded(self, cmd, **cmd_args):
|
||||
self.wait.doc_loaded()
|
||||
@ -485,7 +486,7 @@ class ChromiumBase(BasePage):
|
||||
if perf_counter() >= end_time:
|
||||
return NoneElement(self) if index is not None else ChromiumElementsList(owner=self)
|
||||
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
timeout = end_time - perf_counter()
|
||||
timeout = .5 if timeout <= 0 else timeout
|
||||
result = self.driver.run('DOM.performSearch', query=loc, _timeout=timeout, includeUserAgentShadowDOM=True)
|
||||
@ -538,7 +539,7 @@ class ChromiumBase(BasePage):
|
||||
self._run_cdp('Page.stopLoading')
|
||||
end_time = perf_counter() + 5
|
||||
while self._ready_state != 'complete' and perf_counter() < end_time:
|
||||
sleep(.02)
|
||||
sleep(.1)
|
||||
except (PageDisconnectedError, CDPError):
|
||||
pass
|
||||
finally:
|
||||
@ -599,10 +600,7 @@ class ChromiumBase(BasePage):
|
||||
else:
|
||||
raise TypeError('html_or_info参数必须是html文本或tuple，tuple格式为(tag, {name: value})。')
|
||||
|
||||
try:
|
||||
ele = self._run_js(js, *args)
|
||||
except JavaScriptError:
|
||||
raise RuntimeError('此网页不支持html格式新建元素，请用dict传入html_or_info参数。')
|
||||
ele = self._run_js(js, *args)
|
||||
return ele
|
||||
|
||||
def get_frame(self, loc_ind_ele, timeout=None):
|
||||
@ -675,11 +673,11 @@ class ChromiumBase(BasePage):
|
||||
self._get_document()
|
||||
|
||||
def handle_alert(self, accept=True, send=None, timeout=None, next_one=False):
|
||||
if not isinstance(accept, bool):
|
||||
return self._handle_alert(accept=accept, send=send, timeout=timeout, next_one=next_one)
|
||||
r = self._handle_alert(accept=accept, send=send, timeout=timeout, next_one=next_one)
|
||||
if not isinstance(accept, bool):
|
||||
return r
|
||||
while self._has_alert:
|
||||
sleep(.0001)
|
||||
sleep(.1)
|
||||
return r
|
||||
|
||||
def _handle_alert(self, accept=True, send=None, timeout=None, next_one=False):
|
||||
@ -692,7 +690,7 @@ class ChromiumBase(BasePage):
|
||||
timeout = .1 if timeout <= 0 else timeout
|
||||
end_time = perf_counter() + timeout
|
||||
while not self._alert.activated and perf_counter() < end_time:
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
if not self._alert.activated:
|
||||
return False
|
||||
|
||||
@ -743,7 +741,7 @@ class ChromiumBase(BasePage):
|
||||
'complete') and not self._is_loading:
|
||||
return True
|
||||
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
|
||||
try:
|
||||
self.stop_loading()
|
||||
@ -772,7 +770,7 @@ class ChromiumBase(BasePage):
|
||||
print(f'重试{t + 1} {to_url}')
|
||||
end_time1 = end_time - perf_counter()
|
||||
while self._ready_state not in ('loading', 'complete') and perf_counter() < end_time1: # 等待出错信息显示
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
self.stop_loading()
|
||||
continue
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Tuple, Any, Optional, Literal
|
||||
@ -266,7 +267,7 @@ class ChromiumBase(BasePage):
|
||||
...
|
||||
|
||||
@property
|
||||
def session(self) -> Session:
|
||||
def session(self)->Session:
|
||||
"""返回用于转换模式或download的Session对象"""
|
||||
...
|
||||
|
||||
@ -478,8 +479,7 @@ class ChromiumBase(BasePage):
|
||||
def add_ele(self,
|
||||
html_or_info: Union[str, Tuple[str, dict]],
|
||||
insert_to: Union[ChromiumElement, str, Tuple[str, str], None] = None,
|
||||
before: Union[ChromiumElement, str, Tuple[str, str], None] = None) -> Union[
|
||||
ChromiumElement, ChromiumFrame]:
|
||||
before: Union[ChromiumElement, str, Tuple[str, str], None] = None) -> ChromiumElement:
|
||||
"""新建一个元素
|
||||
:param html_or_info: 新元素的html文本或信息。信息格式为：(tag, {attr1: value, ...})
|
||||
:param insert_to: 插入到哪个元素中，可接收元素对象和定位符，为None且为html添加到body，不为html不插入
|
||||
@ -573,10 +573,7 @@ class ChromiumBase(BasePage):
|
||||
"""
|
||||
...
|
||||
|
||||
def handle_alert(self,
|
||||
accept: Optional[bool] = True,
|
||||
send: str = None,
|
||||
timeout: float = None,
|
||||
def handle_alert(self, accept: Optional[bool] = True, send: str = None, timeout: float = None,
|
||||
next_one: bool = False) -> Union[str, False]:
|
||||
"""处理提示框，可以自动等待提示框出现
|
||||
:param accept: True表示确认，False表示取消，为None不会按按钮但依然返回文本值
|
||||
@ -587,10 +584,7 @@ class ChromiumBase(BasePage):
|
||||
"""
|
||||
...
|
||||
|
||||
def _handle_alert(self,
|
||||
accept: Optional[bool] = True,
|
||||
send: str = None,
|
||||
timeout: float = None,
|
||||
def _handle_alert(self, accept: bool = True, send: str = None, timeout: float = None,
|
||||
next_one: bool = False) -> Union[str, False]:
|
||||
"""处理提示框，可以自动等待提示框出现
|
||||
:param accept: True表示确认，False表示取消，其它值不会按按钮但依然返回文本值
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from copy import copy
|
||||
from re import search, findall, DOTALL
|
||||
@ -34,7 +35,7 @@ class ChromiumFrame(ChromiumBase):
|
||||
if Settings.singleton_tab_obj and fid in cls._Frames:
|
||||
r = cls._Frames[fid]
|
||||
while not hasattr(r, '_type') or r._type != 'ChromiumFrame':
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
return r
|
||||
r = object.__new__(cls)
|
||||
cls._Frames[fid] = r
|
||||
@ -332,9 +333,6 @@ class ChromiumFrame(ChromiumBase):
|
||||
def remove_attr(self, name):
|
||||
self.frame_ele.remove_attr(name)
|
||||
|
||||
def style(self, style, pseudo_ele=''):
|
||||
return self.frame_ele.style(style=style, pseudo_ele=pseudo_ele)
|
||||
|
||||
def run_js(self, script, *args, as_expr=False, timeout=None):
|
||||
return self._run_js(script, *args, as_expr=as_expr, timeout=timeout)
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Tuple, List, Any, Optional, Literal
|
||||
@ -239,14 +240,6 @@ class ChromiumFrame(ChromiumBase):
|
||||
"""
|
||||
...
|
||||
|
||||
def style(self, style: str, pseudo_ele: str = '') -> str:
|
||||
"""返回frame元素样式属性值，可获取伪元素属性值
|
||||
:param style: 样式属性名称
|
||||
:param pseudo_ele: 伪元素名称（如有）
|
||||
:return: 样式属性的值
|
||||
"""
|
||||
...
|
||||
|
||||
def run_js(self,
|
||||
script: str,
|
||||
*args,
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from time import sleep
|
||||
|
||||
@ -23,7 +24,7 @@ class ChromiumPage(ChromiumBase):
|
||||
if browser.id in cls._PAGES:
|
||||
r = cls._PAGES[browser.id]
|
||||
while not hasattr(r, '_frame_id'):
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
return r
|
||||
|
||||
r = object.__new__(cls)
|
||||
@ -42,7 +43,6 @@ class ChromiumPage(ChromiumBase):
|
||||
self._type = 'ChromiumPage'
|
||||
self.set.timeouts(base=timeout) # 即将废弃
|
||||
self._tab = self
|
||||
self._browser._dl_mgr._page_id = self.tab_id
|
||||
|
||||
def __repr__(self):
|
||||
return f'<ChromiumPage browser_id={self.browser.id} tab_id={self.tab_id}>'
|
||||
@ -96,10 +96,6 @@ class ChromiumPage(ChromiumBase):
|
||||
def address(self):
|
||||
return self.browser.address
|
||||
|
||||
@property
|
||||
def download_path(self):
|
||||
return self.browser.download_path
|
||||
|
||||
def save(self, path=None, name=None, as_pdf=False, **kwargs):
|
||||
return save_page(self, path, name, as_pdf, kwargs)
|
||||
|
||||
@ -118,10 +114,10 @@ class ChromiumPage(ChromiumBase):
|
||||
self.browser.activate_tab(id_ind_tab)
|
||||
|
||||
def close(self):
|
||||
self.browser._close_tab(self)
|
||||
self.close_tabs(self.tab_id)
|
||||
|
||||
def close_tabs(self, tabs_or_ids, others=False):
|
||||
self.browser.close_tabs(tabs_or_ids=tabs_or_ids, others=others)
|
||||
def close_tabs(self, tabs_or_ids=None, others=False):
|
||||
self.browser.close_tabs(tabs_or_ids=tabs_or_ids or self.tab_id, others=others)
|
||||
|
||||
def quit(self, timeout=5, force=True, del_data=False):
|
||||
self.browser.quit(timeout, force, del_data=del_data)
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Tuple, List, Optional
|
||||
@ -197,10 +198,10 @@ class ChromiumPage(ChromiumBase):
|
||||
|
||||
def close_tabs(self,
|
||||
tabs_or_ids: Union[str, ChromiumTab, List[Union[str, ChromiumTab]],
|
||||
Tuple[Union[str, ChromiumTab]]],
|
||||
Tuple[Union[str, ChromiumTab]]] = None,
|
||||
others: bool = False) -> None:
|
||||
"""关闭传入的标签页，可传入多个
|
||||
:param tabs_or_ids: 要关闭的标签页对象或id，可传入列表或元组
|
||||
"""关闭传入的标签页，默认关闭当前页。可传入多个
|
||||
:param tabs_or_ids: 要关闭的标签页对象或id，可传入列表或元组，为None时关闭当前页
|
||||
:param others: 是否关闭指定标签页之外的
|
||||
:return: None
|
||||
"""
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from copy import copy
|
||||
from time import sleep
|
||||
@ -21,7 +22,7 @@ class ChromiumTab(ChromiumBase):
|
||||
if Settings.singleton_tab_obj and tab_id in cls._TABS:
|
||||
r = cls._TABS[tab_id]
|
||||
while not hasattr(r, '_frame_id'):
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
return r
|
||||
r = object.__new__(cls)
|
||||
cls._TABS[tab_id] = r
|
||||
@ -50,10 +51,7 @@ class ChromiumTab(ChromiumBase):
|
||||
self._none_ele_value = self.browser._none_ele_value
|
||||
|
||||
def close(self, others=False):
|
||||
if others:
|
||||
self.browser.close_tabs(self.tab_id, others=True)
|
||||
else:
|
||||
self.browser._close_tab(self)
|
||||
self.browser.close_tabs(self.tab_id, others=others)
|
||||
|
||||
@property
|
||||
def set(self):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Optional
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from .chromium_tab import ChromiumTab
|
||||
from .._base.base import BasePage
|
||||
@ -178,10 +179,7 @@ class MixTab(SessionPage, ChromiumTab, BasePage):
|
||||
else super().cookies(all_domains, all_info)
|
||||
|
||||
def close(self, others=False, session=False):
|
||||
if others:
|
||||
self.browser.close_tabs(self.tab_id, others=True)
|
||||
else:
|
||||
self.browser._close_tab(self)
|
||||
self.browser.close_tabs(self.tab_id, others=others)
|
||||
if session and self._session:
|
||||
self._session.close()
|
||||
if self._response is not None:
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from http.cookiejar import CookieJar
|
||||
from typing import Union, Tuple, Any, Optional, Literal
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from re import search, DOTALL
|
||||
@ -11,12 +12,11 @@ from urllib.parse import urlparse
|
||||
|
||||
from requests import Response
|
||||
from requests.structures import CaseInsensitiveDict
|
||||
from tldextract import TLDExtract
|
||||
from tldextract import extract
|
||||
|
||||
from .._base.base import BasePage
|
||||
from .._elements.session_element import SessionElement, make_session_ele
|
||||
from .._functions.cookies import cookie_to_dict, CookiesList
|
||||
from .._functions.settings import Settings
|
||||
from .._functions.web import format_headers
|
||||
from .._units.setter import SessionPageSetter
|
||||
|
||||
@ -155,9 +155,7 @@ class SessionPage(BasePage):
|
||||
cookies = self.session.cookies
|
||||
else:
|
||||
if self.url:
|
||||
ex_url = TLDExtract(
|
||||
suffix_list_urls=["https://publicsuffix.org/list/public_suffix_list.dat",
|
||||
f"file:///{Settings.suffixes_list_path}"]).extract_str(self._session_url)
|
||||
ex_url = extract(self._session_url)
|
||||
domain = f'{ex_url.domain}.{ex_url.suffix}' if ex_url.suffix else ex_url.domain
|
||||
cookies = tuple(c for c in self.session.cookies if domain in c.domain or c.domain == '')
|
||||
else:
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Any, Union, Tuple, Optional
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from .chromium_page import ChromiumPage
|
||||
from .session_page import SessionPage
|
||||
@ -111,10 +112,6 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
|
||||
def timeout(self):
|
||||
return self.timeouts.base if self._d_mode else self._timeout
|
||||
|
||||
@property
|
||||
def download_path(self):
|
||||
return self.browser.download_path
|
||||
|
||||
def get(self, url, show_errmsg=False, retry=None, interval=None, timeout=None, **kwargs):
|
||||
if self._d_mode:
|
||||
return super(SessionPage, self).get(url, show_errmsg, retry, interval, timeout)
|
||||
@ -126,8 +123,9 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
|
||||
def post(self, url, show_errmsg=False, retry=None, interval=None, **kwargs):
|
||||
if self.mode == 'd':
|
||||
self.cookies_to_session()
|
||||
super().post(url, show_errmsg, retry, interval, **kwargs)
|
||||
return self.response
|
||||
super().post(url, show_errmsg, retry, interval, **kwargs)
|
||||
return self.response
|
||||
return super().post(url, show_errmsg, retry, interval, **kwargs)
|
||||
|
||||
def ele(self, locator, index=1, timeout=None):
|
||||
return (super(SessionPage, self).ele(locator, index=index, timeout=timeout)
|
||||
@ -230,7 +228,7 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
|
||||
|
||||
def close(self):
|
||||
if self._has_driver:
|
||||
self.browser._close_tab(self)
|
||||
self.close_tabs(self.tab_id)
|
||||
if self._session:
|
||||
self._session.close()
|
||||
if self._response is not None:
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from http.cookiejar import CookieJar
|
||||
from typing import Union, Tuple, List, Any, Optional, Literal
|
||||
@ -18,7 +19,6 @@ from .._configs.chromium_options import ChromiumOptions
|
||||
from .._configs.session_options import SessionOptions
|
||||
from .._elements.chromium_element import ChromiumElement
|
||||
from .._elements.session_element import SessionElement
|
||||
from .._functions.cookies import CookiesList
|
||||
from .._functions.elements import SessionElementsList, ChromiumElementsList
|
||||
from .._units.setter import WebPageSetter
|
||||
from .._units.waiter import WebPageWaiter
|
||||
@ -285,7 +285,7 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
|
||||
|
||||
def cookies(self,
|
||||
all_domains: bool = False,
|
||||
all_info: bool = False) -> CookiesList:
|
||||
all_info: bool = False) -> Union[dict, list]:
|
||||
"""返回cookies
|
||||
:param all_domains: 是否返回所有域的cookies
|
||||
:param all_info: 是否返回所有信息，False则只返回name、value、domain
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from time import sleep, perf_counter
|
||||
|
||||
@ -178,7 +179,7 @@ class Actions:
|
||||
self.owner._run_cdp('Input.dispatchKeyEvent', **data)
|
||||
return self
|
||||
|
||||
def type(self, keys, interval=0):
|
||||
def type(self, keys):
|
||||
modifiers = []
|
||||
if not isinstance(keys, (str, tuple, list)):
|
||||
keys = str(keys)
|
||||
@ -196,7 +197,6 @@ class Actions:
|
||||
|
||||
else:
|
||||
self.owner._run_cdp('Input.dispatchKeyEvent', type='char', text=character)
|
||||
sleep(interval)
|
||||
|
||||
for m in modifiers:
|
||||
self.key_up(m)
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union, Tuple, Any, Literal
|
||||
|
||||
@ -65,7 +66,7 @@ class Actions:
|
||||
:param offset_x: 偏移量x
|
||||
:param offset_y: 偏移量y
|
||||
:param duration: 拖动用时，传入0即瞬间到达
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
@ -74,7 +75,7 @@ class Actions:
|
||||
:param offset_x: 偏移量x
|
||||
:param offset_y: 偏移量y
|
||||
:param duration: 拖动用时，传入0即瞬间到达
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
@ -82,7 +83,7 @@ class Actions:
|
||||
"""点击鼠标左键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:param times: 点击次数
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
@ -90,7 +91,7 @@ class Actions:
|
||||
"""点击鼠标右键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:param times: 点击次数
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
@ -98,49 +99,49 @@ class Actions:
|
||||
"""点击鼠标中键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:param times: 点击次数
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def hold(self, on_ele: Union[ChromiumElement, str] = None) -> Actions:
|
||||
"""按住鼠标左键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def release(self, on_ele: Union[ChromiumElement, str] = None) -> Actions:
|
||||
"""释放鼠标左键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def r_hold(self, on_ele: Union[ChromiumElement, str] = None) -> Actions:
|
||||
"""按住鼠标右键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def r_release(self, on_ele: Union[ChromiumElement, str] = None) -> Actions:
|
||||
"""释放鼠标右键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def m_hold(self, on_ele: Union[ChromiumElement, str] = None) -> Actions:
|
||||
"""按住鼠标中键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def m_release(self, on_ele: Union[ChromiumElement, str] = None) -> Actions:
|
||||
"""释放鼠标中键，可先移动到元素上
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
@ -152,14 +153,14 @@ class Actions:
|
||||
:param on_ele: ChromiumElement元素或文本定位符
|
||||
:param button: 要按下的按键
|
||||
:param count: 点击次数
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def _release(self, button: str) -> Actions:
|
||||
"""释放鼠标按键
|
||||
:param button: 要释放的按键
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
@ -169,66 +170,63 @@ class Actions:
|
||||
:param delta_y: 滚轮变化值y
|
||||
:param delta_x: 滚轮变化值x
|
||||
:param on_ele: ChromiumElement元素
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def up(self, pixel: int) -> Actions:
|
||||
"""鼠标向上移动若干像素
|
||||
:param pixel: 鼠标移动的像素值
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def down(self, pixel: int) -> Actions:
|
||||
"""鼠标向下移动若干像素
|
||||
:param pixel: 鼠标移动的像素值
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def left(self, pixel: int) -> Actions:
|
||||
"""鼠标向左移动若干像素
|
||||
:param pixel: 鼠标移动的像素值
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def right(self, pixel: int) -> Actions:
|
||||
"""鼠标向右移动若干像素
|
||||
:param pixel: 鼠标移动的像素值
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def key_down(self, key: Union[KEYS, str]) -> Actions:
|
||||
"""按下键盘上的按键，
|
||||
:param key: 使用Keys获取的按键，或 'DEL' 形式按键名称
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def key_up(self, key: Union[KEYS, str]) -> Actions:
|
||||
"""提起键盘上的按键
|
||||
:param key: 按键，特殊字符见Keys
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def type(self,
|
||||
keys: Union[KEYS, str, list, tuple],
|
||||
interval: float = 0) -> Actions:
|
||||
def type(self, keys: Union[KEYS, str, list, tuple]) -> Actions:
|
||||
"""用模拟键盘按键方式输入文本，可输入字符串，也可输入组合键
|
||||
:param keys: 要按下的按键，特殊字符和多个文本可用list或tuple传入
|
||||
:param interval: 每个字符之间间隔时间
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
def input(self, text: Any) -> Actions:
|
||||
"""输入文本，也可输入组合键，组合键用tuple形式输入
|
||||
:param text: 文本值或按键组合
|
||||
:return: 动作链对象本身
|
||||
:return: self
|
||||
"""
|
||||
...
|
||||
|
||||
|
||||
@ -2,15 +2,14 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from time import perf_counter, sleep
|
||||
|
||||
from .waiter import wait_mission
|
||||
from .._functions.settings import Settings
|
||||
from .._functions.web import offset_scroll
|
||||
from .._units.downloader import TabDownloadSettings
|
||||
from ..errors import CanNotClickError, CDPError, NoRectError, AlertExistsError
|
||||
|
||||
|
||||
@ -119,59 +118,25 @@ class Clicker(object):
|
||||
def multi(self, times=2):
|
||||
return self.at(count=times)
|
||||
|
||||
def to_download(self, save_path=None, rename=None, suffix=None, new_tab=None, by_js=False, timeout=None):
|
||||
def to_download(self, save_path=None, rename=None, suffix=None, new_tab=False, by_js=False, timeout=None):
|
||||
tmp_save_path = None
|
||||
if not self._ele.tab._browser._dl_mgr._running:
|
||||
self._ele.tab._browser.set.download_path('.')
|
||||
|
||||
when_file_exists = None
|
||||
tmp_path = None
|
||||
if self._ele.tab._type.endswith('Page'):
|
||||
obj = browser = self._ele.owner._browser
|
||||
tid = 'browser'
|
||||
|
||||
elif new_tab:
|
||||
obj = browser = self._ele.owner._browser
|
||||
tid = 'browser'
|
||||
t_settings = TabDownloadSettings(self._ele.owner.tab_id)
|
||||
b_settings = TabDownloadSettings('browser')
|
||||
|
||||
when_file_exists = b_settings.when_file_exists
|
||||
b_settings.when_file_exists = t_settings.when_file_exists
|
||||
b_settings.rename = t_settings.rename
|
||||
b_settings.suffix = t_settings.suffix
|
||||
t_settings.rename = None
|
||||
t_settings.suffix = None
|
||||
if not save_path and b_settings.path != t_settings.path:
|
||||
tmp_path = b_settings.path
|
||||
b_settings.path = t_settings.path
|
||||
|
||||
else:
|
||||
obj = self._ele.owner._tab
|
||||
browser = obj.browser
|
||||
browser._dl_mgr._waiting_tab.add(self._ele.owner.tab_id)
|
||||
tid = obj.tab_id
|
||||
|
||||
if save_path:
|
||||
tmp_path = obj.download_path
|
||||
TabDownloadSettings(tid).path = str(Path(save_path).absolute())
|
||||
if new_tab:
|
||||
tmp_save_path = str(Path(save_path).absolute())
|
||||
else:
|
||||
self._ele.tab.set.download_path(save_path)
|
||||
|
||||
obj = self._ele.tab._browser if new_tab else self._ele.owner._tab
|
||||
if rename or suffix:
|
||||
obj.set.download_file_name(rename, suffix)
|
||||
if timeout is None:
|
||||
timeout = obj.timeout
|
||||
|
||||
browser._dl_mgr.set_flag(tid, True)
|
||||
self.left(by_js=by_js)
|
||||
m = wait_mission(browser, tid, timeout)
|
||||
|
||||
if tmp_path:
|
||||
TabDownloadSettings(tid).path = tmp_path
|
||||
if when_file_exists:
|
||||
browser.set.when_download_file_exists(when_file_exists)
|
||||
if m and new_tab:
|
||||
self._ele.owner.browser._dl_mgr._tab_missions.setdefault(self._ele.owner.tab_id, set()).add(m)
|
||||
m.from_tab = self._ele.owner.tab_id
|
||||
browser._dl_mgr._waiting_tab.discard(self._ele.owner.tab_id)
|
||||
return m
|
||||
r = obj.wait.download_begin(timeout=timeout)
|
||||
if tmp_save_path:
|
||||
r.path = tmp_save_path
|
||||
return r
|
||||
|
||||
def to_upload(self, file_paths, by_js=False):
|
||||
self._ele.owner.set.upload_files(file_paths)
|
||||
@ -179,7 +144,7 @@ class Clicker(object):
|
||||
self._ele.owner.wait.upload_paths_inputted()
|
||||
|
||||
def for_new_tab(self, by_js=False, timeout=3):
|
||||
curr_tid = self._ele.tab.browser._newest_tab_id
|
||||
curr_tid = self._ele.tab.browser.tab_ids[0]
|
||||
self.left(by_js=by_js)
|
||||
tid = self._ele.tab.browser.wait.new_tab(timeout=timeout, curr_tab=curr_tid)
|
||||
if not tid:
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union
|
||||
@ -79,14 +80,14 @@ class Clicker(object):
|
||||
save_path: Union[str, Path] = None,
|
||||
rename: str = None,
|
||||
suffix: str = None,
|
||||
new_tab: bool = None,
|
||||
new_tab: bool = False,
|
||||
by_js: bool = False,
|
||||
timeout: float = None) -> DownloadMission:
|
||||
"""点击触发下载
|
||||
:param save_path: 保存路径，为None保存在原来设置的，如未设置保存到当前路径
|
||||
:param rename: 重命名文件名
|
||||
:param suffix: 指定文件后缀
|
||||
:param new_tab: 下载任务是否从新标签页触发，为None会自动获取，如获取不到，设为True
|
||||
:param new_tab: 该下载是否在新tab中触发
|
||||
:param by_js: 是否用js方式点击，逻辑与click()一致
|
||||
:param timeout: 等待下载触发的超时时间，为None则使用页面对象设置
|
||||
:return: DownloadMission对象
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from .._functions.cookies import set_tab_cookies, set_session_cookies, set_browser_cookies
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from http.cookiejar import Cookie, CookieJar
|
||||
from typing import Union
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from os.path import sep
|
||||
from pathlib import Path
|
||||
@ -24,11 +25,8 @@ class DownloadManager(object):
|
||||
t.when_file_exists = 'rename'
|
||||
|
||||
self._missions = {} # {guid: DownloadMission}
|
||||
self._tab_missions = {} # {tab_id: [DownloadMission, ...]}
|
||||
self._tab_missions = {} # {tab_id: DownloadMission}
|
||||
self._flags = {} # {tab_id: [bool, DownloadMission]}
|
||||
self._waiting_tab = set() # click.to_download()专用
|
||||
self._tmp_path = '.'
|
||||
self._page_id = None
|
||||
|
||||
self._running = False
|
||||
|
||||
@ -44,7 +42,6 @@ class DownloadManager(object):
|
||||
self._browser._driver.set_callback('Browser.downloadWillBegin', self._onDownloadWillBegin)
|
||||
r = self._browser._run_cdp('Browser.setDownloadBehavior', downloadPath=self._browser._download_path,
|
||||
behavior='allowAndName', eventsEnabled=True)
|
||||
self._tmp_path = self._browser._download_path
|
||||
if 'error' in r:
|
||||
print('浏览器版本太低无法使用下载管理功能。')
|
||||
self._running = True
|
||||
@ -64,17 +61,14 @@ class DownloadManager(object):
|
||||
return self._flags.get(tab_id, None)
|
||||
|
||||
def get_tab_missions(self, tab_id):
|
||||
return self._tab_missions.get(tab_id, set())
|
||||
return self._tab_missions.get(tab_id, [])
|
||||
|
||||
def set_done(self, mission, state, final_path=None):
|
||||
if mission.state not in ('canceled', 'skipped'):
|
||||
mission.state = state
|
||||
mission.final_path = final_path
|
||||
if mission.tab_id in self._tab_missions and mission in self._tab_missions[mission.tab_id]:
|
||||
self._tab_missions[mission.tab_id].discard(mission)
|
||||
if (mission.from_tab and mission.from_tab in self._tab_missions
|
||||
and mission in self._tab_missions[mission.from_tab]):
|
||||
self._tab_missions[mission.from_tab].discard(mission)
|
||||
if mission.tab_id in self._tab_missions and mission.id in self._tab_missions[mission.tab_id]:
|
||||
self._tab_missions[mission.tab_id].remove(mission.id)
|
||||
self._missions.pop(mission.id, None)
|
||||
mission._is_done = True
|
||||
|
||||
@ -98,18 +92,12 @@ class DownloadManager(object):
|
||||
self._tab_missions.pop(tab_id, None)
|
||||
self._flags.pop(tab_id, None)
|
||||
TabDownloadSettings.TABS.pop(tab_id, None)
|
||||
self._waiting_tab.discard(tab_id)
|
||||
|
||||
def _onDownloadWillBegin(self, **kwargs):
|
||||
guid = kwargs['guid']
|
||||
tab_id = self._browser._frames.get(kwargs['frameId'], 'browser')
|
||||
tab = 'browser' if tab_id in ('browser', self._page_id) or self.get_flag('browser') is not None else tab_id
|
||||
opener = self._browser._relation.get(tab_id, None)
|
||||
from_tab = None
|
||||
if opener and opener in self._waiting_tab:
|
||||
tab = from_tab = opener
|
||||
|
||||
settings = TabDownloadSettings(tab)
|
||||
settings = TabDownloadSettings(tab_id if tab_id in TabDownloadSettings.TABS else 'browser')
|
||||
if settings.rename:
|
||||
if settings.suffix is not None:
|
||||
name = f'{settings.rename}.{settings.suffix}' if settings.suffix else settings.rename
|
||||
@ -134,33 +122,25 @@ class DownloadManager(object):
|
||||
name = kwargs['suggestedFilename']
|
||||
|
||||
skip = False
|
||||
overwrite = None # 存在且重命名
|
||||
goal_path = Path(settings.path) / name
|
||||
if goal_path.exists():
|
||||
if settings.when_file_exists == 'skip':
|
||||
skip = True
|
||||
elif settings.when_file_exists == 'overwrite':
|
||||
overwrite = True # 存在且覆盖
|
||||
else: # 不存在
|
||||
overwrite = False
|
||||
goal_path.unlink()
|
||||
|
||||
m = DownloadMission(self, tab_id, guid, settings.path, name, kwargs['url'], self._tmp_path, overwrite)
|
||||
if from_tab:
|
||||
m.from_tab = from_tab
|
||||
self._tab_missions.setdefault(from_tab, set()).add(m)
|
||||
m = DownloadMission(self, tab_id, guid, settings.path, name, kwargs['url'], self._browser.download_path)
|
||||
self._missions[guid] = m
|
||||
|
||||
if self.get_flag('browser') is False or self.get_flag(tab) is False: # 取消该任务
|
||||
if self.get_flag(tab_id) is False: # 取消该任务
|
||||
self.cancel(m)
|
||||
elif skip:
|
||||
self.skip(m)
|
||||
else:
|
||||
self._tab_missions.setdefault(tab_id, set()).add(m)
|
||||
self._tab_missions.setdefault(tab_id, []).append(m)
|
||||
|
||||
if self.get_flag('browser') is not None:
|
||||
self._flags['browser'] = m
|
||||
elif self.get_flag(tab) is not None:
|
||||
self._flags[tab] = m
|
||||
if self.get_flag(tab_id) is not None:
|
||||
self._flags[tab_id] = m
|
||||
|
||||
def _onDownloadProgress(self, **kwargs):
|
||||
if kwargs['guid'] in self._missions:
|
||||
@ -171,17 +151,13 @@ class DownloadManager(object):
|
||||
|
||||
elif kwargs['state'] == 'completed':
|
||||
if mission.state == 'skipped':
|
||||
Path(f'{mission.tmp_path}{sep}{mission.id}').unlink(True)
|
||||
Path(f'{mission.save_path}{sep}{mission.id}').unlink(True)
|
||||
self.set_done(mission, 'skipped')
|
||||
return
|
||||
mission.received_bytes = kwargs['receivedBytes']
|
||||
mission.total_bytes = kwargs['totalBytes']
|
||||
form_path = f'{mission.tmp_path}{sep}{mission.id}'
|
||||
if mission._overwrite is None:
|
||||
to_path = str(get_usable_path(f'{mission.folder}{sep}{mission.name}'))
|
||||
else:
|
||||
to_path = f'{mission.folder}{sep}{mission.name}'
|
||||
Path(mission.folder).mkdir(parents=True, exist_ok=True)
|
||||
form_path = f'{mission.save_path}{sep}{mission.id}'
|
||||
to_path = str(get_usable_path(f'{mission.path}{sep}{mission.name}'))
|
||||
not_moved = True
|
||||
for _ in range(10):
|
||||
try:
|
||||
@ -217,27 +193,25 @@ class TabDownloadSettings(object):
|
||||
self.tab_id = tab_id
|
||||
self.rename = None
|
||||
self.suffix = None
|
||||
self.path = '' if tab_id == 'browser' else self.TABS['browser'].path
|
||||
self.when_file_exists = 'rename' if tab_id == 'browser' else self.TABS['browser'].when_file_exists
|
||||
self.path = ''
|
||||
self.when_file_exists = 'rename'
|
||||
|
||||
TabDownloadSettings.TABS[tab_id] = self
|
||||
|
||||
|
||||
class DownloadMission(object):
|
||||
def __init__(self, mgr, tab_id, _id, folder, name, url, tmp_path, overwrite):
|
||||
def __init__(self, mgr, tab_id, _id, path, name, url, save_path):
|
||||
self._mgr = mgr
|
||||
self.url = url
|
||||
self.tab_id = tab_id
|
||||
self.from_tab = None
|
||||
self.id = _id
|
||||
self.folder = folder
|
||||
self.path = path
|
||||
self.name = name
|
||||
self.state = 'running'
|
||||
self.total_bytes = None
|
||||
self.received_bytes = 0
|
||||
self.final_path = None
|
||||
self.tmp_path = tmp_path
|
||||
self._overwrite = overwrite
|
||||
self.save_path = save_path
|
||||
self._is_done = False
|
||||
|
||||
def __repr__(self):
|
||||
@ -260,8 +234,8 @@ class DownloadMission(object):
|
||||
end_time = perf_counter()
|
||||
while self.name is None and perf_counter() < end_time:
|
||||
sleep(0.01)
|
||||
print(f'文件名：{self.name or "未知"}')
|
||||
print(f'目录路径：{self.folder}')
|
||||
print(f'文件名：{self.name}')
|
||||
print(f'目标路径：{self.path}')
|
||||
|
||||
if timeout is None:
|
||||
while not self.is_done:
|
||||
@ -281,17 +255,11 @@ class DownloadMission(object):
|
||||
|
||||
if show:
|
||||
if self.state == 'completed':
|
||||
print('\r100% ', end='')
|
||||
if self._overwrite is None:
|
||||
print(f'完成并重命名 {self.final_path}')
|
||||
elif self._overwrite is False:
|
||||
print(f'下载完成 {self.final_path}')
|
||||
else:
|
||||
print(f'已覆盖 {self.final_path}')
|
||||
print(f'下载完成 {self.final_path}')
|
||||
elif self.state == 'canceled':
|
||||
print(f'下载取消')
|
||||
elif self.state == 'skipped':
|
||||
print(f'已跳过 {self.folder}{sep}{self.name}')
|
||||
print(f'已跳过')
|
||||
print()
|
||||
|
||||
return self.final_path if self.final_path else False
|
||||
|
||||
@ -2,9 +2,10 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Dict, Optional, Union, Literal, Set
|
||||
from typing import Dict, Optional, Union, Literal
|
||||
|
||||
from .._base.chromium import Chromium
|
||||
from .._pages.chromium_base import ChromiumBase
|
||||
@ -15,12 +16,9 @@ FILE_EXISTS = Literal['skip', 'rename', 'overwrite', 's', 'r', 'o']
|
||||
class DownloadManager(object):
|
||||
_browser: Chromium = ...
|
||||
_missions: Dict[str, DownloadMission] = ...
|
||||
_tab_missions: Dict[str, Set[DownloadMission]] = ...
|
||||
_tab_missions: dict = ...
|
||||
_flags: dict = ...
|
||||
_waiting_tab: set = ...
|
||||
_running: bool = ...
|
||||
_tmp_path: str = ...
|
||||
_page_id: Optional[str] = ...
|
||||
|
||||
def __init__(self, browser: Chromium):
|
||||
"""
|
||||
@ -132,7 +130,7 @@ class TabDownloadSettings(object):
|
||||
rename: Optional[str] = ...
|
||||
suffix: Optional[str] = ...
|
||||
path: Optional[str] = ...
|
||||
when_file_exists: FILE_EXISTS = ...
|
||||
when_file_exists: str = ...
|
||||
|
||||
def __init__(self, tab_id: str):
|
||||
"""
|
||||
@ -143,38 +141,34 @@ class TabDownloadSettings(object):
|
||||
|
||||
class DownloadMission(object):
|
||||
tab_id: str = ...
|
||||
from_tab: Optional[str] = ...
|
||||
_mgr: DownloadManager = ...
|
||||
url: str = ...
|
||||
id: str = ...
|
||||
folder: str = ...
|
||||
path: str = ...
|
||||
name: str = ...
|
||||
state: str = ...
|
||||
total_bytes: Optional[int] = ...
|
||||
received_bytes: int = ...
|
||||
final_path: Optional[str] = ...
|
||||
tmp_path: str = ...
|
||||
_overwrite: bool = ...
|
||||
save_path: str = ...
|
||||
_is_done: bool = ...
|
||||
|
||||
def __init__(self,
|
||||
mgr: DownloadManager,
|
||||
tab_id: str,
|
||||
_id: str,
|
||||
folder: str,
|
||||
path: str,
|
||||
name: str,
|
||||
url: str,
|
||||
tmp_path: str,
|
||||
overwrite: bool):
|
||||
save_path: str):
|
||||
"""
|
||||
:param mgr: BrowserDownloadManager对象
|
||||
:param tab_id: 标签页id
|
||||
:param _id: 任务id
|
||||
:param folder: 最终保存文件夹路径
|
||||
:param path: 最终保存路径
|
||||
:param name: 文件名
|
||||
:param url: url
|
||||
:param tmp_path: 下载临时路径
|
||||
:param overwrite: 是否已存在同名文件，None表示重命名
|
||||
:param save_path: 下载临时路径
|
||||
"""
|
||||
...
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from base64 import b64decode
|
||||
from json import JSONDecodeError, loads
|
||||
@ -190,7 +191,7 @@ class Listener(object):
|
||||
if timeout is None:
|
||||
while ((not targets_only and self._running_requests > limit)
|
||||
or (targets_only and self._running_targets > limit)):
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
return True
|
||||
|
||||
end_time = perf_counter() + timeout
|
||||
@ -198,7 +199,7 @@ class Listener(object):
|
||||
if ((not targets_only and self._running_requests <= limit)
|
||||
or (targets_only and self._running_targets <= limit)):
|
||||
return True
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
else:
|
||||
return False
|
||||
|
||||
@ -422,7 +423,7 @@ class DataPacket(object):
|
||||
def wait_extra_info(self, timeout=None):
|
||||
if timeout is None:
|
||||
while self._responseExtraInfo is None:
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
return True
|
||||
|
||||
else:
|
||||
@ -430,7 +431,7 @@ class DataPacket(object):
|
||||
while perf_counter() < end_time:
|
||||
if self._responseExtraInfo is not None:
|
||||
return True
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
else:
|
||||
return False
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from queue import Queue
|
||||
from typing import Union, List, Iterable, Optional, Literal, Any
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Tuple, Union
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from base64 import b64decode
|
||||
from os.path import sep
|
||||
@ -57,7 +58,7 @@ class Screencast(object):
|
||||
? "video/webm; codecs=vp9"
|
||||
: "video/webm"
|
||||
mediaRecorder = new MediaRecorder(stream, {mimeType: mime})
|
||||
DrissionPage_Screencast_chunks = [];
|
||||
DrissionPage_Screencast_chunks = []
|
||||
mediaRecorder.addEventListener('dataavailable', function(e) {
|
||||
DrissionPage_Screencast_blob_ok = false;
|
||||
DrissionPage_Screencast_chunks.push(e.data);
|
||||
@ -75,7 +76,6 @@ class Screencast(object):
|
||||
print('请手动选择要录制的目标。')
|
||||
self._owner._run_js('var DrissionPage_Screencast_blob;var DrissionPage_Screencast_blob_ok=false;')
|
||||
self._owner._run_js(js)
|
||||
print('开始录制')
|
||||
|
||||
def stop(self, video_name=None):
|
||||
if video_name and not video_name.endswith('mp4'):
|
||||
@ -86,13 +86,12 @@ class Screencast(object):
|
||||
if self._mode.startswith('js'):
|
||||
self._owner._run_js('mediaRecorder.stop();', as_expr=True)
|
||||
while not self._owner._run_js('return DrissionPage_Screencast_blob_ok;'):
|
||||
sleep(.05)
|
||||
sleep(.1)
|
||||
blob = self._owner._run_js('return DrissionPage_Screencast_blob;')
|
||||
uuid = self._owner._run_cdp('IO.resolveBlob', objectId=blob['result']['objectId'])['uuid']
|
||||
data = self._owner._run_cdp('IO.read', handle=f'blob:{uuid}')['data']
|
||||
with open(path, 'wb') as f:
|
||||
f.write(b64decode(self._owner._run_js('return DrissionPage_Screencast_blob;')))
|
||||
self._owner._run_js('DrissionPage_Screencast_blob_ok = false;'
|
||||
'DrissionPage_Screencast_chunks = [];'
|
||||
'DrissionPage_Screencast_blob = null', as_expr=True)
|
||||
print('停止录制')
|
||||
f.write(b64decode(data))
|
||||
return path
|
||||
|
||||
if self._mode.startswith('frugal'):
|
||||
@ -101,10 +100,9 @@ class Screencast(object):
|
||||
else:
|
||||
self._enable = False
|
||||
while self._running:
|
||||
sleep(.01)
|
||||
sleep(.1)
|
||||
|
||||
if self._mode.endswith('imgs'):
|
||||
print('停止录制')
|
||||
return str(Path(self._path).absolute())
|
||||
|
||||
if not str(self._path).isascii():
|
||||
@ -129,7 +127,6 @@ class Screencast(object):
|
||||
|
||||
rmtree(self._tmp_path)
|
||||
self._tmp_path = None
|
||||
print('停止录制')
|
||||
return f'{self._path}{sep}{name}'
|
||||
|
||||
def set_save_path(self, save_path=None):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Optional
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from time import sleep, perf_counter
|
||||
|
||||
@ -76,7 +77,7 @@ class Scroller(object):
|
||||
|
||||
end_time = perf_counter() + owner.timeout
|
||||
while perf_counter() < end_time:
|
||||
sleep(.02)
|
||||
sleep(.1)
|
||||
r = owner._run_cdp('Page.getLayoutMetrics')
|
||||
x1 = r['layoutViewport']['pageX']
|
||||
y1 = r['layoutViewport']['pageY']
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from time import perf_counter, sleep
|
||||
|
||||
@ -31,7 +32,8 @@ class SelectElement(object):
|
||||
|
||||
@property
|
||||
def selected_option(self):
|
||||
return self._ele._run_js('return this.options[this.selectedIndex];')
|
||||
ele = self._ele._run_js('return this.options[this.selectedIndex];')
|
||||
return ele
|
||||
|
||||
@property
|
||||
def selected_options(self):
|
||||
@ -52,7 +54,6 @@ class SelectElement(object):
|
||||
i._run_js(f'this.selected={mode};')
|
||||
if change:
|
||||
self._dispatch_change()
|
||||
return self._ele
|
||||
|
||||
def clear(self):
|
||||
if not self.is_multi:
|
||||
@ -72,7 +73,7 @@ class SelectElement(object):
|
||||
return self._by_loc(locator, timeout)
|
||||
|
||||
def by_option(self, option):
|
||||
return self._select_options(option, 'true')
|
||||
self._select_options(option, 'true')
|
||||
|
||||
def cancel_by_text(self, text, timeout=None):
|
||||
return self._select(text, 'text', True, timeout)
|
||||
@ -87,17 +88,19 @@ class SelectElement(object):
|
||||
return self._by_loc(locator, timeout, True)
|
||||
|
||||
def cancel_by_option(self, option):
|
||||
return self._select_options(option, 'false')
|
||||
self._select_options(option, 'false')
|
||||
|
||||
def _by_loc(self, loc, timeout=None, cancel=False):
|
||||
eles = self._ele.eles(loc, timeout)
|
||||
if not eles:
|
||||
raise RuntimeError('没有找到指定选项。')
|
||||
return False
|
||||
|
||||
mode = 'false' if cancel else 'true'
|
||||
if not self.is_multi:
|
||||
eles = eles[0]
|
||||
return self._select_options(eles, mode)
|
||||
if self.is_multi:
|
||||
self._select_options(eles, mode)
|
||||
else:
|
||||
self._select_options(eles[0], mode)
|
||||
return True
|
||||
|
||||
def _select(self, condition, para_type='text', cancel=False, timeout=None):
|
||||
if not self.is_multi and isinstance(condition, (list, tuple)):
|
||||
@ -114,6 +117,7 @@ class SelectElement(object):
|
||||
return self._index(condition, mode, timeout)
|
||||
|
||||
def _text_value(self, condition, para_type, mode, timeout):
|
||||
ok = False
|
||||
text_len = len(condition)
|
||||
eles = []
|
||||
end_time = perf_counter() + timeout
|
||||
@ -124,22 +128,34 @@ class SelectElement(object):
|
||||
eles = [i for i in self.options if i.attr('value') in condition]
|
||||
|
||||
if len(eles) >= text_len:
|
||||
return self._select_options(eles, mode)
|
||||
ok = True
|
||||
break
|
||||
sleep(.01)
|
||||
|
||||
raise RuntimeError('没有找到指定选项。')
|
||||
if ok:
|
||||
self._select_options(eles, mode)
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def _index(self, condition, mode, timeout):
|
||||
ok = False
|
||||
condition = [int(i) for i in condition]
|
||||
text_len = abs(max(condition, key=abs))
|
||||
end_time = perf_counter() + timeout
|
||||
while perf_counter() < end_time:
|
||||
if len(self.options) >= text_len:
|
||||
eles = self.options
|
||||
eles = [eles[i - 1] if i > 0 else eles[i] for i in condition]
|
||||
return self._select_options(eles, mode)
|
||||
ok = True
|
||||
break
|
||||
sleep(.01)
|
||||
raise RuntimeError('没有找到指定选项。')
|
||||
|
||||
if ok:
|
||||
eles = self.options
|
||||
eles = [eles[i - 1] if i > 0 else eles[i] for i in condition]
|
||||
self._select_options(eles, mode)
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def _select_options(self, option, mode):
|
||||
if isinstance(option, (list, tuple, set)):
|
||||
@ -151,7 +167,6 @@ class SelectElement(object):
|
||||
else:
|
||||
option._run_js(f'this.selected={mode};')
|
||||
self._dispatch_change()
|
||||
return self._ele
|
||||
|
||||
def _dispatch_change(self):
|
||||
self._ele._run_js('this.dispatchEvent(new CustomEvent("change", {bubbles: true}));')
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union, Tuple, List, Optional
|
||||
|
||||
@ -19,11 +20,11 @@ class SelectElement(object):
|
||||
|
||||
def __call__(self,
|
||||
text_or_index: Union[str, int, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""选定下拉列表中子元素
|
||||
:param text_or_index: 根据文本、值选或序号择选项，若允许多选，传入list或tuple可多选
|
||||
:param timeout: 超时时间（秒），不输入默认实用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: None
|
||||
"""
|
||||
...
|
||||
|
||||
@ -47,124 +48,122 @@ class SelectElement(object):
|
||||
"""返回所有被选中的<option>元素列表"""
|
||||
...
|
||||
|
||||
def all(self) -> ChromiumElement:
|
||||
def all(self) -> None:
|
||||
"""全选"""
|
||||
...
|
||||
|
||||
def invert(self) -> ChromiumElement:
|
||||
def invert(self) -> None:
|
||||
"""反选"""
|
||||
...
|
||||
|
||||
def clear(self) -> ChromiumElement:
|
||||
def clear(self) -> None:
|
||||
"""清除所有已选项"""
|
||||
...
|
||||
|
||||
def by_text(self,
|
||||
text: Union[str, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""此方法用于根据text值选择项。当元素是多选列表时，可以接收list或tuple
|
||||
:param text: text属性值，传入list或tuple可选择多项
|
||||
:param timeout: 超时时间（秒），为None默认使用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def by_value(self,
|
||||
value: Union[str, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""此方法用于根据value值选择项。当元素是多选列表时，可以接收list或tuple
|
||||
:param value: value属性值，传入list或tuple可选择多项
|
||||
:param timeout: 超时时间，为None默认使用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def by_index(self,
|
||||
index: Union[int, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""此方法用于根据index值选择项。当元素是多选列表时，可以接收list或tuple
|
||||
:param index: 序号，从1开始，可传入负数获取倒数第几个，传入list或tuple可选择多项
|
||||
:param timeout: 超时时间，为None默认使用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def by_locator(self,
|
||||
locator: Union[Tuple[str, str], str],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""用定位符选择指定的项
|
||||
:param locator: 定位符
|
||||
:param timeout: 超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def by_option(self,
|
||||
option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]]) -> ChromiumElement:
|
||||
def by_option(self, option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]]) -> None:
|
||||
"""选中单个或多个<option>元素
|
||||
:param option: <option>元素或它们组成的列表
|
||||
:return: <select>元素对象
|
||||
:return: None
|
||||
"""
|
||||
...
|
||||
|
||||
def cancel_by_text(self,
|
||||
text: Union[str, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""此方法用于根据text值取消选择项。当元素是多选列表时，可以接收list或tuple
|
||||
:param text: 文本，传入list或tuple可取消多项
|
||||
:param timeout: 超时时间，不输入默认实用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否取消成功
|
||||
"""
|
||||
...
|
||||
|
||||
def cancel_by_value(self,
|
||||
value: Union[str, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""此方法用于根据value值取消选择项。当元素是多选列表时，可以接收list或tuple
|
||||
:param value: value属性值，传入list或tuple可取消多项
|
||||
:param timeout: 超时时间，不输入默认实用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否取消成功
|
||||
"""
|
||||
...
|
||||
|
||||
def cancel_by_index(self,
|
||||
index: Union[int, list, tuple],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""此方法用于根据index值取消选择项。当元素是多选列表时，可以接收list或tuple
|
||||
:param index: 序号，从1开始，可传入负数获取倒数第几个，传入list或tuple可取消多项
|
||||
:param timeout: 超时时间，不输入默认实用页面超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否取消成功
|
||||
"""
|
||||
...
|
||||
|
||||
def cancel_by_locator(self,
|
||||
locator: Union[Tuple[str, str], str],
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""用定位符取消选择指定的项
|
||||
:param locator: 定位符
|
||||
:param timeout: 超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def cancel_by_option(self,
|
||||
option: Union[ChromiumElement, List[ChromiumElement],
|
||||
Tuple[ChromiumElement]]) -> ChromiumElement:
|
||||
option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]]) -> None:
|
||||
"""取消选中单个或多个<option>元素
|
||||
:param option: <option>元素或它们组成的列表
|
||||
:return: <select>元素对象
|
||||
:return: None
|
||||
"""
|
||||
...
|
||||
|
||||
def _by_loc(self,
|
||||
loc: Union[str, Tuple[str, str]],
|
||||
timeout: float = None,
|
||||
cancel: bool = False) -> ChromiumElement:
|
||||
cancel: bool = False) -> bool:
|
||||
"""用定位符取消选择指定的项
|
||||
:param loc: 定位符
|
||||
:param timeout: 超时时间
|
||||
:param cancel: 是否取消选择
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
@ -172,12 +171,12 @@ class SelectElement(object):
|
||||
condition: Union[str, int, list, tuple] = None,
|
||||
para_type: str = 'text',
|
||||
cancel: bool = False,
|
||||
timeout: float = None) -> ChromiumElement:
|
||||
timeout: float = None) -> bool:
|
||||
"""选定或取消选定下拉列表中子元素
|
||||
:param condition: 根据文本、值选或序号择选项，若允许多选，传入list或tuple可多选
|
||||
:param para_type: 参数类型，可选 'text'、'value'、'index'
|
||||
:param cancel: 是否取消选择
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
@ -185,32 +184,31 @@ class SelectElement(object):
|
||||
condition: Union[list, set],
|
||||
para_type: str,
|
||||
mode: str,
|
||||
timeout: float) -> ChromiumElement:
|
||||
timeout: float) -> bool:
|
||||
"""执行text和value搜索
|
||||
:param condition: 条件set
|
||||
:param para_type: 参数类型，可选 'text'、'value'
|
||||
:param mode: 'true' 或 'false'
|
||||
:param timeout: 超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def _index(self, condition: set, mode: str, timeout: float) -> ChromiumElement:
|
||||
def _index(self, condition: set, mode: str, timeout: float) -> bool:
|
||||
"""执行index搜索
|
||||
:param condition: 条件set
|
||||
:param mode: 'true' 或 'false'
|
||||
:param timeout: 超时时间
|
||||
:return: <select>元素对象
|
||||
:return: 是否选择成功
|
||||
"""
|
||||
...
|
||||
|
||||
def _select_options(self,
|
||||
option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]],
|
||||
mode: str) -> ChromiumElement:
|
||||
def _select_options(self, option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]],
|
||||
mode: str) -> None:
|
||||
"""选中或取消某个选项
|
||||
:param option: options元素对象
|
||||
:param mode: 选中还是取消
|
||||
:return: <select>元素对象
|
||||
:return: None
|
||||
"""
|
||||
...
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from time import sleep
|
||||
@ -50,7 +51,7 @@ class SessionPageSetter(BaseSetter):
|
||||
def download_path(self, path):
|
||||
super().download_path(path)
|
||||
if self._owner._DownloadKit:
|
||||
self._owner._DownloadKit.set.save_path(self._owner._download_path)
|
||||
self._owner._DownloadKit.set.goal_path(self._owner._download_path)
|
||||
|
||||
def timeout(self, second):
|
||||
self._owner._timeout = second
|
||||
@ -229,7 +230,7 @@ class TabSetter(ChromiumBaseSetter):
|
||||
super().download_path(path)
|
||||
self._owner.browser._dl_mgr.set_path(self._owner, self._owner._download_path)
|
||||
if self._owner._DownloadKit:
|
||||
self._owner._DownloadKit.set.save_path(self._owner._download_path)
|
||||
self._owner._DownloadKit.set.goal_path(self._owner._download_path)
|
||||
|
||||
def download_file_name(self, name=None, suffix=None):
|
||||
self._owner.browser._dl_mgr.set_rename(self._owner.tab_id, name, suffix)
|
||||
@ -262,18 +263,8 @@ class ChromiumPageSetter(TabSetter):
|
||||
self._owner.browser.retry_interval = interval
|
||||
|
||||
def download_path(self, path):
|
||||
if path is None:
|
||||
path = '.'
|
||||
self._owner._download_path = str(Path(path).absolute())
|
||||
self._owner.browser.set.download_path(path)
|
||||
if self._owner._DownloadKit:
|
||||
self._owner._DownloadKit.set.save_path(path)
|
||||
|
||||
def download_file_name(self, name=None, suffix=None):
|
||||
self._owner.browser.set.download_file_name(name, suffix)
|
||||
|
||||
def when_download_file_exists(self, mode):
|
||||
self._owner.browser.set.when_download_file_exists(mode)
|
||||
super().download_path(path)
|
||||
self._owner.browser._download_path = self._owner._download_path
|
||||
|
||||
|
||||
class WebPageSetter(ChromiumPageSetter):
|
||||
@ -468,7 +459,7 @@ class WindowSetter(object):
|
||||
try:
|
||||
return self._owner._run_cdp('Browser.getWindowForTarget')
|
||||
except:
|
||||
sleep(.02)
|
||||
sleep(.1)
|
||||
raise RuntimeError('获取窗口信息失败。')
|
||||
|
||||
def _perform(self, bounds):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Union, Tuple, Literal, Any, Optional
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from .._functions.web import location_in_viewport
|
||||
from ..errors import CDPError, NoRectError, PageDisconnectedError, ElementLostError
|
||||
@ -138,18 +139,6 @@ class PageStates(object):
|
||||
def has_alert(self):
|
||||
return self._owner._has_alert
|
||||
|
||||
@property
|
||||
def is_headless(self):
|
||||
return self._owner.browser.states.is_headless
|
||||
|
||||
@property
|
||||
def is_existed(self):
|
||||
return self._owner.browser.states.is_existed
|
||||
|
||||
@property
|
||||
def is_incognito(self):
|
||||
return self._owner.browser.states.is_incognito
|
||||
|
||||
|
||||
class FrameStates(object):
|
||||
def __init__(self, frame):
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union, Tuple, List, Optional, Literal
|
||||
|
||||
@ -152,21 +153,6 @@ class PageStates(object):
|
||||
"""返回当前页面是否存在弹窗"""
|
||||
...
|
||||
|
||||
@property
|
||||
def is_headless(self) -> bool:
|
||||
"""返回浏览器是否无头模式"""
|
||||
...
|
||||
|
||||
@property
|
||||
def is_existed(self) -> bool:
|
||||
"""返回浏览器是否接管的"""
|
||||
...
|
||||
|
||||
@property
|
||||
def is_incognito(self) -> bool:
|
||||
"""返回浏览器是否无痕模式"""
|
||||
...
|
||||
|
||||
|
||||
class FrameStates(object):
|
||||
_frame: ChromiumFrame = ...
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from time import sleep, perf_counter
|
||||
|
||||
@ -27,15 +28,16 @@ class OriginWaiter(object):
|
||||
class BrowserWaiter(OriginWaiter):
|
||||
def new_tab(self, timeout=None, curr_tab=None, raise_err=None):
|
||||
if not curr_tab:
|
||||
curr_tab = self._owner._newest_tab_id
|
||||
curr_tab = self._owner.tab_ids[0]
|
||||
elif hasattr(curr_tab, '_type'):
|
||||
curr_tab = curr_tab.tab_id
|
||||
if timeout is None:
|
||||
timeout = self._owner.timeout
|
||||
end_time = perf_counter() + timeout
|
||||
while perf_counter() < end_time:
|
||||
if curr_tab != self._owner._newest_tab_id:
|
||||
return self._owner._newest_tab_id
|
||||
latest_tid = self._owner.tab_ids[0]
|
||||
if curr_tab != latest_tid:
|
||||
return latest_tid
|
||||
sleep(.01)
|
||||
|
||||
if raise_err is True or Settings.raise_when_wait_failed is True:
|
||||
@ -49,7 +51,18 @@ class BrowserWaiter(OriginWaiter):
|
||||
self._owner._dl_mgr.set_flag('browser', False if cancel_it else True)
|
||||
if timeout is None:
|
||||
timeout = self._owner.timeout
|
||||
return wait_mission(self._owner, 'browser', timeout)
|
||||
|
||||
r = False
|
||||
end_time = perf_counter() + timeout
|
||||
while perf_counter() < end_time:
|
||||
v = self._owner._dl_mgr.get_flag('browser')
|
||||
if not isinstance(v, bool):
|
||||
r = v
|
||||
break
|
||||
sleep(.005)
|
||||
|
||||
self._owner._dl_mgr.set_flag('browser', None)
|
||||
return r
|
||||
|
||||
def downloads_done(self, timeout=None, cancel_if_timeout=True):
|
||||
if not self._owner._dl_mgr._running:
|
||||
@ -171,7 +184,18 @@ class BaseWaiter(OriginWaiter):
|
||||
self._owner.browser._dl_mgr.set_flag(self._owner.tab_id, False if cancel_it else True)
|
||||
if timeout is None:
|
||||
timeout = self._owner.timeout
|
||||
return wait_mission(self._owner.browser, self._owner.tab_id, timeout)
|
||||
|
||||
r = False
|
||||
end_time = perf_counter() + timeout
|
||||
while perf_counter() < end_time:
|
||||
v = self._owner.browser._dl_mgr.get_flag(self._owner.tab_id)
|
||||
if not isinstance(v, bool):
|
||||
r = v
|
||||
break
|
||||
sleep(.005)
|
||||
|
||||
self._owner.browser._dl_mgr.set_flag(self._owner.tab_id, None)
|
||||
return r
|
||||
|
||||
def url_change(self, text, exclude=False, timeout=None, raise_err=None):
|
||||
return self._owner if self._change('url', text, exclude, timeout, raise_err) else False
|
||||
@ -269,9 +293,6 @@ class ChromiumPageWaiter(TabWaiter):
|
||||
def new_tab(self, timeout=None, raise_err=None):
|
||||
return self._owner.browser.wait.new_tab(timeout=timeout, raise_err=raise_err)
|
||||
|
||||
def download_begin(self, timeout=None, cancel_it=False):
|
||||
return self._owner.browser.wait.download_begin(timeout=timeout, cancel_it=cancel_it)
|
||||
|
||||
def all_downloads_done(self, timeout=None, cancel_if_timeout=True):
|
||||
return self._owner.browser.wait.downloads_done(timeout=timeout, cancel_if_timeout=cancel_if_timeout)
|
||||
|
||||
@ -397,17 +418,3 @@ class FrameWaiter(BaseWaiter, ElementWaiter):
|
||||
@property
|
||||
def _timeout(self):
|
||||
return self._owner.timeout
|
||||
|
||||
|
||||
def wait_mission(browser, tid, timeout=None):
|
||||
r = False
|
||||
end_time = perf_counter() + timeout
|
||||
while perf_counter() < end_time:
|
||||
v = browser._dl_mgr.get_flag(tid)
|
||||
if not isinstance(v, bool):
|
||||
r = v
|
||||
break
|
||||
sleep(.005)
|
||||
|
||||
browser._dl_mgr.set_flag(tid, None)
|
||||
return r
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from typing import Union, Tuple, Any
|
||||
|
||||
@ -767,13 +768,3 @@ class FrameWaiter(BaseWaiter, ElementWaiter):
|
||||
:return: 成功返回元素对象，失败返回False
|
||||
"""
|
||||
...
|
||||
|
||||
|
||||
def wait_mission(browser: Chromium, tid: str, timeout: float = None) -> Union[DownloadMission, False]:
|
||||
"""等待下载任务
|
||||
:param browser: Chromium对象
|
||||
:param tid: 标签页id
|
||||
:param timeout: 超时时间
|
||||
:return:
|
||||
"""
|
||||
...
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from ._base.chromium import Chromium
|
||||
from ._configs.chromium_options import ChromiumOptions
|
||||
from ._elements.session_element import make_session_ele
|
||||
from ._functions.by import By
|
||||
from ._functions.keys import Keys
|
||||
@ -23,9 +23,7 @@ def from_selenium(driver):
|
||||
address, port = driver.caps.get('goog:chromeOptions', {}).get('debuggerAddress', ':').split(':')
|
||||
if not address:
|
||||
raise RuntimeError('获取失败。')
|
||||
co = ChromiumOptions().set_local_port(port)
|
||||
co._ua_set = True
|
||||
return Chromium(co)
|
||||
return Chromium(f'{address}:{port}')
|
||||
|
||||
|
||||
def from_playwright(page_or_browser):
|
||||
@ -50,6 +48,4 @@ def from_playwright(page_or_browser):
|
||||
break
|
||||
else:
|
||||
raise RuntimeError('获取失败，请用管理员权限运行。')
|
||||
co = ChromiumOptions().set_local_port(f'127.0.0.1:{port}')
|
||||
co._ua_set = True
|
||||
return Chromium(co)
|
||||
return Chromium(f'127.0.0.1:{port}')
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
"""
|
||||
@Author : g1879
|
||||
@Contact : g1879@qq.com
|
||||
@Copyright: (c) 2020 by g1879, Inc. All Rights Reserved.
|
||||
@Copyright: (c) 2024 by g1879, Inc. All Rights Reserved.
|
||||
@License : BSD 3-Clause.
|
||||
"""
|
||||
from ._elements.chromium_element import ChromiumElement, ShadowRoot
|
||||
from ._elements.none_element import NoneElement
|
||||
|
||||
64
LICENSE
64
LICENSE
@ -1,49 +1,29 @@
|
||||
BSD 3-Clause License
|
||||
|
||||
Copyright (c) 2020, g1879
|
||||
All rights reserved.
|
||||
|
||||
允许任何人以个人身份使用或分发本项目源代码，但仅限于学习和合法非盈利目的。
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
个人或组织如未获得版权持有人授权，不得将本项目以源代码或二进制形式用于商业行为。
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
使用本项目需满足以下条款，如使用过程中出现违反任意一项条款的情形，授权自动失效。
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
* 禁止将DrissionPage应用到任何可能违反当地法律规定和道德约束的项目中
|
||||
* Neither the name of the copyright holder nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
* 禁止将DrissionPage用于任何可能有损他人利益的项目中
|
||||
|
||||
* 禁止将DrissionPage用于攻击与骚扰行为
|
||||
|
||||
* 遵守Robots协议，禁止将DrissionPage用于采集法律或系统Robots协议不允许的数据
|
||||
|
||||
使用DrissionPage发生的一切行为均由使用人自行负责。
|
||||
因使用DrissionPage进行任何行为所产生的一切纠纷及后果均与版权持有人无关，
|
||||
版权持有人不承担任何使用DrissionPage带来的风险和损失。
|
||||
版权持有人不对DrissionPage可能存在的缺陷导致的任何损失负任何责任。
|
||||
|
||||
---------------------------------------------------------
|
||||
|
||||
Anyone may use or distribute the source code of this project in their personal capacity,
|
||||
but only for the purpose of learning and legal non-profit activities.
|
||||
|
||||
An individual or organization may not use the project's source code or binary form for
|
||||
commercial purposes without authorization from the copyright holder.
|
||||
|
||||
The following terms and conditions must be met in order to use this project. Authorization
|
||||
will automatically expire if any of the terms are violated during use.
|
||||
|
||||
* It is strictly prohibited to use the DrissionPage app for any project that may violate local
|
||||
laws and ethical constraints.
|
||||
|
||||
* It is strictly prohibited to use DrissionPage for any project that may harm the interests of others.
|
||||
|
||||
* It is strictly prohibited to use DrissionPage for attack and harassment.
|
||||
|
||||
* Follow the Robots protocol and do not use the DrissionPage to collect data that is prohibited
|
||||
by law or the system's Robots protocol.
|
||||
|
||||
All actions taken using DrissionPage are the responsibility of the user.
|
||||
The copyright holder is not involved in any disputes or consequences arising from the use of
|
||||
DrissionPage for any actions, and the copyright holder shall not bear any risks and losses arising
|
||||
from the use of DrissionPage.
|
||||
The copyright holder shall not bear any responsibility for any losses resulting from any defects in
|
||||
DrissionPage.
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
include DrissionPage/_configs/configs.ini
|
||||
include DrissionPage/_functions/suffixes.dat
|
||||
include DrissionPage/*.pyi
|
||||
include DrissionPage/*/*.py
|
||||
include DrissionPage/*/*.pyi
|
||||
31
README.md
31
README.md
@ -14,7 +14,9 @@ DrissionPage 是一个基于 python 的网页自动化工具。
|
||||
|
||||
官方网站：[https://DrissionPage.cn](https://drissionpage.cn)
|
||||
|
||||
项目地址：[gitee](https://gitee.com/g1879/DrissionPage) | [github](https://github.com/g1879/DrissionPage) | [gitcode](https://gitcode.com/g1879/DrissionPage)
|
||||
<a href='https://gitee.com/g1879/DrissionPage/stargazers'><img src='https://gitee.com/g1879/DrissionPage/badge/star.svg?theme=dark' alt='star'></img></a> <a href='https://gitee.com/g1879/DrissionPage/members'><img src='https://gitee.com/g1879/DrissionPage/badge/fork.svg?theme=dark' alt='fork'></img></a>
|
||||
|
||||
项目地址：[gitee](https://gitee.com/g1879/DrissionPage) | [github](https://github.com/g1879/DrissionPage)
|
||||
|
||||
您的星星是对我最大的支持💖
|
||||
|
||||
@ -32,9 +34,7 @@ python 版本：3.6 及以上
|
||||
|
||||
**📖 使用文档：** [点击查看](https://DrissionPage.cn)
|
||||
|
||||
**交流 QQ 群：** 见使用文档
|
||||
|
||||
|
||||
**交流 QQ 群：** 636361957
|
||||
|
||||
---
|
||||
|
||||
@ -79,28 +79,19 @@ python 版本：3.6 及以上
|
||||
|
||||
---
|
||||
|
||||
# 📝 使用条款
|
||||
# 🖐🏻 免责声明
|
||||
|
||||
允许任何人以个人身份使用或分发本项目源代码，但仅限于学习和合法非盈利目的。
|
||||
个人或组织如未获得版权持有人授权，不得将本项目以源代码或二进制形式用于商业行为。
|
||||
|
||||
使用本项目需满足以下条款，如使用过程中出现违反任意一项条款的情形，授权自动失效。
|
||||
- 禁止将DrissionPage应用到任何可能违反当地法律规定和道德约束的项目中
|
||||
- 禁止将DrissionPage用于任何可能有损他人利益的项目中
|
||||
- 禁止将DrissionPage用于攻击与骚扰行为
|
||||
- 遵守Robots协议，禁止将DrissionPage用于采集法律或系统Robots协议不允许的数据
|
||||
|
||||
使用DrissionPage发生的一切行为均由使用人自行负责。
|
||||
因使用DrissionPage进行任何行为所产生的一切纠纷及后果均与版权持有人无关，
|
||||
版权持有人不承担任何使用DrissionPage带来的风险和损失。
|
||||
版权持有人不对DrissionPage可能存在的缺陷导致的任何损失负任何责任。
|
||||
禁止将 DrissionPage 应用到任何可能会违反法律规定和道德约束的项目中。
|
||||
友善使用 DrissionPage，遵守蜘蛛协议，禁止将 DrissionPage 用于任何可能有损他人的项目中。
|
||||
如您选择使用 DrissionPage 即代表您遵守此协议，作者不承担任何由于您违反此协议带来任何的法律风险和损失。
|
||||
同时，作者不对 DrissionPage 可能存在的缺陷导致的损失承担任何责任，一切后果由您承担。
|
||||
|
||||
---
|
||||
|
||||
# ☕ 请我喝咖啡
|
||||
|
||||
作者是个人开发者，开发和写文档工作量较为繁重。
|
||||
作者是单人开发者，开发和写文档工作量较为繁重。
|
||||
|
||||
如果本项目对您有所帮助，不妨打赏一下作者 ：）
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
requests
|
||||
lxml
|
||||
cssselect
|
||||
DownloadKit>=2.0.7
|
||||
DownloadKit>=2.0.4
|
||||
websocket-client
|
||||
click
|
||||
tldextract>=3.4.4
|
||||
tldextract
|
||||
psutil
|
||||
8
setup.py
8
setup.py
@ -13,7 +13,7 @@ setup(
|
||||
description="Python based web automation tool. It can control the browser and send and receive data packets.",
|
||||
long_description=long_description,
|
||||
long_description_content_type="text/markdown",
|
||||
# license="BSD",
|
||||
license="BSD",
|
||||
keywords="DrissionPage",
|
||||
url="https://DrissionPage.cn",
|
||||
include_package_data=True,
|
||||
@ -23,17 +23,17 @@ setup(
|
||||
'lxml',
|
||||
'requests',
|
||||
'cssselect',
|
||||
'DownloadKit>=2.0.7',
|
||||
'DownloadKit>=2.0.4',
|
||||
'websocket-client',
|
||||
'click',
|
||||
'tldextract>=3.4.4',
|
||||
'tldextract',
|
||||
'psutil'
|
||||
],
|
||||
classifiers=[
|
||||
"Programming Language :: Python :: 3.6",
|
||||
"Development Status :: 4 - Beta",
|
||||
"Topic :: Utilities",
|
||||
# "License :: OSI Approved :: BSD License",
|
||||
"License :: OSI Approved :: BSD License",
|
||||
],
|
||||
python_requires='>=3.6',
|
||||
entry_points={
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user