Split settings between Settings.js (handles loading and saving) and ExtensionConf.js (actual configuration). All settings are now handled in background script (content scripts get ExtensionConf from background script). Saving seems to work.
This commit is contained in:
Tamius Han
parent
51f2df930d
commit
e6efaf52d8
@ -1,6 +1,6 @@
|
||||
// Set prod to true when releasing
|
||||
_prod = true;
|
||||
_prod = false;
|
||||
// _prod = false;
|
||||
|
||||
Debug = {
|
||||
debug: true,
|
||||
|
||||
@ -1,18 +1,71 @@
|
||||
// blacklist - ban blacklist.
|
||||
// whitelist - ban all except whitelist
|
||||
// none - ban all
|
||||
var _ec_mode = "blacklist"
|
||||
if(Debug.debug)
|
||||
console.log("Loading: ExtensionConf.js");
|
||||
|
||||
|
||||
var _ec_init = function() {
|
||||
|
||||
if(Debug.debug){
|
||||
console.log("pls implement");
|
||||
console.log("this: ", this);
|
||||
var ExtensionConf = {
|
||||
extensionMode: "whitelist", // how should this extension work?
|
||||
// 'blacklist' - work everywhere except blacklist
|
||||
// 'whitelist' - only work on whitelisted sites
|
||||
// 'disabled' - work nowhere
|
||||
arDetect: {
|
||||
mode: "blacklist", // how should autodetection work?
|
||||
// 'blacklist' - work by default, problem sites need to be blocked
|
||||
// 'whitelist' - only work if site has been specifically approved
|
||||
// 'disabled' - don't work at all
|
||||
allowedMisaligned: 0.05, // top and bottom letterbox thickness can differ by this much.
|
||||
// Any more and we don't adjust ar.
|
||||
allowedArVariance: 0.075, // amount by which old ar can differ from the new (1 = 100%)
|
||||
timer_playing: 1000, // we trigger ar this often (in ms) under this conditions
|
||||
timer_paused: 3000,
|
||||
timer_error: 3000,
|
||||
timer_minimumTimeout: 5, // but regardless of above, we wait this many msec before retriggering
|
||||
hSamples: 640,
|
||||
vSamples: 360,
|
||||
samplingInterval: 10, // we sample at columns at (width/this) * [ 1 .. this - 1]
|
||||
blackLevel_default: 10, // everything darker than 10/255 across all RGB components is considered black by
|
||||
// default. GlobalVars.blackLevel can decrease if we detect darker black.
|
||||
blackbarTreshold: 8, // if pixel is darker than blackLevel + blackbarTreshold, we count it as black
|
||||
// on 0-255. Needs to be fairly high (8 might not cut it) due to compression
|
||||
// artifacts in the video itself
|
||||
staticSampleCols: 9, // we take a column at [0-n]/n-th parts along the width and sample it
|
||||
randomSampleCols: 0, // we add this many randomly selected columns to the static columns
|
||||
staticSampleRows: 9, // forms grid with staticSampleCols. Determined in the same way. For black frame checks
|
||||
guardLine: { // all pixels on the guardline need to be black, or else we trigger AR recalculation
|
||||
// (if AR fails to be recalculated, we reset AR)
|
||||
enabled: true,
|
||||
ignoreEdgeMargin: 0.20, // we ignore anything that pokes over the black line this close to the edge
|
||||
// (relative to width of the sample)
|
||||
imageTestTreshold: 0.1, // when testing for image, this much pixels must be over blackbarTreshold
|
||||
edgeTolerancePx: 3, // black edge violation is performed this far from reported 'last black pixel'
|
||||
edgeTolerancePercent: null // unused. same as above, except use % of canvas height instead of pixels
|
||||
},
|
||||
arSwitchLimiter: { // to be implemented
|
||||
switches: 2, // we can switch this many times
|
||||
period: 2.0 // per this period
|
||||
},
|
||||
edgeDetection: {
|
||||
sampleWidth: 8, // we take a sample this wide for edge detection
|
||||
detectionTreshold: 4, // sample needs to have this many non-black pixels to be a valid edge
|
||||
singleSideConfirmationTreshold: 0.3, // we need this much edges (out of all samples, not just edges) in order
|
||||
// to confirm an edge in case there's no edges on top or bottom (other
|
||||
// than logo, of course)
|
||||
logoTreshold: 0.15, // if edge candidate sits with count greater than this*all_samples, it can't be logo
|
||||
// or watermark.
|
||||
edgeTolerancePx: 2, // we check for black edge violation this far from detection point
|
||||
edgeTolerancePercent: null, // we check for black edge detection this % of height from detection point. unused
|
||||
middleIgnoredArea: 0.2, // we ignore this % of canvas height towards edges while detecting aspect ratios
|
||||
minColsForSearch: 0.5, // if we hit the edge of blackbars for all but this many columns (%-wise), we don't
|
||||
// continue with search. It's pointless, because black edge is higher/lower than we
|
||||
// are now. (NOTE: keep this less than 1 in case we implement logo detection)
|
||||
edgeTolerancePx: 1, // tests for edge detection are performed this far away from detected row
|
||||
}
|
||||
},
|
||||
arChange: {
|
||||
samenessTreshold: 0.025, // if aspect ratios are within 2.5% within each other, don't resize
|
||||
},
|
||||
miscFullscreenSettings: {
|
||||
videoFloat: "center"
|
||||
},
|
||||
colors:{
|
||||
// criticalFail: "background: #fa2; color: #000"
|
||||
}
|
||||
}
|
||||
|
||||
ExtensionConf = {
|
||||
mode: _ec_mode,
|
||||
init: _ec_init
|
||||
}
|
||||
|
||||
@ -1,45 +1,62 @@
|
||||
// Extension settings are in this file. Site configuration is in Sites.js
|
||||
// todo: move keybinds here
|
||||
// This file handles saving and loading of settings.
|
||||
// Actual settings are in ExtensionConf
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("Loading: Settings.js");
|
||||
|
||||
var _se_init = async function(neverFlushStored){
|
||||
|
||||
// if(Debug.flushStoredSettings && neverFlushStored === false)
|
||||
// StorageManager.delopt("uw-settings");
|
||||
var _se_init = async function(isSlave){
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[Settings::_se_init()] -------- starting init! ---------");
|
||||
|
||||
if(isSlave === undefined)
|
||||
isSlave = false;
|
||||
|
||||
if(isSlave){
|
||||
// request settings from background script. Yes, this is supposed to be global.
|
||||
var res = await Comms.sendToBackgroundScript({cmd: "gib-settings"});
|
||||
|
||||
ExtensionConf = res.response;
|
||||
|
||||
if(Debug.debug){
|
||||
console.log("[Settings::_se_init()] received settings from the background script. ExtensionConf:",ExtensionConf,"response message was this:",res);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
var newSettings = await StorageManager.getopt_async("uw-settings");
|
||||
var uwVersion = browser.runtime.getManifest().version;
|
||||
|
||||
if (Debug.debug)
|
||||
console.log("[Settings::_se_init()] settings saved in localstorage are:", newSettings, " - if that's empty, it's gonna be replaced by this:", JSON.stringify(this), ")");
|
||||
console.log("[Settings::_se_init()] settings saved in localstorage are:", newSettings, " - if that's empty, it's gonna be replaced by this:", ExtensionConf, ")");
|
||||
|
||||
if ((Object.keys(newSettings).length === 0 && newSettings.constructor === Object)){
|
||||
console.log("[Settings::_se_init()] replacing settings");
|
||||
StorageManager.setopt({"uw-settings": JSON.stringify(this)});
|
||||
if(Debug.debug)
|
||||
console.log("[Settings::_se_init()] no saved settings, saving default");
|
||||
StorageManager.setopt({"uw-settings": ExtensionConf});
|
||||
}
|
||||
else{
|
||||
var actualSettings = JSON.parse(newSettings["uw-settings"]);
|
||||
var actualSettings = newSettings["uw-settings"];
|
||||
if(actualSettings.version === undefined || actualSettings.version != uwVersion){
|
||||
this.version = uwVersion;
|
||||
console.log("[Settings::_se_init()] extension was updated, replacing settings");
|
||||
StorageManager.setopt({"uw-settings": JSON.stringify(this)});
|
||||
ExtensionConf['version'] = uwVersion;
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[Settings::_se_init()] extension was updated, replacing settings", ExtensionConf);
|
||||
|
||||
StorageManager.setopt({"uw-settings": ExtensionConf});
|
||||
}
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[Settings::_se_init()] parsed settings:", actualSettings);
|
||||
|
||||
for (var k in actualSettings)
|
||||
this[k] = actualSettings[k];
|
||||
ExtensionConf[k] = actualSettings[k];
|
||||
}
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[Settings::_se_init] settings have been loaded/reloaded. Current state: ", this);
|
||||
console.log("[Settings::_se_init] settings have been loaded/reloaded. Current state: ", ExtensionConf);
|
||||
|
||||
}
|
||||
|
||||
@ -47,14 +64,14 @@ var _se_save = function(settings){
|
||||
StorageManager.delopt("uw-settings");
|
||||
|
||||
if(settings !== undefined){
|
||||
StorageManager.setopt({"uw-settings": JSON.stringify(settings)});
|
||||
StorageManager.setopt({"uw-settings": settings});
|
||||
}
|
||||
else{
|
||||
StorageManager.setopt({"uw-settings": JSON.stringify(this)});
|
||||
StorageManager.setopt({"uw-settings": ExtensionConf});
|
||||
}
|
||||
|
||||
if (Debug.debug)
|
||||
console.log("[Settings::_se_save()] saving settings:", JSON.stringify(settings));
|
||||
console.log("[Settings::_se_save()] saving settings:", settings);
|
||||
}
|
||||
|
||||
var _se_reload = function(){
|
||||
@ -70,72 +87,6 @@ var _se_isWhitelisted = function(site){
|
||||
}
|
||||
|
||||
var Settings = {
|
||||
extensionMode: "whitelist", // how should this extension work?
|
||||
// 'blacklist' - work everywhere except blacklist
|
||||
// 'whitelist' - only work on whitelisted sites
|
||||
// 'disabled' - work nowhere
|
||||
arDetect: {
|
||||
mode: "blacklist", // how should autodetection work?
|
||||
// 'blacklist' - work by default, problem sites need to be blocked
|
||||
// 'whitelist' - only work if site has been specifically approved
|
||||
// 'disabled' - don't work at all
|
||||
allowedMisaligned: 0.05, // top and bottom letterbox thickness can differ by this much.
|
||||
// Any more and we don't adjust ar.
|
||||
allowedArVariance: 0.075, // amount by which old ar can differ from the new (1 = 100%)
|
||||
timer_playing: 30, // we trigger ar this often (in ms) under this conditions
|
||||
timer_paused: 3000,
|
||||
timer_error: 3000,
|
||||
timer_minimumTimeout: 5, // but regardless of above, we wait this many msec before retriggering
|
||||
hSamples: 640,
|
||||
vSamples: 360,
|
||||
samplingInterval: 10, // we sample at columns at (width/this) * [ 1 .. this - 1]
|
||||
blackLevel_default: 10, // everything darker than 10/255 across all RGB components is considered black by
|
||||
// default. GlobalVars.blackLevel can decrease if we detect darker black.
|
||||
blackbarTreshold: 8, // if pixel is darker than blackLevel + blackbarTreshold, we count it as black
|
||||
// on 0-255. Needs to be fairly high (8 might not cut it) due to compression
|
||||
// artifacts in the video itself
|
||||
staticSampleCols: 9, // we take a column at [0-n]/n-th parts along the width and sample it
|
||||
randomSampleCols: 0, // we add this many randomly selected columns to the static columns
|
||||
staticSampleRows: 9, // forms grid with staticSampleCols. Determined in the same way. For black frame checks
|
||||
guardLine: { // all pixels on the guardline need to be black, or else we trigger AR recalculation
|
||||
// (if AR fails to be recalculated, we reset AR)
|
||||
enabled: true,
|
||||
ignoreEdgeMargin: 0.20, // we ignore anything that pokes over the black line this close to the edge
|
||||
// (relative to width of the sample)
|
||||
imageTestTreshold: 0.1, // when testing for image, this much pixels must be over blackbarTreshold
|
||||
edgeTolerancePx: 3, // black edge violation is performed this far from reported 'last black pixel'
|
||||
edgeTolerancePercent: null // unused. same as above, except use % of canvas height instead of pixels
|
||||
},
|
||||
arSwitchLimiter: { // to be implemented
|
||||
switches: 2, // we can switch this many times
|
||||
period: 2.0 // per this period
|
||||
},
|
||||
edgeDetection: {
|
||||
sampleWidth: 8, // we take a sample this wide for edge detection
|
||||
detectionTreshold: 4, // sample needs to have this many non-black pixels to be a valid edge
|
||||
singleSideConfirmationTreshold: 0.3, // we need this much edges (out of all samples, not just edges) in order
|
||||
// to confirm an edge in case there's no edges on top or bottom (other
|
||||
// than logo, of course)
|
||||
logoTreshold: 0.15, // if edge candidate sits with count greater than this*all_samples, it can't be logo
|
||||
// or watermark.
|
||||
edgeTolerancePx: 2, // we check for black edge violation this far from detection point
|
||||
edgeTolerancePercent: null, // we check for black edge detection this % of height from detection point. unused
|
||||
middleIgnoredArea: 0.2, // we ignore this % of canvas height towards edges while detecting aspect ratios
|
||||
minColsForSearch: 0.5, // if we hit the edge of blackbars for all but this many columns (%-wise), we don't
|
||||
// continue with search. It's pointless, because black edge is higher/lower than we
|
||||
// are now. (NOTE: keep this less than 1 in case we implement logo detection)
|
||||
edgeTolerancePx: 1, // tests for edge detection are performed this far away from detected row
|
||||
}
|
||||
},
|
||||
arChange: {
|
||||
samenessTreshold: 0.025, // if aspect ratios are within 2.5% within each other, don't resize
|
||||
},
|
||||
miscFullscreenSettings: {
|
||||
videoFloat: "center"
|
||||
},
|
||||
colors:{
|
||||
// criticalFail: "background: #fa2; color: #000"
|
||||
},
|
||||
init: _se_init,
|
||||
save: _se_save,
|
||||
reload: _se_reload,
|
||||
|
||||
@ -140,7 +140,7 @@ function inIframe(){
|
||||
}
|
||||
|
||||
var _sc_isEnabled = function(site){
|
||||
// console.log(".... — _sc_sites[", site, "].status:", (_sc_sites[site] == undefined ? "<default>" : _sc_sites[site].status), "; Settings.extensionMode:", Settings.extensionMode)
|
||||
// console.log(".... — _sc_sites[", site, "].status:", (_sc_sites[site] == undefined ? "<default>" : _sc_sites[site].status), "; ExtensionConf.extensionMode:", ExtensionConf.extensionMode)
|
||||
if( inIframe ) {
|
||||
return _sc_siteEnableEmbedded(site);
|
||||
}
|
||||
@ -155,7 +155,7 @@ var _sc_siteEnabled = function(site){
|
||||
|
||||
console.log(".... this site is undefined!");
|
||||
|
||||
if ( Settings.extensionMode == "blacklist" ){
|
||||
if ( ExtensionConf.extensionMode == "blacklist" ){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -181,7 +181,7 @@ var _sc_siteStatus = function(site){
|
||||
var _sc_arEnabled = function(site){
|
||||
|
||||
if( _sc_sites[site] == undefined || _sc_sites[site].arStatus == "follow-global" ){
|
||||
if(Settings.extensionMode == "blacklist" ){
|
||||
if(ExtensionConf.extensionMode == "blacklist" ){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -205,7 +205,7 @@ var _sc_siteEnableEmbedded = function(site) {
|
||||
if( _sc_sites[site] == undefined || _sc_sites[site].statusEmbedded == "follow-global" ){
|
||||
console.log(".... this site is undefined! er");
|
||||
|
||||
if(Settings.extensionMode == "blacklist" ){
|
||||
if(ExtensionConf.extensionMode == "blacklist" ){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@ -35,8 +35,8 @@ var _arSetup = function(cwidth, cheight){
|
||||
// vstavimo začetne stolpce v _ard_sampleCols.
|
||||
// let's insert initial columns to _ard_sampleCols
|
||||
_ard_sampleCols = [];
|
||||
var samplingIntervalPx = parseInt(GlobalVars.canvas.height / Settings.arDetect.samplingInterval)
|
||||
for(var i = 1; i < Settings.arDetect.samplingInterval; i++){
|
||||
var samplingIntervalPx = parseInt(GlobalVars.canvas.height / ExtensionConf.arDetect.samplingInterval)
|
||||
for(var i = 1; i < ExtensionConf.arDetect.samplingInterval; i++){
|
||||
_ard_sampleCols.push(i * samplingIntervalPx);
|
||||
}
|
||||
|
||||
@ -71,8 +71,8 @@ var _arSetup = function(cwidth, cheight){
|
||||
// things to note: we'll be keeping canvas in memory only.
|
||||
GlobalVars.arDetect.canvas = document.createElement("canvas");
|
||||
|
||||
_ard_canvasWidth = cwidth ? cwidth : Settings.arDetect.hSamples;
|
||||
_ard_canvasHeight = cheight ? cheight : Settings.arDetect.vSamples;
|
||||
_ard_canvasWidth = cwidth ? cwidth : ExtensionConf.arDetect.hSamples;
|
||||
_ard_canvasHeight = cheight ? cheight : ExtensionConf.arDetect.vSamples;
|
||||
|
||||
if(Debug.showArDetectCanvas){
|
||||
GlobalVars.arDetect.canvas.style.position = "absolute";
|
||||
@ -108,8 +108,8 @@ var _arSetup = function(cwidth, cheight){
|
||||
|
||||
try{
|
||||
// determine where to sample
|
||||
var ncol = Settings.arDetect.staticSampleCols;
|
||||
var nrow = Settings.arDetect.staticSampleRows;
|
||||
var ncol = ExtensionConf.arDetect.staticSampleCols;
|
||||
var nrow = ExtensionConf.arDetect.staticSampleRows;
|
||||
|
||||
var colSpacing = _ard_canvasWidth / ncol;
|
||||
var rowSpacing = (_ard_canvasHeight * 4) / nrow;
|
||||
@ -134,7 +134,7 @@ var _arSetup = function(cwidth, cheight){
|
||||
}
|
||||
}
|
||||
catch(ex){
|
||||
console.log("%c[ArDetect::_arSetup] something went terribly wrong when calcuating sample colums.", Settings.colors.criticalFail);
|
||||
console.log("%c[ArDetect::_arSetup] something went terribly wrong when calcuating sample colums.", ExtensionConf.colors.criticalFail);
|
||||
console.log("settings object:", Settings);
|
||||
console.log("error:", ex);
|
||||
}
|
||||
@ -213,7 +213,7 @@ var _ard_processAr = function(video, width, height, edge_h, edge_w, fallbackMode
|
||||
if(Debug.debug && Debug.debugArDetect)
|
||||
console.log("%c[ArDetect::_ard_processAr] new aspect ratio varies from the old one by this much:\n","color: #aaf","old Ar", GlobalVars.lastAr.ar, "current ar", trueAr, "arDiff (absolute):",arDiff,"ar diff (relative to new ar)", arDiff_percent);
|
||||
|
||||
if (arDiff < trueAr * Settings.arDetect.allowedArVariance){
|
||||
if (arDiff < trueAr * ExtensionConf.arDetect.allowedArVariance){
|
||||
if(Debug.debug && Debug.debugArDetect)
|
||||
console.log("%c[ArDetect::_ard_processAr] aspect ratio change denied — diff %:", "background: #740; color: #fa2", arDiff_percent)
|
||||
|
||||
@ -269,13 +269,13 @@ var _ard_vdraw = function (timeout, force_reset){
|
||||
|
||||
var executions = 0;
|
||||
|
||||
if(Debug.debug){
|
||||
setInterval(function(){
|
||||
console.log("STATS FOR LAST SECOND\nexecutions:", executions,"; vdraw timeouts cleared:", clearTimeoutCount);
|
||||
executions = 0;
|
||||
clearTimeoutCount = 0;
|
||||
}, 1000);
|
||||
}
|
||||
// if(Debug.debug){
|
||||
// setInterval(function(){
|
||||
// console.log("STATS FOR LAST SECOND\nexecutions:", executions,"; vdraw timeouts cleared:", clearTimeoutCount);
|
||||
// executions = 0;
|
||||
// clearTimeoutCount = 0;
|
||||
// }, 1000);
|
||||
// }
|
||||
|
||||
var _ard_vdraw_but_for_reals = function() {
|
||||
// thanks dude:
|
||||
@ -289,7 +289,7 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
|
||||
var fallbackMode = false;
|
||||
var startTime = performance.now();
|
||||
var baseTimeout = Settings.arDetect.timer_playing;
|
||||
var baseTimeout = ExtensionConf.arDetect.timer_playing;
|
||||
var triggerTimeout;
|
||||
|
||||
var guardLineResult = true; // true if success, false if fail. true by default
|
||||
@ -304,13 +304,13 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
|
||||
if(GlobalVars.video == null || GlobalVars.video.ended || Status.arStrat != "auto"){
|
||||
// we slow down if ended, null, or not auto. Detecting is pointless.
|
||||
_ard_vdraw(Settings.arDetect.timer_paused);
|
||||
_ard_vdraw(ExtensionConf.arDetect.timer_paused);
|
||||
return false;
|
||||
}
|
||||
|
||||
if(GlobalVars.video.paused){
|
||||
// if the video is paused, we still do autodetection. We just increase the interval.
|
||||
baseTimeout = Settings.arDetect.timer_paused;
|
||||
baseTimeout = ExtensionConf.arDetect.timer_paused;
|
||||
}
|
||||
|
||||
|
||||
@ -335,9 +335,9 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
var newCanvasWidth = window.innerHeight * 1.77;
|
||||
var newCanvasHeight = window.innerHeight;
|
||||
|
||||
if(Settings.miscFullscreenSettings.videoFloat == "center")
|
||||
if(ExtensionConf.miscFullscreenSettings.videoFloat == "center")
|
||||
_ard_canvasDrawWindowHOffset = Math.round((window.innerWidth - newCanvasWidth) * 0.5);
|
||||
else if(Settings.miscFullscreenSettings.videFloat == "left")
|
||||
else if(ExtensionConf.miscFullscreenSettings.videFloat == "left")
|
||||
_ard_canvasDrawWindowHOffset = 0;
|
||||
else
|
||||
_ard_canvasDrawWindowHOffset = window.innerWidth - newCanvasWidth;
|
||||
@ -351,11 +351,11 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
if(Debug.debug)
|
||||
console.log("%c[ArDetect::_ard_vdraw] okay this didnt work either", "color:#000; backgroud:#f51;", ex);
|
||||
|
||||
_ard_vdraw( Settings.arDetect.timer_error );
|
||||
_ard_vdraw( ExtensionConf.arDetect.timer_error );
|
||||
return;
|
||||
}
|
||||
|
||||
// _ard_timer = setTimeout(_ard_vdraw, Settings.arDetect.timer_error, vid, context, w, h);
|
||||
// _ard_timer = setTimeout(_ard_vdraw, ExtensionConf.arDetect.timer_error, vid, context, w, h);
|
||||
// return;
|
||||
}
|
||||
|
||||
@ -416,7 +416,7 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
GlobalVars.arDetect.blackLevel = GlobalVars.arDetect.blackLevel < currentMinVal ? GlobalVars.arDetect.blackLevel : currentMinVal;
|
||||
|
||||
// this means we don't have letterbox
|
||||
if ( currentMaxVal > (GlobalVars.arDetect.blackLevel + Settings.arDetect.blackbarTreshold) || (currentMaxVal - currentMinVal) > Settings.arDetect.blackbarTreshold ){
|
||||
if ( currentMaxVal > (GlobalVars.arDetect.blackLevel + ExtensionConf.arDetect.blackbarTreshold) || (currentMaxVal - currentMinVal) > ExtensionConf.arDetect.blackbarTreshold ){
|
||||
|
||||
// Če ne zaznamo letterboxa, kličemo reset. Lahko, da je bilo razmerje stranic popravljeno na roke. Možno je tudi,
|
||||
// da je letterbox izginil.
|
||||
@ -459,7 +459,7 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
var guardLineOut;
|
||||
var imageDetectOut;
|
||||
|
||||
if(Settings.arDetect.guardLine.enabled){
|
||||
if(ExtensionConf.arDetect.guardLine.enabled){
|
||||
guardLineOut = _ard_guardLineCheck(image);
|
||||
guardLineResult = guardLineOut.success;
|
||||
|
||||
@ -475,9 +475,6 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
// če sta obe funkciji uspeli, potem se razmerje stranic ni spremenilo.
|
||||
// if both succeed, then aspect ratio hasn't changed.
|
||||
if(imageDetectResult && guardLineResult){
|
||||
|
||||
console.log("STATS: both guardLine and imageTest tests succeeded. AR didn't change. Guard line:", GlobalVars.arDetect.guardLine);
|
||||
|
||||
delete image;
|
||||
triggerTimeout = _ard_getTimeout(baseTimeout, startTime);
|
||||
_ard_vdraw(triggerTimeout); //no letterbox, no problem
|
||||
@ -495,7 +492,7 @@ var _ard_vdraw_but_for_reals = function() {
|
||||
var edgeCandidates = _ard_edgeDetect(image, blackbarSamples);
|
||||
var edgePost = _ard_edgePostprocess(edgeCandidates, GlobalVars.canvas.height);
|
||||
|
||||
// console.log("SAMPLES:", blackbarSamples, "candidates:", edgeCandidates, "post:", edgePost,"\n\nblack level:",GlobalVars.arDetect.blackLevel, "tresh:", GlobalVars.arDetect.blackLevel + Settings.arDetect.blackbarTreshold);
|
||||
// console.log("SAMPLES:", blackbarSamples, "candidates:", edgeCandidates, "post:", edgePost,"\n\nblack level:",GlobalVars.arDetect.blackLevel, "tresh:", GlobalVars.arDetect.blackLevel + ExtensionConf.arDetect.blackbarTreshold);
|
||||
|
||||
if(edgePost.status == "ar_known"){
|
||||
_ard_processAr(GlobalVars.video, GlobalVars.canvas.width, GlobalVars.canvas.height, edgePost.blackbarWidth, null, fallbackMode);
|
||||
@ -535,11 +532,11 @@ var _ard_guardLineCheck = function(image){
|
||||
if(GlobalVars.arDetect.guardLine.top == null || GlobalVars.arDetect.guardLine.bottom == null)
|
||||
return { success: true };
|
||||
|
||||
var blackbarTreshold = GlobalVars.arDetect.blackLevel + Settings.arDetect.blackbarTreshold;
|
||||
var blackbarTreshold = GlobalVars.arDetect.blackLevel + ExtensionConf.arDetect.blackbarTreshold;
|
||||
var edges = GlobalVars.arDetect.guardLine;
|
||||
|
||||
|
||||
var offset = parseInt(GlobalVars.canvas.width * Settings.arDetect.guardLine.ignoreEdgeMargin) * 4;
|
||||
var offset = parseInt(GlobalVars.canvas.width * ExtensionConf.arDetect.guardLine.ignoreEdgeMargin) * 4;
|
||||
|
||||
var offenders = [];
|
||||
var firstOffender = -1;
|
||||
@ -551,11 +548,11 @@ var _ard_guardLineCheck = function(image){
|
||||
// preglejmo obe vrstici
|
||||
// check both rows
|
||||
|
||||
var edge_upper = edges.top - Settings.arDetect.guardLine.edgeTolerancePx;
|
||||
var edge_upper = edges.top - ExtensionConf.arDetect.guardLine.edgeTolerancePx;
|
||||
if(edge_upper < 0)
|
||||
return {success: true}; // if we go out of bounds here, the black bars are negligible
|
||||
|
||||
var edge_lower = edges.bottom + Settings.arDetect.guardLine.edgeTolerancePx;
|
||||
var edge_lower = edges.bottom + ExtensionConf.arDetect.guardLine.edgeTolerancePx;
|
||||
if(edge_lower > GlobalVars.canvas.height - 1)
|
||||
return {success: true}; // if we go out of bounds here, the black bars are negligible
|
||||
|
||||
@ -635,10 +632,10 @@ var _ard_edgeDetect = function(image, samples){
|
||||
var edgeCandidatesTop = {};
|
||||
var edgeCandidatesBottom = {};
|
||||
|
||||
var sampleWidthBase = Settings.arDetect.edgeDetection.sampleWidth * 4; // corrected so we can work on imagedata
|
||||
var sampleWidthBase = ExtensionConf.arDetect.edgeDetection.sampleWidth * 4; // corrected so we can work on imagedata
|
||||
var halfSample = sampleWidthBase * 0.5;
|
||||
var detections;
|
||||
var detectionTreshold = Settings.arDetect.edgeDetection.detectionTreshold;
|
||||
var detectionTreshold = ExtensionConf.arDetect.edgeDetection.detectionTreshold;
|
||||
var canvasWidth = GlobalVars.canvas.width;
|
||||
var canvasHeight = GlobalVars.canvas.height;
|
||||
|
||||
@ -646,7 +643,7 @@ var _ard_edgeDetect = function(image, samples){
|
||||
var sampleRow_black, sampleRow_color;
|
||||
|
||||
var blackEdgeViolation = false;
|
||||
var blackbarTreshold = GlobalVars.arDetect.blackLevel + Settings.arDetect.blackbarTreshold;
|
||||
var blackbarTreshold = GlobalVars.arDetect.blackLevel + ExtensionConf.arDetect.blackbarTreshold;
|
||||
|
||||
var topEdgeCount = 0;
|
||||
var bottomEdgeCount = 0;
|
||||
@ -666,8 +663,8 @@ var _ard_edgeDetect = function(image, samples){
|
||||
sampleEnd = GlobalVars.canvas.imageDataRowLength;
|
||||
|
||||
// calculate row offsets for imageData array
|
||||
sampleRow_black = (sample.top - Settings.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
sampleRow_color = (sample.top + 1 + Settings.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
sampleRow_black = (sample.top - ExtensionConf.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
sampleRow_color = (sample.top + 1 + ExtensionConf.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
|
||||
// že ena kršitev črnega roba pomeni, da kandidat ni primeren
|
||||
// even a single black edge violation means the candidate is not an edge
|
||||
@ -719,8 +716,8 @@ var _ard_edgeDetect = function(image, samples){
|
||||
sampleEnd = GlobalVars.canvas.imageDataRowLength;
|
||||
|
||||
// calculate row offsets for imageData array
|
||||
sampleRow_black = (sample.bottom + Settings.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
sampleRow_color = (sample.bottom - 1 - Settings.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
sampleRow_black = (sample.bottom + ExtensionConf.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
sampleRow_color = (sample.bottom - 1 - ExtensionConf.arDetect.edgeDetection.edgeTolerancePx) * GlobalVars.canvas.imageDataRowLength;
|
||||
|
||||
// že ena kršitev črnega roba pomeni, da kandidat ni primeren
|
||||
// even a single black edge violation means the candidate is not an edge
|
||||
@ -785,20 +782,20 @@ var _ard_findBlackbarLimits = function(image, cols, guardLineResult, imageDetect
|
||||
var res_top = [];
|
||||
var res_bottom = [];
|
||||
|
||||
var colsTreshold = cols.length * Settings.arDetect.edgeDetection.minColsForSearch;
|
||||
var colsTreshold = cols.length * ExtensionConf.arDetect.edgeDetection.minColsForSearch;
|
||||
if(colsTreshold == 0)
|
||||
colsTreshold = 1;
|
||||
|
||||
blackbarTreshold = GlobalVars.arDetect.blackLevel + Settings.arDetect.blackbarTreshold;
|
||||
blackbarTreshold = GlobalVars.arDetect.blackLevel + ExtensionConf.arDetect.blackbarTreshold;
|
||||
|
||||
// if guardline didn't fail and imageDetect did, we don't have to check the upper few pixels
|
||||
// but only if upper and lower edge are defined. If they're not, we need to check full height
|
||||
// if(GlobalVars.arDetect.guardLine.top != null || GlobalVars.arDetect.guardLine.bottom != null){
|
||||
// if(guardLineResult && !imageDetectResult){
|
||||
// upper_top = GlobalVars.arDetect.guardline.top;
|
||||
// upper_bottom = (GlobalVars.canvas.height * 0.5) - parseInt(GlobalVars.canvas.height * Settings.arDetect.edgeDetection.middleIgnoredArea);
|
||||
// upper_bottom = (GlobalVars.canvas.height * 0.5) - parseInt(GlobalVars.canvas.height * ExtensionConf.arDetect.edgeDetection.middleIgnoredArea);
|
||||
//
|
||||
// lower_top = (GlobalVars.canvas.height * 0.5) + parseInt(GlobalVars.canvas.height * Settings.arDetect.edgeDetection.middleIgnoredArea);
|
||||
// lower_top = (GlobalVars.canvas.height * 0.5) + parseInt(GlobalVars.canvas.height * ExtensionConf.arDetect.edgeDetection.middleIgnoredArea);
|
||||
// lower_bottom = GlobalVars.arDetect.guardline.bottom;
|
||||
// }
|
||||
// else if(!guardLineResult && imageDetectResult){
|
||||
@ -812,17 +809,17 @@ var _ard_findBlackbarLimits = function(image, cols, guardLineResult, imageDetect
|
||||
// // if they're both false or true (?? they shouldn't be, but let's handle it anyway because dark frames
|
||||
// // could get confusing enough for that to happen), we go for default
|
||||
// upper_top = 0;
|
||||
// upper_bottom = (GlobalVars.canvas.height * 0.5) - parseInt(GlobalVars.canvas.height * Settings.arDetect.edgeDetection.middleIgnoredArea);
|
||||
// upper_bottom = (GlobalVars.canvas.height * 0.5) - parseInt(GlobalVars.canvas.height * ExtensionConf.arDetect.edgeDetection.middleIgnoredArea);
|
||||
//
|
||||
// lower_top = (GlobalVars.canvas.height * 0.5) + parseInt(GlobalVars.canvas.height * Settings.arDetect.edgeDetection.middleIgnoredArea);
|
||||
// lower_top = (GlobalVars.canvas.height * 0.5) + parseInt(GlobalVars.canvas.height * ExtensionConf.arDetect.edgeDetection.middleIgnoredArea);
|
||||
// lower_bottom = GlobalVars.canvas.height;
|
||||
// }
|
||||
// }
|
||||
// else{
|
||||
upper_top = 0;
|
||||
upper_bottom = (GlobalVars.canvas.height * 0.5) /*- parseInt(GlobalVars.canvas.height * Settings.arDetect.edgeDetection.middleIgnoredArea);*/
|
||||
upper_bottom = (GlobalVars.canvas.height * 0.5) /*- parseInt(GlobalVars.canvas.height * ExtensionConf.arDetect.edgeDetection.middleIgnoredArea);*/
|
||||
|
||||
lower_top = (GlobalVars.canvas.height * 0.5) /*+ parseInt(GlobalVars.canvas.height * Settings.arDetect.edgeDetection.middleIgnoredArea);*/
|
||||
lower_top = (GlobalVars.canvas.height * 0.5) /*+ parseInt(GlobalVars.canvas.height * ExtensionConf.arDetect.edgeDetection.middleIgnoredArea);*/
|
||||
lower_bottom = GlobalVars.canvas.height - 1;
|
||||
// }
|
||||
|
||||
@ -881,11 +878,11 @@ var _ard_guardLineImageDetect = function(image){
|
||||
if(GlobalVars.arDetect.guardLine.top == null || GlobalVars.arDetect.guardLine.bottom == null)
|
||||
return { success: false };
|
||||
|
||||
var blackbarTreshold = GlobalVars.arDetect.blackLevel + Settings.arDetect.blackbarTreshold;
|
||||
var blackbarTreshold = GlobalVars.arDetect.blackLevel + ExtensionConf.arDetect.blackbarTreshold;
|
||||
var edges = GlobalVars.arDetect.guardLine;
|
||||
|
||||
|
||||
var offset = parseInt(GlobalVars.canvas.width * Settings.arDetect.guardLine.ignoreEdgeMargin) * 4;
|
||||
var offset = parseInt(GlobalVars.canvas.width * ExtensionConf.arDetect.guardLine.ignoreEdgeMargin) * 4;
|
||||
|
||||
// TODO: implement logo check.
|
||||
|
||||
@ -893,14 +890,14 @@ var _ard_guardLineImageDetect = function(image){
|
||||
// preglejmo obe vrstici - tukaj po pravilih ne bi smeli iti prek mej platna. ne rabimo preverjati
|
||||
// check both rows - by the rules and definitions, we shouldn't go out of bounds here. no need to check, then
|
||||
|
||||
var edge_upper = edges.top + Settings.arDetect.guardLine.edgeTolerancePx;
|
||||
var edge_lower = edges.bottom - Settings.arDetect.guardLine.edgeTolerancePx;
|
||||
var edge_upper = edges.top + ExtensionConf.arDetect.guardLine.edgeTolerancePx;
|
||||
var edge_lower = edges.bottom - ExtensionConf.arDetect.guardLine.edgeTolerancePx;
|
||||
|
||||
// koliko pikslov rabimo zaznati, da je ta funkcija uspe. Tu dovoljujemo tudi, da so vsi piksli na enem
|
||||
// robu (eden izmed robov je lahko v celoti črn)
|
||||
// how many non-black pixels we need to consider this check a success. We only need to detect enough pixels
|
||||
// on one edge (one of the edges can be black as long as both aren't)
|
||||
var successTreshold = parseInt(GlobalVars.canvas.width * Settings.arDetect.guardLine.imageTestTreshold);
|
||||
var successTreshold = parseInt(GlobalVars.canvas.width * ExtensionConf.arDetect.guardLine.imageTestTreshold);
|
||||
var rowStart, rowEnd;
|
||||
|
||||
|
||||
@ -940,7 +937,7 @@ var _ard_guardLineImageDetect = function(image){
|
||||
var _ard_edgePostprocess = function(edges, canvasHeight){
|
||||
var edgesTop = [];
|
||||
var edgesBottom = [];
|
||||
var alignMargin = canvasHeight * Settings.arDetect.allowedMisaligned;
|
||||
var alignMargin = canvasHeight * ExtensionConf.arDetect.allowedMisaligned;
|
||||
|
||||
var missingEdge = edges.edgeCandidatesTopCount == 0 || edges.edgeCandidatesBottomCount == 0;
|
||||
|
||||
@ -987,7 +984,7 @@ var _ard_edgePostprocess = function(edges, canvasHeight){
|
||||
// it could be watermark. It could be a dark frame. Let's check for watermark first.
|
||||
if( edgesTop[0].distance < edgesBottom[0].distance &&
|
||||
edgesTop[0].count < edgesBottom[0].count &&
|
||||
edgesTop[0].count < GlobalVars.arDetect.sampleCols * Settings.arDetect.edgeDetection.logoTreshold){
|
||||
edgesTop[0].count < GlobalVars.arDetect.sampleCols * ExtensionConf.arDetect.edgeDetection.logoTreshold){
|
||||
// možno, da je watermark zgoraj. Preverimo, če se kateri od drugih potencialnih robov na zgornjem robu
|
||||
// ujema s prvim spodnjim (+/- variance). Če je temu tako, potem bo verjetno watermark. Logo mora imeti
|
||||
// manj vzorcev kot navaden rob.
|
||||
@ -1010,7 +1007,7 @@ var _ard_edgePostprocess = function(edges, canvasHeight){
|
||||
}
|
||||
if( edgesBottom[0].distance < edgesTop[0].distance &&
|
||||
edgesBottom[0].count < edgesTop[0].count &&
|
||||
edgesBottom[0].count < GlobalVars.arDetect.sampleCols * Settings.arDetect.edgeDetection.logoTreshold){
|
||||
edgesBottom[0].count < GlobalVars.arDetect.sampleCols * ExtensionConf.arDetect.edgeDetection.logoTreshold){
|
||||
|
||||
if(edgesBottom[0].length > 1){
|
||||
var lowMargin = edgesTop[0].distance - alignMargin;
|
||||
@ -1035,7 +1032,7 @@ var _ard_edgePostprocess = function(edges, canvasHeight){
|
||||
// either the top or the bottom edge remains undetected, but we have one more trick that we
|
||||
// can try. It also tries to work around logos.
|
||||
|
||||
var edgeDetectionTreshold = GlobalVars.arDetect.sampleCols * Settings.arDetect.edgeDetection.singleSideConfirmationTreshold;
|
||||
var edgeDetectionTreshold = GlobalVars.arDetect.sampleCols * ExtensionConf.arDetect.edgeDetection.singleSideConfirmationTreshold;
|
||||
|
||||
if(edges.edgeCandidatesTopCount == 0 && edges.edgeCandidatesBottomCount != 0){
|
||||
for(var edge of edgesBottom){
|
||||
@ -1066,7 +1063,7 @@ var _ard_stop = function(){
|
||||
}
|
||||
|
||||
var _ard_resetBlackLevel = function(){
|
||||
GlobalVars.arDetect.blackLevel = Settings.arDetect.blackLevel_default;
|
||||
GlobalVars.arDetect.blackLevel = ExtensionConf.arDetect.blackLevel_default;
|
||||
}
|
||||
|
||||
var _ard_isRunning = function(){
|
||||
@ -1076,7 +1073,7 @@ var _ard_isRunning = function(){
|
||||
function _ard_getTimeout(baseTimeout, startTime){
|
||||
// baseTimeout -= (performance.now() - startTime);
|
||||
|
||||
// return baseTimeout > Settings.arDetect.minimumTimeout ? baseTimeout : Settings.arDetect.minimumTimeout;
|
||||
// return baseTimeout > ExtensionConf.arDetect.minimumTimeout ? baseTimeout : ExtensionConf.arDetect.minimumTimeout;
|
||||
|
||||
return baseTimeout;
|
||||
}
|
||||
|
||||
@ -161,7 +161,7 @@ var _res_setAr = function(ar){
|
||||
var _res_computeOffsets = function(vidDim, playerDim){
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[Resizer::_res_computeOffsets] video will be aligned to ", Settings.miscFullscreenSettings.videoFloat);
|
||||
console.log("[Resizer::_res_computeOffsets] video will be aligned to ", ExtensionConf.miscFullscreenSettings.videoFloat);
|
||||
|
||||
var offsets = {
|
||||
width: vidDim.width,
|
||||
@ -170,11 +170,11 @@ var _res_computeOffsets = function(vidDim, playerDim){
|
||||
top: ((playerDim.height - vidDim.height) / 2)
|
||||
}
|
||||
|
||||
if( Settings.miscFullscreenSettings.videoFloat == "center" ){
|
||||
if( ExtensionConf.miscFullscreenSettings.videoFloat == "center" ){
|
||||
offsets.left = (playerDim.width - vidDim.width ) / 2;
|
||||
|
||||
}
|
||||
else if( Settings.miscFullscreenSettings.videoFloat == "right" ){
|
||||
else if( ExtensionConf.miscFullscreenSettings.videoFloat == "right" ){
|
||||
offsets.left = (playerDim.width - vidDim.width);
|
||||
}
|
||||
|
||||
@ -183,7 +183,7 @@ var _res_computeOffsets = function(vidDim, playerDim){
|
||||
|
||||
var _res_align = function(float){
|
||||
if(! float)
|
||||
float = Settings.miscFullscreenSettings.videoFloat;
|
||||
float = ExtensionConf.miscFullscreenSettings.videoFloat;
|
||||
|
||||
var dimensions = {left: 0};
|
||||
|
||||
|
||||
53
js/uw-bg.js
53
js/uw-bg.js
@ -138,17 +138,17 @@ function _uwbg_rcvmsg(message, sender, sendResponse){
|
||||
|
||||
if(message.cmd == "get-config"){
|
||||
var config = {};
|
||||
config.videoAlignment = Settings.miscFullscreenSettings.videoFloat;
|
||||
config.videoAlignment = ExtensionConf.miscFullscreenSettings.videoFloat;
|
||||
config.arConf = {};
|
||||
config.arConf.enabled_global = Settings.arDetect.enabled == "blacklist";
|
||||
config.arConf.enabled_global = ExtensionConf.arDetect.enabled == "blacklist";
|
||||
|
||||
config.site = {};
|
||||
config.site.status = SitesConf.getSiteStatus(BgVars.currentSite);
|
||||
config.site.arStatus = SitesConf.getArStatus(BgVars.currentSite);
|
||||
|
||||
config.mode = Settings.extensionMode;
|
||||
config.arMode = Settings.arDetect.mode;
|
||||
config.arTimerPlaying = Settings.arDetect.timer_playing;
|
||||
config.mode = ExtensionConf.extensionMode;
|
||||
config.arMode = ExtensionConf.arDetect.mode;
|
||||
config.arTimerPlaying = ExtensionConf.arDetect.timer_playing;
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[uw-bg::_uwbg_rcvmsg] Keybinds.getKeybinds() returned this:", Keybinds.getKeybinds());
|
||||
@ -158,7 +158,7 @@ function _uwbg_rcvmsg(message, sender, sendResponse){
|
||||
|
||||
// predvidevajmo, da je enako. Če je drugače, bomo popravili ko dobimo odgovor
|
||||
// assume current is same as global & change that when you get response from content script
|
||||
config.arConf.enabled_current = Settings.arDetect.enabled == "blacklist";
|
||||
config.arConf.enabled_current = ExtensionConf.arDetect.enabled == "blacklist";
|
||||
|
||||
var res = {response: config}
|
||||
if(BrowserDetect.firefox){
|
||||
@ -198,16 +198,40 @@ function _uwbg_rcvmsg(message, sender, sendResponse){
|
||||
SitesConf.updateSite(BgVars.currentSite, {status: message.option, statusEmbedded: message.option});
|
||||
}
|
||||
else if(message.cmd == "enable-autoar"){
|
||||
Settings.arDetect.mode = "blacklist";
|
||||
Settings.save();
|
||||
Comms.sendToAll({cmd: "reload-settings", sender: "uwbg"})
|
||||
ExtensionConf.arDetect.mode = "blacklist";
|
||||
Settings.save(ExtensionConf);
|
||||
// Comms.sendToAll({cmd: "reload-settings", sender: "uwbg"})
|
||||
if(Debug.debug){
|
||||
console.log("[uw-bg] autoar set to enabled (blacklist). evidenz:", ExtensionConf);
|
||||
}
|
||||
}
|
||||
else if(message.cmd == "disable-autoar"){
|
||||
Settings.arDetect.mode = "disabled";
|
||||
Settings.save();
|
||||
Comms.sendToAll({cmd: "reload-settings", sender: "uwbg"});
|
||||
ExtensionConf.arDetect.mode = "disabled";
|
||||
Settings.save(ExtensionConf);
|
||||
// Comms.sendToAll({cmd: "reload-settings", sender: "uwbg"});
|
||||
if(Debug.debug){
|
||||
console.log("[uw-bg] autoar set to disabled. evidenz:", ExtensionConf);
|
||||
}
|
||||
}
|
||||
else if(message.cmd == "gib-settings"){
|
||||
if(Debug.debug)
|
||||
console.log("[uw-bg] we got asked for settings. Returning this:", ExtensionConf);
|
||||
|
||||
if(BrowserDetect.usebrowser == "firefox")
|
||||
return Promise.resolve({response: ExtensionConf});
|
||||
|
||||
try{
|
||||
sendResponse({response: mode});
|
||||
}
|
||||
catch(chromeIsShitError){};
|
||||
|
||||
return true;
|
||||
}
|
||||
else if(message.cmd = "autoar-set-timer-playing"){
|
||||
|
||||
if(Debug.debug)
|
||||
console.log("[uw-bg] trying to set new interval for autoAr. New interval is",message.timeout,"ms");
|
||||
|
||||
var timeout = message.timeout;
|
||||
|
||||
if(timeout < 1)
|
||||
@ -215,8 +239,9 @@ function _uwbg_rcvmsg(message, sender, sendResponse){
|
||||
if(timeout > 999)
|
||||
timeout = 999;
|
||||
|
||||
Settings.arDetect.timer_playing = timeout;
|
||||
Comms.sendToAll({cmd: "reload-settings", sender: "uwbg"});
|
||||
ExtensionConf.arDetect.timer_playing = timeout;
|
||||
Settings.save(ExtensionConf);
|
||||
Comms.sendToAll({cmd: "update-settings", sender: "uwbg", newConf: ExtensionConf});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
47
js/uw.js
47
js/uw.js
@ -19,12 +19,11 @@ async function main(){
|
||||
console.log("[uw::main] loading configuration ...");
|
||||
|
||||
// load settings
|
||||
await Settings.init();
|
||||
var isSlave = true;
|
||||
await Settings.init(isSlave);
|
||||
var scpromise = SitesConf.init();
|
||||
var kbpromise = Keybinds.init();
|
||||
|
||||
ExtensionConf.init();
|
||||
|
||||
// počakamo, da so nastavitve naložene
|
||||
// wait for settings to load
|
||||
await scpromise;
|
||||
@ -48,14 +47,21 @@ async function main(){
|
||||
return;
|
||||
}
|
||||
|
||||
if(SitesConf.isArEnabled(window.location.hostname)){
|
||||
// if(SitesConf.isArEnabled(window.location.hostname)){
|
||||
// if(Debug.debug)
|
||||
// console.log("[uw::main] Aspect ratio detection is enabled. Starting ArDetect");
|
||||
// ArDetect.arSetup();
|
||||
// }
|
||||
console.log("[uw::main] ExtensionConf:", ExtensionConf);
|
||||
|
||||
if(ExtensionConf.arDetect.mode == "blacklist"){
|
||||
if(Debug.debug)
|
||||
console.log("[uw::main] Aspect ratio detection is enabled. Starting ArDetect");
|
||||
console.log("[uw::main] Aspect ratio detection is enabled (mode=",ExtensionConf.arDetect.mode,"). Starting ArDetect");
|
||||
ArDetect.arSetup();
|
||||
}
|
||||
else{
|
||||
if(Debug.debug)
|
||||
console.log("[uw::main] Aspect ratio detection is disabled. This is in settings:", Settings.arDetect.enabled);
|
||||
console.log("[uw::main] Aspect ratio detection is disabled. Mode:", ExtensionConf.arDetect.mode);
|
||||
}
|
||||
|
||||
browser.runtime.onMessage.addListener(receiveMessage);
|
||||
@ -173,9 +179,9 @@ function receiveMessage(message, sender, sendResponse) {
|
||||
else if(message.cmd == "get-config"){
|
||||
|
||||
var config = {};
|
||||
config.videoAlignment = Settings.miscFullscreenSettings.videoFloat;
|
||||
config.videoAlignment = ExtensionConf.miscFullscreenSettings.videoFloat;
|
||||
config.arConf = {};
|
||||
config.arConf.enabled_global = Settings.arDetect.enabled == "global";
|
||||
config.arConf.enabled_global = ExtensionConf.arDetect.enabled == "global";
|
||||
|
||||
|
||||
var keybinds = Keybinds.getKeybinds();
|
||||
@ -216,15 +222,32 @@ function receiveMessage(message, sender, sendResponse) {
|
||||
if(Debug.debug)
|
||||
console.log("[uw::receiveMessage] we're aligning video to", message.newFloat);
|
||||
|
||||
Settings.miscFullscreenSettings.videoFloat = message.newFloat;
|
||||
Settings.save();
|
||||
ExtensionConf.miscFullscreenSettings.videoFloat = message.newFloat;
|
||||
Settings.save(ExtensionConf);
|
||||
}
|
||||
else if(message.cmd == "stop-autoar"){
|
||||
ArDetect.stop();
|
||||
}
|
||||
else if(message.cmd == "reload-settings"){
|
||||
Settings.reload();
|
||||
else if(message.cmd == "update-settings"){
|
||||
if(Debug.debug){
|
||||
console.log("[uw] we got sent new ExtensionConf to abide by:", cmd.newConf);
|
||||
}
|
||||
ExtensionConf = cmd.newConf;
|
||||
}
|
||||
// else if(message.cmd == "enable-autoar"){
|
||||
// if(Debug.debug){
|
||||
// console.log("[uw] enabling autoar.");
|
||||
// }
|
||||
// ExtensionConf.autoAr.mode == "blacklist";
|
||||
// Settings.save(ExtensionConf);
|
||||
// }
|
||||
// else if(message.cmd == "disable-autoar"){
|
||||
// if(Debug.debug){
|
||||
// console.log("[uw] disabling autoar.");
|
||||
// }
|
||||
// ExtensionConf.autoAr.mode == "disabled";
|
||||
// Settings.save(ExtensionConf);
|
||||
// }
|
||||
if(message.cmd == "testing"){
|
||||
if(Browserdetect.usebrowser = "firefox")
|
||||
return Promise.resolve({response: "test response hier"});
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"manifest_version": 2,
|
||||
"name": "Ultrawidify",
|
||||
"version": "2.2.0a1",
|
||||
"version": "2.2.0a4",
|
||||
|
||||
"icons": {
|
||||
"32":"res/icons/uw-32.png",
|
||||
@ -25,7 +25,6 @@
|
||||
"js/conf/Settings.js",
|
||||
"js/conf/SitesConf.js",
|
||||
"js/conf/Status.js",
|
||||
"js/conf/ExtensionConf.js",
|
||||
|
||||
"js/lib/PlayerDetect.js",
|
||||
|
||||
@ -49,10 +48,10 @@
|
||||
"js/lib/Comms.js",
|
||||
|
||||
"js/conf/Debug.js",
|
||||
"js/conf/ExtensionConf.js",
|
||||
"js/conf/Settings.js",
|
||||
"js/conf/SitesConf.js",
|
||||
"js/conf/Status.js",
|
||||
"js/conf/ExtensionConf.js",
|
||||
|
||||
"js/conf/Keybinds.js",
|
||||
|
||||
@ -61,7 +60,7 @@
|
||||
},
|
||||
|
||||
"permissions": [
|
||||
"tabs", "storage", "activeTab", "<all_urls>", "webNavigation"
|
||||
"tabs", "storage", "activeTab", "<all_urls>", "webNavigation"
|
||||
],
|
||||
|
||||
"browser_action": {
|
||||
|
||||
@ -176,7 +176,10 @@ function loadConfig(config){
|
||||
}
|
||||
|
||||
document.getElementById("_checkbox_autoArEnabled").checked = config.arMode == "blacklist";
|
||||
document.getElementById("_input_autoAr_frequency").value = config.arTimeoutPlaying;
|
||||
|
||||
console.log("how do I checked? arMode:", config.arMode, " -- is equal to blacklist?", config.arMode == "blacklist");
|
||||
|
||||
document.getElementById("_input_autoAr_frequency").value = parseInt(1000/config.arTimerPlaying);
|
||||
|
||||
// process video alignment:
|
||||
if(config.videoAlignment){
|
||||
@ -420,25 +423,33 @@ document.addEventListener("click", (e) => {
|
||||
// }
|
||||
// _arctl_onclick(command);
|
||||
// return command;
|
||||
console.log("......");
|
||||
var command = {};
|
||||
if(e.target.classList.contains("_autoAr_enabled")){
|
||||
var arStatus = document.getElementById("_checkbox_autoArEnabled").checked;
|
||||
if(arStatus){
|
||||
|
||||
// this event fires before the checkbox is checked, therefore arStatus is opposite of what it should be
|
||||
if(! arStatus){
|
||||
Comms.sendToBackgroundScript({cmd: "disable-autoar", sender: "popup", receiver: "uwbg"});
|
||||
Comms.sendToAll({cmd: "disable-autoar", sender: "popup", receiver: "uwbg"});
|
||||
Comms.sendToAll({cmd: "stop-autoar", sender: "popup", receiver: "uwbg"});
|
||||
}
|
||||
else{
|
||||
Comms.sendToAll({cmd: "enable-autoar", sender: "popup", receiver: "uwbg"});
|
||||
Comms.sendToBackgroundScript({cmd: "enable-autoar", sender: "popup", receiver: "uwbg"});
|
||||
Comms.sendToAll({cmd: "force-ar", newAr: "auto", sender: "popup", receiver: "uwbg"});
|
||||
}
|
||||
return;
|
||||
}
|
||||
else if(e.target.classList.contains("_save_autoAr_frequency")){
|
||||
var value = parseInt(document.getElementById("_input_autoAr_frequency").value);
|
||||
var value = parseInt(document.getElementById("_input_autoAr_frequency").value.trim());
|
||||
|
||||
if(! isNaN(value)){
|
||||
var timeout = parseInt(1000 / value);
|
||||
command = {cmd: "autoar-set-timer-playing", timeout: timeout, sender: "popup", receiver: "uwbg"};
|
||||
Comms.sendToBackgroundScript(command);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -209,7 +209,9 @@
|
||||
</div>
|
||||
|
||||
<div id="autoar-basic-settings" class="suboption hidden">
|
||||
<div class="warning"><p>Due to technical reasons, the check frequency has been temporarily-ish decreased to 1 check per second.</p><small><p>Raising that number back to 30 will make sure the extension corrects aspect ratio as soon as change is detected. Doing so will also raise RAM usage to 30-500 MB if you opened your browser 5 seconds ago, north of 1 GB (<i>way</i> north) if your browser has been opened for a while.</p><p>Keeping check frequency low will make the problem go away (mostly), but aspect ratio corrections will be delayed a bit.</p></small></div>
|
||||
<div class="warning">
|
||||
<p>Due to technical reasons, the check frequency has been temporarily-ish decreased to 1 check per second.</p><small><p>Raising that number back to 30 will make sure the extension corrects aspect ratio as soon as change is detected. Doing so will also raise RAM usage to 30-500 MB if you opened your browser 5 seconds ago, north of 1 GB (<i>way</i> north) if your browser has been opened for a while.</p><p>Keeping check frequency low will make the problem go away (mostly), but aspect ratio corrections will be delayed a bit.</p></small>
|
||||
</div>
|
||||
|
||||
<p><input type="checkbox" id="_checkbox_autoArEnabled" class="_autoAr_enabled _autoAr"> Enable automatic aspect ratio detection?</p>
|
||||
<p>Checks per second: <input id="_input_autoAr_frequency" class="_autoAr_frequency _autoAr" type="number" min="1" max="999"><span class="button _save_autoAr_frequency _autoAr">Save</div></p>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user