From 73e9cca7019c15a92cb4cd320034652590513198 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 21 Mar 2022 13:41:44 +0100 Subject: [bugfix] Close ReadClosers properly in the media package (#434) * defer lock reader * close readers when finished with them * close the reader in the teereader when finished --- internal/processing/media/util.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'internal/processing/media/util.go') diff --git a/internal/processing/media/util.go b/internal/processing/media/util.go index 37dc87979..9739e70b7 100644 --- a/internal/processing/media/util.go +++ b/internal/processing/media/util.go @@ -20,6 +20,7 @@ package media import ( "fmt" + "io" "strconv" "strings" ) @@ -61,3 +62,16 @@ func parseFocus(focus string) (focusx, focusy float32, err error) { focusy = float32(fy) return } + +type teeReadCloser struct { + teeReader io.Reader + close func() error +} + +func (t teeReadCloser) Read(p []byte) (n int, err error) { + return t.teeReader.Read(p) +} + +func (t teeReadCloser) Close() error { + return t.close() +} -- cgit v1.2.3