Pārlūkot izejas kodu

fix chrome profile precedence order to be equal

Nick Sweeting 6 gadi atpakaļ
vecāks
revīzija
8f73fdbe09
2 mainītis faili ar 11 papildinājumiem un 8 dzēšanām
  1. 7 4
      archivebox/config.py
  2. 4 4
      archivebox/util.py

+ 7 - 4
archivebox/config.py

@@ -77,15 +77,18 @@ if not CHROME_BINARY:
     common_chrome_executable_names = (
         'chromium-browser',
         'chromium',
+        '/Applications/Chromium.app/Contents/MacOS/Chromium',
+
         'google-chrome',
+        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
         'google-chrome-stable',
-        'google-chrome-unstable',
+        
         'google-chrome-beta',
-        'google-chrome-canary',
+        'google-chrome-unstable',
         'google-chrome-dev',
-        '/Applications/Chromium.app/Contents/MacOS/Chromium',
-        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+        'google-chrome-canary',
         '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
+
     )
     for name in common_chrome_executable_names:
         full_path_exists = shutil.which(name)

+ 4 - 4
archivebox/util.py

@@ -630,14 +630,14 @@ def chrome_args(binary=CHROME_BINARY, user_data_dir=CHROME_USER_DATA_DIR,
     # Find chrome user data directory
     default_profile_paths = (
         '~/.config/chromium',
+        '~/Library/Application Support/Chromium',
+        '~/AppData/Local/Chromium/User Data',
         '~/.config/google-chrome',
+        '~/Library/Application Support/Google/Chrome',
+        '~/AppData/Local/Google/Chrome/User Data',
         '~/.config/google-chrome-beta',
         '~/.config/google-chrome-unstable',
-        '~/Library/Application Support/Chromium',
-        '~/Library/Application Support/Google/Chrome',
         '~/Library/Application Support/Google/Chrome Canary',
-        '~/AppData/Local/Chromium/User Data',
-        '~/AppData/Local/Google/Chrome/User Data',
         '~/AppData/Local/Google/Chrome SxS/User Data',
     )
     if user_data_dir: