From 2c645d1b91397bd106ae4333cfe20ae4575644e6 Mon Sep 17 00:00:00 2001
From: Christopher Vagnetoft <cvagnetoft@gmail.com>
Date: Fri, 14 Aug 2020 02:05:01 +0200
Subject: [PATCH] Updated flavorstash json schema

* Made vendor optional
---
 json/vape/flavorstash/README.md       | 7 ++++---
 json/vape/flavorstash/v1-example.json | 3 ++-
 json/vape/flavorstash/v1-invalid.json | 4 +---
 json/vape/flavorstash/v1.schema       | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/json/vape/flavorstash/README.md b/json/vape/flavorstash/README.md
index e116795..e3fa3d7 100644
--- a/json/vape/flavorstash/README.md
+++ b/json/vape/flavorstash/README.md
@@ -13,8 +13,9 @@ another site.
 * For applications, allowing both to save/load from file and clipboard is suggested.
 
 ## Implementation Details
-The schema is as simplified as possible, meaning only the `vendor` and `flavor` fields are
-required for each record.
+The schema is as simplified as possible, meaning only the `flavor` field is required for
+each record. It is recommended that the vendor is included, and that the vendor is not
+merged into the flavor.
 
     [
       { "vendor":"TFA", "flavor":"Smooth" }
@@ -38,4 +39,4 @@ Application-specific data can (and should) be namespaced using dots, eg. `my_mix
 
 
 
-  
\ No newline at end of file
+  
diff --git a/json/vape/flavorstash/v1-example.json b/json/vape/flavorstash/v1-example.json
index 54d7e96..1fc2c14 100644
--- a/json/vape/flavorstash/v1-example.json
+++ b/json/vape/flavorstash/v1-example.json
@@ -1,4 +1,5 @@
 [
   { "vendor":"FA", "flavor":"Apple Pie" },
-  { "vendor":"FA", "flavor":"Hazelnut" }
+  { "vendor":"FA", "flavor":"Hazelnut" },
+  { "flavor":"WS-23 10%" }
 ]
diff --git a/json/vape/flavorstash/v1-invalid.json b/json/vape/flavorstash/v1-invalid.json
index 0c377a5..4814149 100644
--- a/json/vape/flavorstash/v1-invalid.json
+++ b/json/vape/flavorstash/v1-invalid.json
@@ -1,5 +1,3 @@
 [
-  { "flavor":"FA Apple Pie" },
-  { "vendor":"FA Hazelnut" },
-  { "flavor":"FA Hazelnut" }
+  { "vendor":"FA Hazelnut" }
 ]
diff --git a/json/vape/flavorstash/v1.schema b/json/vape/flavorstash/v1.schema
index de46f03..f981c4e 100644
--- a/json/vape/flavorstash/v1.schema
+++ b/json/vape/flavorstash/v1.schema
@@ -19,7 +19,6 @@
       }
     },
     "required": [
-      "vendor",
       "flavor"
     ],
     "additionalProperties": false