github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support cygwin/BSD/etc for --cookies-from-browser

Browse Source 
https://github.com/yt-dlp/yt-dlp/pull/3975
This commit is contained in:
Mike Fährmann
2022-06-11 14:07:03 +02:00
parent ae1b24aa6a
commit 34c428abf1
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
gallery_dl/cookies.py
View File

@@ -152,13 +152,11 @@ def _firefox_cookies_database(profile=None):
def _firefox_browser_directory(): def _firefox_browser_directory():
if sys.platform in ("linux", "linux2"): if sys.platform in ("win32", "cygwin"):
return os.path.expanduser("~/.mozilla/firefox")
if sys.platform == "win32":
return os.path.expandvars(R"%APPDATA%\Mozilla\Firefox\Profiles") return os.path.expandvars(R"%APPDATA%\Mozilla\Firefox\Profiles")
if sys.platform == "darwin": if sys.platform == "darwin":
return os.path.expanduser("~/Library/Application Support/Firefox") return os.path.expanduser("~/Library/Application Support/Firefox")
raise ValueError("unsupported platform '{}'".format(sys.platform)) return os.path.expanduser("~/.mozilla/firefox")
# -------------------------------------------------------------------- # --------------------------------------------------------------------
@@ -277,20 +275,7 @@ def _get_chromium_based_browser_settings(browser_name):
# /src/+/HEAD/docs/user_data_dir.md # /src/+/HEAD/docs/user_data_dir.md
join = os.path.join join = os.path.join
if sys.platform in ("linux", "linux2"): if sys.platform in ("win32", "cygwin"):
config = (os.environ.get("XDG_CONFIG_HOME") or
os.path.expanduser("~/.config"))
browser_dir = {
"brave" : join(config, "BraveSoftware/Brave-Browser"),
"chrome" : join(config, "google-chrome"),
"chromium": join(config, "chromium"),
"edge" : join(config, "microsoft-edge"),
"opera" : join(config, "opera"),
"vivaldi" : join(config, "vivaldi"),
}[browser_name]
elif sys.platform == "win32":
appdata_local = os.path.expandvars("%LOCALAPPDATA%") appdata_local = os.path.expandvars("%LOCALAPPDATA%")
appdata_roaming = os.path.expandvars("%APPDATA%") appdata_roaming = os.path.expandvars("%APPDATA%")
browser_dir = { browser_dir = {
@@ -315,7 +300,16 @@ def _get_chromium_based_browser_settings(browser_name):
}[browser_name] }[browser_name]
else: else:
raise ValueError("unsupported platform '{}'".format(sys.platform)) config = (os.environ.get("XDG_CONFIG_HOME") or
os.path.expanduser("~/.config"))
browser_dir = {
"brave" : join(config, "BraveSoftware/Brave-Browser"),
"chrome" : join(config, "google-chrome"),
"chromium": join(config, "chromium"),
"edge" : join(config, "microsoft-edge"),
"opera" : join(config, "opera"),
"vivaldi" : join(config, "vivaldi"),
}[browser_name]
# Linux keyring names can be determined by snooping on dbus # Linux keyring names can be determined by snooping on dbus
# while opening the browser in KDE: # while opening the browser in KDE:
@@ -379,16 +373,13 @@ class ChromeCookieDecryptor:
def get_cookie_decryptor(browser_root, browser_keyring_name, *, keyring=None): def get_cookie_decryptor(browser_root, browser_keyring_name, *, keyring=None):
if sys.platform in ("linux", "linux2"): if sys.platform in ("win32", "cygwin"):
return LinuxChromeCookieDecryptor( return WindowsChromeCookieDecryptor(browser_root)
browser_keyring_name, keyring=keyring)
elif sys.platform == "darwin": elif sys.platform == "darwin":
return MacChromeCookieDecryptor(browser_keyring_name) return MacChromeCookieDecryptor(browser_keyring_name)
elif sys.platform == "win32":
return WindowsChromeCookieDecryptor(browser_root)
else: else:
raise NotImplementedError("Chrome cookie decryption is not supported " return LinuxChromeCookieDecryptor(
"on {}".format(sys.platform)) browser_keyring_name, keyring=keyring)
class LinuxChromeCookieDecryptor(ChromeCookieDecryptor): class LinuxChromeCookieDecryptor(ChromeCookieDecryptor):