From 6958685b1a9047e737bb750bbaa3b8bfcead1b28 Mon Sep 17 00:00:00 2001
From: Max <max32002@gmail.com>
Date: Sat, 29 Jul 2023 18:16:10 +0800
Subject: [PATCH] use chromedriver_autodownload instead of uc auto download.

---
 chrome_tixcraft.py | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py
index d6311b3..0a0ae38 100644
--- a/chrome_tixcraft.py
+++ b/chrome_tixcraft.py
@@ -55,7 +55,7 @@ import argparse
 import itertools
 import chromedriver_autoinstaller
 
-CONST_APP_VERSION = "MaxBot (2023.07.22)"
+CONST_APP_VERSION = "MaxBot (2023.07.23)"
 
 CONST_MAXBOT_CONFIG_FILE = "settings.json"
 CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt"
@@ -562,6 +562,9 @@ def load_chromdriver_uc(config_dict):
 
     driver = None
     if os.path.exists(chromedriver_path):
+        # use chromedriver_autodownload instead of uc auto download.
+        is_cache_exist = clean_uc_exe_cache()
+
         try:
             driver = uc.Chrome(driver_executable_path=chromedriver_path, options=options, headless=config_dict["advanced"]["headless"])
         except Exception as exc:
@@ -576,25 +579,19 @@ def load_chromdriver_uc(config_dict):
                 print(CONST_CHROME_VERSION_NOT_MATCH_EN)
                 print(CONST_CHROME_VERSION_NOT_MATCH_TW)
 
-            is_cache_exist = clean_uc_exe_cache()
-            if is_cache_exist:
-                try:
-                    driver = uc.Chrome(driver_executable_path=chromedriver_path, options=options, headless=config_dict["advanced"]["headless"])
-                except Exception as exc:
-                    pass
-            else:
-                # remove exist download again.
-                try:
-                    os.unlink(chromedriver_path)
-                except PermissionError:
-                    pass
-                except FileNotFoundError:
-                    pass
-                chromedriver_autoinstaller.install(path="webdriver", make_version_dir=False)
-                try:
-                    driver = uc.Chrome(driver_executable_path=chromedriver_path, options=options, headless=config_dict["advanced"]["headless"])
-                except Exception as exc2:
-                    pass
+            # remove exist chromedriver, download again.
+            try:
+                os.unlink(chromedriver_path)
+            except PermissionError:
+                pass
+            except FileNotFoundError:
+                pass
+
+            chromedriver_autoinstaller.install(path="webdriver", make_version_dir=False)
+            try:
+                driver = uc.Chrome(driver_executable_path=chromedriver_path, options=options, headless=config_dict["advanced"]["headless"])
+            except Exception as exc2:
+                pass
     else:
         print("WebDriver not found at path:", chromedriver_path)