From 1abbf8e9a68ca2a50f81ff612002d6b2749cab88 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Fri, 20 Nov 2020 23:21:43 +0800
Subject: [PATCH] =?UTF-8?q?DriverOptions=E5=92=8COptionsManager=E7=9A=84sa?=
 =?UTF-8?q?ve()=E6=96=B9=E6=B3=95=E9=BB=98=E8=AE=A4=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=B0=E5=BD=93=E5=89=8D=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5'default'=E4=BF=9D=E5=AD=98=E5=88=B0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?ini=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/config.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/DrissionPage/config.py b/DrissionPage/config.py
index 45dc9c2..fcdd6b0 100644
--- a/DrissionPage/config.py
+++ b/DrissionPage/config.py
@@ -91,12 +91,16 @@ class OptionsManager(object):
         return self
 
     def save(self, path: str = None):
-        """保存配置文件                                      \n
-        :param path: ini文件的路径，默认保存到模块文件夹下的
+        """保存配置文件                                               \n
+        :param path: ini文件的路径，传入 'default' 保存到默认ini文件
         :return: 当前对象
         """
-        path = path or self.path
+        path = Path(__file__).parent / 'configs.ini' if path == 'default' else path
+        path = Path(path or self.path)
+        path = path / 'config.ini' if path.is_dir() else path
+        path = path.absolute()
         self._conf.write(open(path, 'w', encoding='utf-8'))
+
         return self
 
 
@@ -108,6 +112,7 @@ class DriverOptions(Options):
     def __init__(self, read_file: bool = True, ini_path: str = None):
         """初始化，默认从文件读取设置                      \n
         :param read_file: 是否从默认ini文件中读取配置信息
+        :param ini_path: ini文件路径，为None则读取默认ini文件
         """
         super().__init__()
         self._driver_path = None
@@ -135,13 +140,16 @@ class DriverOptions(Options):
         return self.binary_location
 
     def save(self, path: str = None):
-        """保存设置到文件                                     \n
-        :param path: ini文件的路径，默认保存到模块文件夹下的
+        """保存设置到文件                                              \n
+        :param path: ini文件的路径，传入 'default' 保存到默认ini文件
         :return: 当前对象
         """
         om = OptionsManager()
         options = _chrome_options_to_dict(self)
-        path = path or self.path
+        path = Path(__file__).parent / 'configs.ini' if path == 'default' else path
+        path = Path(path or self.path)
+        path = path / 'config.ini' if path.is_dir() else path
+        path = path.absolute()
 
         for i in options:
             if i == 'driver_path':
@@ -206,6 +214,7 @@ class DriverOptions(Options):
         :param on_off: 开或关
         :return: 当前对象
         """
+        on_off = True if on_off else False
         return self.set_argument('--headless', on_off)
 
     def set_no_imgs(self, on_off: bool = True):
@@ -213,6 +222,7 @@ class DriverOptions(Options):
         :param on_off: 开或关
         :return: 当前对象
         """
+        on_off = True if on_off else False
         return self.set_argument('--blink-settings=imagesEnabled=false', on_off)
 
     def set_no_js(self, on_off: bool = True):
@@ -220,6 +230,7 @@ class DriverOptions(Options):
         :param on_off: 开或关
         :return: 当前对象
         """
+        on_off = True if on_off else False
         return self.set_argument('--disable-javascript', on_off)
 
     def set_mute(self, on_off: bool = True):
@@ -227,6 +238,7 @@ class DriverOptions(Options):
         :param on_off: 开或关
         :return: 当前对象
         """
+        on_off = True if on_off else False
         return self.set_argument('--mute-audio', on_off)
 
     def set_user_agent(self, user_agent: str):