johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

API: Improve content type string generation #1307 #3168

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-01-29 21:35:07 +01:00
parent 933cc5031f
commit 06e59d9993
12 changed files with 94 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
internal/entity/file.go
View File

@@ -6,14 +6,9 @@ import (
"math"
"path/filepath"
"sort"
"strings"
"sync"
"time"
"github.com/photoprism/photoprism/pkg/media/video"
"github.com/photoprism/photoprism/pkg/header"
"github.com/dustin/go-humanize/english"
"github.com/gosimple/slug"
"github.com/jinzhu/gorm"
@@ -26,6 +21,7 @@ import (
"github.com/photoprism/photoprism/pkg/media"
"github.com/photoprism/photoprism/pkg/media/colors"
"github.com/photoprism/photoprism/pkg/media/projection"
"github.com/photoprism/photoprism/pkg/media/video"
"github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/txt"
)
@@ -888,51 +884,12 @@ func (m *File) SetOrientation(val int, src string) *File {
// ContentType returns the HTTP content type of the file including the codec as a parameter, if known.
func (m *File) ContentType() (contentType string) {
contentType = m.FileMime
if m.FileVideo {
if contentType == "" {
var codec string
if m.FileCodec != "" {
codec = m.FileCodec
} else {
codec = m.FileType
}
switch codec {
case video.CodecAVC, "mov", "mp4", "avc", "v_avc", "v_avc1":
contentType = header.ContentTypeAVC // Advanced Video Coding (AVC), also known as H.264
case video.CodecHEVC, "hvc", "hevc", "v_hvc", "v_hvc1":
contentType = header.ContentTypeHEVC // High Efficiency Video Coding (HEVC), also known as H.265
case video.CodecHEV1, "hev":
contentType = header.ContentTypeHEV1 // High Efficiency Video Coding (HEVC) Bitstream
case video.CodecVVC, "vvc":
contentType = header.ContentTypeVVC // Versatile Video Coding (VVC), also known as H.266
case video.CodecEVC, "evc":
contentType = header.ContentTypeEVC // MPEG-5 Essential Video Coding (EVC), also known as ISO/IEC 23094-1
case video.CodecVP8, "vp08":
contentType = header.ContentTypeVP8
case video.CodecVP9, "vp9":
contentType = header.ContentTypeVP9
case video.CodecAV1, "av1":
contentType = header.ContentTypeAV1
case video.CodecOGV, "ogg":
contentType = header.ContentTypeOGV
case "webm":
contentType = header.ContentTypeWebM
}
}
if contentType != "" && !strings.Contains(contentType, ";") {
if codec := clean.Codec(m.FileCodec); codec != "" {
contentType = fmt.Sprintf("%s; codecs=\"%s\"", contentType, codec)
}
}
contentType = video.ContentType(m.FileMime, m.FileType, m.FileCodec)
} else {
contentType = clean.ContentType(m.FileMime)
}
contentType = clean.ContentType(contentType)
log.Debugf("file: %s has content type %s", clean.Log(m.FileName), clean.LogQuote(contentType))
return contentType