From cde2fb6244a791b3c5b746112e3a8be3a79f39a4 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Fri, 12 Jul 2024 09:39:47 +0000
Subject: [PATCH] [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
---
README.md | 1 +
cmd/gotosocial/action/server/server.go | 45 +-
cmd/process-emoji/main.go | 122 +
cmd/process-media/main.go | 124 +
docs/configuration/media.md | 23 +-
example/config.yaml | 23 +-
go.mod | 23 +-
go.sum | 61 +-
internal/api/client/admin/emojicreate_test.go | 12 +-
internal/api/client/admin/emojidelete_test.go | 2 +-
internal/api/client/admin/emojiget_test.go | 4 +-
internal/api/client/admin/emojiupdate_test.go | 30 +-
internal/api/client/instance/instancepatch.go | 7 -
.../api/client/instance/instancepatch_test.go | 14 +-
internal/api/client/media/mediacreate.go | 13 -
internal/api/client/media/mediacreate_test.go | 4 +-
internal/cleaner/media_test.go | 4 +-
internal/config/config.go | 4 +-
internal/config/defaults.go | 4 +-
internal/config/flags.go | 4 +-
internal/config/helpers.gen.go | 100 +-
internal/federation/dereferencing/emoji.go | 15 +-
.../federation/dereferencing/emoji_test.go | 2 +-
internal/federation/dereferencing/media.go | 15 +-
internal/httpclient/client.go | 37 +-
internal/httpclient/client_test.go | 39 +-
internal/media/ffmpeg.go | 313 +++
internal/media/ffmpeg/cache.go | 46 +
internal/media/ffmpeg/ffmpeg.go | 92 +
internal/media/ffmpeg/ffprobe.go | 92 +
internal/media/ffmpeg/pool.go | 75 +
internal/media/image.go | 189 --
internal/media/manager.go | 30 +-
internal/media/manager_test.go | 821 +-----
internal/media/png-stripper.go | 211 --
internal/media/processingemoji.go | 216 +-
internal/media/processingmedia.go | 467 ++--
internal/media/refetch.go | 10 +-
internal/media/test/birdnest-processed.mp4 | Bin 1409577 -> 1409625 bytes
internal/media/test/birdnest-thumbnail.jpg | Bin 2897 -> 10114 bytes
internal/media/test/gts_pixellated-static.png | Bin 1010 -> 1512 bytes
internal/media/test/longer-mp4-processed.mp4 | Bin 109549 -> 109569 bytes
internal/media/test/longer-mp4-thumbnail.jpg | Bin 2897 -> 3789 bytes
internal/media/test/nb-flag-static.png | Bin 878 -> 709 bytes
internal/media/test/rainbow-static.png | Bin 10413 -> 6092 bytes
internal/media/test/test-jpeg-thumbnail.jpg | Bin 20973 -> 11113 bytes
internal/media/test/test-mp4-processed.mp4 | Bin 312413 -> 312453 bytes
internal/media/test/test-mp4-thumbnail.jpg | Bin 1913 -> 4543 bytes
internal/media/test/test-opus-original.opus | Bin 0 -> 1776956 bytes
internal/media/test/test-opus-processed.opus | Bin 0 -> 1776956 bytes
.../test/test-png-alphachannel-processed.png | Bin 18904 -> 18904 bytes
.../test/test-png-alphachannel-thumbnail.jpg | Bin 5984 -> 8029 bytes
.../test-png-noalphachannel-thumbnail.jpg | Bin 5984 -> 8063 bytes
internal/media/types.go | 2 +-
internal/media/util.go | 176 +-
internal/media/video.go | 141 -
internal/processing/account/update.go | 50 +-
internal/processing/admin/emoji.go | 64 +-
internal/processing/admin/media.go | 4 +-
internal/processing/media/create.go | 33 +-
internal/processing/media/getfile_test.go | 27 +-
internal/storage/storage.go | 25 +
internal/transport/derefmedia.go | 22 +-
internal/transport/transport.go | 4 +-
internal/typeutils/internaltofrontend.go | 8 +-
internal/typeutils/internaltofrontend_test.go | 8 +-
test/envparsing.sh | 8 +-
testrig/config.go | 20 +-
testrig/media/cowlick-small.jpeg | Bin 5272 -> 6922 bytes
testrig/media/kip-static.png | Bin 802 -> 1056 bytes
testrig/media/ohyou-small.jpg | Bin 6177 -> 7647 bytes
testrig/media/rainbow-static.png | Bin 10413 -> 6092 bytes
testrig/media/sloth-small.jpg | Bin 50820 -> 36046 bytes
testrig/media/team-fortress-small.jpg | Bin 42308 -> 9921 bytes
testrig/media/thoughtsofdog-small.jpg | Bin 19312 -> 11751 bytes
testrig/media/trent-small.jpg | Bin 8803 -> 9764 bytes
testrig/media/welcome-small.jpg | Bin 6872 -> 7587 bytes
testrig/media/yell-static.png | Bin 10808 -> 8965 bytes
testrig/media/zork-small.jpg | Bin 15374 -> 29812 bytes
testrig/testmodels.go | 6 +-
.../go-ffmpreg}/LICENSE | 147 +-
.../gruf/go-ffmpreg/embed/ffmpeg/ffmpeg.wasm | Bin 0 -> 12941748 bytes
.../gruf/go-ffmpreg/embed/ffmpeg/lib.go | 38 +
.../go-ffmpreg/embed/ffprobe/ffprobe.wasm | Bin 0 -> 12859932 bytes
.../gruf/go-ffmpreg/embed/ffprobe/lib.go | 38 +
.../gruf/go-ffmpreg/ffmpeg/ffmpeg.go | 109 +
.../gruf/go-ffmpreg/ffprobe/ffprobe.go | 108 +
.../gruf/go-ffmpreg/internal/wasm.go | 25 +
.../gruf/go-ffmpreg/util/funcs.go | 65 +
.../codeberg.org/gruf/go-ffmpreg/util/wasm.go | 81 +
.../gruf/go-ffmpreg/wasm/instance.go | 181 ++
vendor/codeberg.org/gruf/go-iotools/close.go | 9 +
.../codeberg.org/gruf/go-iotools/helpers.go | 85 +
vendor/codeberg.org/gruf/go-iotools/read.go | 21 +-
vendor/codeberg.org/gruf/go-iotools/size.go | 25 +
vendor/codeberg.org/gruf/go-iotools/write.go | 9 +-
.../codeberg.org/gruf/go-mimetypes/README.md | 5 +
.../gruf/go-mimetypes/get-mime-types.sh | 42 +
.../gruf/go-mimetypes/mime.gen.go | 1207 ++++++++
vendor/codeberg.org/gruf/go-mimetypes/mime.go | 47 +
.../gruf/go-storage/memory/memory.go | 3 +-
.../exif-terminator/README.md | 122 -
.../exif-terminator/jpeg.go | 295 --
.../exif-terminator/png.go | 93 -
.../exif-terminator/terminator.go | 158 --
.../exif-terminator/webp.go | 101 -
vendor/github.com/abema/go-mp4/.gitignore | 1 -
vendor/github.com/abema/go-mp4/LICENSE | 21 -
vendor/github.com/abema/go-mp4/README.md | 159 --
vendor/github.com/abema/go-mp4/anytype.go | 19 -
vendor/github.com/abema/go-mp4/box.go | 188 --
vendor/github.com/abema/go-mp4/box_info.go | 162 --
.../github.com/abema/go-mp4/box_types_3gpp.go | 24 -
.../github.com/abema/go-mp4/box_types_av1.go | 44 -
.../abema/go-mp4/box_types_etsi_ts_102_366.go | 36 -
.../abema/go-mp4/box_types_iso14496_12.go | 2460 -----------------
.../abema/go-mp4/box_types_iso14496_14.go | 126 -
.../abema/go-mp4/box_types_iso23001_5.go | 35 -
.../abema/go-mp4/box_types_iso23001_7.go | 108 -
.../abema/go-mp4/box_types_metadata.go | 257 --
.../github.com/abema/go-mp4/box_types_opus.go | 54 -
.../github.com/abema/go-mp4/box_types_vp.go | 53 -
vendor/github.com/abema/go-mp4/extract.go | 98 -
vendor/github.com/abema/go-mp4/field.go | 290 --
.../abema/go-mp4/internal/bitio/bitio.go | 8 -
.../abema/go-mp4/internal/bitio/read.go | 97 -
.../abema/go-mp4/internal/bitio/write.go | 61 -
.../abema/go-mp4/internal/util/io.go | 30 -
.../abema/go-mp4/internal/util/string.go | 42 -
vendor/github.com/abema/go-mp4/marshaller.go | 663 -----
vendor/github.com/abema/go-mp4/mp4.go | 171 --
vendor/github.com/abema/go-mp4/probe.go | 684 -----
vendor/github.com/abema/go-mp4/read.go | 199 --
vendor/github.com/abema/go-mp4/string.go | 261 --
vendor/github.com/abema/go-mp4/write.go | 68 -
.../dsoprea/go-exif/v3/.MODULE_ROOT | 0
vendor/github.com/dsoprea/go-exif/v3/LICENSE | 9 -
.../dsoprea/go-exif/v3/common/ifd.go | 651 -----
.../dsoprea/go-exif/v3/common/parser.go | 280 --
.../go-exif/v3/common/testing_common.go | 88 -
.../dsoprea/go-exif/v3/common/type.go | 482 ----
.../dsoprea/go-exif/v3/common/utility.go | 148 -
.../go-exif/v3/common/value_context.go | 464 ----
.../go-exif/v3/common/value_encoder.go | 273 --
.../dsoprea/go-exif/v3/data_layer.go | 50 -
vendor/github.com/dsoprea/go-exif/v3/error.go | 14 -
vendor/github.com/dsoprea/go-exif/v3/exif.go | 333 ---
vendor/github.com/dsoprea/go-exif/v3/gps.go | 117 -
.../dsoprea/go-exif/v3/ifd_builder.go | 1199 --------
.../dsoprea/go-exif/v3/ifd_builder_encode.go | 532 ----
.../dsoprea/go-exif/v3/ifd_enumerate.go | 1672 -----------
.../dsoprea/go-exif/v3/ifd_tag_entry.go | 298 --
.../github.com/dsoprea/go-exif/v3/package.go | 8 -
vendor/github.com/dsoprea/go-exif/v3/tags.go | 475 ----
.../dsoprea/go-exif/v3/tags_data.go | 968 -------
.../dsoprea/go-exif/v3/testing_common.go | 188 --
.../dsoprea/go-exif/v3/undefined/README.md | 4 -
.../dsoprea/go-exif/v3/undefined/accessor.go | 62 -
.../go-exif/v3/undefined/exif_8828_oecf.go | 148 -
.../v3/undefined/exif_9000_exif_version.go | 69 -
.../exif_9101_components_configuration.go | 124 -
.../v3/undefined/exif_927C_maker_note.go | 114 -
.../v3/undefined/exif_9286_user_comment.go | 142 -
.../undefined/exif_A000_flashpix_version.go | 69 -
.../exif_A20C_spatial_frequency_response.go | 160 --
.../v3/undefined/exif_A300_file_source.go | 79 -
.../v3/undefined/exif_A301_scene_type.go | 76 -
.../v3/undefined/exif_A302_cfa_pattern.go | 97 -
.../exif_iop_0002_interop_version.go | 69 -
.../gps_001B_gps_processing_method.go | 65 -
.../gps_001C_gps_area_information.go | 65 -
.../go-exif/v3/undefined/registration.go | 42 -
.../dsoprea/go-exif/v3/undefined/type.go | 44 -
.../github.com/dsoprea/go-exif/v3/utility.go | 237 --
.../github.com/dsoprea/go-iptc/.MODULE_ROOT | 0
vendor/github.com/dsoprea/go-iptc/.travis.yml | 14 -
vendor/github.com/dsoprea/go-iptc/LICENSE | 21 -
vendor/github.com/dsoprea/go-iptc/README.md | 8 -
vendor/github.com/dsoprea/go-iptc/standard.go | 101 -
vendor/github.com/dsoprea/go-iptc/tag.go | 277 --
.../dsoprea/go-iptc/testing_common.go | 73 -
vendor/github.com/dsoprea/go-iptc/utility.go | 25 -
.../github.com/dsoprea/go-logging/.travis.yml | 12 -
vendor/github.com/dsoprea/go-logging/LICENSE | 9 -
.../github.com/dsoprea/go-logging/README.md | 223 --
.../github.com/dsoprea/go-logging/config.go | 246 --
.../dsoprea/go-logging/console_adapter.go | 36 -
vendor/github.com/dsoprea/go-logging/log.go | 537 ----
.../go-photoshop-info-format/.MODULE_ROOT | 0
.../go-photoshop-info-format/.travis.yml | 14 -
.../dsoprea/go-photoshop-info-format/LICENSE | 21 -
.../go-photoshop-info-format/README.md | 8 -
.../dsoprea/go-photoshop-info-format/info.go | 119 -
.../testing_common.go | 73 -
.../github.com/dsoprea/go-utility/v2/LICENSE | 7 -
.../go-utility/v2/filesystem/README.md | 64 -
.../go-utility/v2/filesystem/bounceback.go | 273 --
.../filesystem/boundedreadwriteseekcloser.go | 95 -
.../v2/filesystem/boundedreadwriteseeker.go | 156 --
.../v2/filesystem/calculate_seek.go | 52 -
.../go-utility/v2/filesystem/common.go | 15 -
.../copy_bytes_between_positions.go | 40 -
.../go-utility/v2/filesystem/does_exist.go | 19 -
.../go-utility/v2/filesystem/graceful_copy.go | 54 -
.../go-utility/v2/filesystem/list_files.go | 143 -
.../v2/filesystem/progress_wrapper.go | 93 -
.../go-utility/v2/filesystem/read_counter.go | 36 -
.../v2/filesystem/readseeker_to_readerat.go | 63 -
.../v2/filesystem/readwriteseekcloser.go | 29 -
.../v2/filesystem/seekable_buffer.go | 146 -
.../v2/filesystem/simplefileinfo.go | 69 -
.../go-utility/v2/filesystem/utility.go | 17 -
.../go-utility/v2/filesystem/write_counter.go | 36 -
.../dsoprea/go-utility/v2/image/README.md | 9 -
.../go-utility/v2/image/media_parser_type.go | 34 -
.../github.com/go-errors/errors/.travis.yml | 8 -
.../github.com/go-errors/errors/LICENSE.MIT | 7 -
vendor/github.com/go-errors/errors/README.md | 81 -
vendor/github.com/go-errors/errors/error.go | 209 --
.../github.com/go-errors/errors/error_1_13.go | 31 -
.../go-errors/errors/error_backward.go | 57 -
.../go-errors/errors/parse_panic.go | 127 -
.../github.com/go-errors/errors/stackframe.go | 114 -
vendor/github.com/go-xmlfmt/xmlfmt/LICENSE | 21 -
vendor/github.com/go-xmlfmt/xmlfmt/README.md | 240 --
vendor/github.com/go-xmlfmt/xmlfmt/xmlfmt.go | 77 -
vendor/github.com/golang/geo/LICENSE | 202 --
vendor/github.com/golang/geo/r1/doc.go | 20 -
vendor/github.com/golang/geo/r1/interval.go | 177 --
vendor/github.com/golang/geo/r2/doc.go | 20 -
vendor/github.com/golang/geo/r2/rect.go | 255 --
vendor/github.com/golang/geo/r3/doc.go | 20 -
.../github.com/golang/geo/r3/precisevector.go | 198 --
vendor/github.com/golang/geo/r3/vector.go | 183 --
vendor/github.com/golang/geo/s1/angle.go | 120 -
vendor/github.com/golang/geo/s1/chordangle.go | 320 ---
vendor/github.com/golang/geo/s1/doc.go | 20 -
vendor/github.com/golang/geo/s1/interval.go | 462 ----
vendor/github.com/golang/geo/s2/bits_go18.go | 53 -
vendor/github.com/golang/geo/s2/bits_go19.go | 39 -
vendor/github.com/golang/geo/s2/cap.go | 519 ----
vendor/github.com/golang/geo/s2/cell.go | 698 -----
vendor/github.com/golang/geo/s2/cell_index.go | 498 ----
vendor/github.com/golang/geo/s2/cellid.go | 944 -------
vendor/github.com/golang/geo/s2/cellunion.go | 590 ----
vendor/github.com/golang/geo/s2/centroids.go | 133 -
.../golang/geo/s2/contains_point_query.go | 190 --
.../golang/geo/s2/contains_vertex_query.go | 63 -
.../golang/geo/s2/convex_hull_query.go | 258 --
.../golang/geo/s2/crossing_edge_query.go | 409 ---
.../golang/geo/s2/distance_target.go | 149 -
vendor/github.com/golang/geo/s2/doc.go | 29 -
.../github.com/golang/geo/s2/edge_clipping.go | 672 -----
.../github.com/golang/geo/s2/edge_crosser.go | 227 --
.../golang/geo/s2/edge_crossings.go | 396 ---
.../golang/geo/s2/edge_distances.go | 408 ---
vendor/github.com/golang/geo/s2/edge_query.go | 803 ------
.../golang/geo/s2/edge_tessellator.go | 291 --
vendor/github.com/golang/geo/s2/encode.go | 224 --
vendor/github.com/golang/geo/s2/interleave.go | 143 -
vendor/github.com/golang/geo/s2/latlng.go | 101 -
vendor/github.com/golang/geo/s2/lexicon.go | 175 --
vendor/github.com/golang/geo/s2/loop.go | 1833 ------------
vendor/github.com/golang/geo/s2/matrix3x3.go | 127 -
.../golang/geo/s2/max_distance_targets.go | 306 --
vendor/github.com/golang/geo/s2/metric.go | 164 --
.../golang/geo/s2/min_distance_targets.go | 362 ---
.../github.com/golang/geo/s2/nthderivative.go | 88 -
vendor/github.com/golang/geo/s2/paddedcell.go | 252 --
vendor/github.com/golang/geo/s2/point.go | 258 --
.../golang/geo/s2/point_measures.go | 149 -
.../github.com/golang/geo/s2/point_vector.go | 42 -
.../golang/geo/s2/pointcompression.go | 319 ---
vendor/github.com/golang/geo/s2/polygon.go | 1213 --------
vendor/github.com/golang/geo/s2/polyline.go | 589 ----
.../golang/geo/s2/polyline_measures.go | 53 -
vendor/github.com/golang/geo/s2/predicates.go | 701 -----
.../github.com/golang/geo/s2/projections.go | 241 --
.../github.com/golang/geo/s2/query_entry.go | 93 -
.../github.com/golang/geo/s2/query_options.go | 196 --
vendor/github.com/golang/geo/s2/rect.go | 710 -----
.../github.com/golang/geo/s2/rect_bounder.go | 352 ---
vendor/github.com/golang/geo/s2/region.go | 71 -
.../github.com/golang/geo/s2/regioncoverer.go | 615 -----
.../github.com/golang/geo/s2/regionunion.go | 66 -
vendor/github.com/golang/geo/s2/shape.go | 263 --
vendor/github.com/golang/geo/s2/shapeindex.go | 1526 ----------
vendor/github.com/golang/geo/s2/shapeutil.go | 228 --
.../golang/geo/s2/shapeutil_edge_iterator.go | 72 -
vendor/github.com/golang/geo/s2/stuv.go | 427 ---
vendor/github.com/golang/geo/s2/util.go | 125 -
.../golang/geo/s2/wedge_relations.go | 97 -
.../github.com/h2non/filetype/.editorconfig | 12 -
vendor/github.com/h2non/filetype/.gitignore | 2 -
vendor/github.com/h2non/filetype/.travis.yml | 16 -
vendor/github.com/h2non/filetype/History.md | 163 --
vendor/github.com/h2non/filetype/LICENSE | 24 -
vendor/github.com/h2non/filetype/README.md | 294 --
vendor/github.com/h2non/filetype/filetype.go | 102 -
vendor/github.com/h2non/filetype/kind.go | 91 -
vendor/github.com/h2non/filetype/match.go | 90 -
.../h2non/filetype/matchers/application.go | 43 -
.../h2non/filetype/matchers/archive.go | 211 --
.../h2non/filetype/matchers/audio.go | 85 -
.../h2non/filetype/matchers/document.go | 197 --
.../h2non/filetype/matchers/font.go | 45 -
.../h2non/filetype/matchers/image.go | 143 -
.../filetype/matchers/isobmff/isobmff.go | 37 -
.../h2non/filetype/matchers/matchers.go | 51 -
.../h2non/filetype/matchers/video.go | 145 -
.../h2non/filetype/types/defaults.go | 4 -
.../github.com/h2non/filetype/types/mime.go | 14 -
.../github.com/h2non/filetype/types/split.go | 11 -
.../github.com/h2non/filetype/types/type.go | 16 -
.../github.com/h2non/filetype/types/types.go | 23 -
vendor/github.com/h2non/filetype/version.go | 4 -
.../go-jpeg-image-structure/v2/.MODULE_ROOT | 0
.../go-jpeg-image-structure/v2/LICENSE | 9 -
.../go-jpeg-image-structure/v2/README.md | 10 -
.../go-jpeg-image-structure/v2/markers.go | 212 --
.../v2/media_parser.go | 139 -
.../go-jpeg-image-structure/v2/segment.go | 352 ---
.../v2/segment_list.go | 416 ---
.../go-jpeg-image-structure/v2/splitter.go | 437 ---
.../v2/testing_common.go | 73 -
.../go-jpeg-image-structure/v2/utility.go | 110 -
.../go-png-image-structure/v2/.MODULE_ROOT | 0
.../go-png-image-structure/v2/LICENSE | 9 -
.../v2/chunk_decoder.go | 81 -
.../go-png-image-structure/v2/media_parser.go | 85 -
.../go-png-image-structure/v2/png.go | 386 ---
.../v2/testing_common.go | 77 -
.../go-png-image-structure/v2/utility.go | 67 -
.../imports/wasi_snapshot_preview1/args.go | 97 +
.../imports/wasi_snapshot_preview1/clock.go | 116 +
.../imports/wasi_snapshot_preview1/environ.go | 100 +
.../imports/wasi_snapshot_preview1/fs.go | 2016 ++++++++++++++
.../imports/wasi_snapshot_preview1/poll.go | 239 ++
.../imports/wasi_snapshot_preview1/proc.go | 44 +
.../imports/wasi_snapshot_preview1/random.go | 55 +
.../imports/wasi_snapshot_preview1/sched.go | 22 +
.../imports/wasi_snapshot_preview1/sock.go | 188 ++
.../imports/wasi_snapshot_preview1/wasi.go | 314 +++
.../wazero/internal/wasip1/args.go | 6 +
.../wazero/internal/wasip1/clock.go | 16 +
.../wazero/internal/wasip1/environ.go | 6 +
.../wazero/internal/wasip1/errno.go | 314 +++
.../tetratelabs/wazero/internal/wasip1/fs.go | 164 ++
.../wazero/internal/wasip1/poll.go | 15 +
.../wazero/internal/wasip1/proc.go | 6 +
.../wazero/internal/wasip1/random.go | 3 +
.../wazero/internal/wasip1/rights.go | 148 +
.../wazero/internal/wasip1/sched.go | 3 +
.../wazero/internal/wasip1/sock.go | 71 +
.../wazero/internal/wasip1/wasi.go | 26 +
vendor/golang.org/x/image/riff/riff.go | 193 --
vendor/golang.org/x/image/vp8/decode.go | 403 ---
vendor/golang.org/x/image/vp8/filter.go | 273 --
vendor/golang.org/x/image/vp8/idct.go | 98 -
vendor/golang.org/x/image/vp8/partition.go | 129 -
vendor/golang.org/x/image/vp8/pred.go | 201 --
vendor/golang.org/x/image/vp8/predfunc.go | 553 ----
vendor/golang.org/x/image/vp8/quant.go | 98 -
vendor/golang.org/x/image/vp8/reconstruct.go | 442 ---
vendor/golang.org/x/image/vp8/token.go | 381 ---
vendor/golang.org/x/image/vp8l/decode.go | 603 ----
vendor/golang.org/x/image/vp8l/huffman.go | 245 --
vendor/golang.org/x/image/vp8l/transform.go | 299 --
vendor/golang.org/x/image/webp/decode.go | 276 --
vendor/golang.org/x/image/webp/doc.go | 9 -
vendor/golang.org/x/net/context/context.go | 56 -
vendor/golang.org/x/net/context/go17.go | 72 -
vendor/golang.org/x/net/context/go19.go | 20 -
vendor/golang.org/x/net/context/pre_go17.go | 300 --
vendor/golang.org/x/net/context/pre_go19.go | 109 -
vendor/modules.txt | 76 +-
376 files changed, 8026 insertions(+), 54091 deletions(-)
create mode 100644 cmd/process-emoji/main.go
create mode 100644 cmd/process-media/main.go
create mode 100644 internal/media/ffmpeg.go
create mode 100644 internal/media/ffmpeg/cache.go
create mode 100644 internal/media/ffmpeg/ffmpeg.go
create mode 100644 internal/media/ffmpeg/ffprobe.go
create mode 100644 internal/media/ffmpeg/pool.go
delete mode 100644 internal/media/image.go
delete mode 100644 internal/media/png-stripper.go
create mode 100644 internal/media/test/test-opus-original.opus
create mode 100644 internal/media/test/test-opus-processed.opus
delete mode 100644 internal/media/video.go
mode change 100755 => 100644 testrig/media/ohyou-small.jpg
mode change 100755 => 100644 testrig/media/rainbow-static.png
mode change 100755 => 100644 testrig/media/trent-small.jpg
mode change 100755 => 100644 testrig/media/welcome-small.jpg
rename vendor/codeberg.org/{superseriousbusiness/exif-terminator => gruf/go-ffmpreg}/LICENSE (86%)
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/embed/ffmpeg/ffmpeg.wasm
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/embed/ffmpeg/lib.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/embed/ffprobe/ffprobe.wasm
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/embed/ffprobe/lib.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/ffmpeg/ffmpeg.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/ffprobe/ffprobe.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/internal/wasm.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/util/funcs.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/util/wasm.go
create mode 100644 vendor/codeberg.org/gruf/go-ffmpreg/wasm/instance.go
create mode 100644 vendor/codeberg.org/gruf/go-iotools/helpers.go
create mode 100644 vendor/codeberg.org/gruf/go-iotools/size.go
create mode 100644 vendor/codeberg.org/gruf/go-mimetypes/README.md
create mode 100644 vendor/codeberg.org/gruf/go-mimetypes/get-mime-types.sh
create mode 100644 vendor/codeberg.org/gruf/go-mimetypes/mime.gen.go
create mode 100644 vendor/codeberg.org/gruf/go-mimetypes/mime.go
delete mode 100644 vendor/codeberg.org/superseriousbusiness/exif-terminator/README.md
delete mode 100644 vendor/codeberg.org/superseriousbusiness/exif-terminator/jpeg.go
delete mode 100644 vendor/codeberg.org/superseriousbusiness/exif-terminator/png.go
delete mode 100644 vendor/codeberg.org/superseriousbusiness/exif-terminator/terminator.go
delete mode 100644 vendor/codeberg.org/superseriousbusiness/exif-terminator/webp.go
delete mode 100644 vendor/github.com/abema/go-mp4/.gitignore
delete mode 100644 vendor/github.com/abema/go-mp4/LICENSE
delete mode 100644 vendor/github.com/abema/go-mp4/README.md
delete mode 100644 vendor/github.com/abema/go-mp4/anytype.go
delete mode 100644 vendor/github.com/abema/go-mp4/box.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_info.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_3gpp.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_av1.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_etsi_ts_102_366.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_iso14496_12.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_iso14496_14.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_iso23001_5.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_iso23001_7.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_metadata.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_opus.go
delete mode 100644 vendor/github.com/abema/go-mp4/box_types_vp.go
delete mode 100644 vendor/github.com/abema/go-mp4/extract.go
delete mode 100644 vendor/github.com/abema/go-mp4/field.go
delete mode 100644 vendor/github.com/abema/go-mp4/internal/bitio/bitio.go
delete mode 100644 vendor/github.com/abema/go-mp4/internal/bitio/read.go
delete mode 100644 vendor/github.com/abema/go-mp4/internal/bitio/write.go
delete mode 100644 vendor/github.com/abema/go-mp4/internal/util/io.go
delete mode 100644 vendor/github.com/abema/go-mp4/internal/util/string.go
delete mode 100644 vendor/github.com/abema/go-mp4/marshaller.go
delete mode 100644 vendor/github.com/abema/go-mp4/mp4.go
delete mode 100644 vendor/github.com/abema/go-mp4/probe.go
delete mode 100644 vendor/github.com/abema/go-mp4/read.go
delete mode 100644 vendor/github.com/abema/go-mp4/string.go
delete mode 100644 vendor/github.com/abema/go-mp4/write.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/.MODULE_ROOT
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/LICENSE
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/ifd.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/parser.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/testing_common.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/type.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/utility.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/value_context.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/common/value_encoder.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/data_layer.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/error.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/exif.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/gps.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/ifd_builder.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/ifd_builder_encode.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/ifd_enumerate.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/ifd_tag_entry.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/package.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/tags.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/tags_data.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/testing_common.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/README.md
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/accessor.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_8828_oecf.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_9000_exif_version.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_9101_components_configuration.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_927C_maker_note.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_9286_user_comment.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_A000_flashpix_version.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_A20C_spatial_frequency_response.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_A300_file_source.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_A301_scene_type.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_A302_cfa_pattern.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/exif_iop_0002_interop_version.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/gps_001B_gps_processing_method.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/gps_001C_gps_area_information.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/registration.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/undefined/type.go
delete mode 100644 vendor/github.com/dsoprea/go-exif/v3/utility.go
delete mode 100644 vendor/github.com/dsoprea/go-iptc/.MODULE_ROOT
delete mode 100644 vendor/github.com/dsoprea/go-iptc/.travis.yml
delete mode 100644 vendor/github.com/dsoprea/go-iptc/LICENSE
delete mode 100644 vendor/github.com/dsoprea/go-iptc/README.md
delete mode 100644 vendor/github.com/dsoprea/go-iptc/standard.go
delete mode 100644 vendor/github.com/dsoprea/go-iptc/tag.go
delete mode 100644 vendor/github.com/dsoprea/go-iptc/testing_common.go
delete mode 100644 vendor/github.com/dsoprea/go-iptc/utility.go
delete mode 100644 vendor/github.com/dsoprea/go-logging/.travis.yml
delete mode 100644 vendor/github.com/dsoprea/go-logging/LICENSE
delete mode 100644 vendor/github.com/dsoprea/go-logging/README.md
delete mode 100644 vendor/github.com/dsoprea/go-logging/config.go
delete mode 100644 vendor/github.com/dsoprea/go-logging/console_adapter.go
delete mode 100644 vendor/github.com/dsoprea/go-logging/log.go
delete mode 100644 vendor/github.com/dsoprea/go-photoshop-info-format/.MODULE_ROOT
delete mode 100644 vendor/github.com/dsoprea/go-photoshop-info-format/.travis.yml
delete mode 100644 vendor/github.com/dsoprea/go-photoshop-info-format/LICENSE
delete mode 100644 vendor/github.com/dsoprea/go-photoshop-info-format/README.md
delete mode 100644 vendor/github.com/dsoprea/go-photoshop-info-format/info.go
delete mode 100644 vendor/github.com/dsoprea/go-photoshop-info-format/testing_common.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/LICENSE
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/README.md
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/bounceback.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/boundedreadwriteseekcloser.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/boundedreadwriteseeker.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/calculate_seek.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/common.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/copy_bytes_between_positions.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/does_exist.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/graceful_copy.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/list_files.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/progress_wrapper.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/read_counter.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/readseeker_to_readerat.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/readwriteseekcloser.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/seekable_buffer.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/simplefileinfo.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/utility.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/filesystem/write_counter.go
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/image/README.md
delete mode 100644 vendor/github.com/dsoprea/go-utility/v2/image/media_parser_type.go
delete mode 100644 vendor/github.com/go-errors/errors/.travis.yml
delete mode 100644 vendor/github.com/go-errors/errors/LICENSE.MIT
delete mode 100644 vendor/github.com/go-errors/errors/README.md
delete mode 100644 vendor/github.com/go-errors/errors/error.go
delete mode 100644 vendor/github.com/go-errors/errors/error_1_13.go
delete mode 100644 vendor/github.com/go-errors/errors/error_backward.go
delete mode 100644 vendor/github.com/go-errors/errors/parse_panic.go
delete mode 100644 vendor/github.com/go-errors/errors/stackframe.go
delete mode 100644 vendor/github.com/go-xmlfmt/xmlfmt/LICENSE
delete mode 100644 vendor/github.com/go-xmlfmt/xmlfmt/README.md
delete mode 100644 vendor/github.com/go-xmlfmt/xmlfmt/xmlfmt.go
delete mode 100644 vendor/github.com/golang/geo/LICENSE
delete mode 100644 vendor/github.com/golang/geo/r1/doc.go
delete mode 100644 vendor/github.com/golang/geo/r1/interval.go
delete mode 100644 vendor/github.com/golang/geo/r2/doc.go
delete mode 100644 vendor/github.com/golang/geo/r2/rect.go
delete mode 100644 vendor/github.com/golang/geo/r3/doc.go
delete mode 100644 vendor/github.com/golang/geo/r3/precisevector.go
delete mode 100644 vendor/github.com/golang/geo/r3/vector.go
delete mode 100644 vendor/github.com/golang/geo/s1/angle.go
delete mode 100644 vendor/github.com/golang/geo/s1/chordangle.go
delete mode 100644 vendor/github.com/golang/geo/s1/doc.go
delete mode 100644 vendor/github.com/golang/geo/s1/interval.go
delete mode 100644 vendor/github.com/golang/geo/s2/bits_go18.go
delete mode 100644 vendor/github.com/golang/geo/s2/bits_go19.go
delete mode 100644 vendor/github.com/golang/geo/s2/cap.go
delete mode 100644 vendor/github.com/golang/geo/s2/cell.go
delete mode 100644 vendor/github.com/golang/geo/s2/cell_index.go
delete mode 100644 vendor/github.com/golang/geo/s2/cellid.go
delete mode 100644 vendor/github.com/golang/geo/s2/cellunion.go
delete mode 100644 vendor/github.com/golang/geo/s2/centroids.go
delete mode 100644 vendor/github.com/golang/geo/s2/contains_point_query.go
delete mode 100644 vendor/github.com/golang/geo/s2/contains_vertex_query.go
delete mode 100644 vendor/github.com/golang/geo/s2/convex_hull_query.go
delete mode 100644 vendor/github.com/golang/geo/s2/crossing_edge_query.go
delete mode 100644 vendor/github.com/golang/geo/s2/distance_target.go
delete mode 100644 vendor/github.com/golang/geo/s2/doc.go
delete mode 100644 vendor/github.com/golang/geo/s2/edge_clipping.go
delete mode 100644 vendor/github.com/golang/geo/s2/edge_crosser.go
delete mode 100644 vendor/github.com/golang/geo/s2/edge_crossings.go
delete mode 100644 vendor/github.com/golang/geo/s2/edge_distances.go
delete mode 100644 vendor/github.com/golang/geo/s2/edge_query.go
delete mode 100644 vendor/github.com/golang/geo/s2/edge_tessellator.go
delete mode 100644 vendor/github.com/golang/geo/s2/encode.go
delete mode 100644 vendor/github.com/golang/geo/s2/interleave.go
delete mode 100644 vendor/github.com/golang/geo/s2/latlng.go
delete mode 100644 vendor/github.com/golang/geo/s2/lexicon.go
delete mode 100644 vendor/github.com/golang/geo/s2/loop.go
delete mode 100644 vendor/github.com/golang/geo/s2/matrix3x3.go
delete mode 100644 vendor/github.com/golang/geo/s2/max_distance_targets.go
delete mode 100644 vendor/github.com/golang/geo/s2/metric.go
delete mode 100644 vendor/github.com/golang/geo/s2/min_distance_targets.go
delete mode 100644 vendor/github.com/golang/geo/s2/nthderivative.go
delete mode 100644 vendor/github.com/golang/geo/s2/paddedcell.go
delete mode 100644 vendor/github.com/golang/geo/s2/point.go
delete mode 100644 vendor/github.com/golang/geo/s2/point_measures.go
delete mode 100644 vendor/github.com/golang/geo/s2/point_vector.go
delete mode 100644 vendor/github.com/golang/geo/s2/pointcompression.go
delete mode 100644 vendor/github.com/golang/geo/s2/polygon.go
delete mode 100644 vendor/github.com/golang/geo/s2/polyline.go
delete mode 100644 vendor/github.com/golang/geo/s2/polyline_measures.go
delete mode 100644 vendor/github.com/golang/geo/s2/predicates.go
delete mode 100644 vendor/github.com/golang/geo/s2/projections.go
delete mode 100644 vendor/github.com/golang/geo/s2/query_entry.go
delete mode 100644 vendor/github.com/golang/geo/s2/query_options.go
delete mode 100644 vendor/github.com/golang/geo/s2/rect.go
delete mode 100644 vendor/github.com/golang/geo/s2/rect_bounder.go
delete mode 100644 vendor/github.com/golang/geo/s2/region.go
delete mode 100644 vendor/github.com/golang/geo/s2/regioncoverer.go
delete mode 100644 vendor/github.com/golang/geo/s2/regionunion.go
delete mode 100644 vendor/github.com/golang/geo/s2/shape.go
delete mode 100644 vendor/github.com/golang/geo/s2/shapeindex.go
delete mode 100644 vendor/github.com/golang/geo/s2/shapeutil.go
delete mode 100644 vendor/github.com/golang/geo/s2/shapeutil_edge_iterator.go
delete mode 100644 vendor/github.com/golang/geo/s2/stuv.go
delete mode 100644 vendor/github.com/golang/geo/s2/util.go
delete mode 100644 vendor/github.com/golang/geo/s2/wedge_relations.go
delete mode 100644 vendor/github.com/h2non/filetype/.editorconfig
delete mode 100644 vendor/github.com/h2non/filetype/.gitignore
delete mode 100644 vendor/github.com/h2non/filetype/.travis.yml
delete mode 100644 vendor/github.com/h2non/filetype/History.md
delete mode 100644 vendor/github.com/h2non/filetype/LICENSE
delete mode 100644 vendor/github.com/h2non/filetype/README.md
delete mode 100644 vendor/github.com/h2non/filetype/filetype.go
delete mode 100644 vendor/github.com/h2non/filetype/kind.go
delete mode 100644 vendor/github.com/h2non/filetype/match.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/application.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/archive.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/audio.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/document.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/font.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/image.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/isobmff/isobmff.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/matchers.go
delete mode 100644 vendor/github.com/h2non/filetype/matchers/video.go
delete mode 100644 vendor/github.com/h2non/filetype/types/defaults.go
delete mode 100644 vendor/github.com/h2non/filetype/types/mime.go
delete mode 100644 vendor/github.com/h2non/filetype/types/split.go
delete mode 100644 vendor/github.com/h2non/filetype/types/type.go
delete mode 100644 vendor/github.com/h2non/filetype/types/types.go
delete mode 100644 vendor/github.com/h2non/filetype/version.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/.MODULE_ROOT
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/LICENSE
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/README.md
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/markers.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/media_parser.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/segment_list.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/splitter.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/testing_common.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-jpeg-image-structure/v2/utility.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/.MODULE_ROOT
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/LICENSE
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/chunk_decoder.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/media_parser.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/png.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/testing_common.go
delete mode 100644 vendor/github.com/superseriousbusiness/go-png-image-structure/v2/utility.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/args.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/clock.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/environ.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/fs.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/poll.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/proc.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/random.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/sched.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/sock.go
create mode 100644 vendor/github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1/wasi.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/args.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/clock.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/environ.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/errno.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/fs.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/poll.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/proc.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/random.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/rights.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/sched.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/sock.go
create mode 100644 vendor/github.com/tetratelabs/wazero/internal/wasip1/wasi.go
delete mode 100644 vendor/golang.org/x/image/riff/riff.go
delete mode 100644 vendor/golang.org/x/image/vp8/decode.go
delete mode 100644 vendor/golang.org/x/image/vp8/filter.go
delete mode 100644 vendor/golang.org/x/image/vp8/idct.go
delete mode 100644 vendor/golang.org/x/image/vp8/partition.go
delete mode 100644 vendor/golang.org/x/image/vp8/pred.go
delete mode 100644 vendor/golang.org/x/image/vp8/predfunc.go
delete mode 100644 vendor/golang.org/x/image/vp8/quant.go
delete mode 100644 vendor/golang.org/x/image/vp8/reconstruct.go
delete mode 100644 vendor/golang.org/x/image/vp8/token.go
delete mode 100644 vendor/golang.org/x/image/vp8l/decode.go
delete mode 100644 vendor/golang.org/x/image/vp8l/huffman.go
delete mode 100644 vendor/golang.org/x/image/vp8l/transform.go
delete mode 100644 vendor/golang.org/x/image/webp/decode.go
delete mode 100644 vendor/golang.org/x/image/webp/doc.go
delete mode 100644 vendor/golang.org/x/net/context/context.go
delete mode 100644 vendor/golang.org/x/net/context/go17.go
delete mode 100644 vendor/golang.org/x/net/context/go19.go
delete mode 100644 vendor/golang.org/x/net/context/pre_go17.go
delete mode 100644 vendor/golang.org/x/net/context/pre_go19.go
diff --git a/README.md b/README.md
index b883e96d1..eaf4889ee 100644
--- a/README.md
+++ b/README.md
@@ -261,6 +261,7 @@ The following open source libraries, frameworks, and tools are used by GoToSocia
- [gruf/go-debug](https://codeberg.org/gruf/go-debug); debug build tag. [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-errors](https://codeberg.org/gruf/go-errors); context-like error w/ value wrapping [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-fastcopy](https://codeberg.org/gruf/go-fastcopy); performant (buffer pooled) I/O copying [MIT License](https://spdx.org/licenses/MIT.html).
+ - [gruf/go-ffmpreg](https://codeberg.org/gruf/go-ffmpreg); embedded ffmpeg / ffprobe WASM binaries [GPL-3.0 License](https://spdx.org/licenses/GPL-3.0-only.html).
- [gruf/go-kv](https://codeberg.org/gruf/go-kv); log field formatting. [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-list](https://codeberg.org/gruf/go-list); generic doubly linked list. [MIT License](https://spdx.org/licenses/MIT.html).
- [gruf/go-mutexes](https://codeberg.org/gruf/go-mutexes); safemutex & mutex map. [MIT License](https://spdx.org/licenses/MIT.html).
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
index 14db67795..828b9c875 100644
--- a/cmd/gotosocial/action/server/server.go
+++ b/cmd/gotosocial/action/server/server.go
@@ -24,12 +24,14 @@ import (
"net/http"
"os"
"os/signal"
+ "runtime"
"strings"
"syscall"
"time"
"github.com/KimMachineGun/automemlimit/memlimit"
"github.com/gin-gonic/gin"
+ "github.com/ncruces/go-sqlite3"
"github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action"
"github.com/superseriousbusiness/gotosocial/internal/api"
apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
@@ -37,6 +39,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/filter/spam"
"github.com/superseriousbusiness/gotosocial/internal/filter/visibility"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/media/ffmpeg"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/metrics"
"github.com/superseriousbusiness/gotosocial/internal/middleware"
@@ -66,14 +69,15 @@ import (
// Start creates and starts a gotosocial server
var Start action.GTSAction = func(ctx context.Context) error {
- if _, err := maxprocs.Set(maxprocs.Logger(nil)); err != nil {
- log.Warnf(ctx, "could not set CPU limits from cgroup: %s", err)
- }
+ // Set GOMAXPROCS / GOMEMLIMIT
+ // to match container limits.
+ setLimits(ctx)
- if _, err := memlimit.SetGoMemLimitWithOpts(); err != nil {
- if !strings.Contains(err.Error(), "cgroup mountpoint does not exist") {
- log.Warnf(ctx, "could not set Memory limits from cgroup: %s", err)
- }
+ // Compile WASM modules ahead of first use
+ // to prevent unexpected initial slowdowns.
+ log.Info(ctx, "precompiling WebAssembly")
+ if err := precompileWASM(ctx); err != nil {
+ return err
}
var (
@@ -429,3 +433,30 @@ var Start action.GTSAction = func(ctx context.Context) error {
return nil
}
+
+func setLimits(ctx context.Context) {
+ if _, err := maxprocs.Set(maxprocs.Logger(nil)); err != nil {
+ log.Warnf(ctx, "could not set CPU limits from cgroup: %s", err)
+ }
+
+ if _, err := memlimit.SetGoMemLimitWithOpts(); err != nil {
+ if !strings.Contains(err.Error(), "cgroup mountpoint does not exist") {
+ log.Warnf(ctx, "could not set Memory limits from cgroup: %s", err)
+ }
+ }
+}
+
+func precompileWASM(ctx context.Context) error {
+ // TODO: make max number instances configurable
+ maxprocs := runtime.GOMAXPROCS(0)
+ if err := sqlite3.Initialize(); err != nil {
+ return gtserror.Newf("error compiling sqlite3: %w", err)
+ }
+ if err := ffmpeg.InitFfmpeg(ctx, maxprocs); err != nil {
+ return gtserror.Newf("error compiling ffmpeg: %w", err)
+ }
+ if err := ffmpeg.InitFfprobe(ctx, maxprocs); err != nil {
+ return gtserror.Newf("error compiling ffprobe: %w", err)
+ }
+ return nil
+}
diff --git a/cmd/process-emoji/main.go b/cmd/process-emoji/main.go
new file mode 100644
index 000000000..62253bbdf
--- /dev/null
+++ b/cmd/process-emoji/main.go
@@ -0,0 +1,122 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package main
+
+import (
+ "context"
+ "io"
+ "os"
+ "os/signal"
+ "syscall"
+
+ "codeberg.org/gruf/go-storage/memory"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/db/bundb"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
+ "github.com/superseriousbusiness/gotosocial/internal/media"
+ "github.com/superseriousbusiness/gotosocial/internal/state"
+ "github.com/superseriousbusiness/gotosocial/internal/storage"
+ "github.com/superseriousbusiness/gotosocial/internal/util"
+)
+
+func main() {
+ ctx := context.Background()
+ ctx, cncl := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT)
+ defer cncl()
+
+ if len(os.Args) != 3 {
+ log.Panic(ctx, "Usage: go run ./cmd/process-emoji ")
+ }
+
+ var st storage.Driver
+ st.Storage = memory.Open(10, true)
+
+ var state state.State
+ state.Storage = &st
+
+ state.Caches.Init()
+
+ var err error
+
+ config.SetHost("example.com")
+ config.SetStorageBackend("disk")
+ config.SetStorageLocalBasePath("/tmp/gotosocial")
+ config.SetDbType("sqlite")
+ config.SetDbAddress(":memory:")
+
+ state.DB, err = bundb.NewBunDBService(ctx, &state)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ if err := state.DB.CreateInstanceAccount(ctx); err != nil {
+ log.Panicf(ctx, "error creating instance account: %s", err)
+ }
+
+ if err := state.DB.CreateInstanceInstance(ctx); err != nil {
+ log.Panicf(ctx, "error creating instance instance: %s", err)
+ }
+
+ if err := state.DB.CreateInstanceApplication(ctx); err != nil {
+ log.Panicf(ctx, "error creating instance application: %s", err)
+ }
+
+ mgr := media.NewManager(&state)
+
+ processing, err := mgr.CreateEmoji(ctx,
+ "emoji",
+ "example.com",
+ func(ctx context.Context) (reader io.ReadCloser, err error) {
+ return os.Open(os.Args[1])
+ },
+ media.AdditionalEmojiInfo{
+ URI: util.Ptr("example.com/emoji"),
+ },
+ )
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ emoji, err := processing.Load(ctx)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ copyFile(ctx, &st, emoji.ImageStaticPath, os.Args[2])
+}
+
+func copyFile(ctx context.Context, st *storage.Driver, key string, path string) {
+ rc, err := st.GetStream(ctx, key)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+ defer rc.Close()
+
+ _ = os.Remove(path)
+
+ output, err := os.Create(path)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+ defer output.Close()
+
+ _, err = io.Copy(output, rc)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+}
diff --git a/cmd/process-media/main.go b/cmd/process-media/main.go
new file mode 100644
index 000000000..2f5a43f31
--- /dev/null
+++ b/cmd/process-media/main.go
@@ -0,0 +1,124 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package main
+
+import (
+ "context"
+ "io"
+ "os"
+ "os/signal"
+ "syscall"
+
+ "codeberg.org/gruf/go-storage/memory"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/db/bundb"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
+ "github.com/superseriousbusiness/gotosocial/internal/media"
+ "github.com/superseriousbusiness/gotosocial/internal/state"
+ "github.com/superseriousbusiness/gotosocial/internal/storage"
+)
+
+func main() {
+ ctx := context.Background()
+ ctx, cncl := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT)
+ defer cncl()
+
+ if len(os.Args) != 4 {
+ log.Panic(ctx, "Usage: go run ./cmd/process-media ")
+ }
+
+ var st storage.Driver
+ st.Storage = memory.Open(10, true)
+
+ var state state.State
+ state.Storage = &st
+
+ state.Caches.Init()
+
+ var err error
+
+ config.SetHost("example.com")
+ config.SetStorageBackend("disk")
+ config.SetStorageLocalBasePath("/tmp/gotosocial")
+ config.SetDbType("sqlite")
+ config.SetDbAddress(":memory:")
+
+ state.DB, err = bundb.NewBunDBService(ctx, &state)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ if err := state.DB.CreateInstanceAccount(ctx); err != nil {
+ log.Panicf(ctx, "error creating instance account: %s", err)
+ }
+
+ if err := state.DB.CreateInstanceInstance(ctx); err != nil {
+ log.Panicf(ctx, "error creating instance instance: %s", err)
+ }
+
+ if err := state.DB.CreateInstanceApplication(ctx); err != nil {
+ log.Panicf(ctx, "error creating instance application: %s", err)
+ }
+
+ account, err := state.DB.GetInstanceAccount(ctx, "")
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ mgr := media.NewManager(&state)
+
+ processing, err := mgr.CreateMedia(ctx,
+ account.ID,
+ func(ctx context.Context) (reader io.ReadCloser, err error) {
+ return os.Open(os.Args[1])
+ },
+ media.AdditionalMediaInfo{},
+ )
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ media, err := processing.Load(ctx)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+
+ copyFile(ctx, &st, media.File.Path, os.Args[2])
+ copyFile(ctx, &st, media.Thumbnail.Path, os.Args[3])
+}
+
+func copyFile(ctx context.Context, st *storage.Driver, key string, path string) {
+ rc, err := st.GetStream(ctx, key)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+ defer rc.Close()
+
+ _ = os.Remove(path)
+
+ output, err := os.Create(path)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+ defer output.Close()
+
+ _, err = io.Copy(output, rc)
+ if err != nil {
+ log.Panic(ctx, err)
+ }
+}
diff --git a/docs/configuration/media.md b/docs/configuration/media.md
index 656c93315..e07463320 100644
--- a/docs/configuration/media.md
+++ b/docs/configuration/media.md
@@ -7,25 +7,24 @@
##### MEDIA CONFIG #####
########################
-# Config pertaining to media uploads (videos, image, image descriptions, emoji).
+# Config pertaining to media uploads (media, image descriptions, emoji).
-# Size. Maximum allowed image upload size in bytes.
-#
-# Raising this limit may cause other servers to not fetch media
-# attached to a post.
-#
-# Examples: [2097152, 10485760, 10MB, 10MiB]
-# Default: 10MiB (10485760 bytes)
-media-image-max-size: 10MiB
-
-# Size. Maximum allowed video upload size in bytes.
+# Size. Max size in bytes of media uploads via API.
#
# Raising this limit may cause other servers to not fetch media
# attached to a post.
#
# Examples: [2097152, 10485760, 40MB, 40MiB]
# Default: 40MiB (41943040 bytes)
-media-video-max-size: 40MiB
+media-local-max-size: 40MiB
+
+# Size. Max size in bytes of media to download from other instances.
+#
+# Lowering this limit may cause your instance not to fetch post media.
+#
+# Examples: [2097152, 10485760, 40MB, 40MiB]
+# Default: 40MiB (41943040 bytes)
+media-remote-max-size: 40MiB
# Int. Minimum amount of characters required as an image or video description.
# Examples: [500, 1000, 1500]
diff --git a/example/config.yaml b/example/config.yaml
index 6ef9f7a6c..75d0587cf 100644
--- a/example/config.yaml
+++ b/example/config.yaml
@@ -444,25 +444,24 @@ accounts-custom-css-length: 10000
##### MEDIA CONFIG #####
########################
-# Config pertaining to media uploads (videos, image, image descriptions, emoji).
+# Config pertaining to media uploads (media, image descriptions, emoji).
-# Size. Maximum allowed image upload size in bytes.
-#
-# Raising this limit may cause other servers to not fetch media
-# attached to a post.
-#
-# Examples: [2097152, 10485760, 10MB, 10MiB]
-# Default: 10MiB (10485760 bytes)
-media-image-max-size: 10MiB
-
-# Size. Maximum allowed video upload size in bytes.
+# Size. Max size in bytes of media uploads via API.
#
# Raising this limit may cause other servers to not fetch media
# attached to a post.
#
# Examples: [2097152, 10485760, 40MB, 40MiB]
# Default: 40MiB (41943040 bytes)
-media-video-max-size: 40MiB
+media-local-max-size: 40MiB
+
+# Size. Max size in bytes of media to download from other instances.
+#
+# Lowering this limit may cause your instance not to fetch post media.
+#
+# Examples: [2097152, 10485760, 40MB, 40MiB]
+# Default: 40MiB (41943040 bytes)
+media-remote-max-size: 40MiB
# Int. Minimum amount of characters required as an image or video description.
# Examples: [500, 1000, 1500]
diff --git a/go.mod b/go.mod
index c20cce74d..32ca66e37 100644
--- a/go.mod
+++ b/go.mod
@@ -12,20 +12,20 @@ require (
codeberg.org/gruf/go-debug v1.3.0
codeberg.org/gruf/go-errors/v2 v2.3.2
codeberg.org/gruf/go-fastcopy v1.1.2
- codeberg.org/gruf/go-iotools v0.0.0-20230811115124-5d4223615a7f
+ codeberg.org/gruf/go-ffmpreg v0.2.2
+ codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf
codeberg.org/gruf/go-kv v1.6.4
codeberg.org/gruf/go-list v0.0.0-20240425093752-494db03d641f
codeberg.org/gruf/go-logger/v2 v2.2.1
codeberg.org/gruf/go-mempool v0.0.0-20240507125005-cef10d64a760
+ codeberg.org/gruf/go-mimetypes v1.2.0
codeberg.org/gruf/go-mutexes v1.5.1
codeberg.org/gruf/go-runners v1.6.2
codeberg.org/gruf/go-sched v1.2.3
- codeberg.org/gruf/go-storage v0.1.1
+ codeberg.org/gruf/go-storage v0.1.2
codeberg.org/gruf/go-structr v0.8.7
- codeberg.org/superseriousbusiness/exif-terminator v0.7.0
github.com/DmitriyVTitov/size v1.5.0
github.com/KimMachineGun/automemlimit v0.6.1
- github.com/abema/go-mp4 v1.2.0
github.com/buckket/go-blurhash v1.1.0
github.com/coreos/go-oidc/v3 v3.10.0
github.com/disintegration/imaging v1.6.2
@@ -39,7 +39,6 @@ require (
github.com/google/uuid v1.6.0
github.com/gorilla/feeds v1.2.0
github.com/gorilla/websocket v1.5.2
- github.com/h2non/filetype v1.1.3
github.com/jackc/pgx/v5 v5.6.0
github.com/microcosm-cc/bluemonday v1.0.27
github.com/miekg/dns v1.1.61
@@ -56,6 +55,7 @@ require (
github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB.0.20230227143000-f4900831d6c8
github.com/tdewolff/minify/v2 v2.20.34
github.com/technologize/otel-go-contrib v1.1.1
+ github.com/tetratelabs/wazero v1.7.3
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
github.com/ulule/limiter/v3 v3.11.2
github.com/uptrace/bun v1.2.1
@@ -74,7 +74,6 @@ require (
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/automaxprocs v1.5.3
golang.org/x/crypto v0.25.0
- golang.org/x/image v0.18.0
golang.org/x/net v0.27.0
golang.org/x/oauth2 v0.21.0
golang.org/x/text v0.16.0
@@ -107,17 +106,11 @@ require (
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/go-units v0.5.0 // indirect
- github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b // indirect
- github.com/dsoprea/go-iptc v0.0.0-20200610044640-bc9ca208b413 // indirect
- github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
- github.com/dsoprea/go-photoshop-info-format v0.0.0-20200610045659-121dd752914d // indirect
- github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
- github.com/go-errors/errors v1.4.1 // indirect
github.com/go-fed/httpsig v1.1.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
@@ -137,11 +130,9 @@ require (
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.20.0 // indirect
- github.com/go-xmlfmt/xmlfmt v0.0.0-20211206191508-7fd73a941850 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/godbus/dbus/v5 v5.0.4 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
- github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
github.com/gorilla/context v1.1.2 // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
@@ -196,10 +187,7 @@ require (
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
- github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe // indirect
- github.com/superseriousbusiness/go-png-image-structure/v2 v2.0.1-SSB // indirect
github.com/tdewolff/parse/v2 v2.7.15 // indirect
- github.com/tetratelabs/wazero v1.7.3 // indirect
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
github.com/toqueteos/webbrowser v1.2.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -213,6 +201,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+ golang.org/x/image v0.18.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
diff --git a/go.sum b/go.sum
index 42087dc35..7bc8a8906 100644
--- a/go.sum
+++ b/go.sum
@@ -52,8 +52,10 @@ codeberg.org/gruf/go-fastcopy v1.1.2 h1:YwmYXPsyOcRBxKEE2+w1bGAZfclHVaPijFsOVOcn
codeberg.org/gruf/go-fastcopy v1.1.2/go.mod h1:GDDYR0Cnb3U/AIfGM3983V/L+GN+vuwVMvrmVABo21s=
codeberg.org/gruf/go-fastpath/v2 v2.0.0 h1:iAS9GZahFhyWEH0KLhFEJR+txx1ZhMXxYzu2q5Qo9c0=
codeberg.org/gruf/go-fastpath/v2 v2.0.0/go.mod h1:3pPqu5nZjpbRrOqvLyAK7puS1OfEtQvjd6342Cwz56Q=
-codeberg.org/gruf/go-iotools v0.0.0-20230811115124-5d4223615a7f h1:Kazm/PInN2m1SannRMRe3DQGQc9V2EuetsQ9KAi+pBQ=
-codeberg.org/gruf/go-iotools v0.0.0-20230811115124-5d4223615a7f/go.mod h1:B8uq4yHtIcKXhBZT9C/SYisz25lldLHMVpwZPz4ADLQ=
+codeberg.org/gruf/go-ffmpreg v0.2.2 h1:K4I/7+BuzPLOVjL3hzTFdL8Z9wC0oRCK3xMKNVE86TE=
+codeberg.org/gruf/go-ffmpreg v0.2.2/go.mod h1:oPMfBkOK7xmR/teT/dKW6SeMFpRos9ceR/OuUrxBfcQ=
+codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf h1:84s/ii8N6lYlskZjHH+DG6jyia8w2mXMZlRwFn8Gs3A=
+codeberg.org/gruf/go-iotools v0.0.0-20240710125620-934ae9c654cf/go.mod h1:zZAICsp5rY7+hxnws2V0ePrWxE0Z2Z/KXcN3p/RQCfk=
codeberg.org/gruf/go-kv v1.6.4 h1:3NZiW8HVdBM3kpOiLb7XfRiihnzZWMAixdCznguhILk=
codeberg.org/gruf/go-kv v1.6.4/go.mod h1:O/YkSvKiS9XsRolM3rqCd9YJmND7dAXu9z+PrlYO4bc=
codeberg.org/gruf/go-list v0.0.0-20240425093752-494db03d641f h1:Ss6Z+vygy+jOGhj96d/GwsYYDd22QmIcH74zM7/nQkw=
@@ -68,18 +70,18 @@ codeberg.org/gruf/go-maps v1.0.3 h1:VDwhnnaVNUIy5O93CvkcE2IZXnMB1+IJjzfop9V12es=
codeberg.org/gruf/go-maps v1.0.3/go.mod h1:D5LNDxlC9rsDuVQVM6JObaVGAdHB6g2dTdOdkh1aXWA=
codeberg.org/gruf/go-mempool v0.0.0-20240507125005-cef10d64a760 h1:m2/UCRXhjDwAg4vyji6iKCpomKw6P4PmBOUi5DvAMH4=
codeberg.org/gruf/go-mempool v0.0.0-20240507125005-cef10d64a760/go.mod h1:E3RcaCFNq4zXpvaJb8lfpPqdUAmSkP5F1VmMiEUYTEk=
+codeberg.org/gruf/go-mimetypes v1.2.0 h1:3rZGXY/SkNYbamiddWXs2gETXIBkGIeWYnbWpp2OEbc=
+codeberg.org/gruf/go-mimetypes v1.2.0/go.mod h1:YiUWRj/nAdJQc+UFRvcsL6xXZsbc6b6Ic739ycEO8Yg=
codeberg.org/gruf/go-mutexes v1.5.1 h1:xICU0WXhWr6wf+Iror4eE3xT+xnXNPrO6o77D/G6QuY=
codeberg.org/gruf/go-mutexes v1.5.1/go.mod h1:rPEqQ/y6CmGITaZ3GPTMQVsoZAOzbsAHyIaLsJcOqVE=
codeberg.org/gruf/go-runners v1.6.2 h1:oQef9niahfHu/wch14xNxlRMP8i+ABXH1Cb9PzZ4oYo=
codeberg.org/gruf/go-runners v1.6.2/go.mod h1:Tq5PrZ/m/rBXbLZz0u5if+yP3nG5Sf6S8O/GnyEePeQ=
codeberg.org/gruf/go-sched v1.2.3 h1:H5ViDxxzOBR3uIyGBCf0eH8b1L8wMybOXcdtUUTXZHk=
codeberg.org/gruf/go-sched v1.2.3/go.mod h1:vT9uB6KWFIIwnG9vcPY2a0alYNoqdL1mSzRM8I+PK7A=
-codeberg.org/gruf/go-storage v0.1.1 h1:CSX1PMMg/7vqqK8aCFtq94xCrOB3xhj7eWIvzILdLpY=
-codeberg.org/gruf/go-storage v0.1.1/go.mod h1:145IWMUOc6YpIiZIiCIEwkkNZZPiSbwMnZxRjSc5q6c=
+codeberg.org/gruf/go-storage v0.1.2 h1:dIOVOKq1CJpRmuhbB8Zok3mmo8V6VV/nX5GLIm6hywA=
+codeberg.org/gruf/go-storage v0.1.2/go.mod h1:LRDpFHqRJi0f+35c3ltBH2e/pGfwY5dGlNlgCJ/R1DA=
codeberg.org/gruf/go-structr v0.8.7 h1:agYCI6tSXU4JHVYPwZk3Og5rrBePNVv5iPWsDu7ZJIw=
codeberg.org/gruf/go-structr v0.8.7/go.mod h1:O0FTNgzUnUKwWey4dEW99QD8rPezKPi5sxCVxYOJ1Fg=
-codeberg.org/superseriousbusiness/exif-terminator v0.7.0 h1:Y6VApSXhKqExG0H2hZ2JelRK4xmWdjDQjn13CpEfzko=
-codeberg.org/superseriousbusiness/exif-terminator v0.7.0/go.mod h1:gCWKduudUWFzsnixoMzu0FYVdxHWG+AbXnZ50DqxsUE=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -94,8 +96,6 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
-github.com/abema/go-mp4 v1.2.0 h1:gi4X8xg/m179N/J15Fn5ugywN9vtI6PLk6iLldHGLAk=
-github.com/abema/go-mp4 v1.2.0/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
@@ -138,7 +138,6 @@ github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlS
github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -148,22 +147,6 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
-github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
-github.com/dsoprea/go-exif/v3 v3.0.0-20210428042052-dca55bf8ca15/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
-github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b h1:NgNuLvW/gAFKU30ULWW0gtkCt56JfB7FrZ2zyo0wT8I=
-github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
-github.com/dsoprea/go-iptc v0.0.0-20200610044640-bc9ca208b413 h1:YDRiMEm32T60Kpm35YzOK9ZHgjsS1Qrid+XskNcsdp8=
-github.com/dsoprea/go-iptc v0.0.0-20200610044640-bc9ca208b413/go.mod h1:kYIdx9N9NaOyD7U6D+YtExN7QhRm+5kq7//yOsRXQtM=
-github.com/dsoprea/go-logging v0.0.0-20190624164917-c4f10aab7696/go.mod h1:Nm/x2ZUNRW6Fe5C3LxdY1PyZY5wmDv/s5dkPJ/VB3iA=
-github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
-github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd h1:l+vLbuxptsC6VQyQsfD7NnEC8BZuFpz45PgY+pH8YTg=
-github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
-github.com/dsoprea/go-photoshop-info-format v0.0.0-20200610045659-121dd752914d h1:dg6UMHa50VI01WuPWXPbNJpO8QSyvIF5T5n2IZiqX3A=
-github.com/dsoprea/go-photoshop-info-format v0.0.0-20200610045659-121dd752914d/go.mod h1:pqKB+ijp27cEcrHxhXVgUUMlSDRuGJJp1E+20Lj5H0E=
-github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8=
-github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e h1:IxIbA7VbCNrwumIYjDoMOdf4KOSkMC6NJE4s8oRbE7E=
-github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -197,11 +180,6 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
-github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
-github.com/go-errors/errors v1.4.1 h1:IvVlgbzSsaUNudsw5dcXSzF3EWyXTi5XrAdngnuhRyg=
-github.com/go-errors/errors v1.4.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -254,8 +232,6 @@ github.com/go-swagger/go-swagger v0.31.0 h1:H8eOYQnY2u7vNKWDNykv2xJP3pBhRG/R+SOC
github.com/go-swagger/go-swagger v0.31.0/go.mod h1:WSigRRWEig8zV6t6Sm8Y+EmUjlzA/HoaZJ5edupq7po=
github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-xmlfmt/xmlfmt v0.0.0-20211206191508-7fd73a941850 h1:PSPmmucxGiFBtbQcttHTUc4LQ3P09AW+ldO2qspyKdY=
-github.com/go-xmlfmt/xmlfmt v0.0.0-20211206191508-7fd73a941850/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
@@ -263,10 +239,6 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
-github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -324,7 +296,6 @@ github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlG
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -348,8 +319,6 @@ github.com/gorilla/websocket v1.5.2 h1:qoW6V1GT3aZxybsbC6oLnailWnB+qTMVwMreOso9X
github.com/gorilla/websocket v1.5.2/go.mod h1:0n9H61RBAcf5/38py2MCYbxzPIY9rOkpvvMT24Rqs30=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM=
-github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
-github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
@@ -376,7 +345,6 @@ github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY=
github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw=
github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -404,7 +372,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -459,8 +426,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e h1:s2RNOM/IGdY0Y6qfTeUKhDawdHDpK9RGBdx80qN4Ttw=
-github.com/orcaman/writerseeker v0.0.0-20200621085525-1d3f536ff85e/go.mod h1:nBdnFKj15wFbf94Rwfq4m30eAcyY9V/IyKAGQFtqkW0=
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
@@ -540,13 +505,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/sunfish-shogi/bufseekio v0.0.0-20210207115823-a4185644b365/go.mod h1:dEzdXgvImkQ3WLI+0KQpmEx8T/C/ma9KeS3AfmU899I=
github.com/superseriousbusiness/activity v1.7.0-gts h1:DsCvzksTWptn7JUDTFIIiJ7xkh0A22VZs5KI3q67p+4=
github.com/superseriousbusiness/activity v1.7.0-gts/go.mod h1:AZw0Xb4Oju8rmaJCZ21gc5CPg47MmNgyac+Hx5jo8VM=
-github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe h1:ksl2oCx/Qo8sNDc3Grb8WGKBM9nkvhCm25uvlT86azE=
-github.com/superseriousbusiness/go-jpeg-image-structure/v2 v2.0.0-20220321154430-d89a106fdabe/go.mod h1:gH4P6gN1V+wmIw5o97KGaa1RgXB/tVpC2UNzijhg3E4=
-github.com/superseriousbusiness/go-png-image-structure/v2 v2.0.1-SSB h1:8psprYSK1KdOSH7yQ4PbJq0YYaGQY+gzdW/B0ExDb/8=
-github.com/superseriousbusiness/go-png-image-structure/v2 v2.0.1-SSB/go.mod h1:ymKGfy9kg4dIdraeZRAdobMS/flzLk3VcRPLpEWOAXg=
github.com/superseriousbusiness/httpsig v1.2.0-SSB h1:BinBGKbf2LSuVT5+MuH0XynHN9f0XVshx2CTDtkaWj0=
github.com/superseriousbusiness/httpsig v1.2.0-SSB/go.mod h1:+rxfATjFaDoDIVaJOTSP0gj6UrbicaYPEptvCLC9F28=
github.com/superseriousbusiness/oauth2/v4 v4.3.2-SSB.0.20230227143000-f4900831d6c8 h1:nTIhuP157oOFcscuoK1kCme1xTeGIzztSw70lX9NrDQ=
@@ -739,7 +699,6 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -972,13 +931,9 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/mcuadros/go-syslog.v2 v2.3.0 h1:kcsiS+WsTKyIEPABJBJtoG0KkOS6yzvJ+/eZlhD79kk=
gopkg.in/mcuadros/go-syslog.v2 v2.3.0/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
-gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
-gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/internal/api/client/admin/emojicreate_test.go b/internal/api/client/admin/emojicreate_test.go
index be39ebdf5..a687fb0af 100644
--- a/internal/api/client/admin/emojicreate_test.go
+++ b/internal/api/client/admin/emojicreate_test.go
@@ -90,10 +90,10 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateNewCategory() {
suite.Equal(apiEmoji.StaticURL, dbEmoji.ImageStaticURL)
suite.NotEmpty(dbEmoji.ImagePath)
suite.NotEmpty(dbEmoji.ImageStaticPath)
- suite.Equal("image/png", dbEmoji.ImageContentType)
+ suite.Equal("image/apng", dbEmoji.ImageContentType)
suite.Equal("image/png", dbEmoji.ImageStaticContentType)
suite.Equal(36702, dbEmoji.ImageFileSize)
- suite.Equal(10413, dbEmoji.ImageStaticFileSize)
+ suite.Equal(6092, dbEmoji.ImageStaticFileSize)
suite.False(*dbEmoji.Disabled)
suite.NotEmpty(dbEmoji.URI)
suite.True(*dbEmoji.VisibleInPicker)
@@ -163,10 +163,10 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateExistingCategory() {
suite.Equal(apiEmoji.StaticURL, dbEmoji.ImageStaticURL)
suite.NotEmpty(dbEmoji.ImagePath)
suite.NotEmpty(dbEmoji.ImageStaticPath)
- suite.Equal("image/png", dbEmoji.ImageContentType)
+ suite.Equal("image/apng", dbEmoji.ImageContentType)
suite.Equal("image/png", dbEmoji.ImageStaticContentType)
suite.Equal(36702, dbEmoji.ImageFileSize)
- suite.Equal(10413, dbEmoji.ImageStaticFileSize)
+ suite.Equal(6092, dbEmoji.ImageStaticFileSize)
suite.False(*dbEmoji.Disabled)
suite.NotEmpty(dbEmoji.URI)
suite.True(*dbEmoji.VisibleInPicker)
@@ -236,10 +236,10 @@ func (suite *EmojiCreateTestSuite) TestEmojiCreateNoCategory() {
suite.Equal(apiEmoji.StaticURL, dbEmoji.ImageStaticURL)
suite.NotEmpty(dbEmoji.ImagePath)
suite.NotEmpty(dbEmoji.ImageStaticPath)
- suite.Equal("image/png", dbEmoji.ImageContentType)
+ suite.Equal("image/apng", dbEmoji.ImageContentType)
suite.Equal("image/png", dbEmoji.ImageStaticContentType)
suite.Equal(36702, dbEmoji.ImageFileSize)
- suite.Equal(10413, dbEmoji.ImageStaticFileSize)
+ suite.Equal(6092, dbEmoji.ImageStaticFileSize)
suite.False(*dbEmoji.Disabled)
suite.NotEmpty(dbEmoji.URI)
suite.True(*dbEmoji.VisibleInPicker)
diff --git a/internal/api/client/admin/emojidelete_test.go b/internal/api/client/admin/emojidelete_test.go
index 10cf3fe8d..88e929b55 100644
--- a/internal/api/client/admin/emojidelete_test.go
+++ b/internal/api/client/admin/emojidelete_test.go
@@ -62,7 +62,7 @@ func (suite *EmojiDeleteTestSuite) TestEmojiDelete1() {
"id": "01F8MH9H8E4VG3KDYJR9EGPXCQ",
"disabled": false,
"updated_at": "2021-09-20T10:40:37.000Z",
- "total_file_size": 47115,
+ "total_file_size": 42794,
"content_type": "image/png",
"uri": "http://localhost:8080/emoji/01F8MH9H8E4VG3KDYJR9EGPXCQ"
}`, dst.String())
diff --git a/internal/api/client/admin/emojiget_test.go b/internal/api/client/admin/emojiget_test.go
index b8bad2536..d6b2924ab 100644
--- a/internal/api/client/admin/emojiget_test.go
+++ b/internal/api/client/admin/emojiget_test.go
@@ -60,7 +60,7 @@ func (suite *EmojiGetTestSuite) TestEmojiGet1() {
"id": "01F8MH9H8E4VG3KDYJR9EGPXCQ",
"disabled": false,
"updated_at": "2021-09-20T10:40:37.000Z",
- "total_file_size": 47115,
+ "total_file_size": 42794,
"content_type": "image/png",
"uri": "http://localhost:8080/emoji/01F8MH9H8E4VG3KDYJR9EGPXCQ"
}`, dst.String())
@@ -92,7 +92,7 @@ func (suite *EmojiGetTestSuite) TestEmojiGet2() {
"disabled": false,
"domain": "fossbros-anonymous.io",
"updated_at": "2020-03-18T12:12:00.000Z",
- "total_file_size": 21697,
+ "total_file_size": 19854,
"content_type": "image/png",
"uri": "http://fossbros-anonymous.io/emoji/01GD5KP5CQEE1R3X43Y1EHS2CW"
}`, dst.String())
diff --git a/internal/api/client/admin/emojiupdate_test.go b/internal/api/client/admin/emojiupdate_test.go
index 11beaeaa9..073e3cec0 100644
--- a/internal/api/client/admin/emojiupdate_test.go
+++ b/internal/api/client/admin/emojiupdate_test.go
@@ -100,19 +100,19 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateNewCategory() {
suite.Equal("image/png", dbEmoji.ImageContentType)
suite.Equal("image/png", dbEmoji.ImageStaticContentType)
suite.Equal(36702, dbEmoji.ImageFileSize)
- suite.Equal(10413, dbEmoji.ImageStaticFileSize)
+ suite.Equal(6092, dbEmoji.ImageStaticFileSize)
suite.False(*dbEmoji.Disabled)
suite.NotEmpty(dbEmoji.URI)
suite.True(*dbEmoji.VisibleInPicker)
suite.NotEmpty(dbEmoji.CategoryID)
// emoji should be in storage
- emojiBytes, err := suite.storage.Get(ctx, dbEmoji.ImagePath)
+ entry, err := suite.storage.Storage.Stat(ctx, dbEmoji.ImagePath)
suite.NoError(err)
- suite.Len(emojiBytes, dbEmoji.ImageFileSize)
- emojiStaticBytes, err := suite.storage.Get(ctx, dbEmoji.ImageStaticPath)
+ suite.Equal(int64(dbEmoji.ImageFileSize), entry.Size)
+ entry, err = suite.storage.Storage.Stat(ctx, dbEmoji.ImageStaticPath)
suite.NoError(err)
- suite.Len(emojiStaticBytes, dbEmoji.ImageStaticFileSize)
+ suite.Equal(int64(dbEmoji.ImageStaticFileSize), entry.Size)
}
func (suite *EmojiUpdateTestSuite) TestEmojiUpdateSwitchCategory() {
@@ -177,19 +177,19 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateSwitchCategory() {
suite.Equal("image/png", dbEmoji.ImageContentType)
suite.Equal("image/png", dbEmoji.ImageStaticContentType)
suite.Equal(36702, dbEmoji.ImageFileSize)
- suite.Equal(10413, dbEmoji.ImageStaticFileSize)
+ suite.Equal(6092, dbEmoji.ImageStaticFileSize)
suite.False(*dbEmoji.Disabled)
suite.NotEmpty(dbEmoji.URI)
suite.True(*dbEmoji.VisibleInPicker)
suite.NotEmpty(dbEmoji.CategoryID)
// emoji should be in storage
- emojiBytes, err := suite.storage.Get(ctx, dbEmoji.ImagePath)
+ entry, err := suite.storage.Storage.Stat(ctx, dbEmoji.ImagePath)
suite.NoError(err)
- suite.Len(emojiBytes, dbEmoji.ImageFileSize)
- emojiStaticBytes, err := suite.storage.Get(ctx, dbEmoji.ImageStaticPath)
+ suite.Equal(int64(dbEmoji.ImageFileSize), entry.Size)
+ entry, err = suite.storage.Storage.Stat(ctx, dbEmoji.ImageStaticPath)
suite.NoError(err)
- suite.Len(emojiStaticBytes, dbEmoji.ImageStaticFileSize)
+ suite.Equal(int64(dbEmoji.ImageStaticFileSize), entry.Size)
}
func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyRemoteToLocal() {
@@ -255,19 +255,19 @@ func (suite *EmojiUpdateTestSuite) TestEmojiUpdateCopyRemoteToLocal() {
suite.Equal("image/png", dbEmoji.ImageContentType)
suite.Equal("image/png", dbEmoji.ImageStaticContentType)
suite.Equal(10889, dbEmoji.ImageFileSize)
- suite.Equal(10672, dbEmoji.ImageStaticFileSize)
+ suite.Equal(8965, dbEmoji.ImageStaticFileSize)
suite.False(*dbEmoji.Disabled)
suite.NotEmpty(dbEmoji.URI)
suite.True(*dbEmoji.VisibleInPicker)
suite.NotEmpty(dbEmoji.CategoryID)
// emoji should be in storage
- emojiBytes, err := suite.storage.Get(ctx, dbEmoji.ImagePath)
+ entry, err := suite.storage.Storage.Stat(ctx, dbEmoji.ImagePath)
suite.NoError(err)
- suite.Len(emojiBytes, dbEmoji.ImageFileSize)
- emojiStaticBytes, err := suite.storage.Get(ctx, dbEmoji.ImageStaticPath)
+ suite.Equal(int64(dbEmoji.ImageFileSize), entry.Size)
+ entry, err = suite.storage.Storage.Stat(ctx, dbEmoji.ImageStaticPath)
suite.NoError(err)
- suite.Len(emojiStaticBytes, dbEmoji.ImageStaticFileSize)
+ suite.Equal(int64(dbEmoji.ImageStaticFileSize), entry.Size)
}
func (suite *EmojiUpdateTestSuite) TestEmojiUpdateDisableEmoji() {
diff --git a/internal/api/client/instance/instancepatch.go b/internal/api/client/instance/instancepatch.go
index afddc5a50..64263caf6 100644
--- a/internal/api/client/instance/instancepatch.go
+++ b/internal/api/client/instance/instancepatch.go
@@ -182,13 +182,6 @@ func validateInstanceUpdate(form *apimodel.InstanceSettingsUpdateRequest) error
return errors.New("empty form submitted")
}
- if form.Avatar != nil {
- maxImageSize := config.GetMediaImageMaxSize()
- if size := form.Avatar.Size; size > int64(maxImageSize) {
- return fmt.Errorf("file size limit exceeded: limit is %d bytes but desired instance avatar was %d bytes", maxImageSize, size)
- }
- }
-
if form.AvatarDescription != nil {
maxDescriptionChars := config.GetMediaDescriptionMaxChars()
if length := len([]rune(*form.AvatarDescription)); length > maxDescriptionChars {
diff --git a/internal/api/client/instance/instancepatch_test.go b/internal/api/client/instance/instancepatch_test.go
index 936d6efd9..605b056b9 100644
--- a/internal/api/client/instance/instancepatch_test.go
+++ b/internal/api/client/instance/instancepatch_test.go
@@ -109,7 +109,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() {
"image/webp",
"video/mp4"
],
- "image_size_limit": 10485760,
+ "image_size_limit": 41943040,
"image_matrix_limit": 16777216,
"video_size_limit": 41943040,
"video_frame_rate_limit": 60,
@@ -230,7 +230,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() {
"image/webp",
"video/mp4"
],
- "image_size_limit": 10485760,
+ "image_size_limit": 41943040,
"image_matrix_limit": 16777216,
"video_size_limit": 41943040,
"video_frame_rate_limit": 60,
@@ -351,7 +351,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() {
"image/webp",
"video/mp4"
],
- "image_size_limit": 10485760,
+ "image_size_limit": 41943040,
"image_matrix_limit": 16777216,
"video_size_limit": 41943040,
"video_frame_rate_limit": 60,
@@ -523,7 +523,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() {
"image/webp",
"video/mp4"
],
- "image_size_limit": 10485760,
+ "image_size_limit": 41943040,
"image_matrix_limit": 16777216,
"video_size_limit": 41943040,
"video_frame_rate_limit": 60,
@@ -666,7 +666,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() {
"image/webp",
"video/mp4"
],
- "image_size_limit": 10485760,
+ "image_size_limit": 41943040,
"image_matrix_limit": 16777216,
"video_size_limit": 41943040,
"video_frame_rate_limit": 60,
@@ -754,7 +754,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() {
"url": "http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/attachment/original/`+instanceAccount.AvatarMediaAttachment.ID+`.gif",`+`
"thumbnail_type": "image/gif",
"thumbnail_description": "A bouncing little green peglin.",
- "blurhash": "LG9t;qRS4YtO.4WDRlt5IXoxtPj["
+ "blurhash": "LtJ[eKxu_4xt9Yj]M{WBt8WBM{WB"
}`, string(instanceV2ThumbnailJson))
// double extra special bonus: now update the image description without changing the image
@@ -824,7 +824,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch9() {
"image/webp",
"video/mp4"
],
- "image_size_limit": 10485760,
+ "image_size_limit": 41943040,
"image_matrix_limit": 16777216,
"video_size_limit": 41943040,
"video_frame_rate_limit": 60,
diff --git a/internal/api/client/media/mediacreate.go b/internal/api/client/media/mediacreate.go
index eef945d21..efe567f13 100644
--- a/internal/api/client/media/mediacreate.go
+++ b/internal/api/client/media/mediacreate.go
@@ -153,22 +153,9 @@ func validateCreateMedia(form *apimodel.AttachmentRequest) error {
return errors.New("no attachment given")
}
- maxVideoSize := config.GetMediaVideoMaxSize()
- maxImageSize := config.GetMediaImageMaxSize()
minDescriptionChars := config.GetMediaDescriptionMinChars()
maxDescriptionChars := config.GetMediaDescriptionMaxChars()
- // a very superficial check to see if no size limits are exceeded
- // we still don't actually know which media types we're dealing with but the other handlers will go into more detail there
- maxSize := maxVideoSize
- if maxImageSize > maxSize {
- maxSize = maxImageSize
- }
-
- if form.File.Size > int64(maxSize) {
- return fmt.Errorf("file size limit exceeded: limit is %d bytes but attachment was %d bytes", maxSize, form.File.Size)
- }
-
if length := len([]rune(form.Description)); length > maxDescriptionChars {
return fmt.Errorf("image description length must be between %d and %d characters (inclusive), but provided image description was %d chars", minDescriptionChars, maxDescriptionChars, length)
}
diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go
index c2871aff0..2f6813a7c 100644
--- a/internal/api/client/media/mediacreate_test.go
+++ b/internal/api/client/media/mediacreate_test.go
@@ -206,7 +206,7 @@ func (suite *MediaCreateTestSuite) TestMediaCreateSuccessful() {
Y: 0.5,
},
}, *attachmentReply.Meta)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", *attachmentReply.Blurhash)
+ suite.Equal("LjCGfG#6RkRn_NvzRjWF?urqV@a$", *attachmentReply.Blurhash)
suite.NotEmpty(attachmentReply.ID)
suite.NotEmpty(attachmentReply.URL)
suite.NotEmpty(attachmentReply.PreviewURL)
@@ -291,7 +291,7 @@ func (suite *MediaCreateTestSuite) TestMediaCreateSuccessfulV2() {
Y: 0.5,
},
}, *attachmentReply.Meta)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", *attachmentReply.Blurhash)
+ suite.Equal("LjCGfG#6RkRn_NvzRjWF?urqV@a$", *attachmentReply.Blurhash)
suite.NotEmpty(attachmentReply.ID)
suite.Nil(attachmentReply.URL)
suite.NotEmpty(attachmentReply.PreviewURL)
diff --git a/internal/cleaner/media_test.go b/internal/cleaner/media_test.go
index acb5416f7..46c6edcd4 100644
--- a/internal/cleaner/media_test.go
+++ b/internal/cleaner/media_test.go
@@ -373,13 +373,13 @@ func (suite *MediaTestSuite) TestUncacheAndRecache() {
suite.True(storage.IsNotFound(err))
// now recache the image....
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("../../testrig/media/thoughtsofdog-original.jpg")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
for _, original := range []*gtsmodel.MediaAttachment{
diff --git a/internal/config/config.go b/internal/config/config.go
index 015213184..bffa5b455 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -92,13 +92,13 @@ type Configuration struct {
AccountsAllowCustomCSS bool `name:"accounts-allow-custom-css" usage:"Allow accounts to enable custom CSS for their profile pages and statuses."`
AccountsCustomCSSLength int `name:"accounts-custom-css-length" usage:"Maximum permitted length (characters) of custom CSS for accounts."`
- MediaImageMaxSize bytesize.Size `name:"media-image-max-size" usage:"Max size of accepted images in bytes"`
- MediaVideoMaxSize bytesize.Size `name:"media-video-max-size" usage:"Max size of accepted videos in bytes"`
MediaDescriptionMinChars int `name:"media-description-min-chars" usage:"Min required chars for an image description"`
MediaDescriptionMaxChars int `name:"media-description-max-chars" usage:"Max permitted chars for an image description"`
MediaRemoteCacheDays int `name:"media-remote-cache-days" usage:"Number of days to locally cache media from remote instances. If set to 0, remote media will be kept indefinitely."`
MediaEmojiLocalMaxSize bytesize.Size `name:"media-emoji-local-max-size" usage:"Max size in bytes of emojis uploaded to this instance via the admin API."`
MediaEmojiRemoteMaxSize bytesize.Size `name:"media-emoji-remote-max-size" usage:"Max size in bytes of emojis to download from other instances."`
+ MediaLocalMaxSize bytesize.Size `name:"media-local-max-size" usage:"Max size in bytes of media uploaded to this instance via API"`
+ MediaRemoteMaxSize bytesize.Size `name:"media-remote-max-size" usage:"Max size in bytes of media to download from other instances"`
MediaCleanupFrom string `name:"media-cleanup-from" usage:"Time of day from which to start running media cleanup/prune jobs. Should be in the format 'hh:mm:ss', eg., '15:04:05'."`
MediaCleanupEvery time.Duration `name:"media-cleanup-every" usage:"Period to elapse between cleanups, starting from media-cleanup-at."`
diff --git a/internal/config/defaults.go b/internal/config/defaults.go
index ba068761e..267e7b4bc 100644
--- a/internal/config/defaults.go
+++ b/internal/config/defaults.go
@@ -71,11 +71,11 @@ var Defaults = Configuration{
AccountsAllowCustomCSS: false,
AccountsCustomCSSLength: 10000,
- MediaImageMaxSize: 10 * bytesize.MiB,
- MediaVideoMaxSize: 40 * bytesize.MiB,
MediaDescriptionMinChars: 0,
MediaDescriptionMaxChars: 1500,
MediaRemoteCacheDays: 7,
+ MediaLocalMaxSize: 40 * bytesize.MiB,
+ MediaRemoteMaxSize: 40 * bytesize.MiB,
MediaEmojiLocalMaxSize: 50 * bytesize.KiB,
MediaEmojiRemoteMaxSize: 100 * bytesize.KiB,
MediaCleanupFrom: "00:00", // Midnight.
diff --git a/internal/config/flags.go b/internal/config/flags.go
index 042621afe..f96709e70 100644
--- a/internal/config/flags.go
+++ b/internal/config/flags.go
@@ -97,11 +97,11 @@ func (s *ConfigState) AddServerFlags(cmd *cobra.Command) {
cmd.Flags().Bool(AccountsAllowCustomCSSFlag(), cfg.AccountsAllowCustomCSS, fieldtag("AccountsAllowCustomCSS", "usage"))
// Media
- cmd.Flags().Uint64(MediaImageMaxSizeFlag(), uint64(cfg.MediaImageMaxSize), fieldtag("MediaImageMaxSize", "usage"))
- cmd.Flags().Uint64(MediaVideoMaxSizeFlag(), uint64(cfg.MediaVideoMaxSize), fieldtag("MediaVideoMaxSize", "usage"))
cmd.Flags().Int(MediaDescriptionMinCharsFlag(), cfg.MediaDescriptionMinChars, fieldtag("MediaDescriptionMinChars", "usage"))
cmd.Flags().Int(MediaDescriptionMaxCharsFlag(), cfg.MediaDescriptionMaxChars, fieldtag("MediaDescriptionMaxChars", "usage"))
cmd.Flags().Int(MediaRemoteCacheDaysFlag(), cfg.MediaRemoteCacheDays, fieldtag("MediaRemoteCacheDays", "usage"))
+ cmd.Flags().Uint64(MediaLocalMaxSizeFlag(), uint64(cfg.MediaLocalMaxSize), fieldtag("MediaLocalMaxSize", "usage"))
+ cmd.Flags().Uint64(MediaRemoteMaxSizeFlag(), uint64(cfg.MediaRemoteMaxSize), fieldtag("MediaRemoteMaxSize", "usage"))
cmd.Flags().Uint64(MediaEmojiLocalMaxSizeFlag(), uint64(cfg.MediaEmojiLocalMaxSize), fieldtag("MediaEmojiLocalMaxSize", "usage"))
cmd.Flags().Uint64(MediaEmojiRemoteMaxSizeFlag(), uint64(cfg.MediaEmojiRemoteMaxSize), fieldtag("MediaEmojiRemoteMaxSize", "usage"))
cmd.Flags().String(MediaCleanupFromFlag(), cfg.MediaCleanupFrom, fieldtag("MediaCleanupFrom", "usage"))
diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go
index 8dab7ac6a..8c27da439 100644
--- a/internal/config/helpers.gen.go
+++ b/internal/config/helpers.gen.go
@@ -1075,56 +1075,6 @@ func GetAccountsCustomCSSLength() int { return global.GetAccountsCustomCSSLength
// SetAccountsCustomCSSLength safely sets the value for global configuration 'AccountsCustomCSSLength' field
func SetAccountsCustomCSSLength(v int) { global.SetAccountsCustomCSSLength(v) }
-// GetMediaImageMaxSize safely fetches the Configuration value for state's 'MediaImageMaxSize' field
-func (st *ConfigState) GetMediaImageMaxSize() (v bytesize.Size) {
- st.mutex.RLock()
- v = st.config.MediaImageMaxSize
- st.mutex.RUnlock()
- return
-}
-
-// SetMediaImageMaxSize safely sets the Configuration value for state's 'MediaImageMaxSize' field
-func (st *ConfigState) SetMediaImageMaxSize(v bytesize.Size) {
- st.mutex.Lock()
- defer st.mutex.Unlock()
- st.config.MediaImageMaxSize = v
- st.reloadToViper()
-}
-
-// MediaImageMaxSizeFlag returns the flag name for the 'MediaImageMaxSize' field
-func MediaImageMaxSizeFlag() string { return "media-image-max-size" }
-
-// GetMediaImageMaxSize safely fetches the value for global configuration 'MediaImageMaxSize' field
-func GetMediaImageMaxSize() bytesize.Size { return global.GetMediaImageMaxSize() }
-
-// SetMediaImageMaxSize safely sets the value for global configuration 'MediaImageMaxSize' field
-func SetMediaImageMaxSize(v bytesize.Size) { global.SetMediaImageMaxSize(v) }
-
-// GetMediaVideoMaxSize safely fetches the Configuration value for state's 'MediaVideoMaxSize' field
-func (st *ConfigState) GetMediaVideoMaxSize() (v bytesize.Size) {
- st.mutex.RLock()
- v = st.config.MediaVideoMaxSize
- st.mutex.RUnlock()
- return
-}
-
-// SetMediaVideoMaxSize safely sets the Configuration value for state's 'MediaVideoMaxSize' field
-func (st *ConfigState) SetMediaVideoMaxSize(v bytesize.Size) {
- st.mutex.Lock()
- defer st.mutex.Unlock()
- st.config.MediaVideoMaxSize = v
- st.reloadToViper()
-}
-
-// MediaVideoMaxSizeFlag returns the flag name for the 'MediaVideoMaxSize' field
-func MediaVideoMaxSizeFlag() string { return "media-video-max-size" }
-
-// GetMediaVideoMaxSize safely fetches the value for global configuration 'MediaVideoMaxSize' field
-func GetMediaVideoMaxSize() bytesize.Size { return global.GetMediaVideoMaxSize() }
-
-// SetMediaVideoMaxSize safely sets the value for global configuration 'MediaVideoMaxSize' field
-func SetMediaVideoMaxSize(v bytesize.Size) { global.SetMediaVideoMaxSize(v) }
-
// GetMediaDescriptionMinChars safely fetches the Configuration value for state's 'MediaDescriptionMinChars' field
func (st *ConfigState) GetMediaDescriptionMinChars() (v int) {
st.mutex.RLock()
@@ -1250,6 +1200,56 @@ func GetMediaEmojiRemoteMaxSize() bytesize.Size { return global.GetMediaEmojiRem
// SetMediaEmojiRemoteMaxSize safely sets the value for global configuration 'MediaEmojiRemoteMaxSize' field
func SetMediaEmojiRemoteMaxSize(v bytesize.Size) { global.SetMediaEmojiRemoteMaxSize(v) }
+// GetMediaLocalMaxSize safely fetches the Configuration value for state's 'MediaLocalMaxSize' field
+func (st *ConfigState) GetMediaLocalMaxSize() (v bytesize.Size) {
+ st.mutex.RLock()
+ v = st.config.MediaLocalMaxSize
+ st.mutex.RUnlock()
+ return
+}
+
+// SetMediaLocalMaxSize safely sets the Configuration value for state's 'MediaLocalMaxSize' field
+func (st *ConfigState) SetMediaLocalMaxSize(v bytesize.Size) {
+ st.mutex.Lock()
+ defer st.mutex.Unlock()
+ st.config.MediaLocalMaxSize = v
+ st.reloadToViper()
+}
+
+// MediaLocalMaxSizeFlag returns the flag name for the 'MediaLocalMaxSize' field
+func MediaLocalMaxSizeFlag() string { return "media-local-max-size" }
+
+// GetMediaLocalMaxSize safely fetches the value for global configuration 'MediaLocalMaxSize' field
+func GetMediaLocalMaxSize() bytesize.Size { return global.GetMediaLocalMaxSize() }
+
+// SetMediaLocalMaxSize safely sets the value for global configuration 'MediaLocalMaxSize' field
+func SetMediaLocalMaxSize(v bytesize.Size) { global.SetMediaLocalMaxSize(v) }
+
+// GetMediaRemoteMaxSize safely fetches the Configuration value for state's 'MediaRemoteMaxSize' field
+func (st *ConfigState) GetMediaRemoteMaxSize() (v bytesize.Size) {
+ st.mutex.RLock()
+ v = st.config.MediaRemoteMaxSize
+ st.mutex.RUnlock()
+ return
+}
+
+// SetMediaRemoteMaxSize safely sets the Configuration value for state's 'MediaRemoteMaxSize' field
+func (st *ConfigState) SetMediaRemoteMaxSize(v bytesize.Size) {
+ st.mutex.Lock()
+ defer st.mutex.Unlock()
+ st.config.MediaRemoteMaxSize = v
+ st.reloadToViper()
+}
+
+// MediaRemoteMaxSizeFlag returns the flag name for the 'MediaRemoteMaxSize' field
+func MediaRemoteMaxSizeFlag() string { return "media-remote-max-size" }
+
+// GetMediaRemoteMaxSize safely fetches the value for global configuration 'MediaRemoteMaxSize' field
+func GetMediaRemoteMaxSize() bytesize.Size { return global.GetMediaRemoteMaxSize() }
+
+// SetMediaRemoteMaxSize safely sets the value for global configuration 'MediaRemoteMaxSize' field
+func SetMediaRemoteMaxSize(v bytesize.Size) { global.SetMediaRemoteMaxSize(v) }
+
// GetMediaCleanupFrom safely fetches the Configuration value for state's 'MediaCleanupFrom' field
func (st *ConfigState) GetMediaCleanupFrom() (v string) {
st.mutex.RLock()
diff --git a/internal/federation/dereferencing/emoji.go b/internal/federation/dereferencing/emoji.go
index 16f5acf25..806a3f5ee 100644
--- a/internal/federation/dereferencing/emoji.go
+++ b/internal/federation/dereferencing/emoji.go
@@ -23,6 +23,7 @@ import (
"io"
"net/url"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@@ -90,9 +91,12 @@ func (d *Dereferencer) GetEmoji(
return nil, err
}
+ // Get maximum supported remote emoji size.
+ maxsz := config.GetMediaEmojiRemoteMaxSize()
+
// Prepare data function to dereference remote emoji media.
- data := func(context.Context) (io.ReadCloser, int64, error) {
- return tsport.DereferenceMedia(ctx, url)
+ data := func(context.Context) (io.ReadCloser, error) {
+ return tsport.DereferenceMedia(ctx, url, int64(maxsz))
}
// Pass along for safe processing.
@@ -171,9 +175,12 @@ func (d *Dereferencer) RefreshEmoji(
return nil, err
}
+ // Get maximum supported remote emoji size.
+ maxsz := config.GetMediaEmojiRemoteMaxSize()
+
// Prepare data function to dereference remote emoji media.
- data := func(context.Context) (io.ReadCloser, int64, error) {
- return tsport.DereferenceMedia(ctx, url)
+ data := func(context.Context) (io.ReadCloser, error) {
+ return tsport.DereferenceMedia(ctx, url, int64(maxsz))
}
// Pass along for safe processing.
diff --git a/internal/federation/dereferencing/emoji_test.go b/internal/federation/dereferencing/emoji_test.go
index fdb815762..12965207c 100644
--- a/internal/federation/dereferencing/emoji_test.go
+++ b/internal/federation/dereferencing/emoji_test.go
@@ -75,7 +75,7 @@ func (suite *EmojiTestSuite) TestDereferenceEmojiBlocking() {
suite.Equal("image/gif", emoji.ImageContentType)
suite.Equal("image/png", emoji.ImageStaticContentType)
suite.Equal(37796, emoji.ImageFileSize)
- suite.Equal(7951, emoji.ImageStaticFileSize)
+ suite.Equal(9824, emoji.ImageStaticFileSize)
suite.WithinDuration(time.Now(), emoji.UpdatedAt, 10*time.Second)
suite.False(*emoji.Disabled)
suite.Equal(emojiURI, emoji.URI)
diff --git a/internal/federation/dereferencing/media.go b/internal/federation/dereferencing/media.go
index 874107b13..956866e94 100644
--- a/internal/federation/dereferencing/media.go
+++ b/internal/federation/dereferencing/media.go
@@ -22,6 +22,7 @@ import (
"io"
"net/url"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/media"
@@ -69,12 +70,15 @@ func (d *Dereferencer) GetMedia(
return nil, gtserror.Newf("failed getting transport for %s: %w", requestUser, err)
}
+ // Get maximum supported remote media size.
+ maxsz := config.GetMediaRemoteMaxSize()
+
// Start processing remote attachment at URL.
processing, err := d.mediaManager.CreateMedia(
ctx,
accountID,
- func(ctx context.Context) (io.ReadCloser, int64, error) {
- return tsport.DereferenceMedia(ctx, url)
+ func(ctx context.Context) (io.ReadCloser, error) {
+ return tsport.DereferenceMedia(ctx, url, int64(maxsz))
},
info,
)
@@ -163,11 +167,14 @@ func (d *Dereferencer) RefreshMedia(
return nil, gtserror.Newf("failed getting transport for %s: %w", requestUser, err)
}
+ // Get maximum supported remote media size.
+ maxsz := config.GetMediaRemoteMaxSize()
+
// Start processing remote attachment recache.
processing := d.mediaManager.RecacheMedia(
media,
- func(ctx context.Context) (io.ReadCloser, int64, error) {
- return tsport.DereferenceMedia(ctx, url)
+ func(ctx context.Context) (io.ReadCloser, error) {
+ return tsport.DereferenceMedia(ctx, url, int64(maxsz))
},
)
diff --git a/internal/httpclient/client.go b/internal/httpclient/client.go
index ba8760091..b78dbc2d9 100644
--- a/internal/httpclient/client.go
+++ b/internal/httpclient/client.go
@@ -31,7 +31,6 @@ import (
"strings"
"time"
- "codeberg.org/gruf/go-bytesize"
"codeberg.org/gruf/go-cache/v3"
errorsv2 "codeberg.org/gruf/go-errors/v2"
"codeberg.org/gruf/go-iotools"
@@ -89,9 +88,6 @@ type Config struct {
// WriteBufferSize: see http.Transport{}.WriteBufferSize.
WriteBufferSize int
- // MaxBodySize determines the maximum fetchable body size.
- MaxBodySize int64
-
// Timeout: see http.Client{}.Timeout.
Timeout time.Duration
@@ -111,7 +107,6 @@ type Config struct {
type Client struct {
client http.Client
badHosts cache.TTLCache[string, struct{}]
- bodyMax int64
retries uint
}
@@ -137,11 +132,6 @@ func New(cfg Config) *Client {
cfg.MaxIdleConns = cfg.MaxOpenConnsPerHost * 10
}
- if cfg.MaxBodySize <= 0 {
- // By default set this to a reasonable 40MB.
- cfg.MaxBodySize = int64(40 * bytesize.MiB)
- }
-
// Protect the dialer
// with IP range sanitizer.
d.Control = (&Sanitizer{
@@ -151,7 +141,6 @@ func New(cfg Config) *Client {
// Prepare client fields.
c.client.Timeout = cfg.Timeout
- c.bodyMax = cfg.MaxBodySize
// Prepare transport TLS config.
tlsClientConfig := &tls.Config{
@@ -377,31 +366,15 @@ func (c *Client) do(r *Request) (rsp *http.Response, retry bool, err error) {
rbody := (io.Reader)(rsp.Body)
cbody := (io.Closer)(rsp.Body)
- var limit int64
-
- if limit = rsp.ContentLength; limit < 0 {
- // If unknown, use max as reader limit.
- limit = c.bodyMax
- }
-
- // Don't trust them, limit body reads.
- rbody = io.LimitReader(rbody, limit)
-
- // Wrap closer to ensure entire body drained BEFORE close.
+ // Wrap closer to ensure body drained BEFORE close.
cbody = iotools.CloserAfterCallback(cbody, func() {
_, _ = discard.ReadFrom(rbody)
})
- // Wrap body with limit.
- rsp.Body = &struct {
- io.Reader
- io.Closer
- }{rbody, cbody}
-
- // Check response body not too large.
- if rsp.ContentLength > c.bodyMax {
- _ = rsp.Body.Close()
- return nil, false, ErrBodyTooLarge
+ // Set the wrapped response body.
+ rsp.Body = &iotools.ReadCloserType{
+ Reader: rbody,
+ Closer: cbody,
}
return rsp, true, nil
diff --git a/internal/httpclient/client_test.go b/internal/httpclient/client_test.go
index f0ec01ec3..2e36a6e90 100644
--- a/internal/httpclient/client_test.go
+++ b/internal/httpclient/client_test.go
@@ -48,44 +48,19 @@ var bodies = []string{
"body with\r\nnewlines",
}
-func TestHTTPClientSmallBody(t *testing.T) {
+func TestHTTPClientBody(t *testing.T) {
for _, body := range bodies {
- _TestHTTPClientWithBody(t, []byte(body), int(^uint16(0)))
+ testHTTPClientWithBody(t, []byte(body))
}
}
-func TestHTTPClientExactBody(t *testing.T) {
- for _, body := range bodies {
- _TestHTTPClientWithBody(t, []byte(body), len(body))
- }
-}
-
-func TestHTTPClientLargeBody(t *testing.T) {
- for _, body := range bodies {
- _TestHTTPClientWithBody(t, []byte(body), len(body)-1)
- }
-}
-
-func _TestHTTPClientWithBody(t *testing.T, body []byte, max int) {
+func testHTTPClientWithBody(t *testing.T, body []byte) {
var (
handler http.HandlerFunc
-
- expect []byte
-
- expectErr error
)
- // If this is a larger body, reslice and
- // set error so we know what to expect
- expect = body
- if max < len(body) {
- expect = expect[:max]
- expectErr = httpclient.ErrBodyTooLarge
- }
-
// Create new HTTP client with maximum body size
client := httpclient.New(httpclient.Config{
- MaxBodySize: int64(max),
DisableCompression: true,
AllowRanges: []netip.Prefix{
// Loopback (used by server)
@@ -110,10 +85,8 @@ func _TestHTTPClientWithBody(t *testing.T, body []byte, max int) {
// Perform the test request
rsp, err := client.Do(req)
- if !errors.Is(err, expectErr) {
+ if err != nil {
t.Fatalf("error performing client request: %v", err)
- } else if err != nil {
- return // expected error
}
defer rsp.Body.Close()
@@ -124,8 +97,8 @@ func _TestHTTPClientWithBody(t *testing.T, body []byte, max int) {
}
// Check actual response body matches expected
- if !bytes.Equal(expect, check) {
- t.Errorf("response body did not match expected: expect=%q actual=%q", string(expect), string(check))
+ if !bytes.Equal(body, check) {
+ t.Errorf("response body did not match expected: expect=%q actual=%q", string(body), string(check))
}
}
diff --git a/internal/media/ffmpeg.go b/internal/media/ffmpeg.go
new file mode 100644
index 000000000..eb94849f0
--- /dev/null
+++ b/internal/media/ffmpeg.go
@@ -0,0 +1,313 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package media
+
+import (
+ "context"
+ "encoding/json"
+ "errors"
+ "os"
+ "path"
+ "strconv"
+ "strings"
+
+ "codeberg.org/gruf/go-byteutil"
+
+ "codeberg.org/gruf/go-ffmpreg/wasm"
+ _ffmpeg "github.com/superseriousbusiness/gotosocial/internal/media/ffmpeg"
+
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/tetratelabs/wazero"
+)
+
+// ffmpegClearMetadata generates a copy (in-place) of input media with all metadata cleared.
+func ffmpegClearMetadata(ctx context.Context, filepath string, ext string) error {
+ // Get directory from filepath.
+ dirpath := path.Dir(filepath)
+
+ // Generate output file path with ext.
+ outpath := filepath + "_cleaned." + ext
+
+ // Clear metadata with ffmpeg.
+ if err := ffmpeg(ctx, dirpath,
+ "-loglevel", "error",
+ "-i", filepath,
+ "-map_metadata", "-1",
+ "-codec", "copy",
+ "-y",
+ outpath,
+ ); err != nil {
+ return err
+ }
+
+ // Move the new output file path to original location.
+ if err := os.Rename(outpath, filepath); err != nil {
+ return gtserror.Newf("error renaming %s: %w", outpath, err)
+ }
+
+ return nil
+}
+
+// ffmpegGenerateThumb generates a thumbnail jpeg from input media of any type, useful for any media.
+func ffmpegGenerateThumb(ctx context.Context, filepath string, width, height int) (string, error) {
+ // Get directory from filepath.
+ dirpath := path.Dir(filepath)
+
+ // Generate output frame file path.
+ outpath := filepath + "_thumb.jpg"
+
+ // Generate thumb with ffmpeg.
+ if err := ffmpeg(ctx, dirpath,
+ "-loglevel", "error",
+ "-i", filepath,
+ "-filter:v", "thumbnail=n=10",
+ "-filter:v", "scale="+strconv.Itoa(width)+":"+strconv.Itoa(height),
+ "-qscale:v", "12", // ~ 70% quality
+ "-frames:v", "1",
+ "-y",
+ outpath,
+ ); err != nil {
+ return "", err
+ }
+
+ return outpath, nil
+}
+
+// ffmpegGenerateStatic generates a static png from input image of any type, useful for emoji.
+func ffmpegGenerateStatic(ctx context.Context, filepath string) (string, error) {
+ // Get directory from filepath.
+ dirpath := path.Dir(filepath)
+
+ // Generate output static file path.
+ outpath := filepath + "_static.png"
+
+ // Generate static with ffmpeg.
+ if err := ffmpeg(ctx, dirpath,
+ "-loglevel", "error",
+ "-i", filepath,
+ "-codec:v", "png", // specifically NOT 'apng'
+ "-frames:v", "1", // in case animated, only take 1 frame
+ "-y",
+ outpath,
+ ); err != nil {
+ return "", err
+ }
+
+ return outpath, nil
+}
+
+// ffmpeg calls `ffmpeg [args...]` (WASM) with directory path mounted in runtime.
+func ffmpeg(ctx context.Context, dirpath string, args ...string) error {
+ var stderr byteutil.Buffer
+ rc, err := _ffmpeg.Ffmpeg(ctx, wasm.Args{
+ Stderr: &stderr,
+ Args: args,
+ Config: func(modcfg wazero.ModuleConfig) wazero.ModuleConfig {
+ fscfg := wazero.NewFSConfig()
+ fscfg = fscfg.WithDirMount(dirpath, dirpath)
+ modcfg = modcfg.WithFSConfig(fscfg)
+ return modcfg
+ },
+ })
+ if err != nil {
+ return gtserror.Newf("error running: %w", err)
+ } else if rc != 0 {
+ return gtserror.Newf("non-zero return code %d (%s)", rc, stderr.B)
+ }
+ return nil
+}
+
+// ffprobe calls `ffprobe` (WASM) on filepath, returning parsed JSON output.
+func ffprobe(ctx context.Context, filepath string) (*ffprobeResult, error) {
+ var stdout byteutil.Buffer
+
+ // Get directory from filepath.
+ dirpath := path.Dir(filepath)
+
+ // Run ffprobe on our given file at path.
+ _, err := _ffmpeg.Ffprobe(ctx, wasm.Args{
+ Stdout: &stdout,
+
+ Args: []string{
+ "-i", filepath,
+ "-loglevel", "quiet",
+ "-print_format", "json",
+ "-show_streams",
+ "-show_format",
+ "-show_error",
+ },
+
+ Config: func(modcfg wazero.ModuleConfig) wazero.ModuleConfig {
+ fscfg := wazero.NewFSConfig()
+ fscfg = fscfg.WithReadOnlyDirMount(dirpath, dirpath)
+ modcfg = modcfg.WithFSConfig(fscfg)
+ return modcfg
+ },
+ })
+ if err != nil {
+ return nil, gtserror.Newf("error running: %w", err)
+ }
+
+ var result ffprobeResult
+
+ // Unmarshal the ffprobe output as our result type.
+ if err := json.Unmarshal(stdout.B, &result); err != nil {
+ return nil, gtserror.Newf("error unmarshaling json: %w", err)
+ }
+
+ return &result, nil
+}
+
+// ffprobeResult contains parsed JSON data from
+// result of calling `ffprobe` on a media file.
+type ffprobeResult struct {
+ Streams []ffprobeStream `json:"streams"`
+ Format *ffprobeFormat `json:"format"`
+ Error *ffprobeError `json:"error"`
+}
+
+// ImageMeta extracts image metadata contained within ffprobe'd media result streams.
+func (res *ffprobeResult) ImageMeta() (width int, height int, err error) {
+ for _, stream := range res.Streams {
+ if stream.Width > width {
+ width = stream.Width
+ }
+ if stream.Height > height {
+ height = stream.Height
+ }
+ }
+ if width == 0 || height == 0 {
+ err = errors.New("invalid image stream(s)")
+ }
+ return
+}
+
+// VideoMeta extracts video metadata contained within ffprobe'd media result streams.
+func (res *ffprobeResult) VideoMeta() (width, height int, framerate float32, err error) {
+ for _, stream := range res.Streams {
+ if stream.Width > width {
+ width = stream.Width
+ }
+ if stream.Height > height {
+ height = stream.Height
+ }
+ if fr := stream.GetFrameRate(); fr > 0 {
+ if framerate == 0 || fr < framerate {
+ framerate = fr
+ }
+ }
+ }
+ if width == 0 || height == 0 || framerate == 0 {
+ err = errors.New("invalid video stream(s)")
+ }
+ return
+}
+
+type ffprobeStream struct {
+ CodecName string `json:"codec_name"`
+ AvgFrameRate string `json:"avg_frame_rate"`
+ Width int `json:"width"`
+ Height int `json:"height"`
+ // + unused fields.
+}
+
+// GetFrameRate calculates float32 framerate value from stream json string.
+func (str *ffprobeStream) GetFrameRate() float32 {
+ if str.AvgFrameRate != "" {
+ var (
+ // numerator
+ num float32
+
+ // denominator
+ den float32
+ )
+
+ // Check for a provided inequality, i.e. numerator / denominator.
+ if p := strings.SplitN(str.AvgFrameRate, "/", 2); len(p) == 2 {
+ n, _ := strconv.ParseFloat(p[0], 32)
+ d, _ := strconv.ParseFloat(p[1], 32)
+ num, den = float32(n), float32(d)
+ } else {
+ n, _ := strconv.ParseFloat(p[0], 32)
+ num = float32(n)
+ }
+
+ return num / den
+ }
+ return 0
+}
+
+type ffprobeFormat struct {
+ Filename string `json:"filename"`
+ FormatName string `json:"format_name"`
+ Duration string `json:"duration"`
+ BitRate string `json:"bit_rate"`
+ // + unused fields
+}
+
+// GetFileType determines file type and extension to use for media data.
+func (fmt *ffprobeFormat) GetFileType() (gtsmodel.FileType, string) {
+ switch fmt.FormatName {
+ case "mov,mp4,m4a,3gp,3g2,mj2":
+ return gtsmodel.FileTypeVideo, "mp4"
+ case "apng":
+ return gtsmodel.FileTypeImage, "apng"
+ case "png_pipe":
+ return gtsmodel.FileTypeImage, "png"
+ case "image2", "jpeg_pipe":
+ return gtsmodel.FileTypeImage, "jpeg"
+ case "webp_pipe":
+ return gtsmodel.FileTypeImage, "webp"
+ case "gif":
+ return gtsmodel.FileTypeImage, "gif"
+ case "mp3":
+ return gtsmodel.FileTypeAudio, "mp3"
+ case "ogg":
+ return gtsmodel.FileTypeAudio, "ogg"
+ default:
+ return gtsmodel.FileTypeUnknown, fmt.FormatName
+ }
+}
+
+// GetDuration calculates float32 framerate value from format json string.
+func (fmt *ffprobeFormat) GetDuration() float32 {
+ if fmt.Duration != "" {
+ dur, _ := strconv.ParseFloat(fmt.Duration, 32)
+ return float32(dur)
+ }
+ return 0
+}
+
+// GetBitRate calculates uint64 bitrate value from format json string.
+func (fmt *ffprobeFormat) GetBitRate() uint64 {
+ if fmt.BitRate != "" {
+ r, _ := strconv.ParseUint(fmt.BitRate, 10, 64)
+ return r
+ }
+ return 0
+}
+
+type ffprobeError struct {
+ Code int `json:"code"`
+ String string `json:"string"`
+}
+
+func (err *ffprobeError) Error() string {
+ return err.String + " (" + strconv.Itoa(err.Code) + ")"
+}
diff --git a/internal/media/ffmpeg/cache.go b/internal/media/ffmpeg/cache.go
new file mode 100644
index 000000000..371d409dc
--- /dev/null
+++ b/internal/media/ffmpeg/cache.go
@@ -0,0 +1,46 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package ffmpeg
+
+import (
+ "os"
+
+ "github.com/tetratelabs/wazero"
+)
+
+// shared WASM compilation cache.
+var cache wazero.CompilationCache
+
+func initCache() {
+ if cache != nil {
+ return
+ }
+
+ if dir := os.Getenv("WAZERO_COMPILATION_CACHE"); dir != "" {
+ var err error
+
+ // Use on-filesystem compilation cache given by env.
+ cache, err = wazero.NewCompilationCacheWithDir(dir)
+ if err != nil {
+ panic(err)
+ }
+ } else {
+ // Use in-memory compilation cache.
+ cache = wazero.NewCompilationCache()
+ }
+}
diff --git a/internal/media/ffmpeg/ffmpeg.go b/internal/media/ffmpeg/ffmpeg.go
new file mode 100644
index 000000000..357289fcc
--- /dev/null
+++ b/internal/media/ffmpeg/ffmpeg.go
@@ -0,0 +1,92 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package ffmpeg
+
+import (
+ "context"
+
+ ffmpeglib "codeberg.org/gruf/go-ffmpreg/embed/ffmpeg"
+ "codeberg.org/gruf/go-ffmpreg/util"
+ "codeberg.org/gruf/go-ffmpreg/wasm"
+
+ "github.com/tetratelabs/wazero"
+ "github.com/tetratelabs/wazero/api"
+ "github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
+)
+
+// InitFfmpeg initializes the ffmpeg WebAssembly instance pool,
+// with given maximum limiting the number of concurrent instances.
+func InitFfmpeg(ctx context.Context, max int) error {
+ initCache() // ensure compilation cache initialized
+ return ffmpegPool.Init(ctx, max)
+}
+
+// Ffmpeg runs the given arguments with an instance of ffmpeg.
+func Ffmpeg(ctx context.Context, args wasm.Args) (uint32, error) {
+ return ffmpegPool.Run(ctx, args)
+}
+
+var ffmpegPool = wasmInstancePool{
+ inst: wasm.Instantiator{
+
+ // WASM module name.
+ Module: "ffmpeg",
+
+ // Per-instance WebAssembly runtime (with shared cache).
+ Runtime: func(ctx context.Context) wazero.Runtime {
+
+ // Prepare config with cache.
+ cfg := wazero.NewRuntimeConfig()
+ cfg = cfg.WithCoreFeatures(ffmpeglib.CoreFeatures)
+ cfg = cfg.WithCompilationCache(cache)
+
+ // Instantiate runtime with our config.
+ rt := wazero.NewRuntimeWithConfig(ctx, cfg)
+
+ // Prepare default "env" host module.
+ env := rt.NewHostModuleBuilder("env")
+ env = env.NewFunctionBuilder().
+ WithGoModuleFunction(
+ api.GoModuleFunc(util.Wasm_Tempnam),
+ []api.ValueType{api.ValueTypeI32, api.ValueTypeI32},
+ []api.ValueType{api.ValueTypeI32},
+ ).
+ Export("tempnam")
+
+ // Instantiate "env" module in our runtime.
+ _, err := env.Instantiate(context.Background())
+ if err != nil {
+ panic(err)
+ }
+
+ // Instantiate the wasi snapshot preview 1 in runtime.
+ _, err = wasi_snapshot_preview1.Instantiate(ctx, rt)
+ if err != nil {
+ panic(err)
+ }
+
+ return rt
+ },
+
+ // Per-run module configuration.
+ Config: wazero.NewModuleConfig,
+
+ // Embedded WASM.
+ Source: ffmpeglib.B,
+ },
+}
diff --git a/internal/media/ffmpeg/ffprobe.go b/internal/media/ffmpeg/ffprobe.go
new file mode 100644
index 000000000..0b9660e60
--- /dev/null
+++ b/internal/media/ffmpeg/ffprobe.go
@@ -0,0 +1,92 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package ffmpeg
+
+import (
+ "context"
+
+ ffprobelib "codeberg.org/gruf/go-ffmpreg/embed/ffprobe"
+ "codeberg.org/gruf/go-ffmpreg/util"
+ "codeberg.org/gruf/go-ffmpreg/wasm"
+
+ "github.com/tetratelabs/wazero"
+ "github.com/tetratelabs/wazero/api"
+ "github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
+)
+
+// InitFfprobe initializes the ffprobe WebAssembly instance pool,
+// with given maximum limiting the number of concurrent instances.
+func InitFfprobe(ctx context.Context, max int) error {
+ initCache() // ensure compilation cache initialized
+ return ffprobePool.Init(ctx, max)
+}
+
+// Ffprobe runs the given arguments with an instance of ffprobe.
+func Ffprobe(ctx context.Context, args wasm.Args) (uint32, error) {
+ return ffprobePool.Run(ctx, args)
+}
+
+var ffprobePool = wasmInstancePool{
+ inst: wasm.Instantiator{
+
+ // WASM module name.
+ Module: "ffprobe",
+
+ // Per-instance WebAssembly runtime (with shared cache).
+ Runtime: func(ctx context.Context) wazero.Runtime {
+
+ // Prepare config with cache.
+ cfg := wazero.NewRuntimeConfig()
+ cfg = cfg.WithCoreFeatures(ffprobelib.CoreFeatures)
+ cfg = cfg.WithCompilationCache(cache)
+
+ // Instantiate runtime with our config.
+ rt := wazero.NewRuntimeWithConfig(ctx, cfg)
+
+ // Prepare default "env" host module.
+ env := rt.NewHostModuleBuilder("env")
+ env = env.NewFunctionBuilder().
+ WithGoModuleFunction(
+ api.GoModuleFunc(util.Wasm_Tempnam),
+ []api.ValueType{api.ValueTypeI32, api.ValueTypeI32},
+ []api.ValueType{api.ValueTypeI32},
+ ).
+ Export("tempnam")
+
+ // Instantiate "env" module in our runtime.
+ _, err := env.Instantiate(context.Background())
+ if err != nil {
+ panic(err)
+ }
+
+ // Instantiate the wasi snapshot preview 1 in runtime.
+ _, err = wasi_snapshot_preview1.Instantiate(ctx, rt)
+ if err != nil {
+ panic(err)
+ }
+
+ return rt
+ },
+
+ // Per-run module configuration.
+ Config: wazero.NewModuleConfig,
+
+ // Embedded WASM.
+ Source: ffprobelib.B,
+ },
+}
diff --git a/internal/media/ffmpeg/pool.go b/internal/media/ffmpeg/pool.go
new file mode 100644
index 000000000..9f6446be3
--- /dev/null
+++ b/internal/media/ffmpeg/pool.go
@@ -0,0 +1,75 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+package ffmpeg
+
+import (
+ "context"
+
+ "codeberg.org/gruf/go-ffmpreg/wasm"
+)
+
+// wasmInstancePool wraps a wasm.Instantiator{} and a
+// channel of wasm.Instance{}s to provide a concurrency
+// safe pool of WebAssembly module instances capable of
+// compiling new instances on-the-fly, with a predetermined
+// maximum number of concurrent instances at any one time.
+type wasmInstancePool struct {
+ inst wasm.Instantiator
+ pool chan *wasm.Instance
+}
+
+func (p *wasmInstancePool) Init(ctx context.Context, sz int) error {
+ p.pool = make(chan *wasm.Instance, sz)
+ for i := 0; i < sz; i++ {
+ inst, err := p.inst.New(ctx)
+ if err != nil {
+ return err
+ }
+ p.pool <- inst
+ }
+ return nil
+}
+
+func (p *wasmInstancePool) Run(ctx context.Context, args wasm.Args) (uint32, error) {
+ var inst *wasm.Instance
+
+ select {
+ // Context canceled.
+ case <-ctx.Done():
+ return 0, ctx.Err()
+
+ // Acquire instance.
+ case inst = <-p.pool:
+
+ // Ensure instance is
+ // ready for running.
+ if inst.IsClosed() {
+ var err error
+ inst, err = p.inst.New(ctx)
+ if err != nil {
+ return 0, err
+ }
+ }
+ }
+
+ // Release instance to pool on end.
+ defer func() { p.pool <- inst }()
+
+ // Pass args to instance.
+ return inst.Run(ctx, args)
+}
diff --git a/internal/media/image.go b/internal/media/image.go
deleted file mode 100644
index 8a34e5062..000000000
--- a/internal/media/image.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-package media
-
-import (
- "bufio"
- "image"
- "image/color"
- "image/draw"
- "image/jpeg"
- "image/png"
- "io"
- "sync"
-
- "github.com/buckket/go-blurhash"
- "github.com/disintegration/imaging"
- "github.com/superseriousbusiness/gotosocial/internal/iotools"
-
- // import to init webp encode/decoding.
- _ "golang.org/x/image/webp"
-)
-
-var (
- // pngEncoder provides our global PNG encoding with
- // specified compression level, and memory pooled buffers.
- pngEncoder = png.Encoder{
- CompressionLevel: png.DefaultCompression,
- BufferPool: &pngEncoderBufferPool{},
- }
-
- // jpegBufferPool is a memory pool
- // of byte buffers for JPEG encoding.
- jpegBufferPool sync.Pool
-)
-
-// gtsImage is a thin wrapper around the standard library image
-// interface to provide our own useful helper functions for image
-// size and aspect ratio calculations, streamed encoding to various
-// types, and creating reduced size thumbnail images.
-type gtsImage struct{ image image.Image }
-
-// blankImage generates a blank image of given dimensions.
-func blankImage(width int, height int) *gtsImage {
- // create a rectangle with the same dimensions as the video
- img := image.NewRGBA(image.Rect(0, 0, width, height))
-
- // fill the rectangle with our desired fill color.
- draw.Draw(img, img.Bounds(), &image.Uniform{
- color.RGBA{42, 43, 47, 0},
- }, image.Point{}, draw.Src)
-
- return >sImage{image: img}
-}
-
-// decodeImage will decode image from reader stream and return image wrapped in our own gtsImage{} type.
-func decodeImage(r io.Reader, opts ...imaging.DecodeOption) (*gtsImage, error) {
- img, err := imaging.Decode(r, opts...)
- if err != nil {
- return nil, err
- }
- return >sImage{image: img}, nil
-}
-
-// Width returns the image width in pixels.
-func (m *gtsImage) Width() int {
- return m.image.Bounds().Size().X
-}
-
-// Height returns the image height in pixels.
-func (m *gtsImage) Height() int {
- return m.image.Bounds().Size().Y
-}
-
-// Size returns the total number of image pixels.
-func (m *gtsImage) Size() int {
- return m.image.Bounds().Size().X *
- m.image.Bounds().Size().Y
-}
-
-// AspectRatio returns the image ratio of width:height.
-func (m *gtsImage) AspectRatio() float32 {
-
- // note: we cast bounds to float64 to prevent truncation
- // and only at the end aspect ratio do we cast to float32
- // (as the sizes are likely to be much larger than ratio).
- return float32(float64(m.image.Bounds().Size().X) /
- float64(m.image.Bounds().Size().Y))
-}
-
-// Thumbnail returns a small sized copy of gtsImage{}, limited to 512x512 if not small enough.
-func (m *gtsImage) Thumbnail() *gtsImage {
- const (
- // max thumb
- // dimensions.
- maxWidth = 512
- maxHeight = 512
- )
-
- // Check the receiving image is within max thumnail bounds.
- if m.Width() <= maxWidth && m.Height() <= maxHeight {
- return >sImage{image: imaging.Clone(m.image)}
- }
-
- // Image is too large, needs to be resized to thumbnail max.
- img := imaging.Fit(m.image, maxWidth, maxHeight, imaging.Linear)
- return >sImage{image: img}
-}
-
-// Blurhash calculates the blurhash for the receiving image data.
-func (m *gtsImage) Blurhash() (string, error) {
- // for generating blurhashes, it's more cost effective to
- // lose detail since it's blurry, so make a tiny version.
- tiny := imaging.Resize(m.image, 32, 0, imaging.NearestNeighbor)
-
- // Encode blurhash from resized version
- return blurhash.Encode(4, 3, tiny)
-}
-
-// ToJPEG creates a new streaming JPEG encoder from receiving image, and a size ptr
-// which stores the number of bytes written during the image encoding process.
-func (m *gtsImage) ToJPEG(opts *jpeg.Options) io.Reader {
- return iotools.StreamWriteFunc(func(w io.Writer) error {
- // Get encoding buffer
- bw := getJPEGBuffer(w)
-
- // Encode JPEG to buffered writer.
- err := jpeg.Encode(bw, m.image, opts)
-
- // Replace buffer.
- //
- // NOTE: jpeg.Encode() already
- // performs a bufio.Writer.Flush().
- putJPEGBuffer(bw)
-
- return err
- })
-}
-
-// ToPNG creates a new streaming PNG encoder from receiving image, and a size ptr
-// which stores the number of bytes written during the image encoding process.
-func (m *gtsImage) ToPNG() io.Reader {
- return iotools.StreamWriteFunc(func(w io.Writer) error {
- return pngEncoder.Encode(w, m.image)
- })
-}
-
-// getJPEGBuffer fetches a reset JPEG encoding buffer from global JPEG buffer pool.
-func getJPEGBuffer(w io.Writer) *bufio.Writer {
- v := jpegBufferPool.Get()
- if v == nil {
- v = bufio.NewWriter(nil)
- }
- buf := v.(*bufio.Writer)
- buf.Reset(w)
- return buf
-}
-
-// putJPEGBuffer resets the given bufio writer and places in global JPEG buffer pool.
-func putJPEGBuffer(buf *bufio.Writer) {
- buf.Reset(nil)
- jpegBufferPool.Put(buf)
-}
-
-// pngEncoderBufferPool implements png.EncoderBufferPool.
-type pngEncoderBufferPool sync.Pool
-
-func (p *pngEncoderBufferPool) Get() *png.EncoderBuffer {
- buf, _ := (*sync.Pool)(p).Get().(*png.EncoderBuffer)
- return buf
-}
-
-func (p *pngEncoderBufferPool) Put(buf *png.EncoderBuffer) {
- (*sync.Pool)(p).Put(buf)
-}
diff --git a/internal/media/manager.go b/internal/media/manager.go
index ea126e460..aaf9448b8 100644
--- a/internal/media/manager.go
+++ b/internal/media/manager.go
@@ -314,21 +314,26 @@ func (m *Manager) RefreshEmoji(
// Since this is a refresh we will end up storing new images at new
// paths, so we should wrap closer to delete old paths at completion.
- wrapped := func(ctx context.Context) (io.ReadCloser, int64, error) {
+ wrapped := func(ctx context.Context) (io.ReadCloser, error) {
- // Call original data func.
- rc, sz, err := data(ctx)
+ // Call original func.
+ rc, err := data(ctx)
if err != nil {
- return nil, 0, err
+ return nil, err
}
- // Wrap closer to cleanup old data.
- c := iotools.CloserFunc(func() error {
+ // Cast as separated reader / closer types.
+ rct, ok := rc.(*iotools.ReadCloserType)
- // First try close original.
- if rc.Close(); err != nil {
- return err
- }
+ if !ok {
+ // Allocate new read closer type.
+ rct = new(iotools.ReadCloserType)
+ rct.Reader = rc
+ rct.Closer = rc
+ }
+
+ // Wrap underlying io.Closer type to cleanup old data.
+ rct.Closer = iotools.CloserCallback(rct.Closer, func() {
// Remove any *old* emoji image file path now stream is closed.
if err := m.state.Storage.Delete(ctx, oldPath); err != nil &&
@@ -341,12 +346,9 @@ func (m *Manager) RefreshEmoji(
!storage.IsNotFound(err) {
log.Errorf(ctx, "error deleting old static emoji %s from storage: %v", shortcodeDomain, err)
}
-
- return nil
})
- // Return newly wrapped readcloser and size.
- return iotools.ReadCloser(rc, c), sz, nil
+ return rct, nil
}
// Use a new ID to create a new path
diff --git a/internal/media/manager_test.go b/internal/media/manager_test.go
index 53c08eed8..a099d2b95 100644
--- a/internal/media/manager_test.go
+++ b/internal/media/manager_test.go
@@ -20,12 +20,14 @@ package media_test
import (
"bytes"
"context"
+ "crypto/md5"
"fmt"
"io"
"os"
"testing"
"time"
+ "codeberg.org/gruf/go-iotools"
"codeberg.org/gruf/go-storage/disk"
"github.com/stretchr/testify/suite"
gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@@ -33,6 +35,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/storage"
gtsstorage "github.com/superseriousbusiness/gotosocial/internal/storage"
+ "github.com/superseriousbusiness/gotosocial/internal/util"
"github.com/superseriousbusiness/gotosocial/testrig"
)
@@ -43,13 +46,13 @@ type ManagerTestSuite struct {
func (suite *ManagerTestSuite) TestEmojiProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/rainbow-original.png")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
processing, err := suite.manager.CreateEmoji(ctx,
@@ -66,7 +69,7 @@ func (suite *ManagerTestSuite) TestEmojiProcess() {
suite.NotNil(emoji)
// file meta should be correctly derived from the image
- suite.Equal("image/png", emoji.ImageContentType)
+ suite.Equal("image/apng", emoji.ImageContentType)
suite.Equal("image/png", emoji.ImageStaticContentType)
suite.Equal(36702, emoji.ImageFileSize)
@@ -75,29 +78,9 @@ func (suite *ManagerTestSuite) TestEmojiProcess() {
suite.NoError(err)
suite.NotNil(dbEmoji)
- // make sure the processed emoji file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, emoji.ImagePath)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/rainbow-original.png")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedStaticBytes, err := suite.storage.Get(ctx, emoji.ImageStaticPath)
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytes)
-
- processedStaticBytesExpected, err := os.ReadFile("./test/rainbow-static.png")
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytesExpected)
-
- suite.Equal(processedStaticBytesExpected, processedStaticBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbEmoji.ImagePath, "./test/rainbow-original.png")
+ equalFiles(suite.T(), suite.state.Storage, dbEmoji.ImageStaticPath, "./test/rainbow-static.png")
}
func (suite *ManagerTestSuite) TestEmojiProcessRefresh() {
@@ -114,12 +97,12 @@ func (suite *ManagerTestSuite) TestEmojiProcessRefresh() {
oldEmojiImagePath := emojiToUpdate.ImagePath
oldEmojiImageStaticPath := emojiToUpdate.ImageStaticPath
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
b, err := os.ReadFile("./test/gts_pixellated-original.png")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
processing, err := suite.manager.RefreshEmoji(ctx,
@@ -151,29 +134,9 @@ func (suite *ManagerTestSuite) TestEmojiProcessRefresh() {
suite.NoError(err)
suite.NotNil(dbEmoji)
- // make sure the processed emoji file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, emoji.ImagePath)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/gts_pixellated-original.png")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedStaticBytes, err := suite.storage.Get(ctx, emoji.ImageStaticPath)
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytes)
-
- processedStaticBytesExpected, err := os.ReadFile("./test/gts_pixellated-static.png")
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytesExpected)
-
- suite.Equal(processedStaticBytesExpected, processedStaticBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbEmoji.ImagePath, "./test/gts_pixellated-original.png")
+ equalFiles(suite.T(), suite.state.Storage, dbEmoji.ImageStaticPath, "./test/gts_pixellated-static.png")
// most fields should be different on the emoji now from what they were before
suite.Equal(originalEmoji.ID, dbEmoji.ID)
@@ -197,124 +160,47 @@ func (suite *ManagerTestSuite) TestEmojiProcessRefresh() {
func (suite *ManagerTestSuite) TestEmojiProcessTooLarge() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // load bytes from a test image
- b, err := os.ReadFile("./test/big-panda.gif")
- if err != nil {
- panic(err)
- }
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ // Open test image as file for reading.
+ file, err := os.Open("./test/big-panda.gif")
+ if err != nil {
+ panic(err)
}
+ // Get file size info.
+ stat, err := file.Stat()
+ if err != nil {
+ panic(err)
+ }
+
+ // Set max allowed size UNDER image size.
+ lr := io.LimitReader(file, stat.Size()-10)
+ rc := iotools.ReadCloser(lr, file)
+
processing, err := suite.manager.CreateEmoji(ctx,
"big_panda",
"",
- data,
+ func(ctx context.Context) (reader io.ReadCloser, err error) {
+ return rc, nil
+ },
media.AdditionalEmojiInfo{},
)
suite.NoError(err)
// do a blocking call to fetch the emoji
_, err = processing.Load(ctx)
- suite.EqualError(err, "store: given emoji size 630kiB greater than max allowed 50.0kiB")
-}
-
-func (suite *ManagerTestSuite) TestEmojiProcessTooLargeNoSizeGiven() {
- ctx := context.Background()
-
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // load bytes from a test image
- b, err := os.ReadFile("./test/big-panda.gif")
- if err != nil {
- panic(err)
- }
- return io.NopCloser(bytes.NewBuffer(b)), -1, nil
- }
-
- processing, err := suite.manager.CreateEmoji(ctx,
- "big_panda",
- "",
- data,
- media.AdditionalEmojiInfo{},
- )
- suite.NoError(err)
-
- // do a blocking call to fetch the emoji
- _, err = processing.Load(ctx)
- suite.EqualError(err, "store: written emoji size 630kiB greater than max allowed 50.0kiB")
-}
-
-func (suite *ManagerTestSuite) TestEmojiProcessNoFileSizeGiven() {
- ctx := context.Background()
-
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // load bytes from a test image
- b, err := os.ReadFile("./test/rainbow-original.png")
- if err != nil {
- panic(err)
- }
- return io.NopCloser(bytes.NewBuffer(b)), -1, nil
- }
-
- // process the media with no additional info provided
- processing, err := suite.manager.CreateEmoji(ctx,
- "rainbow_test",
- "",
- data,
- media.AdditionalEmojiInfo{},
- )
- suite.NoError(err)
-
- // do a blocking call to fetch the emoji
- emoji, err := processing.Load(ctx)
- suite.NoError(err)
- suite.NotNil(emoji)
-
- // file meta should be correctly derived from the image
- suite.Equal("image/png", emoji.ImageContentType)
- suite.Equal("image/png", emoji.ImageStaticContentType)
- suite.Equal(36702, emoji.ImageFileSize)
-
- // now make sure the emoji is in the database
- dbEmoji, err := suite.db.GetEmojiByID(ctx, emoji.ID)
- suite.NoError(err)
- suite.NotNil(dbEmoji)
-
- // make sure the processed emoji file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, emoji.ImagePath)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/rainbow-original.png")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedStaticBytes, err := suite.storage.Get(ctx, emoji.ImageStaticPath)
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytes)
-
- processedStaticBytesExpected, err := os.ReadFile("./test/rainbow-static.png")
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytesExpected)
-
- suite.Equal(processedStaticBytesExpected, processedStaticBytes)
+ suite.EqualError(err, "store: error draining data to tmp: reached read limit 630kiB")
}
func (suite *ManagerTestSuite) TestEmojiWebpProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/nb-flag-original.webp")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
// process the media with no additional info provided
@@ -341,41 +227,21 @@ func (suite *ManagerTestSuite) TestEmojiWebpProcess() {
suite.NoError(err)
suite.NotNil(dbEmoji)
- // make sure the processed emoji file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, emoji.ImagePath)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/nb-flag-original.webp")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedStaticBytes, err := suite.storage.Get(ctx, emoji.ImageStaticPath)
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytes)
-
- processedStaticBytesExpected, err := os.ReadFile("./test/nb-flag-static.png")
- suite.NoError(err)
- suite.NotEmpty(processedStaticBytesExpected)
-
- suite.Equal(processedStaticBytesExpected, processedStaticBytes)
+ // ensure files are equal
+ equalFiles(suite.T(), suite.state.Storage, dbEmoji.ImagePath, "./test/nb-flag-original.webp")
+ equalFiles(suite.T(), suite.state.Storage, dbEmoji.ImageStaticPath, "./test/nb-flag-static.png")
}
func (suite *ManagerTestSuite) TestSimpleJpegProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/test-jpeg.jpg")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -409,117 +275,66 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcess() {
suite.Equal("image/jpeg", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
suite.Equal(269739, attachment.File.FileSize)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", attachment.Blurhash)
+ suite.Equal("LjCGfG#6RkRn_NvzRjWF?urqV@a$", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-jpeg-processed.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-jpeg-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/test-jpeg-processed.jpg")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/test-jpeg-thumbnail.jpg")
}
-func (suite *ManagerTestSuite) TestSimpleJpegProcessPartial() {
+func (suite *ManagerTestSuite) TestSimpleJpegProcessTooLarge() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // load bytes from a test image
- b, err := os.ReadFile("./test/test-jpeg.jpg")
- if err != nil {
- panic(err)
- }
-
- // Fuck up the bytes a bit by cutting
- // off the second half, tee hee!
- b = b[:len(b)/2]
-
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ // Open test image as file for reading.
+ file, err := os.Open("./test/test-jpeg.jpg")
+ if err != nil {
+ panic(err)
}
+ // Get file size info.
+ stat, err := file.Stat()
+ if err != nil {
+ panic(err)
+ }
+
+ // Set max allowed size UNDER image size.
+ lr := io.LimitReader(file, stat.Size()-10)
+ rc := iotools.ReadCloser(lr, file)
+
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
// process the media with no additional info provided
processing, err := suite.manager.CreateMedia(ctx,
accountID,
- data,
+ func(ctx context.Context) (reader io.ReadCloser, err error) {
+ return rc, nil
+ },
media.AdditionalMediaInfo{},
)
suite.NoError(err)
suite.NotNil(processing)
// do a blocking call to fetch the attachment
- attachment, err := processing.Load(ctx)
-
- // Since we're cutting off the byte stream
- // halfway through, we should get an error here.
- suite.EqualError(err, "store: error writing media to storage: scan-data is unbounded; EOI not encountered before EOF")
- suite.NotNil(attachment)
-
- // make sure it's got the stuff set on it that we expect
- // the attachment ID and accountID we expect
- suite.Equal(processing.ID(), attachment.ID)
- suite.Equal(accountID, attachment.AccountID)
-
- // file meta should be correctly derived from the image
- suite.Zero(attachment.FileMeta)
- suite.Equal("image/jpeg", attachment.File.ContentType)
- suite.Empty(attachment.Blurhash)
-
- // now make sure the attachment is in the database
- dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
- suite.NoError(err)
- suite.NotNil(dbAttachment)
-
- // Attachment should have type unknown
- suite.Equal(gtsmodel.FileTypeUnknown, dbAttachment.Type)
-
- // Nothing should be in storage for this attachment.
- stored, err := suite.storage.Has(ctx, attachment.File.Path)
- if err != nil {
- suite.FailNow(err.Error())
- }
- suite.False(stored)
-
- stored, err = suite.storage.Has(ctx, attachment.Thumbnail.Path)
- if err != nil {
- suite.FailNow(err.Error())
- }
- suite.False(stored)
+ _, err = processing.Load(ctx)
+ suite.EqualError(err, "store: error draining data to tmp: reached read limit 263kiB")
}
func (suite *ManagerTestSuite) TestPDFProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from Frantz
b, err := os.ReadFile("./test/Frantz-Fanon-The-Wretched-of-the-Earth-1965.pdf")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -545,7 +360,7 @@ func (suite *ManagerTestSuite) TestPDFProcess() {
// file meta should be correctly derived from the image
suite.Zero(attachment.FileMeta)
- suite.Equal("application/pdf", attachment.File.ContentType)
+ suite.Equal("application/octet-stream", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
suite.Empty(attachment.Blurhash)
@@ -559,28 +374,24 @@ func (suite *ManagerTestSuite) TestPDFProcess() {
// Nothing should be in storage for this attachment.
stored, err := suite.storage.Has(ctx, attachment.File.Path)
- if err != nil {
- suite.FailNow(err.Error())
- }
+ suite.NoError(err)
suite.False(stored)
stored, err = suite.storage.Has(ctx, attachment.Thumbnail.Path)
- if err != nil {
- suite.FailNow(err.Error())
- }
+ suite.NoError(err)
suite.False(stored)
}
func (suite *ManagerTestSuite) TestSlothVineProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test video
b, err := os.ReadFile("./test/test-mp4-original.mp4")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -609,57 +420,37 @@ func (suite *ManagerTestSuite) TestSlothVineProcess() {
suite.Equal(240, attachment.FileMeta.Original.Height)
suite.Equal(81120, attachment.FileMeta.Original.Size)
suite.EqualValues(float32(1.4083333), attachment.FileMeta.Original.Aspect)
- suite.EqualValues(float32(6.640907), *attachment.FileMeta.Original.Duration)
- suite.EqualValues(float32(29.000029), *attachment.FileMeta.Original.Framerate)
- suite.EqualValues(0x59e74, *attachment.FileMeta.Original.Bitrate)
+ suite.EqualValues(float32(6.641), *attachment.FileMeta.Original.Duration)
+ suite.EqualValues(float32(29.00003), *attachment.FileMeta.Original.Framerate)
+ suite.EqualValues(0x5be18, *attachment.FileMeta.Original.Bitrate)
suite.EqualValues(gtsmodel.Small{
Width: 338, Height: 240, Size: 81120, Aspect: 1.4083333333333334,
}, attachment.FileMeta.Small)
suite.Equal("video/mp4", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
- suite.Equal(312413, attachment.File.FileSize)
- suite.Equal("L00000fQfQfQfQfQfQfQfQfQfQfQ", attachment.Blurhash)
+ suite.Equal(312453, attachment.File.FileSize)
+ suite.Equal("LrJuJat6NZkBt7ayW.j[_4WBsWoL", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-mp4-processed.mp4")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-mp4-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/test-mp4-processed.mp4")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/test-mp4-thumbnail.jpg")
}
func (suite *ManagerTestSuite) TestLongerMp4Process() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test video
b, err := os.ReadFile("./test/longer-mp4-original.mp4")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -690,55 +481,35 @@ func (suite *ManagerTestSuite) TestLongerMp4Process() {
suite.EqualValues(float32(1.8181819), attachment.FileMeta.Original.Aspect)
suite.EqualValues(float32(16.6), *attachment.FileMeta.Original.Duration)
suite.EqualValues(float32(10), *attachment.FileMeta.Original.Framerate)
- suite.EqualValues(0xc8fb, *attachment.FileMeta.Original.Bitrate)
+ suite.EqualValues(0xce3a, *attachment.FileMeta.Original.Bitrate)
suite.EqualValues(gtsmodel.Small{
Width: 512, Height: 281, Size: 143872, Aspect: 1.822064,
}, attachment.FileMeta.Small)
suite.Equal("video/mp4", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
- suite.Equal(109549, attachment.File.FileSize)
- suite.Equal("L00000fQfQfQfQfQfQfQfQfQfQfQ", attachment.Blurhash)
+ suite.Equal(109569, attachment.File.FileSize)
+ suite.Equal("LASY{q~qD%_3~qD%ofRjM{ofofRj", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/longer-mp4-processed.mp4")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/longer-mp4-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/longer-mp4-processed.mp4")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/longer-mp4-thumbnail.jpg")
}
func (suite *ManagerTestSuite) TestBirdnestMp4Process() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test video
b, err := os.ReadFile("./test/birdnest-original.mp4")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -767,93 +538,37 @@ func (suite *ManagerTestSuite) TestBirdnestMp4Process() {
suite.Equal(720, attachment.FileMeta.Original.Height)
suite.Equal(290880, attachment.FileMeta.Original.Size)
suite.EqualValues(float32(0.5611111), attachment.FileMeta.Original.Aspect)
- suite.EqualValues(float32(9.822041), *attachment.FileMeta.Original.Duration)
+ suite.EqualValues(float32(9.823), *attachment.FileMeta.Original.Duration)
suite.EqualValues(float32(30), *attachment.FileMeta.Original.Framerate)
- suite.EqualValues(0x117c79, *attachment.FileMeta.Original.Bitrate)
+ suite.EqualValues(0x11844c, *attachment.FileMeta.Original.Bitrate)
suite.EqualValues(gtsmodel.Small{
Width: 287, Height: 512, Size: 146944, Aspect: 0.5605469,
}, attachment.FileMeta.Small)
suite.Equal("video/mp4", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
- suite.Equal(1409577, attachment.File.FileSize)
- suite.Equal("L00000fQfQfQfQfQfQfQfQfQfQfQ", attachment.Blurhash)
+ suite.Equal(1409625, attachment.File.FileSize)
+ suite.Equal("LOGb||RjRO.99DRORPaetkV?afMw", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/birdnest-processed.mp4")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/birdnest-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/birdnest-processed.mp4")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/birdnest-thumbnail.jpg")
}
-func (suite *ManagerTestSuite) TestNotAnMp4Process() {
- // try to load an 'mp4' that's actually an mkv in disguise
-
+func (suite *ManagerTestSuite) TestOpusProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // load bytes from a test video
- b, err := os.ReadFile("./test/not-an.mp4")
- if err != nil {
- panic(err)
- }
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
- }
-
- accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
-
- // pre processing should go fine but...
- processing, err := suite.manager.CreateMedia(ctx,
- accountID,
- data,
- media.AdditionalMediaInfo{},
- )
- suite.NoError(err)
- suite.NotNil(processing)
-
- // we should get an error while loading
- attachment, err := processing.Load(ctx)
- suite.EqualError(err, "finish: error decoding video: error determining video metadata: [width height framerate]")
-
- // partial attachment should be
- // returned, with 'unknown' type.
- suite.NotNil(attachment)
- suite.Equal(gtsmodel.FileTypeUnknown, attachment.Type)
-}
-
-func (suite *ManagerTestSuite) TestSimpleJpegProcessNoContentLengthGiven() {
- ctx := context.Background()
-
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
- b, err := os.ReadFile("./test/test-jpeg.jpg")
+ b, err := os.ReadFile("./test/test-opus-original.opus")
if err != nil {
panic(err)
}
- // give length as -1 to indicate unknown
- return io.NopCloser(bytes.NewBuffer(b)), -1, nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -879,132 +594,33 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessNoContentLengthGiven() {
// file meta should be correctly derived from the image
suite.EqualValues(gtsmodel.Original{
- Width: 1920, Height: 1080, Size: 2073600, Aspect: 1.7777777777777777,
+ Duration: util.Ptr(float32(122.10006)),
+ Bitrate: util.Ptr(uint64(116426)),
}, attachment.FileMeta.Original)
- suite.EqualValues(gtsmodel.Small{
- Width: 512, Height: 288, Size: 147456, Aspect: 1.7777777777777777,
- }, attachment.FileMeta.Small)
- suite.Equal("image/jpeg", attachment.File.ContentType)
- suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
- suite.Equal(269739, attachment.File.FileSize)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", attachment.Blurhash)
+ suite.Equal("audio/ogg", attachment.File.ContentType)
+ suite.Equal(1776956, attachment.File.FileSize)
+ suite.Empty(attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-jpeg-processed.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-jpeg-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
-}
-
-func (suite *ManagerTestSuite) TestSimpleJpegProcessReadCloser() {
- ctx := context.Background()
-
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // open test image as a file
- f, err := os.Open("./test/test-jpeg.jpg")
- if err != nil {
- panic(err)
- }
- // give length as -1 to indicate unknown
- return f, -1, nil
- }
-
- accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
-
- // process the media with no additional info provided
- processing, err := suite.manager.CreateMedia(ctx,
- accountID,
- data,
- media.AdditionalMediaInfo{},
- )
- suite.NoError(err)
- suite.NotNil(processing)
-
- // do a blocking call to fetch the attachment
- attachment, err := processing.Load(ctx)
- suite.NoError(err)
- suite.NotNil(attachment)
-
- // make sure it's got the stuff set on it that we expect
- // the attachment ID and accountID we expect
- suite.Equal(processing.ID(), attachment.ID)
- suite.Equal(accountID, attachment.AccountID)
-
- // file meta should be correctly derived from the image
- suite.EqualValues(gtsmodel.Original{
- Width: 1920, Height: 1080, Size: 2073600, Aspect: 1.7777777777777777,
- }, attachment.FileMeta.Original)
- suite.EqualValues(gtsmodel.Small{
- Width: 512, Height: 288, Size: 147456, Aspect: 1.7777777777777777,
- }, attachment.FileMeta.Small)
- suite.Equal("image/jpeg", attachment.File.ContentType)
- suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
- suite.Equal(269739, attachment.File.FileSize)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", attachment.Blurhash)
-
- // now make sure the attachment is in the database
- dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
- suite.NoError(err)
- suite.NotNil(dbAttachment)
-
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-jpeg-processed.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-jpeg-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/test-opus-processed.opus")
+ suite.Zero(dbAttachment.Thumbnail.FileSize)
}
func (suite *ManagerTestSuite) TestPngNoAlphaChannelProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/test-png-noalphachannel.png")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -1038,48 +654,28 @@ func (suite *ManagerTestSuite) TestPngNoAlphaChannelProcess() {
suite.Equal("image/png", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
suite.Equal(17471, attachment.File.FileSize)
- suite.Equal("LFQT7e.A%O%4?co$M}M{_1W9~TxV", attachment.Blurhash)
+ suite.Equal("LDQJl?%i-?WG%go#RURP~of3~UxV", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-png-noalphachannel-processed.png")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-png-noalphachannel-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/test-png-noalphachannel-processed.png")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/test-png-noalphachannel-thumbnail.jpg")
}
func (suite *ManagerTestSuite) TestPngAlphaChannelProcess() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/test-png-alphachannel.png")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -1113,48 +709,28 @@ func (suite *ManagerTestSuite) TestPngAlphaChannelProcess() {
suite.Equal("image/png", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
suite.Equal(18904, attachment.File.FileSize)
- suite.Equal("LFQT7e.A%O%4?co$M}M{_1W9~TxV", attachment.Blurhash)
+ suite.Equal("LDQJl?%i-?WG%go#RURP~of3~UxV", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-png-alphachannel-processed.png")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-png-alphachannel-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/test-png-alphachannel-processed.png")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/test-png-alphachannel-thumbnail.jpg")
}
func (suite *ManagerTestSuite) TestSimpleJpegProcessWithCallback() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/test-jpeg.jpg")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -1188,53 +764,33 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessWithCallback() {
suite.Equal("image/jpeg", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
suite.Equal(269739, attachment.File.FileSize)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", attachment.Blurhash)
+ suite.Equal("LjCGfG#6RkRn_NvzRjWF?urqV@a$", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := suite.storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-jpeg-processed.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := suite.storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-jpeg-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.File.Path, "./test/test-jpeg-processed.jpg")
+ equalFiles(suite.T(), suite.state.Storage, dbAttachment.Thumbnail.Path, "./test/test-jpeg-thumbnail.jpg")
}
func (suite *ManagerTestSuite) TestSimpleJpegProcessWithDiskStorage() {
ctx := context.Background()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile("./test/test-jpeg.jpg")
if err != nil {
panic(err)
}
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
- temp := fmt.Sprintf("%s/gotosocial-test", os.TempDir())
+ temp := fmt.Sprintf("./%s/gotosocial-test", os.TempDir())
defer os.RemoveAll(temp)
disk, err := disk.Open(temp, nil)
@@ -1285,36 +841,16 @@ func (suite *ManagerTestSuite) TestSimpleJpegProcessWithDiskStorage() {
suite.Equal("image/jpeg", attachment.File.ContentType)
suite.Equal("image/jpeg", attachment.Thumbnail.ContentType)
suite.Equal(269739, attachment.File.FileSize)
- suite.Equal("LiBzRk#6V[WF_NvzV@WY_3rqV@a$", attachment.Blurhash)
+ suite.Equal("LjCGfG#6RkRn_NvzRjWF?urqV@a$", attachment.Blurhash)
// now make sure the attachment is in the database
dbAttachment, err := suite.db.GetAttachmentByID(ctx, attachment.ID)
suite.NoError(err)
suite.NotNil(dbAttachment)
- // make sure the processed file is in storage
- processedFullBytes, err := storage.Get(ctx, attachment.File.Path)
- suite.NoError(err)
- suite.NotEmpty(processedFullBytes)
-
- // load the processed bytes from our test folder, to compare
- processedFullBytesExpected, err := os.ReadFile("./test/test-jpeg-processed.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedFullBytesExpected)
-
- // the bytes in storage should be what we expected
- suite.Equal(processedFullBytesExpected, processedFullBytes)
-
- // now do the same for the thumbnail and make sure it's what we expected
- processedThumbnailBytes, err := storage.Get(ctx, attachment.Thumbnail.Path)
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytes)
-
- processedThumbnailBytesExpected, err := os.ReadFile("./test/test-jpeg-thumbnail.jpg")
- suite.NoError(err)
- suite.NotEmpty(processedThumbnailBytesExpected)
-
- suite.Equal(processedThumbnailBytesExpected, processedThumbnailBytes)
+ // ensure the files contain the expected data.
+ equalFiles(suite.T(), storage, dbAttachment.File.Path, "./test/test-jpeg-processed.jpg")
+ equalFiles(suite.T(), storage, dbAttachment.Thumbnail.Path, "./test/test-jpeg-thumbnail.jpg")
}
func (suite *ManagerTestSuite) TestSmallSizedMediaTypeDetection_issue2263() {
@@ -1348,12 +884,12 @@ func (suite *ManagerTestSuite) TestSmallSizedMediaTypeDetection_issue2263() {
ctx, cncl := context.WithTimeout(context.Background(), time.Second*60)
defer cncl()
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
+ data := func(_ context.Context) (io.ReadCloser, error) {
// load bytes from a test image
b, err := os.ReadFile(test.path)
suite.NoError(err, "Test %d: failed during test setup", index+1)
- return io.NopCloser(bytes.NewBuffer(b)), int64(len(b)), nil
+ return io.NopCloser(bytes.NewBuffer(b)), nil
}
accountID := "01FS1X72SK9ZPW0J1QQ68BD264"
@@ -1390,78 +926,23 @@ func (suite *ManagerTestSuite) TestSmallSizedMediaTypeDetection_issue2263() {
}
}
-func (suite *ManagerTestSuite) TestMisreportedSmallMedia() {
- const accountID = "01FS1X72SK9ZPW0J1QQ68BD264"
- var actualSize int
-
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // Load bytes from small png.
- b, err := os.ReadFile("./test/test-png-alphachannel-1x1px.png")
- if err != nil {
- suite.FailNow(err.Error())
- }
-
- actualSize = len(b)
-
- // Report media as twice its actual size. This should be corrected.
- return io.NopCloser(bytes.NewBuffer(b)), int64(2 * actualSize), nil
- }
-
- ctx := context.Background()
-
- // process the media with no additional info provided
- processing, err := suite.manager.CreateMedia(ctx,
- accountID,
- data,
- media.AdditionalMediaInfo{},
- )
- suite.NoError(err)
- suite.NotNil(processing)
-
- // do a blocking call to fetch the attachment
- attachment, err := processing.Load(ctx)
- suite.NoError(err)
- suite.NotNil(attachment)
-
- suite.Equal(actualSize, attachment.File.FileSize)
-}
-
-func (suite *ManagerTestSuite) TestNoReportedSizeSmallMedia() {
- const accountID = "01FS1X72SK9ZPW0J1QQ68BD264"
- var actualSize int
-
- data := func(_ context.Context) (io.ReadCloser, int64, error) {
- // Load bytes from small png.
- b, err := os.ReadFile("./test/test-png-alphachannel-1x1px.png")
- if err != nil {
- suite.FailNow(err.Error())
- }
-
- actualSize = len(b)
-
- // Return zero for media size. This should be detected.
- return io.NopCloser(bytes.NewBuffer(b)), 0, nil
- }
-
- ctx := context.Background()
-
- // process the media with no additional info provided
- processing, err := suite.manager.CreateMedia(ctx,
- accountID,
- data,
- media.AdditionalMediaInfo{},
- )
- suite.NoError(err)
- suite.NotNil(processing)
-
- // do a blocking call to fetch the attachment
- attachment, err := processing.Load(ctx)
- suite.NoError(err)
- suite.NotNil(attachment)
-
- suite.Equal(actualSize, attachment.File.FileSize)
-}
-
func TestManagerTestSuite(t *testing.T) {
suite.Run(t, &ManagerTestSuite{})
}
+
+// equalFiles checks whether
+func equalFiles(t *testing.T, st *storage.Driver, storagePath, testPath string) {
+ b1, err := st.Get(context.Background(), storagePath)
+ if err != nil {
+ t.Fatalf("error reading file %s: %v", storagePath, err)
+ }
+
+ b2, err := os.ReadFile(testPath)
+ if err != nil {
+ t.Fatalf("error reading file %s: %v", testPath, err)
+ }
+
+ if md5.Sum(b1) != md5.Sum(b2) {
+ t.Errorf("%s != %s", storagePath, testPath)
+ }
+}
diff --git a/internal/media/png-stripper.go b/internal/media/png-stripper.go
deleted file mode 100644
index 09126f6a5..000000000
--- a/internal/media/png-stripper.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-package media
-
-/*
- The code in this file is taken from the following source:
- https://github.com/google/wuffs/blob/414a011491ff513b86d8694c5d71800f3cb5a715/script/strip-png-ancillary-chunks.go
-
- It presents a workaround for this issue: https://github.com/golang/go/issues/43382
-
- The license for the copied code is reproduced below:
-
- Copyright 2021 The Wuffs Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-// strip-png-ancillary-chunks.go copies PNG data from stdin to stdout, removing
-// any ancillary chunks.
-//
-// Specification-compliant PNG decoders are required to honor critical chunks
-// but may ignore ancillary (non-critical) chunks. Stripping out ancillary
-// chunks before decoding should mean that different PNG decoders will agree on
-// the decoded output regardless of which ancillary chunk types they choose to
-// honor. Specifically, some PNG decoders may implement color and gamma
-// correction but not all do.
-//
-// This program will strip out all ancillary chunks, but it should be
-// straightforward to copy-paste-and-modify it to strip out only certain chunk
-// types (e.g. only "tRNS" transparency chunks).
-//
-// --------
-//
-// A PNG file consists of an 8-byte magic identifier and then a series of
-// chunks. Each chunk is:
-//
-// - a 4-byte uint32 payload length N.
-// - a 4-byte chunk type (e.g. "gAMA" for gamma correction metadata).
-// - an N-byte payload.
-// - a 4-byte CRC-32 checksum of the previous (N + 4) bytes, including the
-// chunk type but excluding the payload length.
-//
-// Chunk types consist of 4 ASCII letters. The upper-case / lower-case bit of
-// the first letter denote critical or ancillary chunks: "IDAT" and "PLTE" are
-// critical, "gAMA" and "tEXt" are ancillary. See
-// https://www.w3.org/TR/2003/REC-PNG-20031110/#5Chunk-naming-conventions
-//
-// --------
-
-import (
- "encoding/binary"
- "io"
-)
-
-const (
- chunkTypeIHDR = 0x49484452
- chunkTypePLTE = 0x504C5445
- chunkTypeIDAT = 0x49444154
- chunkTypeIEND = 0x49454E44
- chunkTypeTRNS = 0x74524e53
-)
-
-func isNecessaryChunkType(chunkType uint32) bool {
- switch chunkType {
- case chunkTypeIHDR:
- return true
- case chunkTypePLTE:
- return true
- case chunkTypeIDAT:
- return true
- case chunkTypeIEND:
- return true
- case chunkTypeTRNS:
- return true
- }
- return false
-}
-
-// pngAncillaryChunkStripper wraps another io.Reader to strip ancillary chunks,
-// if the data is in the PNG file format. If the data isn't PNG, it is passed
-// through unmodified.
-type pngAncillaryChunkStripper struct {
- // Reader is the wrapped io.Reader.
- Reader io.Reader
-
- // stickyErr is the first error returned from the wrapped io.Reader.
- stickyErr error
-
- // buffer[rIndex:wIndex] holds data read from the wrapped io.Reader that
- // wasn't passed through yet.
- buffer [8]byte
- rIndex int
- wIndex int
-
- // pending and discard is the number of remaining bytes for (and whether to
- // discard or pass through) the current chunk-in-progress.
- pending int64
- discard bool
-
- // notPNG is set true if the data stream doesn't start with the 8-byte PNG
- // magic identifier. If true, the wrapped io.Reader's data (including the
- // first up-to-8 bytes) is passed through without modification.
- notPNG bool
-
- // seenMagic is whether we've seen the 8-byte PNG magic identifier.
- seenMagic bool
-}
-
-// Read implements io.Reader.
-func (r *pngAncillaryChunkStripper) Read(p []byte) (int, error) {
- for {
- // If the wrapped io.Reader returned a non-nil error, drain r.buffer
- // (what data we have) and return that error (if fully drained).
- if r.stickyErr != nil {
- n := copy(p, r.buffer[r.rIndex:r.wIndex])
- r.rIndex += n
- if r.rIndex < r.wIndex {
- return n, nil
- }
- return n, r.stickyErr
- }
-
- // Handle trivial requests, including draining our buffer.
- if len(p) == 0 {
- return 0, nil
- } else if r.rIndex < r.wIndex {
- n := copy(p, r.buffer[r.rIndex:r.wIndex])
- r.rIndex += n
- return n, nil
- }
-
- // From here onwards, our buffer is drained: r.rIndex == r.wIndex.
-
- // Handle non-PNG input.
- if r.notPNG {
- return r.Reader.Read(p)
- }
-
- // Continue processing any PNG chunk that's in progress, whether
- // discarding it or passing it through.
- for r.pending > 0 {
- if int64(len(p)) > r.pending {
- p = p[:r.pending]
- }
- n, err := r.Reader.Read(p)
- r.pending -= int64(n)
- r.stickyErr = err
- if r.discard {
- continue
- }
- return n, err
- }
-
- // We're either expecting the 8-byte PNG magic identifier or the 4-byte
- // PNG chunk length + 4-byte PNG chunk type. Either way, read 8 bytes.
- r.rIndex = 0
- r.wIndex, r.stickyErr = io.ReadFull(r.Reader, r.buffer[:8])
- if r.stickyErr != nil {
- // Undo io.ReadFull converting io.EOF to io.ErrUnexpectedEOF.
- if r.stickyErr == io.ErrUnexpectedEOF {
- r.stickyErr = io.EOF
- }
- continue
- }
-
- // Process those 8 bytes, either:
- // - a PNG chunk (if we've already seen the PNG magic identifier),
- // - the PNG magic identifier itself (if the input is a PNG) or
- // - something else (if it's not a PNG).
- //nolint:gocritic
- if r.seenMagic {
- // The number of pending bytes is equal to (N + 4) because of the 4
- // byte trailer, a checksum.
- r.pending = int64(binary.BigEndian.Uint32(r.buffer[:4])) + 4
- chunkType := binary.BigEndian.Uint32(r.buffer[4:])
- r.discard = !isNecessaryChunkType(chunkType)
- if r.discard {
- r.rIndex = r.wIndex
- }
- } else if string(r.buffer[:8]) == "\x89PNG\x0D\x0A\x1A\x0A" {
- r.seenMagic = true
- } else {
- r.notPNG = true
- }
- }
-}
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go
index d61043523..cca456837 100644
--- a/internal/media/processingemoji.go
+++ b/internal/media/processingemoji.go
@@ -18,16 +18,10 @@
package media
import (
- "bytes"
"context"
- "io"
- "slices"
- "codeberg.org/gruf/go-bytesize"
errorsv2 "codeberg.org/gruf/go-errors/v2"
"codeberg.org/gruf/go-runners"
- "github.com/h2non/filetype"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@@ -125,19 +119,8 @@ func (p *ProcessingEmoji) load(ctx context.Context) (
// full-size media attachment details.
//
// This will update p.emoji as it goes.
- if err = p.store(ctx); err != nil {
- return err
- }
-
- // Finish processing by reloading media into
- // memory to get dimension and generate a thumb.
- //
- // This will update p.emoji as it goes.
- if err = p.finish(ctx); err != nil {
- return err //nolint:revive
- }
-
- return nil
+ err = p.store(ctx)
+ return err
})
emoji = p.emoji
return
@@ -147,80 +130,66 @@ func (p *ProcessingEmoji) load(ctx context.Context) (
// and updates the underlying attachment fields as necessary. It will then stream
// bytes from p's reader directly into storage so that it can be retrieved later.
func (p *ProcessingEmoji) store(ctx context.Context) error {
- // Load media from provided data fun
- rc, sz, err := p.dataFn(ctx)
+ // Load media from data func.
+ rc, err := p.dataFn(ctx)
if err != nil {
return gtserror.Newf("error executing data function: %w", err)
}
+ var (
+ // predfine temporary media
+ // file path variables so we
+ // can remove them on error.
+ temppath string
+ staticpath string
+ )
+
defer func() {
- // Ensure data reader gets closed on return.
- if err := rc.Close(); err != nil {
- log.Errorf(ctx, "error closing data reader: %v", err)
+ if err := remove(temppath, staticpath); err != nil {
+ log.Errorf(ctx, "error(s) cleaning up files: %v", err)
}
}()
- var maxSize bytesize.Size
-
- if p.emoji.IsLocal() {
- // this is a local emoji upload
- maxSize = config.GetMediaEmojiLocalMaxSize()
- } else {
- // this is a remote incoming emoji
- maxSize = config.GetMediaEmojiRemoteMaxSize()
- }
-
- // Check that provided size isn't beyond max. We check beforehand
- // so that we don't attempt to stream the emoji into storage if not needed.
- if sz > 0 && sz > int64(maxSize) {
- sz := bytesize.Size(sz) // improves log readability
- return gtserror.Newf("given emoji size %s greater than max allowed %s", sz, maxSize)
- }
-
- // Prepare to read bytes from
- // file header or magic number.
- fileSize := int(sz)
- hdrBuf := newHdrBuf(fileSize)
-
- // Read into buffer as much as possible.
- //
- // UnexpectedEOF means we couldn't read up to the
- // given size, but we may still have read something.
- //
- // EOF means we couldn't read anything at all.
- //
- // Any other error likely means the connection messed up.
- //
- // In other words, rather counterintuitively, we
- // can only proceed on no error or unexpected error!
- n, err := io.ReadFull(rc, hdrBuf)
+ // Drain reader to tmp file
+ // (this reader handles close).
+ temppath, err = drainToTmp(rc)
if err != nil {
- if err != io.ErrUnexpectedEOF {
- return gtserror.Newf("error reading first bytes of incoming media: %w", err)
- }
-
- // Initial file size was misreported, so we didn't read
- // fully into hdrBuf. Reslice it to the size we did read.
- hdrBuf = hdrBuf[:n]
- fileSize = n
- p.emoji.ImageFileSize = fileSize
+ return gtserror.Newf("error draining data to tmp: %w", err)
}
- // Parse file type info from header buffer.
- // This should only ever error if the buffer
- // is empty (ie., the attachment is 0 bytes).
- info, err := filetype.Match(hdrBuf)
+ // Pass input file through ffprobe to
+ // parse further metadata information.
+ result, err := ffprobe(ctx, temppath)
if err != nil {
- return gtserror.Newf("error parsing file type: %w", err)
+ return gtserror.Newf("error ffprobing data: %w", err)
}
- // Ensure supported emoji img type.
- if !slices.Contains(SupportedEmojiMIMETypes, info.MIME.Value) {
- return gtserror.Newf("unsupported emoji filetype: %s", info.Extension)
+ switch {
+ // No errors parsing data.
+ case result.Error == nil:
+
+ // Data type unhandleable by ffprobe.
+ case result.Error.Code == -1094995529:
+ log.Warn(ctx, "unsupported data type")
+ return nil
+
+ default:
+ return gtserror.Newf("ffprobe error: %w", err)
}
- // Recombine header bytes with remaining stream
- r := io.MultiReader(bytes.NewReader(hdrBuf), rc)
+ var ext string
+
+ // Set media type from ffprobe format data.
+ fileType, ext := result.Format.GetFileType()
+ if fileType != gtsmodel.FileTypeImage {
+ return gtserror.Newf("unsupported emoji filetype: %s (%s)", fileType, ext)
+ }
+
+ // Generate a static image from input emoji path.
+ staticpath, err = ffmpegGenerateStatic(ctx, temppath)
+ if err != nil {
+ return gtserror.Newf("error generating emoji static: %w", err)
+ }
var pathID string
if p.newPathID != "" {
@@ -244,95 +213,50 @@ func (p *ProcessingEmoji) store(ctx context.Context) error {
string(TypeEmoji),
string(SizeOriginal),
pathID,
- info.Extension,
+ ext,
)
- // File shouldn't already exist in storage at this point,
- // but we do a check as it's worth logging / cleaning up.
- if have, _ := p.mgr.state.Storage.Has(ctx, p.emoji.ImagePath); have {
- log.Warnf(ctx, "emoji already exists at: %s", p.emoji.ImagePath)
-
- // Attempt to remove existing emoji at storage path (might be broken / out-of-date)
- if err := p.mgr.state.Storage.Delete(ctx, p.emoji.ImagePath); err != nil {
- return gtserror.Newf("error removing emoji %s from storage: %v", p.emoji.ImagePath, err)
- }
- }
-
- // Write the final image reader stream to our storage.
- sz, err = p.mgr.state.Storage.PutStream(ctx, p.emoji.ImagePath, r)
+ // Copy temporary file into storage at path.
+ filesz, err := p.mgr.state.Storage.PutFile(ctx,
+ p.emoji.ImagePath,
+ temppath,
+ )
if err != nil {
return gtserror.Newf("error writing emoji to storage: %w", err)
}
- // Perform final size check in case none was
- // given previously, or size was mis-reported.
- // (error here will later perform p.cleanup()).
- if sz > int64(maxSize) {
- sz := bytesize.Size(sz) // improves log readability
- return gtserror.Newf("written emoji size %s greater than max allowed %s", sz, maxSize)
+ // Copy static emoji file into storage at path.
+ staticsz, err := p.mgr.state.Storage.PutFile(ctx,
+ p.emoji.ImageStaticPath,
+ staticpath,
+ )
+ if err != nil {
+ return gtserror.Newf("error writing static to storage: %w", err)
}
+ // Set final determined file sizes.
+ p.emoji.ImageFileSize = int(filesz)
+ p.emoji.ImageStaticFileSize = int(staticsz)
+
// Fill in remaining emoji data now it's stored.
p.emoji.ImageURL = uris.URIForAttachment(
instanceAccID,
string(TypeEmoji),
string(SizeOriginal),
pathID,
- info.Extension,
+ ext,
)
- p.emoji.ImageContentType = info.MIME.Value
- p.emoji.ImageFileSize = int(sz)
+
+ // Get mimetype for the file container
+ // type, falling back to generic data.
+ p.emoji.ImageContentType = getMimeType(ext)
+
+ // We can now consider this cached.
p.emoji.Cached = util.Ptr(true)
return nil
}
-func (p *ProcessingEmoji) finish(ctx context.Context) error {
- // Get a stream to the original file for further processing.
- rc, err := p.mgr.state.Storage.GetStream(ctx, p.emoji.ImagePath)
- if err != nil {
- return gtserror.Newf("error loading file from storage: %w", err)
- }
- defer rc.Close()
-
- // Decode the image from storage.
- staticImg, err := decodeImage(rc)
- if err != nil {
- return gtserror.Newf("error decoding image: %w", err)
- }
-
- // staticImg should be in-memory by
- // now so we're done with storage.
- if err := rc.Close(); err != nil {
- return gtserror.Newf("error closing file: %w", err)
- }
-
- // Static img shouldn't exist in storage at this point,
- // but we do a check as it's worth logging / cleaning up.
- if have, _ := p.mgr.state.Storage.Has(ctx, p.emoji.ImageStaticPath); have {
- log.Warnf(ctx, "static emoji already exists at: %s", p.emoji.ImageStaticPath)
-
- // Attempt to remove existing thumbnail (might be broken / out-of-date).
- if err := p.mgr.state.Storage.Delete(ctx, p.emoji.ImageStaticPath); err != nil {
- return gtserror.Newf("error removing static emoji %s from storage: %v", p.emoji.ImageStaticPath, err)
- }
- }
-
- // Create emoji PNG encoder stream.
- enc := staticImg.ToPNG()
-
- // Stream-encode the PNG static emoji image into our storage driver.
- sz, err := p.mgr.state.Storage.PutStream(ctx, p.emoji.ImageStaticPath, enc)
- if err != nil {
- return gtserror.Newf("error stream-encoding static emoji to storage: %w", err)
- }
-
- // Set final written thumb size.
- p.emoji.ImageStaticFileSize = int(sz)
-
- return nil
-}
-
// cleanup will remove any traces of processing emoji from storage,
// and perform any other necessary cleanup steps after failure.
func (p *ProcessingEmoji) cleanup(ctx context.Context) {
diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go
index 466c3443f..43e153a4d 100644
--- a/internal/media/processingmedia.go
+++ b/internal/media/processingmedia.go
@@ -18,18 +18,12 @@
package media
import (
- "bytes"
- "cmp"
"context"
- "image/jpeg"
- "io"
"time"
errorsv2 "codeberg.org/gruf/go-errors/v2"
"codeberg.org/gruf/go-runners"
- terminator "codeberg.org/superseriousbusiness/exif-terminator"
- "github.com/disintegration/imaging"
- "github.com/h2non/filetype"
+
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@@ -145,19 +139,8 @@ func (p *ProcessingMedia) load(ctx context.Context) (
// full-size media attachment details.
//
// This will update p.media as it goes.
- if err = p.store(ctx); err != nil {
- return err
- }
-
- // Finish processing by reloading media into
- // memory to get dimension and generate a thumb.
- //
- // This will update p.media as it goes.
- if err = p.finish(ctx); err != nil {
- return err //nolint:revive
- }
-
- return nil
+ err = p.store(ctx)
+ return err
})
media = p.media
return
@@ -167,89 +150,224 @@ func (p *ProcessingMedia) load(ctx context.Context) (
// and updates the underlying attachment fields as necessary. It will then stream
// bytes from p's reader directly into storage so that it can be retrieved later.
func (p *ProcessingMedia) store(ctx context.Context) error {
- // Load media from provided data fun
- rc, sz, err := p.dataFn(ctx)
+ // Load media from data func.
+ rc, err := p.dataFn(ctx)
if err != nil {
return gtserror.Newf("error executing data function: %w", err)
}
+ var (
+ // predfine temporary media
+ // file path variables so we
+ // can remove them on error.
+ temppath string
+ thumbpath string
+ )
+
defer func() {
- // Ensure data reader gets closed on return.
- if err := rc.Close(); err != nil {
- log.Errorf(ctx, "error closing data reader: %v", err)
+ if err := remove(temppath, thumbpath); err != nil {
+ log.Errorf(ctx, "error(s) cleaning up files: %v", err)
}
}()
- // Assume we're given correct file
- // size, we can overwrite this later
- // once we know THE TRUTH.
- fileSize := int(sz)
- p.media.File.FileSize = fileSize
-
- // Prepare to read bytes from
- // file header or magic number.
- hdrBuf := newHdrBuf(fileSize)
-
- // Read into buffer as much as possible.
- //
- // UnexpectedEOF means we couldn't read up to the
- // given size, but we may still have read something.
- //
- // EOF means we couldn't read anything at all.
- //
- // Any other error likely means the connection messed up.
- //
- // In other words, rather counterintuitively, we
- // can only proceed on no error or unexpected error!
- n, err := io.ReadFull(rc, hdrBuf)
+ // Drain reader to tmp file
+ // (this reader handles close).
+ temppath, err = drainToTmp(rc)
if err != nil {
- if err != io.ErrUnexpectedEOF {
- return gtserror.Newf("error reading first bytes of incoming media: %w", err)
+ return gtserror.Newf("error draining data to tmp: %w", err)
+ }
+
+ // Pass input file through ffprobe to
+ // parse further metadata information.
+ result, err := ffprobe(ctx, temppath)
+ if err != nil {
+ return gtserror.Newf("error ffprobing data: %w", err)
+ }
+
+ switch {
+ // No errors parsing data.
+ case result.Error == nil:
+
+ // Data type unhandleable by ffprobe.
+ case result.Error.Code == -1094995529:
+ log.Warn(ctx, "unsupported data type")
+ return nil
+
+ default:
+ return gtserror.Newf("ffprobe error: %w", err)
+ }
+
+ var ext string
+
+ // Set the media type from ffprobe format data.
+ p.media.Type, ext = result.Format.GetFileType()
+ if p.media.Type == gtsmodel.FileTypeUnknown {
+
+ // Return early (deleting file)
+ // for unhandled file types.
+ return nil
+ }
+
+ switch p.media.Type {
+ case gtsmodel.FileTypeImage:
+ // Pass file through ffmpeg clearing
+ // any excess metadata (e.g. EXIF).
+ if err := ffmpegClearMetadata(ctx,
+ temppath, ext,
+ ); err != nil {
+ return gtserror.Newf("error cleaning metadata: %w", err)
}
- // Initial file size was misreported, so we didn't read
- // fully into hdrBuf. Reslice it to the size we did read.
- hdrBuf = hdrBuf[:n]
- fileSize = n
- p.media.File.FileSize = fileSize
- }
+ // Extract image metadata from streams.
+ width, height, err := result.ImageMeta()
+ if err != nil {
+ return err
+ }
+ p.media.FileMeta.Original.Width = width
+ p.media.FileMeta.Original.Height = height
+ p.media.FileMeta.Original.Size = (width * height)
+ p.media.FileMeta.Original.Aspect = float32(width) / float32(height)
- // Parse file type info from header buffer.
- // This should only ever error if the buffer
- // is empty (ie., the attachment is 0 bytes).
- info, err := filetype.Match(hdrBuf)
- if err != nil {
- return gtserror.Newf("error parsing file type: %w", err)
- }
+ // Determine thumbnail dimensions to use.
+ thumbWidth, thumbHeight := thumbSize(width, height)
+ p.media.FileMeta.Small.Width = thumbWidth
+ p.media.FileMeta.Small.Height = thumbHeight
+ p.media.FileMeta.Small.Size = (thumbWidth * thumbHeight)
+ p.media.FileMeta.Small.Aspect = float32(thumbWidth) / float32(thumbHeight)
- // Recombine header bytes with remaining stream
- r := io.MultiReader(bytes.NewReader(hdrBuf), rc)
+ // Generate a thumbnail image from input image path.
+ thumbpath, err = ffmpegGenerateThumb(ctx, temppath,
+ thumbWidth,
+ thumbHeight,
+ )
+ if err != nil {
+ return gtserror.Newf("error generating image thumb: %w", err)
+ }
- // Assume we'll put
- // this file in storage.
- store := true
+ case gtsmodel.FileTypeVideo:
+ // Pass file through ffmpeg clearing
+ // any excess metadata (e.g. EXIF).
+ if err := ffmpegClearMetadata(ctx,
+ temppath, ext,
+ ); err != nil {
+ return gtserror.Newf("error cleaning metadata: %w", err)
+ }
- switch info.Extension {
- case "mp4":
- // No problem.
+ // Extract video metadata we can from streams.
+ width, height, framerate, err := result.VideoMeta()
+ if err != nil {
+ return err
+ }
+ p.media.FileMeta.Original.Width = width
+ p.media.FileMeta.Original.Height = height
+ p.media.FileMeta.Original.Size = (width * height)
+ p.media.FileMeta.Original.Aspect = float32(width) / float32(height)
+ p.media.FileMeta.Original.Framerate = &framerate
- case "gif":
- // No problem
+ // Extract total duration from format.
+ duration := result.Format.GetDuration()
+ p.media.FileMeta.Original.Duration = &duration
- case "jpg", "jpeg", "png", "webp":
- if fileSize > 0 {
- // A file size was provided so we can clean
- // exif data from image as we're streaming it.
- r, err = terminator.Terminate(r, fileSize, info.Extension)
+ // Extract total bitrate from format.
+ bitrate := result.Format.GetBitRate()
+ p.media.FileMeta.Original.Bitrate = &bitrate
+
+ // Determine thumbnail dimensions to use.
+ thumbWidth, thumbHeight := thumbSize(width, height)
+ p.media.FileMeta.Small.Width = thumbWidth
+ p.media.FileMeta.Small.Height = thumbHeight
+ p.media.FileMeta.Small.Size = (thumbWidth * thumbHeight)
+ p.media.FileMeta.Small.Aspect = float32(thumbWidth) / float32(thumbHeight)
+
+ // Extract a thumbnail frame from input video path.
+ thumbpath, err = ffmpegGenerateThumb(ctx, temppath,
+ thumbWidth,
+ thumbHeight,
+ )
+ if err != nil {
+ return gtserror.Newf("error extracting video frame: %w", err)
+ }
+
+ case gtsmodel.FileTypeAudio:
+ // Extract total duration from format.
+ duration := result.Format.GetDuration()
+ p.media.FileMeta.Original.Duration = &duration
+
+ // Extract total bitrate from format.
+ bitrate := result.Format.GetBitRate()
+ p.media.FileMeta.Original.Bitrate = &bitrate
+
+ // Extract image metadata from streams (if any),
+ // this will only exist for embedded album art.
+ width, height, _ := result.ImageMeta()
+ if width > 0 && height > 0 {
+
+ // Determine thumbnail dimensions to use.
+ thumbWidth, thumbHeight := thumbSize(width, height)
+ p.media.FileMeta.Small.Width = thumbWidth
+ p.media.FileMeta.Small.Height = thumbHeight
+ p.media.FileMeta.Small.Size = (thumbWidth * thumbHeight)
+ p.media.FileMeta.Small.Aspect = float32(thumbWidth) / float32(thumbHeight)
+
+ // Generate a thumbnail image from input image path.
+ thumbpath, err = ffmpegGenerateThumb(ctx, temppath,
+ thumbWidth,
+ thumbHeight,
+ )
if err != nil {
- return gtserror.Newf("error cleaning exif data: %w", err)
+ return gtserror.Newf("error generating image thumb: %w", err)
}
}
default:
- // The file is not a supported format that we can process, so we can't do much with it.
- log.Warnf(ctx, "unsupported media extension '%s'; not caching locally", info.Extension)
- store = false
+ log.Warnf(ctx, "unsupported type: %s (%s)", p.media.Type, result.Format.FormatName)
+ return nil
+ }
+
+ // Calculate final media attachment file path.
+ p.media.File.Path = uris.StoragePathForAttachment(
+ p.media.AccountID,
+ string(TypeAttachment),
+ string(SizeOriginal),
+ p.media.ID,
+ ext,
+ )
+
+ // Copy temporary file into storage at path.
+ filesz, err := p.mgr.state.Storage.PutFile(ctx,
+ p.media.File.Path,
+ temppath,
+ )
+ if err != nil {
+ return gtserror.Newf("error writing media to storage: %w", err)
+ }
+
+ // Set final determined file size.
+ p.media.File.FileSize = int(filesz)
+
+ if thumbpath != "" {
+ // Note that neither thumbnail storage
+ // nor a blurhash are needed for audio.
+
+ if p.media.Blurhash == "" {
+ // Generate blurhash (if not already) from thumbnail.
+ p.media.Blurhash, err = generateBlurhash(thumbpath)
+ if err != nil {
+ return gtserror.Newf("error generating thumb blurhash: %w", err)
+ }
+ }
+
+ // Copy thumbnail file into storage at path.
+ thumbsz, err := p.mgr.state.Storage.PutFile(ctx,
+ p.media.Thumbnail.Path,
+ thumbpath,
+ )
+ if err != nil {
+ return gtserror.Newf("error writing thumb to storage: %w", err)
+ }
+
+ // Set final determined thumbnail size.
+ p.media.Thumbnail.FileSize = int(thumbsz)
}
// Fill in correct attachment
@@ -259,194 +377,17 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
string(TypeAttachment),
string(SizeOriginal),
p.media.ID,
- info.Extension,
+ ext,
)
- // Prefer discovered MIME, fallback to generic data stream.
- mime := cmp.Or(info.MIME.Value, "application/octet-stream")
- p.media.File.ContentType = mime
-
- // Calculate final media attachment file path.
- p.media.File.Path = uris.StoragePathForAttachment(
- p.media.AccountID,
- string(TypeAttachment),
- string(SizeOriginal),
- p.media.ID,
- info.Extension,
- )
-
- // We should only try to store the file if it's
- // a format we can keep processing, otherwise be
- // a bit cheeky: don't store it and let users
- // click through to the remote server instead.
- if !store {
- return nil
- }
-
- // File shouldn't already exist in storage at this point,
- // but we do a check as it's worth logging / cleaning up.
- if have, _ := p.mgr.state.Storage.Has(ctx, p.media.File.Path); have {
- log.Warnf(ctx, "media already exists at: %s", p.media.File.Path)
-
- // Attempt to remove existing media at storage path (might be broken / out-of-date)
- if err := p.mgr.state.Storage.Delete(ctx, p.media.File.Path); err != nil {
- return gtserror.Newf("error removing media %s from storage: %v", p.media.File.Path, err)
- }
- }
-
- // Write the final reader stream to our storage driver.
- sz, err = p.mgr.state.Storage.PutStream(ctx, p.media.File.Path, r)
- if err != nil {
- return gtserror.Newf("error writing media to storage: %w", err)
- }
-
- // Set actual written size
- // as authoritative file size.
- p.media.File.FileSize = int(sz)
+ // Get mimetype for the file container
+ // type, falling back to generic data.
+ p.media.File.ContentType = getMimeType(ext)
// We can now consider this cached.
p.media.Cached = util.Ptr(true)
- return nil
-}
-
-func (p *ProcessingMedia) finish(ctx context.Context) error {
- // Nothing else to do if
- // media was not cached.
- if !*p.media.Cached {
- return nil
- }
-
- // Get a stream to the original file for further processing.
- rc, err := p.mgr.state.Storage.GetStream(ctx, p.media.File.Path)
- if err != nil {
- return gtserror.Newf("error loading file from storage: %w", err)
- }
- defer rc.Close()
-
- // fullImg is the processed version of
- // the original (stripped + reoriented).
- var fullImg *gtsImage
-
- // Depending on the content type, we
- // can do various types of decoding.
- switch p.media.File.ContentType {
-
- // .jpeg, .gif, .webp image type
- case mimeImageJpeg, mimeImageGif, mimeImageWebp:
- fullImg, err = decodeImage(rc,
- imaging.AutoOrientation(true),
- )
- if err != nil {
- return gtserror.Newf("error decoding image: %w", err)
- }
-
- // Mark as no longer unknown type now
- // we know for sure we can decode it.
- p.media.Type = gtsmodel.FileTypeImage
-
- // .png image (requires ancillary chunk stripping)
- case mimeImagePng:
- fullImg, err = decodeImage(
- &pngAncillaryChunkStripper{Reader: rc},
- imaging.AutoOrientation(true),
- )
- if err != nil {
- return gtserror.Newf("error decoding image: %w", err)
- }
-
- // Mark as no longer unknown type now
- // we know for sure we can decode it.
- p.media.Type = gtsmodel.FileTypeImage
-
- // .mp4 video type
- case mimeVideoMp4:
- video, err := decodeVideoFrame(rc)
- if err != nil {
- return gtserror.Newf("error decoding video: %w", err)
- }
-
- // Set video frame as image.
- fullImg = video.frame
-
- // Set video metadata in attachment info.
- p.media.FileMeta.Original.Duration = &video.duration
- p.media.FileMeta.Original.Framerate = &video.framerate
- p.media.FileMeta.Original.Bitrate = &video.bitrate
-
- // Mark as no longer unknown type now
- // we know for sure we can decode it.
- p.media.Type = gtsmodel.FileTypeVideo
- }
-
- // fullImg should be in-memory by
- // now so we're done with storage.
- if err := rc.Close(); err != nil {
- return gtserror.Newf("error closing file: %w", err)
- }
-
- // Set full-size dimensions in attachment info.
- p.media.FileMeta.Original.Width = fullImg.Width()
- p.media.FileMeta.Original.Height = fullImg.Height()
- p.media.FileMeta.Original.Size = fullImg.Size()
- p.media.FileMeta.Original.Aspect = fullImg.AspectRatio()
-
- // Get smaller thumbnail image
- thumbImg := fullImg.Thumbnail()
-
- // Garbage collector, you may
- // now take our large son.
- fullImg = nil
-
- // Only generate blurhash
- // from thumb if necessary.
- if p.media.Blurhash == "" {
- hash, err := thumbImg.Blurhash()
- if err != nil {
- return gtserror.Newf("error generating blurhash: %w", err)
- }
-
- // Set the attachment blurhash.
- p.media.Blurhash = hash
- }
-
- // Thumbnail shouldn't exist in storage at this point,
- // but we do a check as it's worth logging / cleaning up.
- if have, _ := p.mgr.state.Storage.Has(ctx, p.media.Thumbnail.Path); have {
- log.Warnf(ctx, "thumbnail already exists at: %s", p.media.Thumbnail.Path)
-
- // Attempt to remove existing thumbnail (might be broken / out-of-date).
- if err := p.mgr.state.Storage.Delete(ctx, p.media.Thumbnail.Path); err != nil {
- return gtserror.Newf("error removing thumbnail %s from storage: %v", p.media.Thumbnail.Path, err)
- }
- }
-
- // Create a thumbnail JPEG encoder stream.
- enc := thumbImg.ToJPEG(&jpeg.Options{
-
- // Good enough for
- // a thumbnail.
- Quality: 70,
- })
-
- // Stream-encode the JPEG thumbnail image into our storage driver.
- sz, err := p.mgr.state.Storage.PutStream(ctx, p.media.Thumbnail.Path, enc)
- if err != nil {
- return gtserror.Newf("error stream-encoding thumbnail to storage: %w", err)
- }
-
- // Set final written thumb size.
- p.media.Thumbnail.FileSize = int(sz)
-
- // Set thumbnail dimensions in attachment info.
- p.media.FileMeta.Small = gtsmodel.Small{
- Width: thumbImg.Width(),
- Height: thumbImg.Height(),
- Size: thumbImg.Size(),
- Aspect: thumbImg.AspectRatio(),
- }
-
- // Finally set the attachment as processed.
+ // Finally set the attachment as finished processing.
p.media.Processing = gtsmodel.ProcessingStatusProcessed
return nil
diff --git a/internal/media/refetch.go b/internal/media/refetch.go
index d02f14872..e5b91d56f 100644
--- a/internal/media/refetch.go
+++ b/internal/media/refetch.go
@@ -24,12 +24,13 @@ import (
"io"
"net/url"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/log"
)
-type DereferenceMedia func(ctx context.Context, iri *url.URL) (io.ReadCloser, int64, error)
+type DereferenceMedia func(ctx context.Context, iri *url.URL, maxsz int64) (io.ReadCloser, error)
// RefetchEmojis iterates through remote emojis (for the given domain, or all if domain is empty string).
//
@@ -48,6 +49,9 @@ func (m *Manager) RefetchEmojis(ctx context.Context, domain string, dereferenceM
refetchIDs []string
)
+ // Get max supported remote emoji media size.
+ maxsz := config.GetMediaEmojiRemoteMaxSize()
+
// page through emojis 20 at a time, looking for those with missing images
for {
// Fetch next block of emojis from database
@@ -107,8 +111,8 @@ func (m *Manager) RefetchEmojis(ctx context.Context, domain string, dereferenceM
continue
}
- dataFunc := func(ctx context.Context) (reader io.ReadCloser, fileSize int64, err error) {
- return dereferenceMedia(ctx, emojiImageIRI)
+ dataFunc := func(ctx context.Context) (reader io.ReadCloser, err error) {
+ return dereferenceMedia(ctx, emojiImageIRI, int64(maxsz))
}
processingEmoji, err := m.RefreshEmoji(ctx, emoji, dataFunc, AdditionalEmojiInfo{
diff --git a/internal/media/test/birdnest-processed.mp4 b/internal/media/test/birdnest-processed.mp4
index 2ecc075cd535b782a815af9f3ee83ceda33ebe92..ed9d73a7dd90ef9e8b66170be5bb9c345d81c079 100644
GIT binary patch
delta 319
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
diff --git a/internal/media/test/gts_pixellated-static.png b/internal/media/test/gts_pixellated-static.png
index c6dcb0f4a0a3aaf2e9b0a14767df07c8e9867ac8..530b628bf7cbc749696b0c347e6291b18a103940 100644
GIT binary patch
literal 1512
zcmeAS@N?(olHy`uVBq!ia0vp^n}K)}2OE&&^!OJBq6$1Biy0X7l);#P5&r`Q2F8|5
zXXgM_iqWrYXoKyyeiaE6tZ9NV<$Q+H2UK$i7^G4y(goRd-0#lXzqFR+gIJP>i
z=2M$q=Qz1d<>=AC0$qzA8zV{!3a?!~7%ISG?;taGj!5j1BmY%f#SGiy`m%kEQ(b@$Vnmoc?`hzVadw
zAGRMXk0O^zi+yA(OuBr@^1ZNoWMojs`Of1!yA(buUr(KW-(tGVx6fx*Ogwu=*uAqg
zNc?o{nNw|EHm)+kA-$jeT22=|7d_`{*4(Y{PsU5=WoVy{S#H@QBDRr5kSXO#prfeR
zqb*rWW}LWCcj>VGlOL`{C!efpn3&9Hx?+Ni{SWy+@2=_i`R(w0sB+jhU?!_mz4~p0&YA&fd7cF7%t>4J8
zXZ}U=r;Ux#3R|9iyLRvROXdkn*IhC{a8S`8YSEk0{_^jo-@m<|Sypd<&!p&*Tg#ml
z3=Aw>o-U3d6?5L+vCX^fAkrH6-n07ByglmTj7%xkJV8q)zO+BrbMNufod>QTJvO0u
z%CUyHZMoGGg|zG&Ojdtl_Sg(%l)Nas{km5A<=yw$A9})9{9%x7vRwR$xrF0c&nf;3
ziZhJ0>>b(@&S8}}uuv_z8KhcW+3D^9d
zvRjCpxwY~SLwi%C^;G!>0nIno#l31@`-j2cFwf?Mwn&5WRg4|R?8VEa8Z3%YIp*&Q
z^S|FV3o_ldIs9v)W;;i5oWWrk;WGxuS&YvZ9^@(ZfpSYS&ulh4BqfI_15-G4#{6E<
zXCD&UEY)Tt_Hm}oNN$pRHUo(p)wxqT>_)YDjlIF)JF3{#XdV4ivL-*@S@-@c?)UqS
zp8x+M_xHQ{Rri0n8`ys}y3L<9Be6~LSzfawh_Ul_LK}$j&TNK%%hh9SKo>UytpvLI
z4A9y%pv#ScwnzeOTJ&1OMo+zZ)f=Wv;FRI@~7r>U;LI8OzuH`g?%q
z^On&4^Su-I-G4uS`;XLndE5P8_wD`tnSa0ijNdV8XMn+PeCDp6Fx1i0IgLR=#oJG}
z08N|WuAlwo`D(*(dwa0xexNACQ>ll5+JHgy)(Gg=v>D8X;{O9vMP7$XxJe(qw>R;O
zJTSz;M#G3=U?hXX;hNEz#RcWke>Q#GTrc@kUiyr|e|d;ghes1VN$ubJxK;79e^N3f*^5=kMx2442lN
h;#WAk3Wf2H=>+TRQ%=IQ{lKD|!PC{xWt~$(695(=&|?4q
literal 1010
zcmeAS@N?(olHy`uVBq!ia0vp^n}K)}2OE&&^!OLXz`(rI)5S5QV$Pepj#zn5zE|JUDp|0V_QX_$_R6MH59Z~kieY0}#Bjp@-<|85rl;J28G8bUzD
z``#PhuZ{nC^ZAK0rdI9WEE}$%TfF*>as0G*&t>=QFTe7$BIfJY>2vg^Z@qtL`L$pF
zpJQ4)W7GMXo4Rk5{qKeE(>;^O-&}m*X7QDamY?1{moL4?`%m_uopC85lECggX7$~e
zUuy2+yjs59PgdLicgGT8uiqH!NB#r`WbM=G)2FXoU%xlb{_n4A@6SdU?K%I45lgt%
z{V@K2&-jOBgZH+7mW|%UFP2&s-Fxwzq3!@?S}}ZnuV<;{qbHVMR$Q!o3XH5b^Y?GN
z{qpnk*!Yf3M5A6ZZVbVk}|X
qX=(gs&Y3CTTmy-a{frC@|No~kT(OJr&g}!{Wd=`IKbLh*2~7aVfcAs{
diff --git a/internal/media/test/longer-mp4-processed.mp4 b/internal/media/test/longer-mp4-processed.mp4
index cfb596612fc93880c2d961de13cbce4d98e9141c..d792dc3c530df48647f33071e49d5382e3e8a297 100644
GIT binary patch
delta 112
zcmaERovrZ(Tf-Jcn}v)grrR!LEN1*Ped9vLcE+sfmWvoe7)7V|En>8ny;@w7l*7Ql
zu(r6QI0Z<903#63O)N_`oPK{Hqxf{j#f-UvB1t7hC16>G6TcaNczgC@#wrdDOFbiV
IJwpQn0I}pF+5i9m
delta 94
zcmZp?!S?n#Tf-Jcn}v*9rrR!LEM~kned9vLcE+&jmWvoe7#XMcEn>8nJy=|ll*7Ql
uFtfO%I0Z<903#50CYB`|PQSm9QG7b%V#eIJ4Sv)N?P(W0+X($LpL>4Qn1ej_dL};re
z5LqNOY=unesw%7yC>-+{?9+o@o;
zf5m3fy8v7bq6-Csn*vZc0D}Wk0iXecfDfST2&|~o5uLq!5SP4kqdP?%SJP05kI01u
z!5Wdt@vL9*J-}Q9)i2^?S3LK}KeC(5=Te_@{APO2Cq%!II3DF&Ia@ai1|{z>6Acl~
z{gL{PjXJbhxpY<+Zc5QM6~&Dn7i{nl35iv99@42Vk*8XHoZSt%FAR0&Yu#SeR;f
zhdP|^w1`VoA`)({l%%kT2*@NPtT%s}Y
zDqP&b|BE6jLro*8%x-<&L#3LXD^2`CKjY?hnt*?^@~Y_d1kOwk+wt2UCfQtE6|rsmsTMd0{*Z#wpOuY=Bh
z+`;igOCFNr6av3w2XTTpc_{tGAqQphf9e$WbqfyAS#b9H@kobA1t+q$ia)%@FWr>3
zzQ`Ge#G(Alp+G4}C8WQ2
zg~-_O$?wxMKCN5~6=Dwn9jLwql#v1~7g5-gd@wjv-8KkOQI`;he9`WW5>OOwq3`~4HpwB>%r0W)7K6NqjKz0c(Hl7rBG0Ncdq>_h{
z2OKAx0SFR;#Cdxw0{{*Mib@{x!ElBk<#&*2BSA+93^r5e4|s)~7=Ziijxizg;j
zr{Y$cZ0i>H(wb7_ad4JB?pDEDq`>n*qtu(cm84@`BshpDoQDEe&PanSs5(>~*ubG^
zs5(hq#@7j&uCO~K&H7v3@%0*uTCYp%<+wNw>{|$CJ!~s@P_dEu
z9h9;@ZfDu`OX^%7KRaf0>rK^s@VxjB=K}!K60k*35(!XOD^XKd14UC3sU*E*Ct7VM
zuoEbe^YRjz9SsubA-60~x1Hv#2H;Dc2yI_3=W))&Ed=8U<&{F;KO8leJnGCQ_z-Z?ovW!GlFwEDwj}Yb$6leB0Cf%ANW2wH=Lzc746*
z3ATZ9b#qqjouT3qYod$iWzldgH@?4YkvCUqMD+{Qk9x4A@}>Plu@vA+S`1pBnxIJ^
zXy>inLB(Oons?;{SVQ#$aYE*W|}RWnhCDDpq>Q8Di0;=$1xi-dR`cqIM5iypNZ9mfA=8?}C~-0JZP-teUc%
zsNvV&7^lPD6x~^Kiw%E!&h`GnMACi%k5%O!ySdrPuXI`;)Tj}~QNvHR)vE5zE#MMZ5^{@gnem>jx
z0;Z!5xNEz6nQ`upQ1G^n$C=x4Bbg4}NpvREP
z%F-(-zYAcU)D+tR`=94gIA@45NJs_uh>;C28oGf4KsqU%l!dlMDj}6nW(3Sb$c6m^
z@8JNI
zsEZpC`G^`{)pZkJTTSpQYOQ*#+}{{8^pXP({B!lxood#%#8Uc6w~)(~t;>E-I=3u#
z+N>4N{4}`OuNkO29(g5VOj6K{eJ0%3!(E2xaNn_yCp!i*$J%ou=XkH)FTkb~*FOf4
zijP6AC!mVZ_r$cfv+xl#a%E*CJHIYtPr~fAD5Kxzd%hr-ZcXvOp^?UME+m<#n}RQVy_MjM+-(P_t7UKb@BUcO>~XK_-V!pLqrq{{69DD(>&*QD1-5{mfQzO
zpz4b+rN&v|tDfeF!bVQby|*_s$Sv}71zjLH4z;{CDe$t)y!g?B!g|ijA~7@tk>)1QjAWpSe_&5I%KhYB|pFnB3*FWOk0K>o(YI(BhepwLV+P
zNRBUOVfSTAmsHzxB6*iiywZFwe@1q*YX$?`DTzgV=I=W
zxPJJ-T(D1oPh@{ZQGU_B6naP4hI}~;y+lXrVvV>p{4IG2PU~4_;&X%vY}=M^SI*{f
z2ghD#$fM&N44aDbC(byS7c~l-<;fZafvw9m{&e7d>OI#CVbZ&PnL^R-hg#>CPF%YY
zUB#G7Y245!T=G{KhA_D<{#*;bN#5DR_}#K21Rg8K=Fwpa8sHt_pC9lzWfZc&7T5;<
zIQPVm{F9C9A$r~u!%e4tvE~?FJWS8{Ef$gdMIJ>kqnSZzdlzpONloh=3hk|)ySd-M
zX+Yzd+4fIJC-tVc)DKC%j%V-L^ZHIbH>81-9n^*+mU!073Vsjw>NA?e@VWXj2
zb;-x*u&bTo-`r?F%8la?K7!uC}SrqRJ|X}LdGaX4Ljz>V9M
z(*7WV%L$u9dj*i*(dD3M#OXND`U>+oxZYo18ARV2EJ$#ZPj3L>A$SDc{e@T?j-J5JJsfv|4fmD|8&O
zfKXmX#}H4|(}4&ktqlDTbkxU%^_CGMUd;Z^LtwDF_fKnDd7+${<`dzWlv5`mH9N8h
z+;lHDug&DzFip5K28+?{+It(5Qgx#JCCu5|%ZIh4wz49tl(*&lQ@sYl^M)h!Y`jf>
z`;|^Rl#|O6E=gJX}hogG*T9Mn=dgU-(^*wvv?bh+YB
zriJb|3ANgKOd73j@H$-A4#F(h!BD%7$O#ngq6pQWdlvXVr#*hdutZfIzEr
zrsIO!kUUu_W^HzUN4lxGFgKpN7Xp*?&w5$)7AKU|?coW@chxW@Tkz0jjJ8$}zAA
zvI;30I#U-U>$dGXcJ4ZK_{h;?$4{I*b?NeztJkjIxOwa0qsLF4K70P+<*SdM
zK7aZ8?fZ|PzZil3g8_(#ko+SE^bZpY3o{El$UlrsuS~;l_iU%Emz-M3agxa*3&!JXHM%@)Fob#CfQREFZx=1ozMXTMRtRjKBzE7G$tz
l_&7^rQ3KZ~9u0%hG%%V5M$^D(8W>FjqiJ9Sr2+f@Hvy(B!Yu#*
diff --git a/internal/media/test/nb-flag-static.png b/internal/media/test/nb-flag-static.png
index 399eae5e5310b3e607d748a1642fcb9480e38444..384ee53f7596b07f9fc2e1f59915880a3e5a58c9 100644
GIT binary patch
literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#XuSa7#UhB#ep2Aa!(h>
zkcv5PXBg&PPLOf8pT@?=_-TS=&=MIH_Yb_Yq)lZLTI5((iYiMpGY1zjKdyhO6td#&
zv9*6K-`l>-_4^vRUtHbSO9>S?EncyA&EKHv=;)U^dveWo=a|))eO$DfC(kAR*y=Am
z0^7E>^YE?Jf4%VLwy8$V&97cZEmOadR$w7}ynY^w>!*$WpC-uFs^3U2(2%`;pEM-B5-^8>~$aOYs!D@l$`yw
zLt$I~|JL`HzaD*JzIeIh?NXrpc6+s&@8_@ouz2y&@Iu|eE9MIin=tHPW4O-nK#C!T
zxgndOfR|w%;{j6)!FLZBQtnAG$S^k~GZgSJ^f4YVWUydkIL`0@uOJ)yhn;^`8eb!5
zKDwpW77b_9789+pnK@$p^~v{J<~_^W`bzXb>}}T5Pm4ZDU%cG&*6LXQ+snSUUAvDS
zT7H11_iWPcK8B>QFL@uVbG6%d>Lx)JkShV)S(Nb6Mw<
G&;$UV`XuB4
literal 878
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
OAh3jjc#Wu0$o~MiBuPjB
diff --git a/internal/media/test/test-jpeg-thumbnail.jpg b/internal/media/test/test-jpeg-thumbnail.jpg
index c11569fe6972305481e5f4fcd020d951345a4cd8..e2251afecc4e453f2619c03861be0567ddbe4bda 100644
GIT binary patch
literal 11113
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