From 9cfd88c0984726d37fd27acdefeaa92180d70c27 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 14 Oct 2024 22:02:12 -0500 Subject: [PATCH] Backout flaresolverr_json_fix since it doesn't work for everyone. #1122 --- calibre-plugin/plugin-defaults.ini | 5 ----- fanficfare/configurable.py | 2 -- fanficfare/defaults.ini | 5 ----- fanficfare/fetchers/fetcher_flaresolverr_proxy.py | 6 ------ 4 files changed, 18 deletions(-) diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index fa900325..9fbfc05d 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -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 diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index 584356b3..c6438fc3 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -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', diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 9ba10b48..93da1a6c 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -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 diff --git a/fanficfare/fetchers/fetcher_flaresolverr_proxy.py b/fanficfare/fetchers/fetcher_flaresolverr_proxy.py index 57b5670a..e4f10b7b 100644 --- a/fanficfare/fetchers/fetcher_flaresolverr_proxy.py +++ b/fanficfare/fetchers/fetcher_flaresolverr_proxy.py @@ -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 '
' in data: - data = stripHTML(data) return FetcherResponse(data, url,