Revert "Unify preset names and change 404 to 400"

This reverts commit 160633f.

Author: shauneccles

ledfx/api/presets.py

@@ -27,20 +27,20 @@ async def get(self, effect_id) -> web.Response:
             return web.json_response(data=response, status=400)
 
         if effect_id in self._ledfx.config["ledfx_presets"].keys():
-            ledfx_presets = self._ledfx.config["ledfx_presets"][effect_id]
+            default = self._ledfx.config["ledfx_presets"][effect_id]
         else:
-            ledfx_presets = {}
+            default = {}
 
         if effect_id in self._ledfx.config["user_presets"].keys():
-            user_presets = self._ledfx.config["user_presets"][effect_id]
+            custom = self._ledfx.config["user_presets"][effect_id]
         else:
-            user_presets = {}
+            custom = {}
 
         response = {
             "status": "success",
             "effect": effect_id,
-            "ledfx_presets": ledfx_presets,
-            "user_presets": user_presets,
+            "default_presets": default,
+            "custom_presets": custom,
         }
         return web.json_response(data=response, status=200)
 
@@ -65,7 +65,9 @@ async def put(self, effect_id, request) -> web.Response:
         if category not in ["ledfx_presets", "user_presets"]:
             response = {
                 "status": "failed",
-                "reason": f'Category {category} is not "ledfx_presets" or "user_presets"',
+                "reason": 'Category {} is not "ledfx_presets" or "user_presets"'.format(
+                    category
+                ),
             }
             return web.json_response(data=response, status=400)
 
@@ -79,7 +81,9 @@ async def put(self, effect_id, request) -> web.Response:
         if effect_id not in self._ledfx.config[category].keys():
             response = {
                 "status": "failed",
-                "reason": f"Effect {effect_id} does not exist in category {category}",
+                "reason": "Effect {} does not exist in category {}".format(
+                    effect_id, category
+                ),
             }
             return web.json_response(data=response, status=400)
 
@@ -102,7 +106,9 @@ async def put(self, effect_id, request) -> web.Response:
         if preset_id not in self._ledfx.config[category][effect_id].keys():
             response = {
                 "status": "failed",
-                "reason": f"Preset {preset_id} does not exist for effect {effect_id} in category {category}",
+                "reason": "Preset {} does not exist for effect {} in category {}".format(
+                    preset_id, effect_id, category
+                ),
             }
             return web.json_response(data=response, status=400)
 
@@ -142,7 +148,9 @@ async def delete(self, effect_id, request) -> web.Response:
         if category not in ["ledfx_presets", "user_presets"]:
             response = {
                 "status": "failed",
-                "reason": f'Category {category} is not "ledfx_presets" or "user_presets"',
+                "reason": 'Category {} is not "ledfx_presets" or "user_presets"'.format(
+                    category
+                ),
             }
             return web.json_response(data=response, status=400)
 
@@ -165,7 +173,9 @@ async def delete(self, effect_id, request) -> web.Response:
         if effect_id not in self._ledfx.config[category].keys():
             response = {
                 "status": "failed",
-                "reason": f"Effect {effect_id} does not exist in category {category}",
+                "reason": "Effect {} does not exist in category {}".format(
+                    effect_id, category
+                ),
             }
             return web.json_response(data=response, status=400)
 
@@ -179,7 +189,9 @@ async def delete(self, effect_id, request) -> web.Response:
         if preset_id not in self._ledfx.config[category][effect_id].keys():
             response = {
                 "status": "failed",
-                "reason": f"Preset {preset_id} does not exist for effect {effect_id} in category {category}",
+                "reason": "Preset {} does not exist for effect {} in category {}".format(
+                    preset_id, effect_id, category
+                ),
             }
             return web.json_response(data=response, status=400)
 

ledfx/api/virtual_presets.py

@@ -23,7 +23,7 @@ async def get(self, virtual_id) -> web.Response:
                 "status": "failed",
                 "reason": f"Virtual with ID {virtual_id} not found",
             }
-            return web.json_response(data=response, status=400)
+            return web.json_response(data=response, status=404)
 
         if not virtual.active_effect:
             response = {
@@ -48,8 +48,8 @@ async def get(self, virtual_id) -> web.Response:
             "status": "success",
             "virtual": virtual_id,
             "effect": effect_id,
-            "ledfx_presets": default,
-            "user_presets": custom,
+            "default_presets": default,
+            "custom_presets": custom,
         }
 
         return web.json_response(data=response, status=200)
@@ -83,7 +83,7 @@ async def put(self, virtual_id, request) -> web.Response:
                 "status": "failed",
                 "reason": f"Virtual with ID {virtual_id} not found",
             }
-            return web.json_response(data=response, status=400)
+            return web.json_response(data=response, status=404)
 
         try:
             data = await request.json()
@@ -100,13 +100,18 @@ async def put(self, virtual_id, request) -> web.Response:
             }
             return web.json_response(data=response, status=400)
 
-        if category not in ["ledfx_presets", "user_presets"]:
+        if category not in ["default_presets", "custom_presets"]:
             response = {
                 "status": "failed",
                 "reason": f'Category {category} is not "ledfx_presets" or "user_presets"',
             }
             return web.json_response(data=response, status=400)
 
+        if category == "default_presets":
+            category = "ledfx_presets"
+        else:
+            category = "user_presets"
+
         if effect_id is None:
             response = {
                 "status": "failed",
@@ -131,7 +136,9 @@ async def put(self, virtual_id, request) -> web.Response:
         if preset_id not in self._ledfx.config[category][effect_id].keys():
             response = {
                 "status": "failed",
-                "reason": f"Preset {preset_id} does not exist for effect {effect_id} in category {category}",
+                "reason": "Preset {} does not exist for effect {} in category {}".format(
+                    preset_id, effect_id, category
+                ),
             }
             return web.json_response(data=response, status=400)
 
@@ -174,14 +181,14 @@ async def post(self, virtual_id, request) -> web.Response:
                 "status": "failed",
                 "reason": f"Virtual with ID {virtual_id} not found",
             }
-            return web.json_response(data=response, status=400)
+            return web.json_response(data=response, status=404)
 
         if not virtual.active_effect:
             response = {
                 "status": "failed",
                 "reason": f"Virtual {virtual_id} has no active effect",
             }
-            return web.json_response(data=response, status=400)
+            return web.json_response(data=response, status=404)
 
         try:
             data = await request.json()
@@ -234,7 +241,7 @@ async def delete(self, virtual_id) -> web.Response:
                 "status": "failed",
                 "reason": f"Virtual with ID {virtual_id} not found",
             }
-            return web.json_response(data=response, status=400)
+            return web.json_response(data=response, status=404)
 
         # Clear the effect
         virtual.clear_effect()