From e0482084f07ae947a8b9de860d8b2ed32dd2726c Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Sun, 20 Jan 2019 23:36:08 +0100
Subject: [PATCH] Rounded up some stragglers from refactor

---
 src/ext/conf/ExtensionConf.js |  3 +--
 src/ext/lib/ActionHandler.js  |  6 +++---
 src/ext/lib/Settings.js       | 36 +++++++++++++++++------------------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/ext/conf/ExtensionConf.js b/src/ext/conf/ExtensionConf.js
index 24a15b5..e489dd7 100644
--- a/src/ext/conf/ExtensionConf.js
+++ b/src/ext/conf/ExtensionConf.js
@@ -732,9 +732,8 @@ var ExtensionConf = {
   // <hostname> : {
   //    status: <option>              // should extension work on this site?
   //    arStatus: <option>            // should we do autodetection on this site?
-  //    statusEmbedded: <option>      // reserved for future... maybe
   //    
-  //    defaultAar?: <ratio>          // automatically apply this aspect ratio on this side. Use extension defaults if undefined.
+  //    defaultAr?: <ratio>          // automatically apply this aspect ratio on this side. Use extension defaults if undefined.
   //    stretch? <stretch mode>       // automatically stretch video on this site in this manner
   //    videoAlignment? <left|center|right>
   //
diff --git a/src/ext/lib/ActionHandler.js b/src/ext/lib/ActionHandler.js
index cc4ba85..3d53e48 100644
--- a/src/ext/lib/ActionHandler.js
+++ b/src/ext/lib/ActionHandler.js
@@ -210,13 +210,13 @@ class ActionHandler {
             this.settings.save();
           } else if (action.scope === 'global') {
             if (cmd.action === "set-stretch") {
-              this.settings.active.site['@global'].stretch = cmd.arg;
+              this.settings.active.stretch.initialMode = cmd.arg;
             } else if (cmd.action === "set-alignment") {
-              this.settings.active.site['@global'].videoAlignment = cmd.arg;
+              this.settings.active.miscSettings.videoAlignment = cmd.arg;
             } else if (cmd.action === "set-extension-mode") {
               this.settings.active.sites['@global'] = cmd.arg;
             } else if (cmd.action === "set-autoar-mode") {
-              this.settings.active.site['@global'].autoar.arStatus = cmd.arg;
+              this.settings.active.arDetect.mode.arStatus = cmd.arg;
             }
             this.settings.save();
           }
diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 60d993b..1006eaa 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -237,22 +237,22 @@ class Settings {
     try {
       // if site-specific settings don't exist for the site, we use default mode:
       if (! this.active.sites[site]) {
-        if (this.active.sites['@global'] === "blacklist") {
+        if (this.active.sites['@global'] === ExtensionMode.Enable) {
           return ExtensionMode.Enabled;
         } else {
-          return this.active.basicExtensionMode === "blacklist" ? ExtensionMode.Basic : ExtensionMode.Disabled;
+          return this.active.basicExtensionMode === ExtensionMode.Enable ? ExtensionMode.Basic : ExtensionMode.Disabled;
         }
       }
 
-      if (this.active.sites[site].status === 'enabled') {
+      if (this.active.sites[site].mode === ExtensionMode.Enabled) {
         return ExtensionMode.Enabled;
-      } else if (this.active.sites[site].status === 'basic') {
+      } else if (this.active.sites[site].mode === ExtensionMode.Basic) {
         return ExtensionMode.Basic;
-      } else if (this.active.sites[site].status === 'default') {
-        if (this.active.sites['@global'] === "blacklist") {
+      } else if (this.active.sites[site].mode === ExtensionMode.Default) {
+        if (this.active.sites['@global'] === ExtensionMode.Enable) {
           return ExtensionMode.Enabled;
         } else {
-          return this.active.basicExtensionMode === "blacklist" ? ExtensionMode.Basic : ExtensionMode.Disabled;
+          return this.active.basicExtensionMode === ExtensionMode.Enable ? ExtensionMode.Basic : ExtensionMode.Disabled;
         }
       } else {
         return ExtensionMode.Disabled;
@@ -289,13 +289,13 @@ class Settings {
     try{
     // if site is not defined, we use default mode:
     if (! this.active.sites[site]) {
-      return this.active.sites['@global'] === "blacklist";
+      return this.active.sites['@global'] === ExtensionMode.Enable;
     }
 
-    if(this.active.sites['@global'] === "blacklist") {
-      return this.active.sites[site].status !== "disabled";
-    } else if (this.active.sites['@global'] === "whitelist") {
-      return this.active.sites[site].status === "enabled";
+    if(this.active.sites['@global'] === ExtensionMode.Enable) {
+      return this.active.sites[site].mode !== ExtensionMode.Disabled;
+    } else if (this.active.sites['@global'] === ExtensionMode.Whitelist) {
+      return this.active.sites[site].mode === ExtensionMode.Enabled;
     } else {
       return false;
     }
@@ -308,7 +308,7 @@ class Settings {
   }
 
   extensionEnabled(){
-    return this.active.sites['@global'] !== 'disabled'
+    return this.active.sites['@global'] !== ExtensionMode.Disabled
   }
 
   extensionEnabledForSite(site) {
@@ -341,13 +341,13 @@ class Settings {
 
     // if site is not defined, we use default mode:    
     if (! this.active.sites[site]) {
-      return this.active.sites['@global'].autoar === "blacklist";
+      return this.active.sites['@global'].autoar === ExtensionMode.Enable;
     }
 
-    if (this.active.sites['@global'].autoar === "blacklist") {
-      return this.active.sites[site].arStatus !== "disabled";
-    } else if (this.active.sites['@global'].autoar === "whitelist") {
-      return this.active.sites[site].arStatus === "enabled";
+    if (this.active.sites['@global'].autoar === ExtensionMode.Enable) {
+      return this.active.sites[site].autoar !== ExtensionMode.Disabled;
+    } else if (this.active.sites['@global'].autoar === ExtensionMode.Whitelist) {
+      return this.active.sites[site].autoar === ExtensionMode.Enable;
     } else {
       return false;
     }