pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-07-23 11:54:13 +09:00
Code Issues Projects Releases Wiki Activity

removed alternative browser channels in favour of passing a profile path

Browse Source
This commit is contained in:
Matthew Broadway 2021-06-03 21:27:12 +01:00
parent e9bb3d5e21
commit 5f323b1a94
No known key found for this signature in database
GPG Key ID: DDC0B82B6896B381
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/cookies.py
View File

@ -25,8 +25,7 @@ except ImportError:
KEYRING_AVAILABLE = False KEYRING_AVAILABLE = False
SUPPORTED_BROWSERS = ['firefox', 'chrome', 'chrome_beta', 'chrome_dev', 'chromium', 'brave', 'opera', SUPPORTED_BROWSERS = ['firefox', 'chrome', 'chromium', 'brave', 'opera', 'edge']
'edge', 'edge_beta']
class Logger: class Logger:
@ -47,8 +46,7 @@ def _is_path(value):
def extract_cookies_from_browser(browser_name, profile=None, logger=Logger()): def extract_cookies_from_browser(browser_name, profile=None, logger=Logger()):
if browser_name == 'firefox': if browser_name == 'firefox':
return _extract_firefox_cookies(profile, logger) return _extract_firefox_cookies(profile, logger)
elif browser_name in ('chrome', 'chrome_beta', 'chrome_dev', 'chromium', elif browser_name in ('chrome', 'chromium', 'brave', 'opera', 'edge'):
'brave', 'opera', 'edge', 'edge_beta'):
return _extract_chrome_cookies(browser_name, profile, logger) return _extract_chrome_cookies(browser_name, profile, logger)
else: else:
raise ValueError('unknown browser: {}'.format(browser_name)) raise ValueError('unknown browser: {}'.format(browser_name))
@ -106,13 +104,10 @@ def _get_chrome_like_browser_settings(browser_name):
config = _config_home() config = _config_home()
browser_dir = { browser_dir = {
'chrome': os.path.join(config, 'google-chrome'), 'chrome': os.path.join(config, 'google-chrome'),
'chrome_beta': os.path.join(config, 'google-chrome-beta'),
'chrome_dev': os.path.join(config, 'google-chrome-unstable'),
'chromium': os.path.join(config, 'chromium'), 'chromium': os.path.join(config, 'chromium'),
'brave': os.path.join(config, 'BraveSoftware/Brave-Browser'), 'brave': os.path.join(config, 'BraveSoftware/Brave-Browser'),
'opera': os.path.join(config, 'opera'), 'opera': os.path.join(config, 'opera'),
'edge': os.path.join(config, 'microsoft-edge'), 'edge': os.path.join(config, 'microsoft-edge'),
'edge_beta': os.path.join(config, 'microsoft-edge-beta'),
}[browser_name] }[browser_name]
elif sys.platform == 'win32': elif sys.platform == 'win32':
@ -120,21 +115,16 @@ def _get_chrome_like_browser_settings(browser_name):
appdata_roaming = os.path.expandvars('%APPDATA%') appdata_roaming = os.path.expandvars('%APPDATA%')
browser_dir = { browser_dir = {
'chrome': os.path.join(appdata_local, r'Google\Chrome'), 'chrome': os.path.join(appdata_local, r'Google\Chrome'),
'chrome_beta': os.path.join(appdata_local, r'Google\Chrome Beta'),
'chrome_dev': os.path.join(appdata_local, r'Google\Chrome SxS'),
'chromium': os.path.join(appdata_local, r'Google\Chromium'), 'chromium': os.path.join(appdata_local, r'Google\Chromium'),
'brave': os.path.join(appdata_local, r'BraveSoftware\Brave-Browser'), 'brave': os.path.join(appdata_local, r'BraveSoftware\Brave-Browser'),
'opera': os.path.join(appdata_roaming, r'Opera Software\Opera Stable'), 'opera': os.path.join(appdata_roaming, r'Opera Software\Opera Stable'),
'edge': os.path.join(appdata_local, r'Microsoft\Edge'), 'edge': os.path.join(appdata_local, r'Microsoft\Edge'),
'edge_beta': os.path.join(appdata_local, r'Microsoft\Edge Beta'),
}[browser_name] }[browser_name]
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
appdata = os.path.expanduser('~/Library/Application Support') appdata = os.path.expanduser('~/Library/Application Support')
browser_dir = { browser_dir = {
'chrome': os.path.join(appdata, 'Google/Chrome'), 'chrome': os.path.join(appdata, 'Google/Chrome'),
'chrome_beta': os.path.join(appdata, 'Google/Chrome Beta'),
'chrome_dev': os.path.join(appdata, 'Google/Chrome Canary'),
'chromium': os.path.join(appdata, 'Google/Chromium'), 'chromium': os.path.join(appdata, 'Google/Chromium'),
'brave': os.path.join(appdata, 'BraveSoftware/Brave-Browser'), 'brave': os.path.join(appdata, 'BraveSoftware/Brave-Browser'),
'opera': os.path.join(appdata, 'com.operasoftware.Opera'), 'opera': os.path.join(appdata, 'com.operasoftware.Opera'),
@ -148,13 +138,10 @@ def _get_chrome_like_browser_settings(browser_name):
# dbus-monitor "interface='org.kde.KWallet'" "type=method_return" # dbus-monitor "interface='org.kde.KWallet'" "type=method_return"
keyring_name = { keyring_name = {
'chrome': 'Chrome', 'chrome': 'Chrome',
'chrome_beta': 'Chrome',
'chrome_dev': 'Chrome',
'chromium': 'Chromium', 'chromium': 'Chromium',
'brave': 'Brave', 'brave': 'Brave',
'opera': 'Opera' if sys.platform == 'darwin' else 'Chromium', 'opera': 'Opera' if sys.platform == 'darwin' else 'Chromium',
'edge': 'Mirosoft Edge' if sys.platform == 'darwin' else 'Chromium', 'edge': 'Mirosoft Edge' if sys.platform == 'darwin' else 'Chromium',
'edge_beta': 'Mirosoft Edge' if sys.platform == 'darwin' else 'Chromium',
}[browser_name] }[browser_name]
return { return {
@ -524,6 +511,8 @@ def parse_browser_specification(browser_specification):
if not parts[0] or len(parts) > 2: if not parts[0] or len(parts) > 2:
raise ValueError('invalid browser specification: "{}"'.format(browser_specification)) raise ValueError('invalid browser specification: "{}"'.format(browser_specification))
browser_name, profile = parts browser_name, profile = parts
if _is_path(profile):
profile = os.path.expanduser(profile)
return browser_name, profile return browser_name, profile