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

微调注释

Browse Source
This commit is contained in:
g1879 2022-12-22 10:17:38 +08:00
parent 4d41c3b993
commit 517da31d30
38 changed files with 123 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DrissionPage/__init__.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from warnings import filterwarnings

4
DrissionPage/action_chains.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from time import sleep
from .common import _location_in_viewport

4
DrissionPage/action_chains.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, Tuple
from .chromium_base import ChromiumBase

1
DrissionPage/base.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : base.py
"""
from abc import abstractmethod
from re import sub

4
DrissionPage/base.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from abc import abstractmethod
from typing import Union, Tuple, List

12
DrissionPage/chromium_base.py
View File

@ -1,11 +1,15 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from json import loads
from time import perf_counter, sleep
from requests import Session
from .base import BasePage
from .chromium_element import ChromiumElementWaiter, ChromeScroll, ChromiumElement, run_script
from .chromium_element import ChromiumElementWaiter, ChromeScroll, ChromiumElement, run_script, make_chromium_ele
from .common import get_loc
from .config import cookies_to_tuple
from .session_element import make_session_ele
@ -408,11 +412,7 @@ class ChromiumBase(BasePage):
toIndex=count)
eles = []
for i in nodeIds['nodeIds']:
ele = ChromiumElement(self, node_id=i)
if ele.tag in ('iframe', 'frame'):
from .chromium_frame import ChromiumFrame
ele = ChromiumFrame(self, ele)
eles.append(ele)
eles.append(make_chromium_ele(self, node_id=i))
return eles[0] if single else eles

4
DrissionPage/chromium_base.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, Tuple, List, Any
from DataRecorder import Recorder

27
DrissionPage/chromium_element.py
View File

@ -443,7 +443,7 @@ class ChromiumElement(DrissionElement):
:param single: True则返回第一个，False则返回全部
:return: ChromiumElement对象或文本、属性或其组成的列表
"""
return make_chromium_ele(self, loc_or_str, single, timeout, relative=relative)
return find_in_chromium_ele(self, loc_or_str, single, timeout, relative=relative)
def style(self, style, pseudo_ele=''):
"""返回元素样式属性值，可获取伪元素属性值 \n
@ -1022,7 +1022,7 @@ class ChromiumShadowRootElement(BaseElement):
if single:
node_id = self.page.run_cdp('DOM.querySelector',
nodeId=self._node_id, selector=css_paths[0], not_change=True)['nodeId']
return _make_chromium_ele(self.page, node_id=node_id) if node_id else None
return make_chromium_ele(self.page, node_id=node_id) if node_id else None
else:
results = []
@ -1030,7 +1030,7 @@ class ChromiumShadowRootElement(BaseElement):
node_id = self.page.run_cdp('DOM.querySelector',
nodeId=self._node_id, selector=i, not_change=True)['nodeId']
if node_id:
results.append(_make_chromium_ele(self.page, node_id=node_id))
results.append(make_chromium_ele(self.page, node_id=node_id))
return results
def _get_node_id(self, obj_id):
@ -1046,7 +1046,7 @@ class ChromiumShadowRootElement(BaseElement):
return self.page.run_cdp('DOM.describeNode', nodeId=node_id, not_change=True)['node']['backendNodeId']
def make_chromium_ele(ele, loc, single=True, timeout=None, relative=True):
def find_in_chromium_ele(ele, loc, single=True, timeout=None, relative=True):
"""在chromium元素中查找 \n
:param ele: ChromiumElement对象
:param loc: 元素定位元组
@ -1117,14 +1117,14 @@ def _find_by_xpath(ele, xpath, single, timeout, relative=True):
return None
else:
# return ChromiumElement(ele.page, obj_id=r['result']['objectId'])
return _make_chromium_ele(ele.page, obj_id=r['result']['objectId'])
return make_chromium_ele(ele.page, obj_id=r['result']['objectId'])
else:
if r['result']['description'] == 'NodeList(0)':
return []
else:
r = ele.page.driver.Runtime.getProperties(objectId=r['result']['objectId'], ownProperties=True)['result']
return [_make_chromium_ele(ele.page, obj_id=i['value']['objectId'])
return [make_chromium_ele(ele.page, obj_id=i['value']['objectId'])
if i['value']['type'] == 'object' else i['value']['value']
for i in r[:-1]]
@ -1158,18 +1158,23 @@ def _find_by_css(ele, selector, single, timeout):
if r['result']['subtype'] == 'null':
return None
else:
return _make_chromium_ele(ele.page, obj_id=r['result']['objectId'])
return make_chromium_ele(ele.page, obj_id=r['result']['objectId'])
else:
if r['result']['description'] == 'NodeList(0)':
return []
else:
r = ele.page.driver.Runtime.getProperties(objectId=r['result']['objectId'], ownProperties=True)['result']
return [_make_chromium_ele(ele.page, obj_id=i['value']['objectId']) for i in r]
return [make_chromium_ele(ele.page, obj_id=i['value']['objectId']) for i in r]
def _make_chromium_ele(page, node_id=None, obj_id=None):
"""根据node id或object id生成相应元素对象"""
def make_chromium_ele(page, node_id=None, obj_id=None):
"""根据node id或object id生成相应元素对象 \n
:param page: ChromiumPage对象
:param node_id: 元素的node id
:param obj_id: 元素的object id
:return: ChromiumElement对象或ChromiumFrame对象
"""
ele = ChromiumElement(page, obj_id=obj_id, node_id=node_id)
if ele.tag in ('iframe', 'frame'):
from .chromium_frame import ChromiumFrame
@ -1290,7 +1295,7 @@ def _parse_js_result(page, ele, result):
elif class_name == 'HTMLDocument':
return result
else:
return _make_chromium_ele(page, obj_id=result['objectId'])
return make_chromium_ele(page, obj_id=result['objectId'])
elif sub_type == 'array':
r = page.driver.Runtime.getProperties(objectId=result['result']['objectId'], ownProperties=True)['result']

5
DrissionPage/chromium_element.pyi
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : chromium_element.py
"""
from pathlib import Path
from typing import Union, Tuple, List, Any
@ -321,7 +320,7 @@ class ChromiumShadowRootElement(BaseElement):
def _get_backend_id(self, node_id: str) -> str: ...
def make_chromium_ele(ele: ChromiumElement,
def find_in_chromium_ele(ele: ChromiumElement,
loc: Union[str, Tuple[str, str]],
single: bool = ...,
timeout: float = ...,
@ -341,7 +340,7 @@ def _find_by_css(ele: ChromiumElement,
timeout: float) -> Union[ChromiumElement, List[ChromiumElement], None]: ...
def _make_chromium_ele(page: ChromiumBase, node_id: str = ..., obj_id: str = ...) -> ChromiumElement: ...
def make_chromium_ele(page: ChromiumBase, node_id: str = ..., obj_id: str = ...) -> Union[ChromiumElement, ChromiumFrame]: ...
def _make_js_for_find_ele_by_xpath(xpath: str, type_txt: str, node_txt: str) -> str: ...

4
DrissionPage/chromium_frame.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from re import search
from urllib.parse import urlparse

4
DrissionPage/chromium_frame.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, Tuple, List
from session_element import SessionElement

4
DrissionPage/chromium_page.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from pathlib import Path
from platform import system
from re import search

4
DrissionPage/chromium_page.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from os import popen
from pathlib import Path
from typing import Union, Tuple, List

4
DrissionPage/chromium_tab.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from .chromium_base import ChromiumBase

4
DrissionPage/chromium_tab.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from .chromium_base import ChromiumBase
from .chromium_page import ChromiumPage

1
DrissionPage/common.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : common.py
"""
from html import unescape
from pathlib import Path

2
DrissionPage/config.py
View File

@ -1,9 +1,7 @@
# -*- coding:utf-8 -*-
"""
管理配置的类
@Author : g1879
@Contact : g1879@qq.com
@File : config.py
"""
from configparser import RawConfigParser, NoSectionError, NoOptionError
from http.cookiejar import Cookie

4
DrissionPage/config.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from configparser import RawConfigParser
from http.cookiejar import Cookie
from typing import Any, Union, List

1
DrissionPage/drission.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : drission.py
"""
from platform import system
from sys import exit

4
DrissionPage/drission.pyi
View File

@ -1,4 +1,8 @@
# -*- encoding: utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from subprocess import Popen
from typing import Union

1
DrissionPage/driver_element.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : driver_element.py
"""
from os import sep
from pathlib import Path

4
DrissionPage/driver_element.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, List, Any, Tuple
from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver

1
DrissionPage/driver_page.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : driver_page.py
"""
from glob import glob
from os import sep

4
DrissionPage/driver_page.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, List, Any, Tuple
from selenium.webdriver.chrome.webdriver import WebDriver

1
DrissionPage/easy_set.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : driver_page.py
"""
from os import popen
from pathlib import Path

4
DrissionPage/keys.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import List, Tuple, Dict

1
DrissionPage/mix_page.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : mix_page.py
"""
from .base import BasePage
from .drission import Drission

4
DrissionPage/mix_page.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, List, Tuple, Any
from DownloadKit import DownloadKit

1
DrissionPage/session_element.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : session_element.py
"""
from re import match, DOTALL

4
DrissionPage/session_element.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, List, Tuple
from lxml.html import HtmlElement

4
DrissionPage/session_page.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from re import search
from time import sleep
from urllib.parse import urlparse

5
DrissionPage/session_page.pyi
View File

@ -1,3 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Any, Union, Tuple, List
from DownloadKit import DownloadKit

1
DrissionPage/shadow_root_element.py
View File

@ -2,7 +2,6 @@
"""
@Author : g1879
@Contact : g1879@qq.com
@File : shadow_root_element.py
"""
from time import perf_counter
from typing import Union

4
DrissionPage/shadow_root_element.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, Any, Tuple, List
from selenium.webdriver.remote.webelement import WebElement

4
DrissionPage/tab.py
View File

@ -1,4 +1,8 @@
# -*- coding: utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from functools import partial
from json import dumps, loads
from logging import getLogger

2
DrissionPage/tools.py
View File

@ -1,5 +1,7 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
实用工具
"""
from FlowViewer import Listener, RequestMan

4
DrissionPage/web_page.py
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from time import sleep
from requests import Session

4
DrissionPage/web_page.pyi
View File

@ -1,4 +1,8 @@
# -*- coding:utf-8 -*-
"""
@Author : g1879
@Contact : g1879@qq.com
"""
from typing import Union, Tuple, List, Any
from DownloadKit import DownloadKit