refactor(api): stream handler

use file extention to detect which mime type to use
dreamvo · Jan 17, 2021 · 5c87403 · 5c87403
1 parent f28865c
commit 5c87403
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/api/stream.go b/api/stream.go
@@ -8,8 +8,10 @@ import (
 	"github.com/dreamvo/gilfoyle/ent/media"
 	"github.com/dreamvo/gilfoyle/ent/schema"
 	"github.com/gin-gonic/gin"
+	"mime"
 	"net/http"
 	"path"
+	"path/filepath"
 	"strings"
 )
 
@@ -62,7 +64,7 @@ func (s *Server) getMediaPlaylistFile(ctx *gin.Context) {
 	filenameParts := strings.Split(filename, "/")
 	file := filenameParts[len(filenameParts)-1]
 
-	ctx.DataFromReader(http.StatusOK, stat.Size, "application/octet-stream", f, map[string]string{
+	ctx.DataFromReader(http.StatusOK, stat.Size, mime.TypeByExtension(filepath.Ext(file)), f, map[string]string{
 		"Content-Disposition": fmt.Sprintf(`attachment; filename="%s"`, file),
 	})
 }
diff --git a/api/stream_test.go b/api/stream_test.go
@@ -43,7 +43,7 @@ func TestStream(t *testing.T) {
 	})
 
 	t.Run("GET /medias/{media_id}/stream/*filename", func(t *testing.T) {
-		t.Run("should return requested file", func(t *testing.T) {
+		t.Run("should return the requested file", func(t *testing.T) {
 			m, err := dbClient.Media.
 				Create().
 				SetTitle("test").
@@ -59,10 +59,30 @@ func TestStream(t *testing.T) {
 
 			assert.Equal(t, http.StatusOK, res.Result().StatusCode)
 			assert.Equal(t, "test", res.Body.String())
-			assert.Equal(t, "application/octet-stream", res.Header().Get("Content-Type"))
+			assert.Equal(t, "application/x-mpegURL", res.Header().Get("Content-Type"))
 			assert.Equal(t, "attachment; filename=\"index.m3u8\"", res.Header().Get("Content-Disposition"))
 		})
 
+		t.Run("should return the requested file (2)", func(t *testing.T) {
+			m, err := dbClient.Media.
+				Create().
+				SetTitle("test").
+				SetStatus(schema.MediaStatusReady).
+				Save(context.Background())
+			assert.NoError(t, err)
+
+			err = s.storage.Save(context.Background(), strings.NewReader("test"), path.Join(m.ID.String(), "low", "000.ts"))
+			assert.NoError(t, err)
+
+			res, err := testutils.Send(s.router, http.MethodGet, fmt.Sprintf("/medias/%s/stream/low/000.ts", m.ID.String()), nil)
+			assert.NoError(t, err)
+
+			assert.Equal(t, http.StatusOK, res.Result().StatusCode)
+			assert.Equal(t, "test", res.Body.String())
+			assert.Equal(t, "video/MP2T", res.Header().Get("Content-Type"))
+			assert.Equal(t, "attachment; filename=\"000.ts\"", res.Header().Get("Content-Disposition"))
+		})
+
 		t.Run("should return error because of non-Ready status", func(t *testing.T) {
 			m, err := dbClient.Media.
 				Create().