Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-09 05:21:13 +02:00
Code Issues Projects Releases Wiki Activity

Report cloudscraper exceptions as such, plus hide the potentially misleading 'opensource' part.

Browse source 
Closes #634
This commit is contained in:
Jim Miller 2021-01-16 15:23:41 -06:00
parent c680f3bb64
commit 1930df68d1
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fanficfare/configurable.py
View file

@ -46,6 +46,7 @@ import pickle
## isn't found in plugin when only imported down below inside
## get_scraper()
import cloudscraper
from cloudscraper.exceptions import CloudflareException
from . import exceptions
@ -1135,12 +1136,16 @@ class Configuration(ConfigParser):
if self.getConfig('use_cloudscraper',False):
logger.debug("Using cloudscraper for POST")
resp = self.get_scraper().post(url,
headers=dict(headers),
data=parameters)
logger.debug("response code:%s"%resp.status_code)
resp.raise_for_status() # raises HTTPError if error code.
data = resp.content
try:
resp = self.get_scraper().post(url,
headers=dict(headers),
data=parameters)
logger.debug("response code:%s"%resp.status_code)
resp.raise_for_status() # raises HTTPError if error code.
data = resp.content
except CloudflareException as e:
msg = unicode(e).replace(' in the opensource (free) version','...')
raise exceptions.FailedToDownload('cloudscraper reports: "%s"'%msg)
else:
req = Request(url,
data=ensure_binary(urlencode(parameters)),
@ -1324,7 +1329,13 @@ class Configuration(ConfigParser):
except Exception as e:
excpt=e
logger.debug("Caught an exception reading URL: %s sleeptime(%s) Exception %s."%(unicode(safe_url(url)),sleeptime,unicode(e)))
raise
if isinstance(e,CloudflareException):
## cloudscraper exception messages can appear to
## come from FFF and cause confusion.
msg = unicode(e).replace(' in the opensource (free) version','...')
raise exceptions.FailedToDownload('cloudscraper reports: "%s"'%msg)
else:
raise
logger.debug("Giving up on %s" %safe_url(url))
logger.debug(excpt, exc_info=True)