feat: delta volume change

ItsNotGoodName · Mar 16, 2023 · 8e55f43 · 8e55f43
1 parent 15d88aa
commit 8e55f43
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 43 deletions.
diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go
diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
@@ -396,11 +396,11 @@
                     }
                 }
             },
-            "patch": {
+            "post": {
                 "tags": [
                     "states"
                 ],
-                "summary": "Patch state",
+                "summary": "Update state",
                 "parameters": [
                     {
                         "type": "string",
@@ -415,7 +415,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/http.PatchState"
+                            "$ref": "#/definitions/http.PostState"
                         }
                     }
                 ],
@@ -451,7 +451,7 @@
                 }
             }
         },
-        "http.PatchState": {
+        "http.PostState": {
             "type": "object",
             "properties": {
                 "audio_source": {
@@ -465,6 +465,9 @@
                 },
                 "volume": {
                     "type": "integer"
+                },
+                "volume_delta": {
+                    "type": "integer"
                 }
             }
         },

diff --git a/http/api.go b/http/api.go
@@ -246,23 +246,24 @@ func (a API) GetState(c echo.Context) error {
 	return c.JSON(http.StatusOK, state)
 }
 
-type PatchState struct {
+type PostState struct {
 	Power       *bool   `json:"power,omitempty" validate:"optional"`
 	AudioSource *string `json:"audio_source,omitempty" validate:"optional"`
 	Preset      *int    `json:"preset,omitempty" validate:"optional"`
 	Volume      *int    `json:"volume,omitempty" validate:"optional"`
+	VolumeDelta *int    `json:"volume_delta,omitempty" validate:"optional"`
 }
 
-//	@Summary	Patch state
+//	@Summary	Update state
 //	@Tags		states
 //	@Param		uuid	path	string		true	"Radio UUID"
-//	@Param		state	body	PatchState	true	"Patch state"
+//	@Param		state	body	PostState	true	"Patch state"
 //	@Success	200
 //	@Failure	404	{object}	HTTPError
 //	@Failure	500	{object}	HTTPError
-//	@Router		/states/{uuid} [patch]
-func (a API) PatchState(c echo.Context) error {
-	var req PatchState
+//	@Router		/states/{uuid} [post]
+func (a API) PostState(c echo.Context) error {
+	var req PostState
 	if err := c.Bind(&req); err != nil {
 		return echo.ErrBadRequest.WithInternal(err)
 	}
@@ -289,9 +290,15 @@ func (a API) PatchState(c echo.Context) error {
 		}
 	}
 
-	if req.Volume != nil {
-		if err := radio.SetVolume(ctx, rd, *req.Volume); err != nil {
-			return err
+	if req.Volume != nil || req.VolumeDelta != nil {
+		if req.Volume != nil {
+			if err := radio.SetVolume(ctx, rd, *req.Volume); err != nil {
+				return err
+			}
+		} else if req.VolumeDelta != nil {
+			if err := radio.ChangeVolume(ctx, rd, *req.VolumeDelta); err != nil {
+				return err
+			}
 		}
 	}
 

diff --git a/http/http.go b/http/http.go
@@ -65,7 +65,7 @@ func Router(a API, fs fs.FS) *echo.Echo {
 		apiStates := api.Group("/states/:uuid")
 		apiStates.Use(a.RadioMiddleware)
 		apiStates.GET("", a.GetState)
-		apiStates.PATCH("", a.PatchState)
+		apiStates.POST("", a.PostState)
 
 		api.GET("/ws", a.WS(upgrader()))
 	}

diff --git a/internal/radio/actions.go b/internal/radio/actions.go
@@ -20,6 +20,15 @@ func SetVolume(ctx context.Context, r hub.Radio, volume int) error {
 	})
 }
 
+func ChangeVolume(ctx context.Context, r hub.Radio, delta int) error {
+	s, err := GetState(ctx, r)
+	if err != nil {
+		return err
+	}
+
+	return SetVolume(ctx, r, delta+s.Volume)
+}
+
 func PlayPreset(ctx context.Context, r hub.Radio, preset int) error {
 	s, err := GetState(ctx, r)
 	if err != nil {

diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -47,7 +47,7 @@ import {
 } from "./api";
 import {
   useDiscoverRadios,
-  usePatchState,
+  useUpdateState,
   useRefreshRadioVolume,
   useRefreshRadioSubscription,
   useRadiosListQuery,
@@ -289,11 +289,11 @@ const RadioVolumeButtonGroup: Component<
     state: StateState;
   } & ClassProps
 > = (props) => {
-  const statePatch = usePatchState(props.radioUUID);
+  const updateState = useUpdateState(props.radioUUID);
   const refreshRadioVolume = useRefreshRadioVolume(props.radioUUID);
 
   const changeVolume = (volumeChange: number) => {
-    void statePatch.mutate({ volume: props.state.volume + volumeChange });
+    void updateState.mutate({ volume_delta: volumeChange });
   };
 
   const refreshVolume = () => {
@@ -306,7 +306,7 @@ const RadioVolumeButtonGroup: Component<
       fallback={
         <DaisyButton
           class={mergeClass("btn-error", props.class)}
-          loading={statePatch.loading()}
+          loading={updateState.loading()}
           aria-label="Volume Muted"
         >
           <FaSolidVolumeOff size={ICON_SIZE} />
@@ -316,7 +316,7 @@ const RadioVolumeButtonGroup: Component<
       <div class={mergeClass("btn-group flex-nowrap", props.class)}>
         <DaisyButton
           class="btn-info w-14"
-          loading={statePatch.loading()}
+          loading={updateState.loading()}
           aria-label="Lower Volume"
           onClick={[changeVolume, -5]}
         >
@@ -332,7 +332,7 @@ const RadioVolumeButtonGroup: Component<
         </DaisyButton>
         <DaisyButton
           class="btn-info w-14"
-          loading={statePatch.loading()}
+          loading={updateState.loading()}
           aria-label="Raise Volume"
           onClick={[changeVolume, 5]}
         >
@@ -349,10 +349,10 @@ const RadioPowerButton: Component<
     state: StateState;
   } & ClassProps
 > = (props) => {
-  const patchState = usePatchState(props.radioUUID);
+  const updateState = useUpdateState(props.radioUUID);
 
   const togglePower = () => {
-    void patchState.mutate({
+    void updateState.mutate({
       power: !props.state.power,
     });
   };
@@ -364,7 +364,7 @@ const RadioPowerButton: Component<
         "btn-success": props.state.power,
         "btn-error": !props.state.power,
       }}
-      loading={patchState.loading()}
+      loading={updateState.loading()}
       onClick={togglePower}
       aria-label={"Power " + (props.state.power ? "On" : "Off")}
     >
@@ -386,15 +386,15 @@ const RadioAudioSourceDropdown: Component<
     state: StateState;
   } & ClassProps
 > = (props) => {
-  const statePatch = usePatchState(props.radioUUID);
+  const updateState = useUpdateState(props.radioUUID);
   const [lastLoadingAudioSource, setLastLoadingAudioSource] = createSignal("");
   const loadingAudioSource = (): string =>
-    statePatch.loading() ? lastLoadingAudioSource() : "";
+    updateState.loading() ? lastLoadingAudioSource() : "";
 
   const setAudioSource = (audioSource: string) => {
     batch(() => {
-      statePatch.cancel();
-      void statePatch.mutate({ audio_source: audioSource });
+      updateState.cancel();
+      void updateState.mutate({ audio_source: audioSource });
       setLastLoadingAudioSource(audioSource);
     });
   };

diff --git a/web/src/api.ts b/web/src/api.ts
@@ -13,11 +13,12 @@ export interface HttpHTTPError {
   message: string;
 }
 
-export interface HttpPatchState {
+export interface HttpPostState {
   audio_source?: string;
   power?: boolean;
   preset?: number;
   volume?: number;
+  volume_delta?: number;
 }
 
 export interface ModelBuild {
@@ -548,14 +549,14 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * No description
      *
      * @tags states
-     * @name StatesPartialUpdate
-     * @summary Patch state
-     * @request PATCH:/states/{uuid}
+     * @name StatesCreate
+     * @summary Update state
+     * @request POST:/states/{uuid}
      */
-    statesPartialUpdate: (uuid: string, state: HttpPatchState, params: RequestParams = {}) =>
+    statesCreate: (uuid: string, state: HttpPostState, params: RequestParams = {}) =>
       this.request<void, HttpHTTPError>({
         path: `/states/${uuid}`,
-        method: "PATCH",
+        method: "POST",
         body: state,
         type: ContentType.Json,
         ...params,

diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
@@ -10,7 +10,7 @@ import {
 } from "solid-js";
 import { type StatePreset, type StateState } from "../api";
 import { DaisyButton } from "../Daisy";
-import { usePatchState } from "../store";
+import { useUpdateState } from "../store";
 import { type ClassProps, mergeClass } from "../utils";
 
 export const HomePage: Component<
@@ -19,7 +19,7 @@ export const HomePage: Component<
     state: StateState;
   } & ClassProps
 > = (props) => {
-  const statePatch = usePatchState(props.radioUUID);
+  const statePatch = useUpdateState(props.radioUUID);
   const [lastLoadingNumber, setLoadingNumber] = createSignal(-1);
   const loadingNumber = (): number =>
     statePatch.loading() ? lastLoadingNumber() : -1;

diff --git a/web/src/store.ts b/web/src/store.ts
@@ -10,8 +10,8 @@ import {
 } from "solid-js";
 import {
   Api,
+  type HttpPostState,
   type ModelPreset,
-  type HttpPatchState,
   type RequestParams,
 } from "./api";
 import { type ModelRadio } from "./api";
@@ -165,11 +165,11 @@ export const useRefreshRadioSubscription = (uuid: Accessor<string>) =>
   );
 
 // State update
-export const usePatchState = (uuid: Accessor<string>) =>
+export const useUpdateState = (uuid: Accessor<string>) =>
   cancelWhen(
     uuid,
-    createMutation((params, req: HttpPatchState) =>
-      api.states.statesPartialUpdate(uuid(), req, params)
+    createMutation((params, req: HttpPostState) =>
+      api.states.statesCreate(uuid(), req, params)
     )
   );