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

warn about expired cookies

Browse Source
This commit is contained in:
Mike Fährmann
2020-02-24 23:52:05 +01:00
parent 34887ae139
commit 2a4f227e08
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gallery_dl/extractor/common.py
View File

@@ -246,15 +246,22 @@ class Extractor():
def _check_cookies(self, cookienames, *, domain=None): 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 self._cookiejar:
return False
if domain is None: if domain is None:
domain = self.cookiedomain domain = self.cookiedomain
names = set(cookienames) names = set(cookienames)
now = time.time()
for cookie in self._cookiejar: for cookie in self._cookiejar:
if cookie.domain == domain: if cookie.name in names and cookie.domain == domain:
names.discard(cookie.name) if cookie.expires and cookie.expires < now:
if not names: self.log.warning("Cookie '%s' has expired", cookie.name)
return True else:
names.discard(cookie.name)
if not names:
return True
return False return False
def _get_date_min_max(self, dmin=None, dmax=None): def _get_date_min_max(self, dmin=None, dmax=None):