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

优化cookies域名设置；提高检查端口可用性速度

Browse Source
This commit is contained in:
g1879 2023-03-08 23:19:56 +08:00
parent 0d141e66b8
commit c708a80c6c
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DrissionPage/chromium_base.py
View File

@ -1004,7 +1004,12 @@ class ChromiumBaseSetter(object):
result_cookies = []
for cookie in cookies:
if not cookie.get('domain', None):
cookie['domain'] = urlparse(self._page.url).netloc
netloc = urlparse(self._page.url).netloc
if netloc.replace('.', '').isdigit(): # ip
cookie['domain'] = netloc
else: # 域名
u = netloc.split('.')
cookie['domain'] = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
result_cookies.append({'value': '' if cookie['value'] is None else cookie['value'],
'name': cookie['name'],
'domain': cookie['domain']})

2
DrissionPage/chromium_tab.py
View File

@ -291,7 +291,7 @@ class WebPageTab(SessionPage, ChromiumTab):
domain = netloc
else: # 域名
u = netloc.split('.')
domain = f'{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
domain = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
cookies = []
for cookie in super().get_cookies():
if not cookie.get('domain', None):

1
DrissionPage/commons/tools.py
View File

@ -120,6 +120,7 @@ def port_is_using(ip, port):
"""
from socket import socket, AF_INET, SOCK_STREAM
s = socket(AF_INET, SOCK_STREAM)
s.settimeout(.1)
result = s.connect_ex((ip, int(port)))
s.close()
return result == 0

4
DrissionPage/mixpage/drission.py
View File

@ -272,7 +272,7 @@ class Drission(object):
cookie_domain = browser_domain
else: # 域名
u = browser_domain.split('.')
cookie_domain = f'{u[-2]}.{u[-1]}' if len(u) > 1 else browser_domain
cookie_domain = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else browser_domain
else:
raise ValueError('cookie中没有域名或浏览器未访问过URL。')
@ -336,7 +336,7 @@ class Drission(object):
domain = ex_url
else: # 域名
u = ex_url.split('.')
domain = f'{u[-2]}.{u[-1]}' if len(u) > 1 else ex_url
domain = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else ex_url
cookies = []
for cookie in self.session.cookies:

2
DrissionPage/mixpage/session_page.py
View File

@ -215,7 +215,7 @@ class SessionPage(BasePage):
domain = netloc
else: # 域名
u = netloc.split('.')
domain = f'{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
domain = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
cookies = tuple(x for x in self.session.cookies if domain in x.domain or x.domain == '')
else:
cookies = tuple(x for x in self.session.cookies)

2
DrissionPage/session_page.py
View File

@ -195,7 +195,7 @@ class SessionPage(BasePage):
domain = netloc
else: # 域名
u = netloc.split('.')
domain = f'{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
domain = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
cookies = tuple(x for x in self.session.cookies if domain in x.domain or x.domain == '')
else:
cookies = tuple(x for x in self.session.cookies)

2
DrissionPage/web_page.py
View File

@ -365,7 +365,7 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
domain = netloc
else: # 域名
u = netloc.split('.')
domain = f'{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
domain = f'.{u[-2]}.{u[-1]}' if len(u) > 1 else netloc
cookies = []
for cookie in super().get_cookies():
if not cookie.get('domain', None):