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

Fix logger

Browse Source
This commit is contained in:
Tamius Han 2021-03-06 01:21:31 +01:00
parent e5d1addc00
commit 357d4829eb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ext/lib/Logger.ts
View File

@ -1,6 +1,7 @@
import { decycle } from 'json-cyclic'; import { decycle } from 'json-cyclic';
import Comms from './comms/Comms'; import Comms from './comms/Comms';
import BrowserDetect from '../conf/BrowserDetect'; import BrowserDetect from '../conf/BrowserDetect';
import { browser } from 'webextension-polyfill-ts';
if (process.env.CHANNEL !== 'stable'){ if (process.env.CHANNEL !== 'stable'){
console.info('Loading Logger'); console.info('Loading Logger');
@ -29,11 +30,11 @@ class Logger {
console.info('Saving logger conf:', conf) console.info('Saving logger conf:', conf)
} }
(BrowserDetect.browserObj as any).storage.local.set( {'uwLogger': JSON.stringify(conf)}); browser.storage.local.set( {'uwLogger': JSON.stringify(conf)});
} }
static syncConfig(callback) { static syncConfig(callback) {
(BrowserDetect.browserObj as any).storage.onChanged.addListener( (changes, area) => { browser.storage.onChanged.addListener( (changes, area) => {
if (changes.uwLogger) { if (changes.uwLogger) {
const newLoggerConf = JSON.parse(changes.uwLogger.newValue) const newLoggerConf = JSON.parse(changes.uwLogger.newValue)
if (process.env.CHANNEL === 'dev') { if (process.env.CHANNEL === 'dev') {
@ -47,13 +48,13 @@ class Logger {
static async getConfig() { static async getConfig() {
let ret; let ret;
if (BrowserDetect.firefox) { // if (BrowserDetect.firefox) {
ret = await (BrowserDetect.browserObj as any).storage.local.get('uwLogger'); ret = await browser.storage.local.get('uwLogger');
} else if (BrowserDetect.anyChromium) { // } else if (BrowserDetect.anyChromium) {
ret = await new Promise( (resolve, reject) => { // ret = await new Promise( (resolve, reject) => {
(BrowserDetect.browserObj as any).storage.local.get('uwLogger', (res) => resolve(res)); // browser.storage.local.get('uwLogger', (res) => resolve(res));
}); // });
} // }
if (process.env.CHANNEL === 'dev') { if (process.env.CHANNEL === 'dev') {
try { try {
@ -98,7 +99,7 @@ class Logger {
this.temp_disable = false; this.temp_disable = false;
this.stopTime = this.conf.timeout ? performance.now() + (this.conf.timeout * 1000) : undefined; this.stopTime = this.conf.timeout ? performance.now() + (this.conf.timeout * 1000) : undefined;
(BrowserDetect.browserObj as any).storage.onChanged.addListener( (changes, area) => { browser.storage.onChanged.addListener( (changes, area) => {
if (process.env.CHANNEL === 'dev') { if (process.env.CHANNEL === 'dev') {
if (!changes.uwLogger) { if (!changes.uwLogger) {
// console.info('[Logger::<storage/on change> No new logger settings!'); // console.info('[Logger::<storage/on change> No new logger settings!');