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

Wrap browser cache in thread lock just in case.

Browse source
This commit is contained in:
Jim Miller 2023-01-05 14:07:34 -06:00
parent 91d6aacc74
commit 1d5afe8cd6
1 changed files with 53 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
fanficfare/fetchers/cache_browser.py
View file

@ -19,6 +19,7 @@ from __future__ import absolute_import
import logging
logger = logging.getLogger(__name__)
import threading
import traceback
import time
import webbrowser
@ -36,7 +37,7 @@ class BrowserCacheDecorator(FetcherDecorator):
def __init__(self,cache):
super(BrowserCacheDecorator,self).__init__()
self.cache = cache
self.cache_lock = threading.RLock()
def fetcher_do_request(self,
fetcher,
@ -46,56 +47,58 @@ class BrowserCacheDecorator(FetcherDecorator):
parameters=None,
referer=None,
usecache=True):
# logger.debug("BrowserCacheDecorator fetcher_do_request")
fromcache=True
if usecache:
try:
d = self.cache.get_data(url)
## XXX - should there be a fail counter / limit for
## cases of pointing to wrong cache/etc?
parsedUrl = urlparse(url)
sleeptries = [ 2, 5 ]
while( fetcher.getConfig("use_browser_cache_only") and
fetcher.getConfig("open_pages_in_browser",False) and
not d and sleeptries
and domain_open_tries.get(parsedUrl.netloc,0) < fetcher.getConfig("open_browser_pages_tries_limit",6)):
logger.debug("\n\nopen page in browser: %s\ntries:%s\n"%(url,domain_open_tries.get(parsedUrl.netloc,0)))
webbrowser.open(url)
domain_open_tries[parsedUrl.netloc] = domain_open_tries.get(parsedUrl.netloc,0) + 1
fromcache=False
if parsedUrl.netloc not in domain_open_tries:
logger.debug("First time for (%s) extra sleep"%parsedUrl.netloc)
time.sleep(5)
time.sleep(sleeptries.pop(0))
with self.cache_lock:
# logger.debug("BrowserCacheDecorator fetcher_do_request")
fromcache=True
if usecache:
try:
d = self.cache.get_data(url)
# logger.debug(d)
except Exception as e:
logger.debug(traceback.format_exc())
raise exceptions.BrowserCacheException("Browser Cache Failed to Load with error '%s'"%e)
# had a d = b'' which showed HIT, but failed.
logger.debug(make_log('BrowserCache',method,url,True if d else False))
# logger.debug(d)
if d:
domain_open_tries[parsedUrl.netloc] = 0
logger.debug("fromcache:%s"%fromcache)
return FetcherResponse(d,redirecturl=url,fromcache=fromcache)
## XXX - should there be a fail counter / limit for
## cases of pointing to wrong cache/etc?
if fetcher.getConfig("use_browser_cache_only"):
raise exceptions.HTTPErrorFFF(
parsedUrl = urlparse(url)
sleeptries = [ 2, 5 ]
while( fetcher.getConfig("use_browser_cache_only") and
fetcher.getConfig("open_pages_in_browser",False) and
not d and sleeptries
and domain_open_tries.get(parsedUrl.netloc,0) < fetcher.getConfig("open_browser_pages_tries_limit",6) ):
logger.debug("\n\nopen page in browser: %s\ntries:%s\n"%(url,domain_open_tries.get(parsedUrl.netloc,0)))
webbrowser.open(url)
domain_open_tries[parsedUrl.netloc] = domain_open_tries.get(parsedUrl.netloc,0) + 1
fromcache=False
if parsedUrl.netloc not in domain_open_tries:
logger.debug("First time for (%s) extra sleep"%parsedUrl.netloc)
time.sleep(5)
time.sleep(sleeptries.pop(0))
d = self.cache.get_data(url)
# logger.debug(d)
except Exception as e:
logger.debug(traceback.format_exc())
raise exceptions.BrowserCacheException("Browser Cache Failed to Load with error '%s'"%e)
# had a d = b'' which showed HIT, but failed.
logger.debug(make_log('BrowserCache',method,url,True if d else False))
# logger.debug(d)
if d:
domain_open_tries[parsedUrl.netloc] = 0
logger.debug("fromcache:%s"%fromcache)
return FetcherResponse(d,redirecturl=url,fromcache=fromcache)
if fetcher.getConfig("use_browser_cache_only"):
raise exceptions.HTTPErrorFFF(
url,
428, # 404 & 410 trip StoryDoesNotExist
# 428 ('Precondition Required') gets the
# error_msg through to the user.
"Page not found or expired in Browser Cache (see FFF setting browser_cache_age_limit)",# error_msg
None # data
)
return chainfn(
method,
url,
428, # 404 & 410 trip StoryDoesNotExist
# 428 ('Precondition Required') gets the
# error_msg through to the user.
"Page not found or expired in Browser Cache (see FFF setting browser_cache_age_limit)",# error_msg
None # data
)
return chainfn(
method,
url,
parameters=parameters,
referer=referer,
usecache=usecache)
parameters=parameters,
referer=referer,
usecache=usecache)