Browse Source

Fix remnants of uBO code in cache storage manager

Related feedback:
- https://github.com/uBlockOrigin/uMatrix-issues/issues/227#issuecomment-590543891
pull/2/head
Raymond Hill 5 years ago
parent
commit
41133dffd2
No known key found for this signature in database GPG Key ID: 25E1490B761470C2
  1. 2
      src/js/background.js
  2. 4
      src/js/cachestorage.js
  3. 5
      src/js/start.js

2
src/js/background.js

@ -57,6 +57,8 @@ const rawSettingsDefault = {
assetFetchBypassBrowserCache: false, assetFetchBypassBrowserCache: false,
assetFetchTimeout: 30, assetFetchTimeout: 30,
autoUpdateAssetFetchPeriod: 120, autoUpdateAssetFetchPeriod: 120,
cacheStorageAPI: 'unset',
cacheStorageCompression: true,
cnameIgnoreList: 'unset', cnameIgnoreList: 'unset',
cnameIgnore1stParty: true, cnameIgnore1stParty: true,
cnameIgnoreExceptions: true, cnameIgnoreExceptions: true,

4
src/js/cachestorage.js

@ -119,7 +119,7 @@
disconnect(); disconnect();
}, },
Math.max( Math.max(
µMatrix.hiddenSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
µMatrix.rawSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
180000 180000
) )
); );
@ -296,7 +296,7 @@
const promises = [ getDb() ]; const promises = [ getDb() ];
const entries = []; const entries = [];
const dontCompress = const dontCompress =
µMatrix.hiddenSettings.cacheStorageCompression !== true;
µMatrix.rawSettings.cacheStorageCompression !== true;
const handleEncodingResult = result => { const handleEncodingResult = result => {
entries.push({ key: result.key, value: result.data }); entries.push({ key: result.key, value: result.data });
}; };

5
src/js/start.js

@ -32,6 +32,11 @@
]); ]);
log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`); log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`);
const cacheBackend = await µm.cacheStorage.select(
µm.rawSettings.cacheStorageAPI
);
log.info(`Backend storage for cache will be ${cacheBackend}`);
const shouldWASM = const shouldWASM =
vAPI.canWASM === true && vAPI.canWASM === true &&
µm.rawSettings.disableWebAssembly !== true; µm.rawSettings.disableWebAssembly !== true;

Loading…
Cancel
Save