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

store the original cookiejar as Extractor._cookiejar

Browse Source
This commit is contained in:
Mike Fährmann
2019-11-05 17:55:32 +01:00
parent de83ae4576
commit 1a197d2195
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gallery_dl/extractor/common.py
View File

@@ -37,17 +37,20 @@ class Extractor():
self.session = requests.Session() self.session = requests.Session()
self.log = logging.getLogger(self.category) self.log = logging.getLogger(self.category)
self.url = match.string self.url = match.string
self._init_headers()
self._init_cookies() self._cookiefile = None
self._init_proxies() self._cookiejar = self.session.cookies
self._retries = self.config("retries", 4) self._retries = self.config("retries", 4)
self._timeout = self.config("timeout", 30) self._timeout = self.config("timeout", 30)
self._verify = self.config("verify", True) self._verify = self.config("verify", True)
self._cookiefile = None
if self._retries < 0: if self._retries < 0:
self._retries = float("inf") self._retries = float("inf")
self._init_headers()
self._init_cookies()
self._init_proxies()
@classmethod @classmethod
def from_url(cls, url): def from_url(cls, url):
if isinstance(cls.pattern, str): if isinstance(cls.pattern, str):
@@ -183,7 +186,7 @@ class Extractor():
except OSError as exc: except OSError as exc:
self.log.warning("cookies: %s", exc) self.log.warning("cookies: %s", exc)
else: else:
self.session.cookies.update(cookiejar) self._cookiejar.update(cookiejar)
self._cookiefile = cookiefile self._cookiefile = cookiefile
else: else:
self.log.warning( self.log.warning(
@@ -199,10 +202,10 @@ class Extractor():
"""Store the session's cookiejar in a cookies.txt file""" """Store the session's cookiejar in a cookies.txt file"""
if self._cookiefile and self.config("cookies-update", False): if self._cookiefile and self.config("cookies-update", False):
cookiejar = http.cookiejar.MozillaCookieJar() cookiejar = http.cookiejar.MozillaCookieJar()
for cookie in self.session.cookies: for cookie in self._cookiejar:
cookiejar.set_cookie(cookie) cookiejar.set_cookie(cookie)
try: try:
cookiejar.save(self.cookiefile) cookiejar.save(self._cookiefile)
except OSError as exc: except OSError as exc:
self.log.warning("cookies: %s", exc) self.log.warning("cookies: %s", exc)
@@ -211,7 +214,7 @@ class Extractor():
if isinstance(cookies, dict): if isinstance(cookies, dict):
self._update_cookies_dict(cookies, domain or self.cookiedomain) self._update_cookies_dict(cookies, domain or self.cookiedomain)
else: else:
setcookie = self.session.cookies.set_cookie setcookie = self._cookiejar.set_cookie
try: try:
cookies = iter(cookies) cookies = iter(cookies)
except TypeError: except TypeError:
@@ -222,17 +225,17 @@ class Extractor():
def _update_cookies_dict(self, cookiedict, domain): def _update_cookies_dict(self, cookiedict, domain):
"""Update cookiejar with name-value pairs from a dict""" """Update cookiejar with name-value pairs from a dict"""
setcookie = self.session.cookies.set setcookie = self._cookiejar.set
for name, value in cookiedict.items(): for name, value in cookiedict.items():
setcookie(name, value, domain=domain) setcookie(name, value, domain=domain)
def _check_cookies(self, cookienames, *, domain=""): def _check_cookies(self, cookienames, *, domain=None):
"""Check if all 'cookienames' are in the session's cookiejar""" """Check if all 'cookienames' are in the session's cookiejar"""
if not domain: if domain is None:
domain = self.cookiedomain domain = self.cookiedomain
try: try:
for name in cookienames: for name in cookienames:
self.session.cookies._find(name, domain) self._cookiejar._find(name, domain)
except KeyError: except KeyError:
return False return False
return True return True