4.1.0.10修复文件下载重命名设置；Settings.locate_suffixes_list改为Settings.suffixes_list_path

DrissionPage/__init__.py

@@ -12,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.9'
+__version__ = '4.1.0.10'

DrissionPage/_functions/cookies.py

@@ -92,7 +92,7 @@ def set_browser_cookies(browser, cookies):
 
 
 def set_tab_cookies(page, cookies):
-    suffixes_list = f"file:///{Settings.locate_suffixes_list}"
+    suffixes_list = f"file:///{Settings.suffixes_list_path}"
     for cookie in cookies_to_tuple(cookies):
         cookie = format_cookie(cookie)
 

DrissionPage/_functions/settings.py

@@ -15,7 +15,12 @@ class Settings(object):
     singleton_tab_obj = True
     cdp_timeout = 30
     auto_handle_alert = None
-    locate_suffixes_list = str(Path(__file__).parent.absolute() / 'suffixes.dat').replace('\\', '/')
+    _suffixes_list = str(Path(__file__).parent.absolute() / 'suffixes.dat').replace('\\', '/')
 
-    def set_suffixes_list_path(self, path):
-        Settings.locate_suffixes_list = str(Path(path).absolute())
+    @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('\\', '/')

DrissionPage/_functions/settings.pyi

@@ -16,11 +16,9 @@ class Settings(object):
     singleton_tab_obj: bool = ...
     cdp_timeout: float = ...
     auto_handle_alert: Optional[bool] = ...
-    locate_suffixes_list: str = ...
+    _suffixes_list: str = ...
 
-    def set_suffixes_list_path(self, path: Union[str, Path]) -> None:
-        """设置用于识别域名后缀的文件路径
-        :param path: 文件路径
-        :return: None
-        """
+    @property
+    def suffixes_list_path(self) -> str:
+        """设置用于识别域名后缀的文件路径"""
         ...

DrissionPage/_pages/session_page.py

@@ -158,7 +158,7 @@ class SessionPage(BasePage):
             if self.url:
                 ex_url = TLDExtract(
                     suffix_list_urls=["https://publicsuffix.org/list/public_suffix_list.dat",
-                                      f"file:///{Settings.locate_suffixes_list}"]).extract_str(self._session_url)
+                                      f"file:///{Settings.suffixes_list_path}"]).extract_str(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:

DrissionPage/_units/setter.py

@@ -271,6 +271,7 @@ class ChromiumPageSetter(TabSetter):
             self._owner._DownloadKit.set.save_path(path)
 
     def download_file_name(self, name=None, suffix=None):
+        super().download_file_name(name=name, suffix=suffix)
         self._owner.browser.set.download_file_name(name, suffix)