diff options
author | Alessio Vanni <vannilla@firemail.cc> | 2019-02-20 00:02:26 +0100 |
---|---|---|
committer | Alessio Vanni <vannilla@firemail.cc> | 2019-02-20 00:02:26 +0100 |
commit | b3863f5c4984ae814eeb32407ae5899693b735ab (patch) | |
tree | 097e3320401da482117c07a2f08d98297340abd6 /js/storage.js | |
parent | a35201f45aa8e7735f668d1bb349fca3b1c3cc1e (diff) | |
download | ematrix-b3863f5c4984ae814eeb32407ae5899693b735ab.tar.lz ematrix-b3863f5c4984ae814eeb32407ae5899693b735ab.tar.xz ematrix-b3863f5c4984ae814eeb32407ae5899693b735ab.zip |
Change all names from μMatrix to ηMatrix
Hopefully I caught all of them!
Diffstat (limited to 'js/storage.js')
-rw-r--r-- | js/storage.js | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/js/storage.js b/js/storage.js index c2ece8f..5440176 100644 --- a/js/storage.js +++ b/js/storage.js @@ -26,30 +26,30 @@ /******************************************************************************/ -µMatrix.getBytesInUse = function() { - var µm = this; +ηMatrix.getBytesInUse = function() { + var ηm = this; var getBytesInUseHandler = function(bytesInUse) { - µm.storageUsed = bytesInUse; + ηm.storageUsed = bytesInUse; }; // Not all WebExtension implementations support getBytesInUse(). if ( typeof vAPI.storage.getBytesInUse === 'function' ) { vAPI.storage.getBytesInUse(null, getBytesInUseHandler); } else { - µm.storageUsed = undefined; + ηm.storageUsed = undefined; } }; /******************************************************************************/ -µMatrix.saveUserSettings = function() { +ηMatrix.saveUserSettings = function() { this.XAL.keyvalSetMany( this.userSettings, this.getBytesInUse.bind(this) ); }; -µMatrix.loadUserSettings = function(callback) { - var µm = this; +ηMatrix.loadUserSettings = function(callback) { + var ηm = this; if ( typeof callback !== 'function' ) { callback = this.noopFunc; @@ -58,9 +58,9 @@ var settingsLoaded = function(store) { // console.log('storage.js > loaded user settings'); - µm.userSettings = store; + ηm.userSettings = store; - callback(µm.userSettings); + callback(ηm.userSettings); }; vAPI.storage.get(this.userSettings, settingsLoaded); @@ -68,27 +68,27 @@ /******************************************************************************/ -µMatrix.loadRawSettings = function() { - var µm = this; +ηMatrix.loadRawSettings = function() { + var ηm = this; var onLoaded = function(bin) { if ( !bin || bin.rawSettings instanceof Object === false ) { return; } for ( var key of Object.keys(bin.rawSettings) ) { if ( - µm.rawSettings.hasOwnProperty(key) === false || - typeof bin.rawSettings[key] !== typeof µm.rawSettings[key] + ηm.rawSettings.hasOwnProperty(key) === false || + typeof bin.rawSettings[key] !== typeof ηm.rawSettings[key] ) { continue; } - µm.rawSettings[key] = bin.rawSettings[key]; + ηm.rawSettings[key] = bin.rawSettings[key]; } - µm.rawSettingsWriteTime = Date.now(); + ηm.rawSettingsWriteTime = Date.now(); }; vAPI.storage.get('rawSettings', onLoaded); }; -µMatrix.saveRawSettings = function(rawSettings, callback) { +ηMatrix.saveRawSettings = function(rawSettings, callback) { var keys = Object.keys(rawSettings); if ( keys.length === 0 ) { if ( typeof callback === 'function' ) { @@ -108,7 +108,7 @@ this.rawSettingsWriteTime = Date.now(); }; -µMatrix.rawSettingsFromString = function(raw) { +ηMatrix.rawSettingsFromString = function(raw) { var result = {}, lineIter = new this.LineIterator(raw), line, matches, name, value; @@ -152,7 +152,7 @@ this.saveRawSettings(result); }; -µMatrix.stringFromRawSettings = function() { +ηMatrix.stringFromRawSettings = function() { var out = []; for ( var key of Object.keys(this.rawSettings).sort() ) { out.push(key + ' ' + this.rawSettings[key]); @@ -163,21 +163,21 @@ /******************************************************************************/ // save white/blacklist -µMatrix.saveMatrix = function() { - µMatrix.XAL.keyvalSetOne('userMatrix', this.pMatrix.toString()); +ηMatrix.saveMatrix = function() { + ηMatrix.XAL.keyvalSetOne('userMatrix', this.pMatrix.toString()); }; /******************************************************************************/ -µMatrix.loadMatrix = function(callback) { +ηMatrix.loadMatrix = function(callback) { if ( typeof callback !== 'function' ) { callback = this.noopFunc; } - var µm = this; + var ηm = this; var onLoaded = function(bin) { if ( bin.hasOwnProperty('userMatrix') ) { - µm.pMatrix.fromString(bin.userMatrix); - µm.tMatrix.assign(µm.pMatrix); + ηm.pMatrix.fromString(bin.userMatrix); + ηm.tMatrix.assign(ηm.pMatrix); callback(); } }; @@ -186,7 +186,7 @@ /******************************************************************************/ -µMatrix.listKeysFromCustomHostsFiles = function(raw) { +ηMatrix.listKeysFromCustomHostsFiles = function(raw) { var out = new Set(), reIgnore = /^[!#]/, reValid = /^[a-z-]+:\/\/\S+/, @@ -202,12 +202,12 @@ /******************************************************************************/ -µMatrix.getAvailableHostsFiles = function(callback) { - var µm = this, +ηMatrix.getAvailableHostsFiles = function(callback) { + var ηm = this, availableHostsFiles = {}; // Custom filter lists. - var importedListKeys = this.listKeysFromCustomHostsFiles(µm.userSettings.externalHostsFiles), + var importedListKeys = this.listKeysFromCustomHostsFiles(ηm.userSettings.externalHostsFiles), i = importedListKeys.length, listKey, entry; while ( i-- ) { @@ -250,8 +250,8 @@ if ( entry.submitter !== 'user' ) { continue; } if ( dict.has(assetKey) ) { continue; } delete availableHostsFiles[assetKey]; - µm.assets.unregisterAssetSource(assetKey); - µm.assets.remove(assetKey); + ηm.assets.unregisterAssetSource(assetKey); + ηm.assets.remove(assetKey); } callback(availableHostsFiles); @@ -278,8 +278,8 @@ /******************************************************************************/ -µMatrix.loadHostsFiles = function(callback) { - var µm = µMatrix; +ηMatrix.loadHostsFiles = function(callback) { + var ηm = ηMatrix; var hostsFileLoadCount; if ( typeof callback !== 'function' ) { @@ -287,15 +287,15 @@ } var loadHostsFilesEnd = function() { - µm.ubiquitousBlacklist.freeze(); - vAPI.storage.set({ 'liveHostsFiles': µm.liveHostsFiles }); + ηm.ubiquitousBlacklist.freeze(); + vAPI.storage.set({ 'liveHostsFiles': ηm.liveHostsFiles }); vAPI.messaging.broadcast({ what: 'loadHostsFilesCompleted' }); - µm.getBytesInUse(); + ηm.getBytesInUse(); callback(); }; var mergeHostsFile = function(details) { - µm.mergeHostsFile(details); + ηm.mergeHostsFile(details); hostsFileLoadCount -= 1; if ( hostsFileLoadCount === 0 ) { loadHostsFilesEnd(); @@ -303,8 +303,8 @@ }; var loadHostsFilesStart = function(hostsFiles) { - µm.liveHostsFiles = hostsFiles; - µm.ubiquitousBlacklist.reset(); + ηm.liveHostsFiles = hostsFiles; + ηm.ubiquitousBlacklist.reset(); var locations = Object.keys(hostsFiles); hostsFileLoadCount = locations.length; @@ -315,7 +315,7 @@ hostsFileLoadCount -= 1; continue; } - µm.assets.get(location, mergeHostsFile); + ηm.assets.get(location, mergeHostsFile); } // https://github.com/gorhill/uMatrix/issues/2 @@ -330,7 +330,7 @@ /******************************************************************************/ -µMatrix.mergeHostsFile = function(details) { +ηMatrix.mergeHostsFile = function(details) { var usedCount = this.ubiquitousBlacklist.count; var duplicateCount = this.ubiquitousBlacklist.duplicateCount; @@ -346,7 +346,7 @@ /******************************************************************************/ -µMatrix.mergeHostsFileContent = function(rawText) { +ηMatrix.mergeHostsFileContent = function(rawText) { var rawEnd = rawText.length; var ubiquitousBlacklist = this.ubiquitousBlacklist; var reLocalhost = /(^|\s)(localhost\.localdomain|localhost|local|broadcasthost|0\.0\.0\.0|127\.0\.0\.1|::1|fe80::1%lo0)(?=\s|$)/g; @@ -405,8 +405,8 @@ // `switches` contains the filter lists for which the switch must be revisited. -µMatrix.selectHostsFiles = function(details, callback) { - var µm = this, +ηMatrix.selectHostsFiles = function(details, callback) { + var ηm = this, externalHostsFiles = this.userSettings.externalHostsFiles, i, n, assetKey; @@ -450,7 +450,7 @@ // existing stock list. var assetKeyFromURL = function(url) { var needle = url.replace(/^https?:/, ''); - var assets = µm.liveHostsFiles, asset; + var assets = ηm.liveHostsFiles, asset; for ( var assetKey in assets ) { asset = assets[assetKey]; if ( asset.content !== 'filters' ) { continue; } @@ -503,13 +503,13 @@ // `switches` contains the preset blacklists for which the switch must be // revisited. -µMatrix.reloadHostsFiles = function() { +ηMatrix.reloadHostsFiles = function() { this.loadHostsFiles(); }; /******************************************************************************/ -µMatrix.loadPublicSuffixList = function(callback) { +ηMatrix.loadPublicSuffixList = function(callback) { if ( typeof callback !== 'function' ) { callback = this.noopFunc; } @@ -526,7 +526,7 @@ /******************************************************************************/ -µMatrix.scheduleAssetUpdater = (function() { +ηMatrix.scheduleAssetUpdater = (function() { var timer, next = 0; return function(updateDelay) { if ( timer ) { @@ -547,14 +547,14 @@ timer = vAPI.setTimeout(function() { timer = undefined; next = 0; - µMatrix.assets.updateStart({ delay: 120000 }); + ηMatrix.assets.updateStart({ delay: 120000 }); }, updateDelay); }; })(); /******************************************************************************/ -µMatrix.assetObserver = function(topic, details) { +ηMatrix.assetObserver = function(topic, details) { // Do not update filter list if not in use. if ( topic === 'before-asset-updated' ) { if ( |