Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

jsbrowser: Fix disk cache

Browse Source 
The Qt Disk Cache cannot share the same dir between instances, so we
ensure that never happens by using a temp dir for the cache. This means
that caching is not persistent, but it prevents problems, especially on
windows with its file locking.
This commit is contained in:
Kovid Goyal 2013-06-11 14:31:05 +05:30
parent 8f3a202019
commit c6cbaeb27f
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/web/feeds/jsnews.py
View File

@ -55,6 +55,8 @@ class JavascriptRecipe(BasicNewsRecipe):
:meth:`load_complete` to tell the download system when a page has finished :meth:`load_complete` to tell the download system when a page has finished
loading and is ready to be scraped. loading and is ready to be scraped.
You can use the builtin recipe for time.com as an example of the usage of
this class.
''' '''
#: Minimum calibre version needed to use this recipe #: Minimum calibre version needed to use this recipe

21
src/calibre/web/jsbrowser/browser.py
View File

@ -18,6 +18,7 @@ from PyQt4.QtWebKit import QWebPage, QWebSettings, QWebView, QWebElement
from calibre import USER_AGENT, prints, get_proxies, get_proxy_info, prepare_string_for_xml from calibre import USER_AGENT, prints, get_proxies, get_proxy_info, prepare_string_for_xml
from calibre.constants import ispy3, cache_dir from calibre.constants import ispy3, cache_dir
from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.utils.logging import ThreadSafeLog from calibre.utils.logging import ThreadSafeLog
from calibre.gui2 import must_use_qt from calibre.gui2 import must_use_qt
from calibre.web.jsbrowser.forms import FormsMixin, default_timeout from calibre.web.jsbrowser.forms import FormsMixin, default_timeout
@ -180,13 +181,14 @@ class NetworkAccessManager(QNetworkAccessManager): # {{{
} }
report_reply_signal = pyqtSignal(object) report_reply_signal = pyqtSignal(object)
def __init__(self, log, use_disk_cache=True, parent=None): def __init__(self, log, disk_cache_size=50, parent=None):
QNetworkAccessManager.__init__(self, parent) QNetworkAccessManager.__init__(self, parent)
self.reply_count = 0 self.reply_count = 0
self.log = log self.log = log
if use_disk_cache: if disk_cache_size > 0:
self.cache = QNetworkDiskCache(self) self.cache = QNetworkDiskCache(self)
self.cache.setCacheDirectory(os.path.join(cache_dir(), 'jsbrowser')) self.cache.setCacheDirectory(PersistentTemporaryDirectory(prefix='disk_cache_'))
self.cache.setMaximumCacheSize(int(disk_cache_size * 1024 * 1024))
self.setCache(self.cache) self.setCache(self.cache)
self.sslErrors.connect(self.on_ssl_errors) self.sslErrors.connect(self.on_ssl_errors)
self.pf = ProxyFactory(log) self.pf = ProxyFactory(log)
@ -341,8 +343,11 @@ class Browser(QObject, FormsMixin):
# User agent to be used # User agent to be used
user_agent=USER_AGENT, user_agent=USER_AGENT,
# If True a disk cache is used # The size (in MB) of the on disk cache. Note that because the disk
use_disk_cache=True, # cache cannot be shared between different instances, we currently
# use a temporary dir for the cache, which is deleted on
# program exit. Set to zero to disable cache.
disk_cache_size=50,
# Enable Inspect element functionality # Enable Inspect element functionality
enable_developer_tools=False, enable_developer_tools=False,
@ -368,7 +373,7 @@ class Browser(QObject, FormsMixin):
prompt_callback=prompt_callback, user_agent=user_agent, prompt_callback=prompt_callback, user_agent=user_agent,
enable_developer_tools=enable_developer_tools, enable_developer_tools=enable_developer_tools,
parent=self) parent=self)
self.nam = NetworkAccessManager(log, use_disk_cache=use_disk_cache, parent=self) self.nam = NetworkAccessManager(log, disk_cache_size=disk_cache_size, parent=self)
self.page.setNetworkAccessManager(self.nam) self.page.setNetworkAccessManager(self.nam)
@property @property
@ -635,7 +640,11 @@ class Browser(QObject, FormsMixin):
pass pass
def close(self): def close(self):
self.stop()
self.blank() self.blank()
self.stop()
self.nam.setCache(QNetworkDiskCache())
self.nam.cache = None
self.nam = self.page = None self.nam = self.page = None
def __enter__(self): def __enter__(self):