4.0.4.15元素save()增加rename参数；wait_silent()增加delay参数

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,17 +1,11 @@
-（请按照以下模板填报issue，省略号的位置需要填入）
+在提交issue前，请确认已经给本库点了星星，这对我来说很重要。
 
-0. 我已给本库打了星星
+使用方法请查看[使用文档](http://g1879.gitee.io/drissionpagedocs)，文档里都有。
+也可在QQ群里提问（636361957）。
 
-1. 我本来想借助本库实现一个…………功能；
+请围绕以下内容陈述您的问题：
 
-2. 在实现的过程中我遇到了…………问题；
+1. 遇到了什么问题？什么场景下出现的？如何重现？
-
+2. 请附上代码和报错信息（如有）
-3. 我已经查阅了[使用文档](http://g1879.gitee.io/drissionpagedocs)，与这个功能相关的章节链接是…………（请把链接粘贴到此处）；
+3. DrissionPage、浏览器、python版本号是多少？
-
+4. 有什么意见建议？
-4. 我使用的python版本是……，DrissionPage版本是……；
-
-5. 我的代码截图是：
-（请在此处放图片）
-
-6. 我的报错截图是：
-（请在此处放图片）

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'

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'

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,

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

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: ...
 

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.
+
+---
+
+<a href='https://gitee.com/g1879/DrissionPage/stargazers'><img src='https://gitee.com/g1879/DrissionPage/badge/star.svg?theme=dark' alt=' star'></img></a>
+
+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 `<iframe>` without switching in and out
+- Treat `<iframe>` as a normal element. After obtaining it, you can directly search for elements in it, making the logic clearer.
+- You can operate multiple tabs in the browser at the same time, even if the tab is inactive, no need to switch
+- Can directly read the browser cache to save images without using the GUI to click save
+- You can take screenshots of the entire web page, including parts outside the viewport (supported by browsers 90 and above)
+- Can handle shadow-root in non-open state
+
+## 🎇 Highlighted features
+
+In addition to the above advantages, this library also has numerous built-in humanized designs.
+
+- Minimalist grammar rules. Integrate a large number of commonly used functions to make the code more elegant
+- Positioning elements is easier and the function is more powerful and stable
+- Ubiquitous wait and auto-retry functionality. Make unstable networks easier to control, programs more stable, and writing more worry-free
+- Provide powerful download tools. You can also enjoy fast and reliable download functions when operating the browser
+- Allows repeated use of already open browsers. No need to start the browser from scratch every time, making debugging very convenient
+- Use ini files to save commonly used configurations and call them automatically, providing convenient settings and staying away from complicated configuration items.
+- Built-in lxml as a parsing engine, the parsing speed is improved by several orders of magnitude
+- Encapsulated using POM mode, which can be directly used for testing and easy to expand.
+- Highly integrated convenient functions, reflected in every detail
+- There are many details, so I won’t list them all here. You are welcome to experience them in actual use:)
+
+---
+
+# 🔖 Version History
+
+[Click to view version history](https://g1879.gitee.io/drissionpagedocs/history/introduction/)
+
+---
+
+# 🖐🏻 Disclaimer
+
+Please do not apply DrissionPage to any work that may violate legal regulations and moral constraints. Please use DrissionPage in a friendly manner, comply with the spider agreement, and do not use DrissionPage for any illegal purposes. If you choose to use DrissionPage
+This means that you abide by this agreement. The author does not bear any legal risks and losses caused by your violation of this agreement. You will be responsible for all consequences.
+
+---
+
+# ☕ Buy me coffee
+
+If this project is helpful to you, why not buy the author a cup of coffee :)
+
+![](https://gitee.com/g1879/DrissionPageDocs/raw/master/static/img/code.jpg)

README.md

@@ -63,21 +63,13 @@ python 版本：3.6 及以上
 本库采用全自研的内核，内置了 N 多实用功能，对常用功能作了整合和优化，对比 selenium，有以下优点：
 
 - 无 webdriver 特征
-
 - 无需为不同版本的浏览器下载不同的驱动
-
 - 运行速度更快
-
 - 可以跨`<iframe>`查找元素，无需切入切出
-
 - 把`<iframe>`看作普通元素，获取后可直接在其中查找元素，逻辑更清晰
-
 - 可以同时操作浏览器中的多个标签页，即使标签页为非激活状态，无需切换
-
 - 可以直接读取浏览器缓存来保存图片，无需用 GUI 点击另存
-
 - 可以对整个网页截图，包括视口外的部分（90以上版本浏览器支持）
-
 - 可处理非`open`状态的 shadow-root
 
 ## 🎇 亮点功能
@@ -85,23 +77,14 @@ python 版本：3.6 及以上
 除了以上优点，本库还内置了无数人性化设计。
 
 - 极简的语法规则。集成大量常用功能，代码更优雅
-
 - 定位元素更加容易，功能更强大稳定
-
 - 无处不在的等待和自动重试功能。使不稳定的网络变得易于控制，程序更稳定，编写更省心
-
 - 提供强大的下载工具。操作浏览器时也能享受快捷可靠的下载功能
-
 - 允许反复使用已经打开的浏览器。无须每次运行从头启动浏览器，调试超方便
-
 - 使用 ini 文件保存常用配置，自动调用，提供便捷的设置，远离繁杂的配置项
-
 - 内置 lxml 作为解析引擎，解析速度成几个数量级提升
-
 - 使用 POM 模式封装，可直接用于测试，便于扩展
-
 - 高度集成的便利功能，从每个细节中体现
-
 - 还有很多细节，这里不一一列举，欢迎实际使用中体验：）
 
 ---
@@ -123,4 +106,4 @@ python 版本：3.6 及以上
 
 如果本项目对您有所帮助，不妨请作者我喝杯咖啡 ：）
 
-![](https://g1879.gitee.io/drissionpagedocs/assets/images/code-cf68de50a2f331a2aa0d39c9aebbbe2c.jpg)
+![](https://gitee.com/g1879/DrissionPageDocs/raw/master/static/img/code.jpg)