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

Improve error reporting for open_pages_in_browser_tries_limit #1231

Browse source
This commit is contained in:
Jim Miller 2025-07-20 12:05:05 -05:00
parent d854a6efe7
commit e6d6227ff1
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fanficfare/fetchers/cache_browser.py
View file

@ -59,10 +59,23 @@ class BrowserCacheDecorator(FetcherDecorator):
with self.cache_lock:
# logger.debug("BrowserCacheDecorator fetcher_do_request")
fromcache=True
open_pages_in_browser_tries_limit = int(fetcher.getConfig("open_pages_in_browser_tries_limit",6))
# if usecache: # Ignore usecache flag--it's for BasicCache.
try:
d = self.cache.get_data(url)
parsedUrl = urlparse(url)
if domain_open_tries.get(parsedUrl.netloc,0) >= open_pages_in_browser_tries_limit:
raise exceptions.HTTPErrorFFF(
url,
428, # 404 & 410 trip StoryDoesNotExist
# 428 ('Precondition Required') gets the
# error_msg through to the user.
"open_pages_in_browser_tries_limit exceeded for site (%s), assuming site is off line."%parsedUrl.netloc,
None # data
)
d = self.cache.get_data(url)
open_tries = 2
# logger.debug("domain_open_tries:%s:"%domain_open_tries)
@ -70,7 +83,7 @@ class BrowserCacheDecorator(FetcherDecorator):
fetcher.getConfig("open_pages_in_browser",False) and
parsedUrl.scheme != 'file' and
not d and open_tries
and domain_open_tries.get(parsedUrl.netloc,0) < int(fetcher.getConfig("open_pages_in_browser_tries_limit",6)) ):
and domain_open_tries.get(parsedUrl.netloc,0) < open_pages_in_browser_tries_limit ):
logger.debug("\n\nopen page in browser: %s\ntries:%s\n"%(url,domain_open_tries.get(parsedUrl.netloc,None)))
open_url(url)
# logger.debug("domain_open_tries:%s:"%domain_open_tries)
@ -117,6 +130,7 @@ class BrowserCacheDecorator(FetcherDecorator):
"Page not found or expired in Browser Cache (see FFF setting browser_cache_age_limit)",# error_msg
None # data
)
return chainfn(
method,
url,