From ec9f1efd55f262629fea222354c01e92cd6ac09a Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 4 Apr 2020 12:58:02 -0400
Subject: [PATCH] Added category skip option to just show an overlay without
 skipping

---
 public/_locales/en/messages.json              |  4 +-
 .../CategorySkipOptionsComponent.tsx          | 47 ++++++++++++++-----
 src/config.ts                                 |  4 +-
 src/types.ts                                  |  9 +++-
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index 8beb64f1..cc008f02 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -505,7 +505,7 @@
     "manualSkip": {
         "message": "Manual Skip"
     },
-    "autoSkip": {
-        "message": "Auto Skip"
+    "showOverlay": {
+        "message": "Show Overlay On Player"
     }
 }
diff --git a/src/components/CategorySkipOptionsComponent.tsx b/src/components/CategorySkipOptionsComponent.tsx
index e0604418..58301d7b 100644
--- a/src/components/CategorySkipOptionsComponent.tsx
+++ b/src/components/CategorySkipOptionsComponent.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 
 import Config from "../config"
+import { CategorySkipOption } from "../types";
 
 export interface CategorySkipOptionsProps { 
     category: string;
@@ -27,7 +28,17 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
         // Set the default opton properly
         for (const categorySelection of Config.config.categorySelections) {
             if (categorySelection.name === this.props.category) {
-                defaultOption = categorySelection.autoSkip ? "autoSkip" : "manualSkip";
+                switch (categorySelection.option) {
+                    case CategorySkipOption.ShowOverlay:
+                        defaultOption = "showOverlay";
+                        break;
+                    case CategorySkipOption.ManualSkip:
+                        defaultOption = "manualSkip";
+                        break;
+                    case CategorySkipOption.AutoSkip:
+                        defaultOption = "autoSkip";
+                        break;
+                }
             }
         }
 
@@ -54,22 +65,34 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
     }
 
     skipOptionSelected(event: React.ChangeEvent<HTMLSelectElement>): void {
+        let option: CategorySkipOption;
+
+        this.removeCurrentCategorySelection();
+
         switch (event.target.value) {
             case "disable": 
-                this.removeCurrentCategorySelection();
+                return;
+            case "showOverlay":
+                option = CategorySkipOption.ShowOverlay;
 
                 break;
-            default:
-                this.removeCurrentCategorySelection();
+            case "manualSkip":
+                option = CategorySkipOption.ManualSkip;
 
-                Config.config.categorySelections.push({
-                    name: this.props.category,
-                    autoSkip: event.target.value === "autoSkip"
-                });
+                break;
+            case "autoSkip":
+                option = CategorySkipOption.AutoSkip;
 
-                // Forces the Proxy to send this to the chrome storage API
-                Config.config.categorySelections = Config.config.categorySelections;
+                break;
         }
+
+        Config.config.categorySelections.push({
+            name: this.props.category,
+            option: option
+        });
+
+        // Forces the Proxy to send this to the chrome storage API
+        Config.config.categorySelections = Config.config.categorySelections;
     }
 
     /** Removes this category from the config list of category selections */
@@ -89,8 +112,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
 
     getCategorySkipOptions(): JSX.Element[] {
         let elements: JSX.Element[] = [];
-
-        let optionNames = ["disable", "manualSkip", "autoSkip"];
+""
+        let optionNames = ["disable", "showOverlay", "manualSkip", "autoSkip"];
 
         for (const optionName of optionNames) {
             elements.push(
diff --git a/src/config.ts b/src/config.ts
index f11b735e..7688a1ed 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,5 +1,5 @@
 import * as CompileConfig from "../config.json";
-import { CategorySelection } from "./types";
+import { CategorySelection, CategorySkipOption } from "./types";
 
 interface SBConfig {
     userID: string,
@@ -127,7 +127,7 @@ var Config: SBObject = {
         mobileUpdateShowCount: 0,
         categorySelections: [{
             name: "sponsor",
-            autoSkip: true
+            option: CategorySkipOption.AutoSkip
         }]
     },
     localConfig: null,
diff --git a/src/types.ts b/src/types.ts
index 9f664996..25c6f9c9 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -26,13 +26,20 @@ interface VideoDurationResponse {
     duration: number;
 }
 
+enum CategorySkipOption {
+    ShowOverlay,
+    ManualSkip,
+    AutoSkip
+}
+
 interface CategorySelection {
     name: string;
-    autoSkip: boolean;
+    option: CategorySkipOption
 }
 
 export {
     VideoDurationResponse,
     ContentContainer,
+    CategorySkipOption,
     CategorySelection
 };
\ No newline at end of file