update

woetu · woetu · commit 70529b7a96b3 · 2020-09-30T16:33:34.000+08:00
diff --git a/utils/FileUtil.py b/utils/FileUtil.py
@@ -14,6 +14,8 @@
 import zipfile
 
 # Pillow
+from shutil import copy
+
 from PIL import Image
 
 from . import StringUtil
@@ -149,7 +151,7 @@ def read_file_remove_line_feed(file_path):
 
 def write_temp(file_path, lines):
     """
-    创建临时文件
+    创建临时文件 import tempfile
     :param file_path:文件全路径
     :param lines:内容
     :return:
@@ -304,3 +306,24 @@ def size_unit_format(size, is_speed=False, precision=2):
         if size < unit:
             return f'{round(size, precision)}{i}'
     return f'{round(size, precision)}{i}'
+
+
+def copy_dir(dir, newdir):
+    """
+    复制目录到指定位置
+    import shutil
+    shutil.copytree(user_data, mkdtemp, True)
+    import distutils.dir_util
+    distutils.dir_util.copy_tree(user_data, mkdtemp)
+    :param dir: 需拷贝的文件夹
+    :param newdir: 是拷贝的地方
+    :return:
+    """
+    for p in os.listdir(dir):
+        filepath = os.path.join(newdir, p)
+        old_path = os.path.join(dir, p)
+        if os.path.isdir(old_path):
+            os.mkdir(filepath)
+            copy_dir(old_path, filepath)
+        if os.path.isfile(old_path):
+            copy(old_path, filepath)
diff --git a/utils/ReptileUtil.py b/utils/ReptileUtil.py
@@ -172,16 +172,29 @@ def selenium_driver(url, headless=True, incognito=True):
         options.add_argument('-disable-extensions')
         # 禁用浏览器应用
         options.add_argument('-disable-software-rasterizer')
-
+    else:
+        import tempfile
+        user_data = os.path.expanduser('~') + r"\AppData\Local\Google\Chrome\User Data"
+        # import getpass
+        # user_data = r"--user-data-dir=C:\Users\{}\AppData\Local\Google\Chrome\User Data".format(getpass.getuser())
+        # user_data = r"--user-data-dir=C:\Users\%s\AppData\Local\Google\Chrome\User Data" % os.environ["USERPROFILE"]
+        mkdtemp = tempfile.mkdtemp() + "\\User Data"
+        try:
+            # import distutils.dir_util
+            # distutils.dir_util.copy_tree(user_data, mkdtemp)
+            import shutil
+            shutil.copytree(user_data, mkdtemp, ignore_dangling_symlinks=True)
+        except:
+            pass
+        options.add_argument("--user-data-dir=" + mkdtemp)
     options.add_experimental_option('prefs', prefs)
     # capa = DesiredCapabilities.CHROME
     capa = options.to_capabilities()
     # 懒加载模式，不等待页面加载完毕
     # capa["pageLoadStrategy"] = "none"
 
     # 打开浏览器,executable_path指定驱动位置
-    # driver = webdriver.Chrome(chrome_options=options, executable_path=path, desired_capabilities=capa)
-    driver = webdriver.Chrome(executable_path=path, desired_capabilities=capa)
+    driver = webdriver.Chrome(executable_path=path, options=options, desired_capabilities=capa)
     # 下载设置
     driver.execute_cdp_cmd("Page.setDownloadBehavior", {'behavior': 'deny', 'downloadPath': "D:\\"})
 
@@ -230,6 +243,11 @@ def _quit(driver):
     driver.quit()
     driver.service.stop()
     os.system('taskkill /im chromedriver.exe /F')
+    user_data = driver.desired_capabilities["chrome"]["userDataDir"]
+    if os.path.exists(user_data):
+        path = os.path.split(user_data)
+        # 删除临时文件目录
+        os.remove(path[0])
 
 
 class SafeDriver:
