[cookies] Allow cookiefile to be a text stream

Closes #3674
This commit is contained in:
pukkandan 2022-05-10 11:44:45 +05:30
parent fe1daad3cb
commit d76fa1f3d4
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
3 changed files with 28 additions and 5 deletions

View File

@ -312,7 +312,7 @@ class YoutubeDL:
has been filtered out. has been filtered out.
break_per_url: Whether break_on_reject and break_on_existing break_per_url: Whether break_on_reject and break_on_existing
should act on each input URL as opposed to for the entire queue should act on each input URL as opposed to for the entire queue
cookiefile: File name where cookies should be read from and dumped to cookiefile: File name or text stream from where cookies should be read and dumped to
cookiesfrombrowser: A tuple containing the name of the browser, the profile cookiesfrombrowser: A tuple containing the name of the browser, the profile
name/pathfrom where cookies are loaded, and the name of the name/pathfrom where cookies are loaded, and the name of the
keyring. Eg: ('chrome', ) or ('vivaldi', 'default', 'BASICTEXT') keyring. Eg: ('chrome', ) or ('vivaldi', 'default', 'BASICTEXT')

View File

@ -83,9 +83,12 @@ def load_cookies(cookie_file, browser_specification, ydl):
cookie_jars.append(extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring)) cookie_jars.append(extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring))
if cookie_file is not None: if cookie_file is not None:
cookie_file = expand_path(cookie_file) is_filename = YoutubeDLCookieJar.is_path(cookie_file)
if is_filename:
cookie_file = expand_path(cookie_file)
jar = YoutubeDLCookieJar(cookie_file) jar = YoutubeDLCookieJar(cookie_file)
if os.access(cookie_file, os.R_OK): if not is_filename or os.access(cookie_file, os.R_OK):
jar.load(ignore_discard=True, ignore_expires=True) jar.load(ignore_discard=True, ignore_expires=True)
cookie_jars.append(jar) cookie_jars.append(jar)

View File

@ -1439,6 +1439,26 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar):
'CookieFileEntry', 'CookieFileEntry',
('domain_name', 'include_subdomains', 'path', 'https_only', 'expires_at', 'name', 'value')) ('domain_name', 'include_subdomains', 'path', 'https_only', 'expires_at', 'name', 'value'))
def __init__(self, filename=None, *args, **kwargs):
super().__init__(None, *args, **kwargs)
if self.is_path(filename):
filename = os.fspath(filename)
self.filename = filename
@staticmethod
def is_path(file):
return isinstance(file, (str, bytes, os.PathLike))
@contextlib.contextmanager
def open(self, file, *, write=False):
if self.is_path(file):
with open(file, 'w' if write else 'r', encoding='utf-8') as f:
yield f
else:
if write:
file.truncate(0)
yield file
def save(self, filename=None, ignore_discard=False, ignore_expires=False): def save(self, filename=None, ignore_discard=False, ignore_expires=False):
""" """
Save cookies to a file. Save cookies to a file.
@ -1458,7 +1478,7 @@ def save(self, filename=None, ignore_discard=False, ignore_expires=False):
if cookie.expires is None: if cookie.expires is None:
cookie.expires = 0 cookie.expires = 0
with open(filename, 'w', encoding='utf-8') as f: with self.open(filename, write=True) as f:
f.write(self._HEADER) f.write(self._HEADER)
now = time.time() now = time.time()
for cookie in self: for cookie in self:
@ -1514,7 +1534,7 @@ def prepare_line(line):
return line return line
cf = io.StringIO() cf = io.StringIO()
with open(filename, encoding='utf-8') as f: with self.open(filename) as f:
for line in f: for line in f:
try: try:
cf.write(prepare_line(line)) cf.write(prepare_line(line))