diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
index 2fa45fa..326f102 100644
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md
@@ -1,17 +1,11 @@
-（请按照以下模板填报issue，省略号的位置需要填入）
+在提交issue前，请确认已经给本库点了星星，这对我来说很重要。
-0. 我已给本库打了星星
+使用方法请查看[使用文档](http://g1879.gitee.io/drissionpagedocs)，文档里都有。
+也可在QQ群里提问（636361957）。
-1. 我本来想借助本库实现一个…………功能；
+请围绕以下内容陈述您的问题：
-2. 在实现的过程中我遇到了…………问题；
-
-3. 我已经查阅了[使用文档](http://g1879.gitee.io/drissionpagedocs)，与这个功能相关的章节链接是…………（请把链接粘贴到此处）；
-
-4. 我使用的python版本是……，DrissionPage版本是……；
-
-5. 我的代码截图是：
-（请在此处放图片）
-
-6. 我的报错截图是：
-（请在此处放图片）
+1. 遇到了什么问题？什么场景下出现的？如何重现？
+2. 请附上代码和报错信息（如有）
+3. DrissionPage、浏览器、python版本号是多少？
+4. 有什么意见建议？
diff --git a/DrissionPage/__init__.py b/DrissionPage/__init__.py
index 6859004..5fa6c0f 100644
--- a/DrissionPage/__init__.py
+++ b/DrissionPage/__init__.py
@@ -14,4 +14,4 @@ from ._configs.chromium_options import ChromiumOptions
from ._configs.session_options import SessionOptions
__all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__']
-__version__ = '4.0.4.14'
+__version__ = '4.0.4.15'
diff --git a/DrissionPage/_elements/chromium_element.py b/DrissionPage/_elements/chromium_element.py
index 62c3179..23e04f4 100644
--- a/DrissionPage/_elements/chromium_element.py
+++ b/DrissionPage/_elements/chromium_element.py
@@ -6,7 +6,7 @@
@License : BSD 3-Clause.
"""
from json import loads
-from os.path import basename, sep
+from os.path import basename
from pathlib import Path
from re import search
from time import perf_counter, sleep
@@ -552,11 +552,12 @@ class ChromiumElement(DrissionElement):
else:
return result['content']
- def save(self, path=None, name=None, timeout=None):
+ def save(self, path=None, name=None, timeout=None, rename=True):
"""保存图片或其它有src属性的元素的资源
:param path: 文件保存路径，为None时保存到当前文件夹
:param name: 文件名称，为None时从资源url获取
:param timeout: 等待资源加载的超时时间（秒）
+ :param rename: 是否覆盖重名文件
:return: 返回保存路径
"""
data = self.src(timeout=timeout)
@@ -572,6 +573,8 @@ class ChromiumElement(DrissionElement):
path = Path(path) / make_valid_name(name or basename(self.property('currentSrc')))
if not path.suffix:
path = path.with_suffix('.jpg')
+ if rename:
+ path = get_usable_path(path)
path.parent.mkdir(parents=True, exist_ok=True)
path = path.absolute()
write_type = 'wb' if isinstance(data, bytes) else 'w'
diff --git a/DrissionPage/_elements/chromium_element.pyi b/DrissionPage/_elements/chromium_element.pyi
index bf62dfb..9164d47 100644
--- a/DrissionPage/_elements/chromium_element.pyi
+++ b/DrissionPage/_elements/chromium_element.pyi
@@ -208,7 +208,11 @@ class ChromiumElement(DrissionElement):
def src(self, timeout: float = None, base64_to_bytes: bool = True) -> Union[bytes, str, None]: ...
- def save(self, path: [str, bool] = None, name: str = None, timeout: float = None) -> str: ...
+ def save(self,
+ path: [str, bool] = None,
+ name: str = None,
+ timeout: float = None,
+ rename: bool = True) -> str: ...
def get_screenshot(self,
path: [str, Path] = None,
diff --git a/DrissionPage/_units/listener.py b/DrissionPage/_units/listener.py
index afe171e..b24615b 100644
--- a/DrissionPage/_units/listener.py
+++ b/DrissionPage/_units/listener.py
@@ -216,9 +216,10 @@ class Listener(object):
self._running_requests = 0
self._running_targets = 0
- def wait_silent(self, timeout=None, targets_only=False):
+ def wait_silent(self, timeout=None, delay=0, targets_only=False):
"""等待所有请求结束
:param timeout: 超时，为None时无限等待
+ :param delay: 等待成功后延后若干秒再检测，返回最终结果
:param targets_only: 是否只等待targets指定的请求结束
:return: 返回是否等待成功
"""
@@ -227,12 +228,16 @@ class Listener(object):
if timeout is None:
while (not targets_only and self._running_requests > 0) or (targets_only and self._running_targets > 0):
sleep(.1)
- return True
+ sleep(delay)
+ return self._running_targets <= 0 if targets_only else self._running_requests <= 0
+ delaying = False
end_time = perf_counter() + timeout
while perf_counter() < end_time:
if (not targets_only and self._running_requests <= 0) or (targets_only and self._running_targets <= 0):
- return True
+ if delaying:
+ return True
+ sleep(delay)
sleep(.1)
else:
return False
diff --git a/DrissionPage/_units/listener.pyi b/DrissionPage/_units/listener.pyi
index 7020af6..84b048b 100644
--- a/DrissionPage/_units/listener.pyi
+++ b/DrissionPage/_units/listener.pyi
@@ -72,7 +72,7 @@ class Listener(object):
def clear(self) -> None: ...
- def wait_silent(self, timeout: float = None, targets_only: bool = False) -> bool: ...
+ def wait_silent(self, timeout: float = None, delay: float = 0, targets_only: bool = False) -> bool: ...
def _to_target(self, target_id: str, address: str, owner: ChromiumBase) -> None: ...
diff --git a/README.en.md b/README.en.md
new file mode 100644
index 0000000..642c916
--- /dev/null
+++ b/README.en.md
@@ -0,0 +1,109 @@
+# ✨️ Overview
+
+DrissionPage is a python-based web page automation tool.
+
+It can control the browser, send and receive data packets, and combine the two into one.
+
+It can take into account the convenience of browser automation and the high efficiency of requests.
+
+It is powerful and has countless built-in user-friendly designs and convenient functions.
+
+Its syntax is concise and elegant, the amount of code is small, and it is friendly to novices.
+
+---
+
+
+
+Project address: [gitee](https://gitee.com/g1879/DrissionPage) | [github](https://github.com/g1879/DrissionPage)
+
+Your star is my greatest support💖
+
+---
+
+Supported systems: Windows, Linux, Mac
+
+python version: 3.6 and above
+
+Supported browsers: Chromium core browsers (such as Chrome and Edge), electron applications
+
+---
+
+# 🛠 How to use
+
+**📖 Usage documentation:** [Click to view](https://g1879.gitee.io/drissionpagedocs)
+
+**Communication QQ group:** 636361957
+
+---
+
+# 📕 background
+
+When using requests for data collection, when facing a website to log in to, you have to analyze data packets and JS source code, construct complex requests, and often have to deal with anti-crawling methods such as verification codes, JS obfuscation, and signature parameters. The threshold is high and the development efficiency is low. high.
+Using a browser can largely bypass these pitfalls, but the browser is not very efficient.
+
+Therefore, the original intention of this library is to combine them into one and achieve "fast writing" and "fast running" at the same time. It can switch the corresponding mode when different needs are needed, and provide a humanized usage method to improve development and operation efficiency.
+In addition to merging the two, this library also encapsulates commonly used functions in web page units, providing very simple operations and statements, allowing users to reduce considerations of details and focus on function implementation. Implement powerful functions in a simple way and make your code more elegant.
+
+The previous version was implemented by repackaging selenium. Starting from 3.0, the author started from scratch, redeveloped the bottom layer, got rid of the dependence on selenium, enhanced functions, and improved operating efficiency.
+
+---
+
+# 💡 Concept
+
+Simple yet powerful!
+
+---
+
+# ☀️ Features and Highlights
+
+After long-term practice, the author has stepped through countless pitfalls, and all the experiences he has summarized have been written down in this library.
+
+## 🎇 Powerful self-developed core
+
+This library uses a fully self-developed kernel, has built-in N number of practical functions, and has integrated and optimized common functions. Compared with selenium, it has the following advantages:
+
+- No webdriver features
+- No need to download different drivers for different browser versions
+- Runs faster
+- Can find elements across `