summaryrefslogtreecommitdiff
path: root/vendor/codeberg.org/gruf/go-iotools/read.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-07-12 09:39:47 +0000
committerLibravatar GitHub <noreply@github.com>2024-07-12 09:39:47 +0000
commitcde2fb6244a791b3c5b746112e3a8be3a79f39a4 (patch)
tree6079d6fb66d90ffbe8c1623525bb86829c162459 /vendor/codeberg.org/gruf/go-iotools/read.go
parent[chore] Add interaction policy gtsmodels (#3075) (diff)
downloadgotosocial-cde2fb6244a791b3c5b746112e3a8be3a79f39a4.tar.xz
[feature] support processing of (many) more media types (#3090)
* initial work replacing our media decoding / encoding pipeline with ffprobe + ffmpeg * specify the video codec to use when generating static image from emoji * update go-storage library (fixes incompatibility after updating go-iotools) * maintain image aspect ratio when generating a thumbnail for it * update readme to show go-ffmpreg * fix a bunch of media tests, move filesize checking to callers of media manager for more flexibility * remove extra debug from error message * fix up incorrect function signatures * update PutFile to just use regular file copy, as changes are file is on separate partition * fix remaining tests, remove some unneeded tests now we're working with ffmpeg/ffprobe * update more tests, add more code comments * add utilities to generate processed emoji / media outputs * fix remaining tests * add test for opus media file, add license header to utility cmds * limit the number of concurrently available ffmpeg / ffprobe instances * reduce number of instances * further reduce number of instances * fix envparsing test with configuration variables * update docs and configuration with new media-{local,remote}-max-size variables
Diffstat (limited to 'vendor/codeberg.org/gruf/go-iotools/read.go')
-rw-r--r--vendor/codeberg.org/gruf/go-iotools/read.go21
1 files changed, 13 insertions, 8 deletions
diff --git a/vendor/codeberg.org/gruf/go-iotools/read.go b/vendor/codeberg.org/gruf/go-iotools/read.go
index 6ce2789a7..13c5e21ac 100644
--- a/vendor/codeberg.org/gruf/go-iotools/read.go
+++ b/vendor/codeberg.org/gruf/go-iotools/read.go
@@ -4,6 +4,16 @@ import (
"io"
)
+// ReadCloserType implements io.ReadCloser
+// by combining the two underlying interfaces,
+// while providing an exported type to still
+// access the underlying original io.Reader or
+// io.Closer separately (e.g. without wrapping).
+type ReadCloserType struct {
+ io.Reader
+ io.Closer
+}
+
// ReaderFunc is a function signature which allows
// a function to implement the io.Reader type.
type ReaderFunc func([]byte) (int, error)
@@ -22,15 +32,10 @@ func (rf ReaderFromFunc) ReadFrom(r io.Reader) (int64, error) {
// ReadCloser wraps an io.Reader and io.Closer in order to implement io.ReadCloser.
func ReadCloser(r io.Reader, c io.Closer) io.ReadCloser {
- return &struct {
- io.Reader
- io.Closer
- }{r, c}
+ return &ReadCloserType{r, c}
}
-// NopReadCloser wraps an io.Reader to implement io.ReadCloser with empty io.Closer implementation.
+// NopReadCloser wraps io.Reader with NopCloser{} in ReadCloserType.
func NopReadCloser(r io.Reader) io.ReadCloser {
- return ReadCloser(r, CloserFunc(func() error {
- return nil
- }))
+ return &ReadCloserType{r, NopCloser{}}
}