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

Code for FlareSolverr v2.0.X, can't handle images.

Browse source
This commit is contained in:
Jim Miller 2021-11-03 14:56:13 -05:00
parent d7940213ab
commit 06fa73666f
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fanficfare/flaresolverr_proxy.py
View file

@ -61,8 +61,8 @@ class FlareSolverr_ProxyFetcher(RequestsFetcher):
'session':FLARESOLVERR_SESSION}
)
# XXX check resp for error? What errors could occur?
logger.debug(json.dumps(resp.json, sort_keys=True,
indent=2, separators=(',', ':')))
# logger.debug(json.dumps(resp.json, sort_keys=True,
# indent=2, separators=(',', ':')))
self.fs_session = resp.json['session']
fs_data = {'cmd': cmd,
@ -108,10 +108,25 @@ class FlareSolverr_ProxyFetcher(RequestsFetcher):
logger.debug("response code:%s"%status_code)
# logger.debug(json.dumps(resp.json, sort_keys=True,
# indent=2, separators=(',', ':')))
data = base64.b64decode(resp.json['solution']['response'])
url = resp.json['solution']['url']
for c in cookiejson_to_jarable(resp.json['solution']['cookies']):
self.get_cookiejar().set_cookie(c)
if resp.json.get('version','').startswith('v2.'):
# FlareSolverr v2 detected, don't need base64 decode,
# and image downloads won't work.
if 'image' in resp.json['solution']['headers']['content-type']:
raise exceptions.HTTPErrorFFF(
url,
428, # 404 & 410 trip StoryDoesNotExist
# 428 ('Precondition Required') gets the
# error_msg through to the user.
"FlareSolverr v2 doesn't support image download.",# error_msg
None # data
)
data = resp.json['solution']['response']
else:
# v1 flaresolverr has 'download' option.
data = base64.b64decode(resp.json['solution']['response'])
else:
logger.debug("flaresolverr error resp:")
logger.debug(json.dumps(resp.json, sort_keys=True,