amigan/stillbox
amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Shares #109

Merged
amigan merged 59 commits from shareUI into trunk 2025-02-14 00:25:03 -05:00
Conversation 0 Commits 59 Files changed 82 +10
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 98ff7b031f - Show all commits

6
pkg/incidents/incident.go
View file

@ -2,6 +2,7 @@ package incidents
import ( import (
"encoding/json" "encoding/json"
"strings"
"dynatron.me/x/stillbox/internal/jsontypes" "dynatron.me/x/stillbox/internal/jsontypes"
"dynatron.me/x/stillbox/pkg/calls" "dynatron.me/x/stillbox/pkg/calls"
@ -26,6 +27,11 @@ func (inc *Incident) GetResourceName() string {
return entities.ResourceIncident return entities.ResourceIncident
} }
func (inc *Incident) PlaylistFilename() string {
rep := strings.NewReplacer(" ", "_", "/", "_", ":", "_")
return rep.Replace(strings.ToLower(inc.Name))
}
type IncidentCall struct { type IncidentCall struct {
calls.Call calls.Call
Notes json.RawMessage `json:"notes"` Notes json.RawMessage `json:"notes"`

4
pkg/rest/incidents.go
View file

@ -213,9 +213,12 @@ func (ia *incidentsAPI) getCallsM3U(id ID, share *shares.Share, w http.ResponseW
callUrl := common.PtrTo(*ia.baseURL) callUrl := common.PtrTo(*ia.baseURL)
urlRoot := "/api/call" urlRoot := "/api/call"
filename := inc.PlaylistFilename()
if share != nil { if share != nil {
urlRoot = fmt.Sprintf("/share/%s/call/", share.ID) urlRoot = fmt.Sprintf("/share/%s/call/", share.ID)
filename += "_" + share.ID
} }
filename += ".m3u"
b.WriteString("#EXTM3U\n\n") b.WriteString("#EXTM3U\n\n")
for _, c := range inc.Calls { for _, c := range inc.Calls {
@ -243,6 +246,7 @@ func (ia *incidentsAPI) getCallsM3U(id ID, share *shares.Share, w http.ResponseW
// Not a lot of agreement on which MIME type to use for non-HLS m3u, // Not a lot of agreement on which MIME type to use for non-HLS m3u,
// let's hope this is good enough // let's hope this is good enough
w.Header().Set("Content-Type", "audio/x-mpegurl") w.Header().Set("Content-Type", "audio/x-mpegurl")
w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", filename))
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
_, _ = b.WriteTo(w) _, _ = b.WriteTo(w)
} }