core: pitchers: add current user agent to debug log

providers: titlovi: generally load previous verification(s)
providers: addic7ed: close session on terminate
This commit is contained in:
panni
2019-04-07 06:54:42 +02:00
parent 7856cc5bb3
commit e20f102cb9
3 changed files with 3 additions and 3 deletions
@@ -243,7 +243,7 @@ def load_verification(site_name, session, callback=lambda x: None):
ccks = region.get("%s_data" % site_name, expiration_time=15552000) # 6m
if ccks != NO_VALUE:
cookies, user_agent = ccks
logger.debug("%s: Re-using previous user agent" % site_name.capitalize())
logger.debug("%s: Re-using previous user agent: %s", site_name.capitalize(), user_agent)
session.headers["User-Agent"] = user_agent
try:
session.cookies._cookies.update(cookies)
@@ -144,7 +144,7 @@ class Addic7edProvider(_Addic7edProvider):
self.logged_in = True
def terminate(self):
pass
self.session.close()
@region.cache_on_arguments(expiration_time=SHOW_EXPIRATION_TIME)
def _get_show_ids(self):
@@ -144,6 +144,7 @@ class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
logger.debug('User-Agent set to %s', self.session.headers['User-Agent'])
self.session.headers['Referer'] = self.server_url
logger.debug('Referer set to %s', self.session.headers['Referer'])
load_verification("titlovi", self.session)
def terminate(self):
self.session.close()
@@ -181,7 +182,6 @@ class TitloviProvider(Provider, ProviderSubtitleArchiveMixin):
while True:
# query the server
try:
load_verification("titlovi", self.session)
r = self.session.get(self.search_url, params=params, timeout=10)
r.raise_for_status()
except RequestException as e: