From 6208fd2b8dbc69da8454d594bc4af5a25d8b93cd Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 5 Aug 2024 02:03:34 +0200 Subject: [PATCH] Fix base64 encode --- transcoder/src/info.go | 6 +++--- transcoder/src/metadata.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transcoder/src/info.go b/transcoder/src/info.go index 64ad542a..669199e5 100644 --- a/transcoder/src/info.go +++ b/transcoder/src/info.go @@ -274,8 +274,8 @@ func RetriveMediaInfo(path string, sha string) (*MediaInfo, error) { var link string var path string if extension != nil { - link = fmt.Sprintf("%s/%s/subtitle/%d.%s", Settings.RoutePrefix, base64.StdEncoding.EncodeToString([]byte(path)), i, *extension) - path = fmt.Sprintf("%s/%s/sub/%d.%s", Settings.Metadata, sha, i, extension) + link = fmt.Sprintf("%s/%s/subtitle/%d.%s", Settings.RoutePrefix, base64.RawURLEncoding.EncodeToString([]byte(path)), i, *extension) + path = fmt.Sprintf("%s/%s/sub/%d.%s", Settings.Metadata, sha, i, *extension) } lang, _ := language.Parse(stream.Tags.Language) idx := uint32(i) @@ -302,7 +302,7 @@ func RetriveMediaInfo(path string, sha string) (*MediaInfo, error) { }), Fonts: MapStream(mi.Streams, ffprobe.StreamAttachment, func(stream *ffprobe.Stream, i uint32) string { font, _ := stream.TagList.GetString("filename") - return fmt.Sprintf("%s/%s/attachment/%s", Settings.RoutePrefix, base64.StdEncoding.EncodeToString([]byte(path)), font) + return fmt.Sprintf("%s/%s/attachment/%s", Settings.RoutePrefix, base64.RawURLEncoding.EncodeToString([]byte(path)), font) }), } var codecs []string diff --git a/transcoder/src/metadata.go b/transcoder/src/metadata.go index 1d7c1bcb..b61cbbb3 100644 --- a/transcoder/src/metadata.go +++ b/transcoder/src/metadata.go @@ -169,7 +169,7 @@ func (s *MetadataService) getMetadata(path string, sha string) (*MediaInfo, erro link := fmt.Sprintf( "%s/%s/subtitle/%d.%s", Settings.RoutePrefix, - base64.StdEncoding.EncodeToString([]byte(ret.Path)), + base64.RawURLEncoding.EncodeToString([]byte(ret.Path)), s.Index, *s.Extension, )