Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2025-12-06 08:52:55 +01:00
Code Issues Projects Releases Wiki Activity

Backout flaresolverr_json_fix since it doesn't work for everyone. #1122

Browse source
This commit is contained in:
Jim Miller 2024-10-14 22:02:12 -05:00
parent c1cf8995ea
commit 9cfd88c098
4 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
calibre-plugin/plugin-defaults.ini
View file

@ -653,11 +653,6 @@ browser_cache_age_limit:4.0
#flaresolverr_proxy_protocol:http
#flaresolverr_proxy_timeout:59000
## FlareSolverr, apparently, has problems with JSON. See #1122
## Optional switch in case it causes more problems than it fixes and
## needs to be turned off quickly by the user.
flaresolverr_json_fix:true
## Because some adapters can pull chapter URLs from human posts, the
## odds of errors in the chapter URLs can be higher for some
## sites/stories. You can set continue_on_chapter_error:true to

2
fanficfare/configurable.py
View file

@ -213,7 +213,6 @@ def get_valid_set_options():
'use_basic_cache':(None,None,boollist),
'use_nsapa_proxy':(None,None,boollist),
'use_flaresolverr_proxy':(None,None,boollist+['withimages','directimages']),
'flaresolverr_json_fix':(None,None,boollist),
## currently, browser_cache_path is assumed to be
## shared and only ffnet uses it so far
@ -531,7 +530,6 @@ def get_valid_keywords():
'nsapa_proxy_address',
'nsapa_proxy_port',
'use_flaresolverr_proxy',
'flaresolverr_json_fix',
'flaresolverr_proxy_address',
'flaresolverr_proxy_port',
'flaresolverr_proxy_protocol',

5
fanficfare/defaults.ini
View file

@ -613,11 +613,6 @@ browser_cache_age_limit:4.0
#flaresolverr_proxy_protocol:http
#flaresolverr_proxy_timeout:59000
## FlareSolverr, apparently, has problems with JSON. See #1122
## Optional switch in case it causes more problems than it fixes and
## needs to be turned off quickly by the user.
flaresolverr_json_fix:true
## Because some adapters can pull chapter URLs from human posts, the
## odds of errors in the chapter URLs can be higher for some
## sites/stories. You can set continue_on_chapter_error:true to

6
fanficfare/fetchers/fetcher_flaresolverr_proxy.py
View file

@ -24,7 +24,6 @@ logger = logging.getLogger(__name__)
import requests
from .. import exceptions
from ..htmlcleanup import stripHTML
from .log import make_log
from .base_fetcher import FetcherResponse
from .fetcher_requests import RequestsFetcher
@ -171,11 +170,6 @@ class FlareSolverr_ProxyFetcher(RequestsFetcher):
ensure_text(data),
data
)
## Flaresolverr, apparently, doesn't handle JSON returns
## gracefully.
## See https://github.com/JimmXinu/FanFicFare/issues/1122
if self.getConfig('flaresolverr_json_fix',True) and '<div class=\"json-formatter-container\">' in data:
data = stripHTML(data)
return FetcherResponse(data,
url,