Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code review: avoid compiling twice when list is fetched from remote location the 1st time

This commit is contained in:
gorhill 2017-05-20 15:32:03 -04:00
parent 1de523b7bf
commit 3109d19e3c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/js/storage.js
View File

@ -658,21 +658,34 @@
µBlock.getCompiledFilterList = function(assetKey, callback) {
var µb = this,
compiledPath = 'compiled/' + assetKey;
compiledPath = 'compiled/' + assetKey,
rawContent;
var onCompiledListLoaded2 = function(details) {
if ( details.content === '' ) {
details.content = µb.compileFilters(rawContent);
µb.assets.put(compiledPath, details.content);
}
rawContent = undefined;
details.assetKey = assetKey;
callback(details);
};
var onRawListLoaded = function(details) {
details.assetKey = assetKey;
if ( details.content === '' ) {
details.assetKey = assetKey;
callback(details);
return;
}
µb.extractFilterListMetadata(assetKey, details.content);
details.content = µb.compileFilters(details.content);
µb.assets.put(compiledPath, details.content);
callback(details);
// Fectching the raw content may cause the compiled content to be
// generated somewhere else in uBO, hence we try one last time to
// fetch the compiled content in case it has become available.
rawContent = details.content;
µb.assets.get(compiledPath, onCompiledListLoaded2);
};
var onCompiledListLoaded = function(details) {
var onCompiledListLoaded1 = function(details) {
if ( details.content === '' ) {
µb.assets.get(assetKey, onRawListLoaded);
return;
@ -681,7 +694,7 @@
callback(details);
};
this.assets.get(compiledPath, onCompiledListLoaded);
this.assets.get(compiledPath, onCompiledListLoaded1);
};
/******************************************************************************/