nemunaire/hathoris
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Introduce streams
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/tag Build is failing
Details

Browse Source
This commit is contained in:
nemunaire 2023-11-14 11:17:54 +01:00
parent bbde2299fe
commit 8e948fc451
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/inputs.go
View File

@ -47,7 +47,7 @@ func declareInputsRoutes(cfg *config.Config, router *gin.RouterGroup) {
inputsRoutes.GET("/settings", func(c *gin.Context) { inputsRoutes.GET("/settings", func(c *gin.Context) {
c.JSON(http.StatusOK, c.MustGet("input")) c.JSON(http.StatusOK, c.MustGet("input"))
}) })
inputsRoutes.GET("/currently", func(c *gin.Context) { inputsRoutes.GET("/streams", func(c *gin.Context) {
src := c.MustGet("input").(inputs.SoundInput) src := c.MustGet("input").(inputs.SoundInput)
if !src.IsActive() { if !src.IsActive() {
@ -58,7 +58,7 @@ func declareInputsRoutes(cfg *config.Config, router *gin.RouterGroup) {
c.JSON(http.StatusOK, src.CurrentlyPlaying()) c.JSON(http.StatusOK, src.CurrentlyPlaying())
}) })
streamRoutes := inputsRoutes.Group("/stream/:stream") streamRoutes := inputsRoutes.Group("/streams/:stream")
streamRoutes.Use(StreamHandler) streamRoutes.Use(StreamHandler)
streamRoutes.POST("/pause", func(c *gin.Context) { streamRoutes.POST("/pause", func(c *gin.Context) {

45
ui/src/lib/components/Inputs.svelte
View File

@ -39,27 +39,32 @@
{/each} {/each}
{#each $inputsList as input} {#each $inputsList as input}
{#if showInactives || input.active} {#if showInactives || input.active}
<li class="list-group-item py-3 d-flex justify-content-between"> <li class="list-group-item py-3 d-flex flex-column">
<div> <strong>{input.name}</strong>
<strong>{input.name}</strong> {#await input.streams()}
{#await input.currently()} <div class="spinner-border spinner-border-sm" role="status">
<div class="spinner-border spinner-border-sm" role="status"> <span class="visually-hidden">Loading...</span>
<span class="visually-hidden">Loading...</span>
</div>
{:then title}
<span class="text-muted">{title}</span>
{/await}
</div>
{#if input.controlable}
<div>
<button
class="btn btn-sm btn-primary"
on:click={() => input.playpause()}
>
<i class="bi bi-pause"></i>
</button>
</div> </div>
{/if} {:then streams}
{#each Object.keys(streams) as idstream}
{@const title = streams[idstream]}
<div class="d-flex justify-content-between">
<div>
<span class="text-muted">{title}</span>
</div>
{#if input.controlable}
<div>
<button
class="btn btn-sm btn-primary"
on:click={() => input.playpause(idstream)}
>
<i class="bi bi-pause"></i>
</button>
</div>
{/if}
</div>
{/each}
{/await}
</li> </li>
{/if} {/if}
{/each} {/each}

8
ui/src/lib/input.js
View File

@ -12,8 +12,8 @@ export class Input {
this.controlable = controlable; this.controlable = controlable;
} }
async currently() { async streams() {
const data = await fetch(`api/inputs/${this.id}/currently`, {headers: {'Accept': 'application/json'}}); const data = await fetch(`api/inputs/${this.id}/streams`, {headers: {'Accept': 'application/json'}});
if (data.status == 200) { if (data.status == 200) {
return await data.json(); return await data.json();
} else { } else {
@ -21,8 +21,8 @@ export class Input {
} }
} }
async playpause() { async playpause(idstream) {
const data = await fetch(`api/inputs/${this.id}/pause`, {headers: {'Accept': 'application/json'}, method: 'POST'}); const data = await fetch(`api/inputs/${this.id}/streams/${idstream}/pause`, {headers: {'Accept': 'application/json'}, method: 'POST'});
if (data.status != 200) { if (data.status != 200) {
throw new Error((await res.json()).errmsg); throw new Error((await res.json()).errmsg);
} }

10
ui/src/routes/+page.svelte
View File

@ -40,12 +40,16 @@
<div class="d-inline-block me-3"> <div class="d-inline-block me-3">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
<div> <div>
{#await input.currently()} {#await input.streams()}
<div class="spinner-border spinner-border-sm" role="status"> <div class="spinner-border spinner-border-sm" role="status">
<span class="visually-hidden">Loading...</span> <span class="visually-hidden">Loading...</span>
</div> <span class="text-muted">@ {input.name}</span> </div> <span class="text-muted">@ {input.name}</span>
{:then title} {:then streams}
<strong>{title}</strong> <span class="text-muted">@ {input.name}</span> {#each Object.keys(streams) as idstream}
{@const title = streams[idstream]}
<strong>{title}</strong>
{/each}
<span class="text-muted">@ {input.name}</span>
{:catch error} {:catch error}
{input.name} activée {input.name} activée
{/await} {/await}