From 82b18f0e9bc952582b8faeb924b6b5d5c4bb0a65 Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Mon, 13 Jul 2020 18:01:31 +0200 Subject: [PATCH] Cleanup + add video format --- api/graphql/auth/auth.go | 1 - api/scanner/{photo_type.go => media_type.go} | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) rename api/scanner/{photo_type.go => media_type.go} (98%) diff --git a/api/graphql/auth/auth.go b/api/graphql/auth/auth.go index 90aa085d..6af833e4 100644 --- a/api/graphql/auth/auth.go +++ b/api/graphql/auth/auth.go @@ -28,7 +28,6 @@ func Middleware(db *sql.DB) func(http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if tokenCookie, err := r.Cookie("auth-token"); err == nil { - log.Println("Found auth-token cookie") user, err := models.VerifyTokenAndGetUser(db, tokenCookie.Value) if err != nil { log.Printf("Invalid token: %s\n", err) diff --git a/api/scanner/photo_type.go b/api/scanner/media_type.go similarity index 98% rename from api/scanner/photo_type.go rename to api/scanner/media_type.go index f22aa4c0..c41103b1 100644 --- a/api/scanner/photo_type.go +++ b/api/scanner/media_type.go @@ -63,6 +63,7 @@ const ( TypeWEBM MediaType = "video/webm" TypeMOV MediaType = "video/quicktime" TypeTS MediaType = "video/mp2t" + TypeMTS MediaType = "video/MP2T" ) var SupportedMimetypes = [...]MediaType{ @@ -124,6 +125,7 @@ var VideoMimetypes = [...]MediaType{ TypeWEBM, TypeMOV, TypeTS, + TypeMTS, } var fileExtensions = map[string]MediaType{ @@ -171,6 +173,8 @@ var fileExtensions = map[string]MediaType{ ".mov": TypeMOV, ".qt": TypeMOV, ".ts": TypeTS, + ".m2ts": TypeMTS, + ".mts": TypeMTS, } func (imgType *MediaType) isRaw() bool {