From 0232325f960b1fbe41e03f74a46fb18a7abf33f7 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 26 May 2021 20:38:15 -0400
Subject: Refactor json audio source (#1711)

* Move sources to the end of audio options object

* Add custom-json audio source type

* Add support for downloading custom-json

* Remove customSourceType
---
 ext/data/schemas/options-schema.json | 47 ++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

(limited to 'ext/data')

diff --git a/ext/data/schemas/options-schema.json b/ext/data/schemas/options-schema.json
index 3f5bd0c7..9afad1e3 100644
--- a/ext/data/schemas/options-schema.json
+++ b/ext/data/schemas/options-schema.json
@@ -341,36 +341,17 @@
                                 "type": "object",
                                 "required": [
                                     "enabled",
-                                    "sources",
                                     "volume",
                                     "autoPlay",
                                     "customSourceUrl",
-                                    "customSourceType",
-                                    "textToSpeechVoice"
+                                    "textToSpeechVoice",
+                                    "sources"
                                 ],
                                 "properties": {
                                     "enabled": {
                                         "type": "boolean",
                                         "default": true
                                     },
-                                    "sources": {
-                                        "type": "array",
-                                        "items": {
-                                            "type": "string",
-                                            "enum": [
-                                                "jpod101",
-                                                "jpod101-alternate",
-                                                "jisho",
-                                                "text-to-speech",
-                                                "text-to-speech-reading",
-                                                "custom"
-                                            ],
-                                            "default": "jpod101"
-                                        },
-                                        "default": [
-                                            "jpod101"
-                                        ]
-                                    },
                                     "volume": {
                                         "type": "number",
                                         "minimum": 0,
@@ -385,14 +366,28 @@
                                         "type": "string",
                                         "default": ""
                                     },
-                                    "customSourceType": {
-                                        "type": "string",
-                                        "enum": ["audio", "json"],
-                                        "default": "audio"
-                                    },
                                     "textToSpeechVoice": {
                                         "type": "string",
                                         "default": ""
+                                    },
+                                    "sources": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string",
+                                            "enum": [
+                                                "jpod101",
+                                                "jpod101-alternate",
+                                                "jisho",
+                                                "text-to-speech",
+                                                "text-to-speech-reading",
+                                                "custom",
+                                                "custom-json"
+                                            ],
+                                            "default": "jpod101"
+                                        },
+                                        "default": [
+                                            "jpod101"
+                                        ]
                                     }
                                 }
                             },
-- 
cgit v1.2.3