From 07727753b96d209406783e5e539725bcdafebdc7 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 7 Mar 2022 11:08:26 +0100 Subject: [feature] Clean up/uncache remote media (#407) * Add whereNotEmptyAndNotNull * Add GetRemoteOlderThanDays * Add GetRemoteOlderThanDays * Add PruneRemote to Manager interface * Start implementing PruneRemote * add new attachment + status to tests * fix up and test GetRemoteOlderThan * fix bad import * PruneRemote: return number pruned * add Cached column to mediaattachment * update + test pruneRemote * update mediaTest * use Cached column * upstep bun to latest version * embed structs in mediaAttachment * migrate mediaAttachment to new format * don't default cached to true * select only remote media * update db dependencies * step bun back to last working version * update pruneRemote to use Cached field * fix storage path of test attachments * add recache logic to manager * fix trimmed aspect ratio * test prune and recache * return errwithcode * tidy up different paths for emoji vs attachment * fix incorrect thumbnail type being stored * expose TransportController to media processor * implement tee-ing recached content * add thoughts of dog to test fedi attachments * test get remote files * add comment on PruneRemote * add postData cleanup to recache * test thumbnail fetching * add incredible diagram * go mod tidy * buffer pipes for recache streaming * test for client stops reading after 1kb * add media-remote-cache-days to config * add cron package * wrap logrus so it's available to cron * start and stop cron jobs gracefully --- cmd/gotosocial/flag/server.go | 1 + cmd/gotosocial/flag/usage.go | 1 + 2 files changed, 2 insertions(+) (limited to 'cmd') diff --git a/cmd/gotosocial/flag/server.go b/cmd/gotosocial/flag/server.go index f3f1994ef..418e48af6 100644 --- a/cmd/gotosocial/flag/server.go +++ b/cmd/gotosocial/flag/server.go @@ -63,6 +63,7 @@ func Media(cmd *cobra.Command, values config.Values) { cmd.Flags().Int(config.Keys.MediaVideoMaxSize, values.MediaVideoMaxSize, usage.MediaVideoMaxSize) cmd.Flags().Int(config.Keys.MediaDescriptionMinChars, values.MediaDescriptionMinChars, usage.MediaDescriptionMinChars) cmd.Flags().Int(config.Keys.MediaDescriptionMaxChars, values.MediaDescriptionMaxChars, usage.MediaDescriptionMaxChars) + cmd.Flags().Int(config.Keys.MediaRemoteCacheDays, values.MediaRemoteCacheDays, usage.MediaRemoteCacheDays) } // Storage attaches flags pertaining to storage config. diff --git a/cmd/gotosocial/flag/usage.go b/cmd/gotosocial/flag/usage.go index 63ff97e6d..d7e7fb417 100644 --- a/cmd/gotosocial/flag/usage.go +++ b/cmd/gotosocial/flag/usage.go @@ -47,6 +47,7 @@ var usage = config.KeyNames{ MediaVideoMaxSize: "Max size of accepted videos in bytes", MediaDescriptionMinChars: "Min required chars for an image description", MediaDescriptionMaxChars: "Max permitted chars for an image description", + MediaRemoteCacheDays: "Number of days to locally cache media from remote instances. If set to 0, remote media will be kept indefinitely.", StorageBackend: "Storage backend to use for media attachments", StorageLocalBasePath: "Full path to an already-created directory where gts should store/retrieve media files. Subfolders will be created within this dir.", StatusesMaxChars: "Max permitted characters for posted statuses", -- cgit v1.3