mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-10 17:17:57 +01:00
remove obsolete resource caching code
This commit is contained in:
Raymond Hill
parent
2ef892c086
commit
36956cbc7a
4 changed files with 15 additions and 262 deletions
|
|
@ -547,16 +547,9 @@ var fromCloudData = function(data, append) {
|
|||
checked = data.ignoreGenericCosmeticFilters === true || append && elem.checked;
|
||||
elem.checked = listDetails.ignoreGenericCosmeticFilters = checked;
|
||||
|
||||
var listKey;
|
||||
for ( i = 0, n = data.selectedLists.length; i < n; i++ ) {
|
||||
listKey = data.selectedLists[i];
|
||||
if ( listDetails.aliases[listKey] ) {
|
||||
data.selectedLists[i] = listDetails.aliases[listKey];
|
||||
}
|
||||
}
|
||||
var selectedSet = new Set(data.selectedLists),
|
||||
listEntries = uDom('#lists .listEntry'),
|
||||
listEntry, input;
|
||||
listEntry, listKey, input;
|
||||
for ( i = 0, n = listEntries.length; i < n; i++ ) {
|
||||
listEntry = listEntries.at(i);
|
||||
listKey = listEntry.attr('data-listkey');
|
||||
|
|
|
|||
167
src/js/assets.js
167
src/js/assets.js
|
|
@ -167,157 +167,6 @@ api.fetchText = function(url, onLoad, onError) {
|
|||
}
|
||||
};
|
||||
|
||||
/*******************************************************************************
|
||||
|
||||
TODO(seamless migration):
|
||||
This block of code will be removed when I am confident all users have
|
||||
moved to a version of uBO which does not require the old way of caching
|
||||
assets.
|
||||
|
||||
api.listKeyAliases: a map of old asset keys to new asset keys.
|
||||
|
||||
migrate(): to seamlessly migrate the old cache manager to the new one:
|
||||
- attempt to preserve and move content of cached assets to new locations;
|
||||
- removes all traces of now obsolete cache manager entries in cacheStorage.
|
||||
|
||||
This code will typically execute only once, when the newer version of uBO
|
||||
is first installed and executed.
|
||||
|
||||
**/
|
||||
|
||||
api.listKeyAliases = {
|
||||
"assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat": "public_suffix_list.dat",
|
||||
"assets/user/filters.txt": "user-filters",
|
||||
"assets/ublock/resources.txt": "ublock-resources",
|
||||
"assets/ublock/filters.txt": "ublock-filters",
|
||||
"assets/ublock/privacy.txt": "ublock-privacy",
|
||||
"assets/ublock/unbreak.txt": "ublock-unbreak",
|
||||
"assets/ublock/badware.txt": "ublock-badware",
|
||||
"assets/ublock/experimental.txt": "ublock-experimental",
|
||||
"https://easylist-downloads.adblockplus.org/easylistchina.txt": "CHN-0",
|
||||
"https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt": "CHN-1",
|
||||
"https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjx-annoyance.txt": "CHN-2",
|
||||
"https://easylist-downloads.adblockplus.org/easylistgermany.txt": "DEU-0",
|
||||
"https://adblock.dk/block.csv": "DNK-0",
|
||||
"assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt": "easylist",
|
||||
"https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt": "easylist-nocosmetic",
|
||||
"assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt": "easyprivacy",
|
||||
"https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt": "fanboy-annoyance",
|
||||
"https://easylist-downloads.adblockplus.org/fanboy-social.txt": "fanboy-social",
|
||||
"https://easylist-downloads.adblockplus.org/liste_fr.txt": "FRA-0",
|
||||
"http://adblock.gardar.net/is.abp.txt": "ISL-0",
|
||||
"https://easylist-downloads.adblockplus.org/easylistitaly.txt": "ITA-0",
|
||||
"https://dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt": "ITA-1",
|
||||
"https://easylist-downloads.adblockplus.org/advblock.txt": "RUS-0",
|
||||
"https://easylist-downloads.adblockplus.org/bitblock.txt": "RUS-1",
|
||||
"https://filters.adtidy.org/extension/chromium/filters/1.txt": "RUS-2",
|
||||
"https://adguard.com/en/filter-rules.html?id=1": "RUS-2",
|
||||
"https://easylist-downloads.adblockplus.org/easylistdutch.txt": "NLD-0",
|
||||
"https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt": "LVA-0",
|
||||
"http://hosts-file.net/.%5Cad_servers.txt": "hphosts",
|
||||
"http://adblock.ee/list.php": "EST-0",
|
||||
"https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt": "disconnect-malvertising",
|
||||
"https://s3.amazonaws.com/lists.disconnect.me/simple_malware.txt": "disconnect-malware",
|
||||
"https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt": "disconnect-tracking",
|
||||
"https://www.certyficate.it/adblock/adblock.txt": "POL-0",
|
||||
"https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt": "POL-0",
|
||||
"https://easylist-downloads.adblockplus.org/antiadblockfilters.txt": "awrl-0",
|
||||
"http://adb.juvander.net/Finland_adb.txt": "FIN-0",
|
||||
"https://raw.githubusercontent.com/gfmaster/adblock-korea-contrib/master/filter.txt": "KOR-0",
|
||||
"https://raw.githubusercontent.com/yous/YousList/master/youslist.txt": "KOR-1",
|
||||
"https://www.fanboy.co.nz/fanboy-korean.txt": "KOR-2",
|
||||
"https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt": "IDN-0",
|
||||
"https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt": "IDN-0",
|
||||
"https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abpjf.txt": "JPN-0",
|
||||
"https://raw.githubusercontent.com/liamja/Prebake/master/obtrusive.txt": "EU-prebake",
|
||||
"https://easylist-downloads.adblockplus.org/Liste_AR.txt": "ara-0",
|
||||
"http://margevicius.lt/easylistlithuania.txt": "LTU-0",
|
||||
"assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt": "malware-0",
|
||||
"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains": "malware-1",
|
||||
"http://malwaredomains.lehigh.edu/files/immortal_domains.txt": "malware-2",
|
||||
"assets/thirdparties/pgl.yoyo.org/as/serverlist": "plowe-0",
|
||||
"https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt": "ISR-0",
|
||||
"https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt": "reek-0",
|
||||
"https://raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt": "HUN-0",
|
||||
"https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt": "CZE-0",
|
||||
"http://someonewhocares.org/hosts/hosts": "dpollock-0",
|
||||
"https://raw.githubusercontent.com/Dawsey21/Lists/master/adblock-list.txt": "spam404-0",
|
||||
"http://stanev.org/abp/adblock_bg.txt": "BGR-0",
|
||||
"http://winhelp2002.mvps.org/hosts.txt": "mvps-0",
|
||||
"https://www.fanboy.co.nz/enhancedstats.txt": "fanboy-enhanced",
|
||||
"https://www.fanboy.co.nz/fanboy-antifacebook.txt": "fanboy-thirdparty_social",
|
||||
"https://easylist-downloads.adblockplus.org/easylistspanish.txt": "spa-0",
|
||||
"https://www.fanboy.co.nz/fanboy-swedish.txt": "SWE-0",
|
||||
"https://www.fanboy.co.nz/r/fanboy-ultimate.txt": "fanboy-ultimate",
|
||||
"https://filters.adtidy.org/extension/chromium/filters/13.txt": "TUR-0",
|
||||
"https://adguard.com/filter-rules.html?id=13": "TUR-0",
|
||||
"https://www.fanboy.co.nz/fanboy-vietnam.txt": "VIE-0",
|
||||
"https://www.void.gr/kargig/void-gr-filters.txt": "GRC-0",
|
||||
"https://raw.githubusercontent.com/betterwebleon/slovenian-list/master/filters.txt": "SVN-0"
|
||||
};
|
||||
|
||||
var migrate = function(callback) {
|
||||
var entries,
|
||||
moveCount = 0,
|
||||
toRemove = [];
|
||||
|
||||
var countdown = function(change) {
|
||||
moveCount -= (change || 0);
|
||||
if ( moveCount !== 0 ) { return; }
|
||||
vAPI.cacheStorage.remove(toRemove);
|
||||
saveAssetCacheRegistry();
|
||||
callback();
|
||||
};
|
||||
|
||||
var onContentRead = function(oldKey, newKey, bin) {
|
||||
var content = bin && bin['cached_asset_content://' + oldKey] || undefined;
|
||||
if ( content ) {
|
||||
assetCacheRegistry[newKey] = {
|
||||
readTime: Date.now(),
|
||||
writeTime: entries[oldKey]
|
||||
};
|
||||
if ( reIsExternalPath.test(oldKey) ) {
|
||||
assetCacheRegistry[newKey].remoteURL = oldKey;
|
||||
}
|
||||
bin = {};
|
||||
bin['cache/' + newKey] = content;
|
||||
vAPI.cacheStorage.set(bin);
|
||||
}
|
||||
countdown(1);
|
||||
};
|
||||
|
||||
var onEntries = function(bin) {
|
||||
entries = bin && bin['cached_asset_entries'];
|
||||
if ( !entries ) { return callback(); }
|
||||
if ( bin && bin['assetCacheRegistry'] ) {
|
||||
assetCacheRegistry = bin['assetCacheRegistry'];
|
||||
}
|
||||
var aliases = api.listKeyAliases;
|
||||
for ( var oldKey in entries ) {
|
||||
if ( oldKey.endsWith('assets/user/filters.txt') ) { continue; }
|
||||
var newKey = aliases[oldKey];
|
||||
if ( !newKey && /^https?:\/\//.test(oldKey) ) {
|
||||
newKey = oldKey;
|
||||
}
|
||||
if ( newKey ) {
|
||||
vAPI.cacheStorage.get(
|
||||
'cached_asset_content://' + oldKey,
|
||||
onContentRead.bind(null, oldKey, newKey)
|
||||
);
|
||||
moveCount += 1;
|
||||
}
|
||||
toRemove.push('cached_asset_content://' + oldKey);
|
||||
}
|
||||
toRemove.push('cached_asset_entries', 'extensionLastVersion');
|
||||
countdown();
|
||||
};
|
||||
|
||||
vAPI.cacheStorage.get(
|
||||
[ 'cached_asset_entries', 'assetCacheRegistry' ],
|
||||
onEntries
|
||||
);
|
||||
};
|
||||
|
||||
/*******************************************************************************
|
||||
|
||||
The purpose of the asset source registry is to keep key detail information
|
||||
|
|
@ -523,16 +372,12 @@ var getAssetCacheRegistry = function(callback) {
|
|||
}
|
||||
};
|
||||
|
||||
var migrationDone = function() {
|
||||
vAPI.cacheStorage.get('assetCacheRegistry', function(bin) {
|
||||
if ( bin && bin.assetCacheRegistry ) {
|
||||
assetCacheRegistry = bin.assetCacheRegistry;
|
||||
}
|
||||
registryReady();
|
||||
});
|
||||
};
|
||||
|
||||
migrate(migrationDone);
|
||||
vAPI.cacheStorage.get('assetCacheRegistry', function(bin) {
|
||||
if ( bin && bin.assetCacheRegistry ) {
|
||||
assetCacheRegistry = bin.assetCacheRegistry;
|
||||
}
|
||||
registryReady();
|
||||
});
|
||||
};
|
||||
|
||||
var saveAssetCacheRegistry = (function() {
|
||||
|
|
|
|||
|
|
@ -711,15 +711,7 @@ var backupUserData = function(callback) {
|
|||
dynamicFilteringString: µb.permanentFirewall.toString(),
|
||||
urlFilteringString: µb.permanentURLFiltering.toString(),
|
||||
hostnameSwitchesString: µb.hnSwitches.toString(),
|
||||
userFilters: '',
|
||||
// TODO(seamless migration):
|
||||
// The following is strictly for convenience, to be minimally
|
||||
// forward-compatible. This will definitely be removed in the
|
||||
// short term, as I do not expect the need to install an older
|
||||
// version of uBO to ever be needed beyond the short term.
|
||||
// >>>>>>>>
|
||||
filterLists: µb.oldDataFromNewListKeys(µb.selectedFilterLists)
|
||||
// <<<<<<<<
|
||||
userFilters: ''
|
||||
};
|
||||
|
||||
var onUserFiltersReady = function(details) {
|
||||
|
|
@ -760,17 +752,8 @@ var restoreUserData = function(request) {
|
|||
lastBackupTime: 0
|
||||
});
|
||||
µb.assets.put(µb.userFiltersPath, userData.userFilters);
|
||||
|
||||
// 'filterLists' is available up to uBO v1.10.4, not beyond.
|
||||
// 'selectedFilterLists' is available from uBO v1.11 and beyond.
|
||||
var listKeys;
|
||||
if ( Array.isArray(userData.selectedFilterLists) ) {
|
||||
listKeys = userData.selectedFilterLists;
|
||||
} else if ( userData.filterLists instanceof Object ) {
|
||||
listKeys = µb.newListKeysFromOldData(userData.filterLists);
|
||||
}
|
||||
if ( listKeys !== undefined ) {
|
||||
µb.saveSelectedFilterLists(listKeys, restart);
|
||||
µb.saveSelectedFilterLists(userData.selectedFilterLists, restart);
|
||||
} else {
|
||||
restart();
|
||||
}
|
||||
|
|
@ -828,8 +811,7 @@ var getLists = function(callback) {
|
|||
ignoreGenericCosmeticFilters: µb.userSettings.ignoreGenericCosmeticFilters,
|
||||
netFilterCount: µb.staticNetFilteringEngine.getFilterCount(),
|
||||
parseCosmeticFilters: µb.userSettings.parseAllABPHideFilters,
|
||||
userFiltersPath: µb.userFiltersPath,
|
||||
aliases: µb.assets.listKeyAliases
|
||||
userFiltersPath: µb.userFiltersPath
|
||||
};
|
||||
var onMetadataReady = function(entries) {
|
||||
r.cache = entries;
|
||||
|
|
|
|||
|
|
@ -168,29 +168,16 @@
|
|||
|
||||
µBlock.loadSelectedFilterLists = function(callback) {
|
||||
var µb = this;
|
||||
vAPI.storage.get([ 'selectedFilterLists', 'remoteBlacklists' ], function(bin) {
|
||||
if ( !bin || !bin.selectedFilterLists && !bin.remoteBlacklists ) {
|
||||
// Select default filter lists if first-time launch.
|
||||
vAPI.storage.get('selectedFilterLists', function(bin) {
|
||||
// Select default filter lists if first-time launch.
|
||||
if ( !bin || Array.isArray(bin.selectedFilterLists) === false ) {
|
||||
µb.assets.metadata(function(availableLists) {
|
||||
µb.saveSelectedFilterLists(µb.autoSelectRegionalFilterLists(availableLists));
|
||||
callback();
|
||||
});
|
||||
return;
|
||||
}
|
||||
var listKeys = [];
|
||||
if ( bin.selectedFilterLists ) {
|
||||
listKeys = bin.selectedFilterLists;
|
||||
} else if ( bin.remoteBlacklists ) {
|
||||
var oldListKeys = µb.newListKeysFromOldData(bin.remoteBlacklists);
|
||||
if ( oldListKeys.sort().join() !== listKeys.sort().join() ) {
|
||||
listKeys = oldListKeys;
|
||||
µb.saveSelectedFilterLists(listKeys);
|
||||
}
|
||||
// TODO(seamless migration):
|
||||
// Uncomment when all have moved to v1.11 and beyond.
|
||||
//vAPI.storage.remove('remoteBlacklists');
|
||||
}
|
||||
µb.selectedFilterLists = listKeys;
|
||||
µb.selectedFilterLists = bin.selectedFilterLists;
|
||||
callback();
|
||||
});
|
||||
};
|
||||
|
|
@ -213,63 +200,12 @@
|
|||
}
|
||||
newKeys = this.arrayFrom(newSet);
|
||||
var bin = {
|
||||
selectedFilterLists: newKeys,
|
||||
remoteBlacklists: this.oldDataFromNewListKeys(newKeys)
|
||||
selectedFilterLists: newKeys
|
||||
};
|
||||
this.selectedFilterLists = newKeys;
|
||||
vAPI.storage.set(bin, callback);
|
||||
};
|
||||
|
||||
// TODO(seamless migration):
|
||||
// Remove when all have moved to v1.11 and beyond.
|
||||
// >>>>>>>>
|
||||
µBlock.newListKeysFromOldData = function(oldLists) {
|
||||
var aliases = this.assets.listKeyAliases,
|
||||
listKeys = [], newKey;
|
||||
for ( var oldKey in oldLists ) {
|
||||
if ( oldLists[oldKey].off !== true ) {
|
||||
newKey = aliases[oldKey];
|
||||
listKeys.push(newKey ? newKey : oldKey);
|
||||
}
|
||||
}
|
||||
return listKeys;
|
||||
};
|
||||
|
||||
µBlock.oldDataFromNewListKeys = function(selectedFilterLists) {
|
||||
var µb = this,
|
||||
remoteBlacklists = {};
|
||||
var reverseAliases = Object.keys(this.assets.listKeyAliases).reduce(
|
||||
function(a, b) {
|
||||
a[µb.assets.listKeyAliases[b]] = b; return a;
|
||||
},
|
||||
{}
|
||||
);
|
||||
remoteBlacklists = selectedFilterLists.reduce(
|
||||
function(a, b) {
|
||||
a[reverseAliases[b] || b] = { off: false };
|
||||
return a;
|
||||
},
|
||||
{}
|
||||
);
|
||||
remoteBlacklists = Object.keys(µb.assets.listKeyAliases).reduce(
|
||||
function(a, b) {
|
||||
var aliases = µb.assets.listKeyAliases;
|
||||
if (
|
||||
b.startsWith('assets/') &&
|
||||
aliases[b] !== 'public_suffix_list.dat' &&
|
||||
aliases[b] !== 'ublock-resources' &&
|
||||
!a[b]
|
||||
) {
|
||||
a[b] = { off: true };
|
||||
}
|
||||
return a;
|
||||
},
|
||||
remoteBlacklists
|
||||
);
|
||||
return remoteBlacklists;
|
||||
};
|
||||
// <<<<<<<<
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
µBlock.applyFilterListSelection = function(details, callback) {
|
||||
|
|
@ -1028,9 +964,6 @@
|
|||
if ( Array.isArray(data.selectedFilterLists) ) {
|
||||
bin.selectedFilterLists = data.selectedFilterLists;
|
||||
binNotEmpty = true;
|
||||
} else if ( typeof data.filterLists === 'object' ) {
|
||||
bin.selectedFilterLists = µb.newListKeysFromOldData(data.filterLists);
|
||||
binNotEmpty = true;
|
||||
}
|
||||
|
||||
if ( typeof data.netWhitelist === 'string' ) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue