diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-05-28 13:08:35 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-05-28 14:08:35 +0200 |
| commit | 5faeb4de2032e112ab49751eeeb906ac43826f3d (patch) | |
| tree | ea94b86f27384954ff93aec864b13b83c7f46db0 /internal/processing/media | |
| parent | [docs] Update + simplify roadmap, revise beta estimate (#1826) (diff) | |
| download | gotosocial-5faeb4de2032e112ab49751eeeb906ac43826f3d.tar.xz | |
[chore] tidy up media manager, add calling func to errors, build-script improvements (#1835)
* media manager tidy-up: de-interface and remove unused PostDataFunc
Signed-off-by: kim <grufwub@gmail.com>
* remove last traces of media.Manager being an interface
Signed-off-by: kim <grufwub@gmail.com>
* update error to provide caller, allow tuneable via build tags
Signed-off-by: kim <grufwub@gmail.com>
* remove kim-specific build script changes
Signed-off-by: kim <grufwub@gmail.com>
* fix merge conflicts
Signed-off-by: kim <grufwub@gmail.com>
* update build-script to support externally setting build variables
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/processing/media')
| -rw-r--r-- | internal/processing/media/create.go | 2 | ||||
| -rw-r--r-- | internal/processing/media/getfile.go | 5 | ||||
| -rw-r--r-- | internal/processing/media/media.go | 4 | ||||
| -rw-r--r-- | internal/processing/media/media_test.go | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/internal/processing/media/create.go b/internal/processing/media/create.go index 6bedb9380..cdc65dfa4 100644 --- a/internal/processing/media/create.go +++ b/internal/processing/media/create.go @@ -42,7 +42,7 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form } // process the media attachment and load it immediately - media, err := p.mediaManager.PreProcessMedia(ctx, data, nil, account.ID, &media.AdditionalMediaInfo{ + media, err := p.mediaManager.PreProcessMedia(ctx, data, account.ID, &media.AdditionalMediaInfo{ Description: &form.Description, FocusX: &focusX, FocusY: &focusY, diff --git a/internal/processing/media/getfile.go b/internal/processing/media/getfile.go index 2694fde13..27b08600e 100644 --- a/internal/processing/media/getfile.go +++ b/internal/processing/media/getfile.go @@ -148,8 +148,7 @@ func (p *Processor) getAttachmentContent(ctx context.Context, requestingAccount // [ // the reason it was removed was because a slow // client connection could hold open a storage - // recache operation, and so holding open a media - // worker worker. + // recache operation -> holding open a media worker. // ] dataFn := func(innerCtx context.Context) (io.ReadCloser, int64, error) { @@ -161,7 +160,7 @@ func (p *Processor) getAttachmentContent(ctx context.Context, requestingAccount } // Start recaching this media with the prepared data function. - processingMedia, err := p.mediaManager.PreProcessMediaRecache(ctx, dataFn, nil, wantedMediaID) + processingMedia, err := p.mediaManager.PreProcessMediaRecache(ctx, dataFn, wantedMediaID) if err != nil { return nil, gtserror.NewErrorNotFound(fmt.Errorf("error recaching media: %s", err)) } diff --git a/internal/processing/media/media.go b/internal/processing/media/media.go index d0192c67f..cec912874 100644 --- a/internal/processing/media/media.go +++ b/internal/processing/media/media.go @@ -27,12 +27,12 @@ import ( type Processor struct { state *state.State tc typeutils.TypeConverter - mediaManager media.Manager + mediaManager *media.Manager transportController transport.Controller } // New returns a new media processor. -func New(state *state.State, tc typeutils.TypeConverter, mediaManager media.Manager, transportController transport.Controller) Processor { +func New(state *state.State, tc typeutils.TypeConverter, mediaManager *media.Manager, transportController transport.Controller) Processor { return Processor{ state: state, tc: tc, diff --git a/internal/processing/media/media_test.go b/internal/processing/media/media_test.go index 7c66cfdaa..97e490a9c 100644 --- a/internal/processing/media/media_test.go +++ b/internal/processing/media/media_test.go @@ -37,7 +37,7 @@ type MediaStandardTestSuite struct { tc typeutils.TypeConverter storage *storage.Driver state state.State - mediaManager media.Manager + mediaManager *media.Manager transportController transport.Controller // standard suite models |