tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support static save, load, subscribe to logger settings changes

Browse Source
This commit is contained in:
Tamius Han 2020-01-16 01:00:47 +01:00
parent 6b9bf1b70f
commit 79e781dcd8
1 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/ext/lib/Logger.js
View File

@ -19,47 +19,24 @@ class Logger {
this.stopTime = conf.timeout ? performance.now() + (conf.timeout * 1000) : undefined; this.stopTime = conf.timeout ? performance.now() + (conf.timeout * 1000) : undefined;
} }
initLogger() { static saveConfig(conf) {
const ths = this; if (currentBrowser.firefox || currentBrowser.edge) {
return browser.storage.local.set( {'uwLogger': JSON.stringify(conf)});
} else if (currentBrowser.chrome) {
return chrome.storage.local.set( {'uwLogger': JSON.stringify(conf)});
}
}
static syncConfig(callback) {
const br = currentBrowser.firefox ? browser : chrome; const br = currentBrowser.firefox ? browser : chrome;
br.storage.onChanged.addListener( (changes, area) => { br.storage.onChanged.addListener( (changes, area) => {
if (Debug.debug && Debug.debugStorage) { callback(JSON.parse(changes.uwLogger.newValue));
console.log("[Logger::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
if (changes['uwLogger'] && changes['uwLogger'].newValue) {
console.log("[Logger::<storage/on change>] new settings object:", JSON.parse(changes.uwLogger.newValue));
}
}
if(changes['uwLogger'] && changes['uwLogger'].newValue) {
ths.conf = JSON.parse(changes.uwLogger.newValue);
}
}); });
} }
async init() { static async getConfig() {
if (!this.conf) {
this.conf = await this.getSaved();
}
}
clear() {
this.log = [];
this.startTime = performance.now();
this.stopTime = this.conf.timeout ? performance.now() + (this.conf.timeout * 1000) : undefined;
}
setConf(conf) {
this.conf = conf; // effective immediately
// also persist settings:
if (currentBrowser.firefox || currentBrowser.edge) {
return browser.storage.local.set( {'uwLogger': JSON.stringify(this.conf)});
} else if (currentBrowser.chrome) {
return chrome.storage.local.set( {'uwLogger': JSON.stringify(this.logger)});
}
}
async getSaved() {
let ret; let ret;
if (currentBrowser.firefox) { if (currentBrowser.firefox) {
ret = await browser.storage.local.get('uwLogger'); ret = await browser.storage.local.get('uwLogger');
} else if (currentBrowser.chrome) { } else if (currentBrowser.chrome) {
@ -87,6 +64,46 @@ class Logger {
} }
} }
initLogger() {
const ths = this;
const br = currentBrowser.firefox ? browser : chrome;
br.storage.onChanged.addListener( (changes, area) => {
if (Debug.debug && Debug.debugStorage) {
console.log("[Logger::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
if (changes['uwLogger'] && changes['uwLogger'].newValue) {
console.log("[Logger::<storage/on change>] new settings object:", JSON.parse(changes.uwLogger.newValue));
}
}
if(changes['uwLogger'] && changes['uwLogger'].newValue) {
ths.conf = JSON.parse(changes.uwLogger.newValue);
}
});
this.init();
}
async init() {
if (!this.conf) {
this.conf = await this.getSaved();
}
}
clear() {
this.log = [];
this.startTime = performance.now();
this.stopTime = this.conf.timeout ? performance.now() + (this.conf.timeout * 1000) : undefined;
}
setConf(conf) {
this.conf = conf; // effective immediately
// also persist settings:
Logger.saveConfig(conf);
}
async getSaved() {
return Logger.getSaved();
}
// allow syncing of start times between bg and page scripts. // allow syncing of start times between bg and page scripts.
// may result in negative times in the log file, but that doesn't // may result in negative times in the log file, but that doesn't
@ -127,7 +144,7 @@ class Logger {
} }
canLog(component) { canLog(component) {
return this.canLogFile(component) || this.canLogConsole(component); return this.conf.allowLogging && (this.canLogFile(component) || this.canLogConsole(component));
} }
canLogFile(component) { canLogFile(component) {
@ -135,6 +152,7 @@ class Logger {
return false; return false;
} }
if (performance.now() > this.stopTime) { if (performance.now() > this.stopTime) {
this.conf.allowLogging = false;
return false; return false;
} }
if (Array.isArray(component) && component.length ) { if (Array.isArray(component) && component.length ) {
@ -152,6 +170,7 @@ class Logger {
return false; return false;
} }
if (performance.now() > this.stopTime) { if (performance.now() > this.stopTime) {
this.conf.allowLogging = false;
return false; return false;
} }
if (Array.isArray(component) && component.length) { if (Array.isArray(component) && component.length) {