deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bridgev2/matrixinterface: use callback for DownloadMediaToFile

Browse source 
The caller doesn't know whether the file should be removed, so let the
Matrix interface deal with it.
This commit is contained in:
Tulir Asokan 2024-09-11 12:46:21 +03:00
commit a95cb9adb3
2 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
bridgev2/matrix/intent.go
View file

@ -214,32 +214,29 @@ func (as *ASIntent) DownloadMedia(ctx context.Context, uri id.ContentURIString,
return data, nil
}
func (as *ASIntent) DownloadMediaToFile(ctx context.Context, uri id.ContentURIString, file *event.EncryptedFileInfo, writable bool) (*os.File, error) {
func (as *ASIntent) DownloadMediaToFile(ctx context.Context, uri id.ContentURIString, file *event.EncryptedFileInfo, writable bool, callback func(*os.File) error) error {
if file != nil {
uri = file.URL
err := file.PrepareForDecryption()
if err != nil {
return nil, err
return err
}
}
parsedURI, err := uri.Parse()
if err != nil {
return nil, err
return err
}
tempFile, err := os.CreateTemp("", "mautrix-download-*")
if err != nil {
return nil, fmt.Errorf("failed to create temp file: %w", err)
return fmt.Errorf("failed to create temp file: %w", err)
}
ok := false
defer func() {
if !ok {
_ = tempFile.Close()
_ = os.Remove(tempFile.Name())
}
_ = tempFile.Close()
_ = os.Remove(tempFile.Name())
}()
resp, err := as.Matrix.Download(ctx, parsedURI)
if err != nil {
return nil, fmt.Errorf("failed to send download request: %w", err)
return fmt.Errorf("failed to send download request: %w", err)
}
defer resp.Body.Close()
reader := resp.Body
@ -249,23 +246,26 @@ func (as *ASIntent) DownloadMediaToFile(ctx context.Context, uri id.ContentURISt
if resp.ContentLength > 0 {
err = fallocate.Fallocate(tempFile, int(resp.ContentLength))
if err != nil {
return nil, fmt.Errorf("failed to preallocate file: %w", err)
return fmt.Errorf("failed to preallocate file: %w", err)
}
}
_, err = io.Copy(tempFile, reader)
if err != nil {
return nil, fmt.Errorf("failed to read response: %w", err)
return fmt.Errorf("failed to read response: %w", err)
}
err = reader.Close()
if err != nil {
return nil, fmt.Errorf("failed to close response body: %w", err)
return fmt.Errorf("failed to close response body: %w", err)
}
_, err = tempFile.Seek(0, io.SeekStart)
if err != nil {
return nil, fmt.Errorf("failed to seek to start of temp file: %w", err)
return fmt.Errorf("failed to seek to start of temp file: %w", err)
}
ok = true
return tempFile, nil
err = callback(tempFile)
if err != nil {
return bridgev2.CallbackError{Type: "read", Wrapped: err}
}
return nil
}
func (as *ASIntent) UploadMedia(ctx context.Context, roomID id.RoomID, data []byte, fileName, mimeType string) (url id.ContentURIString, file *event.EncryptedFileInfo, err error) {
@ -351,7 +351,7 @@ func (as *ASIntent) UploadMediaStream(
var res *bridgev2.FileStreamResult
res, err = cb(tempFile)
if err != nil {
err = fmt.Errorf("write callback failed: %w", err)
err = bridgev2.CallbackError{Type: "write", Wrapped: err}
return
}
var replFile *os.File

16
bridgev2/matrixinterface.go
View file

@ -8,6 +8,7 @@ package bridgev2
import (
"context"
"fmt"
"io"
"os"
"time"
@ -102,6 +103,19 @@ type FileStreamResult struct {
// The return value must be non-nil unless there's an error, and should always include FileName and MimeType.
type FileStreamCallback func(file io.Writer) (*FileStreamResult, error)
type CallbackError struct {
Type string
Wrapped error
}
func (ce CallbackError) Error() string {
return fmt.Sprintf("%s callback failed: %s", ce.Type, ce.Wrapped.Error())
}
func (ce CallbackError) Unwrap() error {
return ce.Wrapped
}
type MatrixAPI interface {
GetMXID() id.UserID
@ -111,7 +125,7 @@ type MatrixAPI interface {
MarkUnread(ctx context.Context, roomID id.RoomID, unread bool) error
MarkTyping(ctx context.Context, roomID id.RoomID, typingType TypingType, timeout time.Duration) error
DownloadMedia(ctx context.Context, uri id.ContentURIString, file *event.EncryptedFileInfo) ([]byte, error)
DownloadMediaToFile(ctx context.Context, uri id.ContentURIString, file *event.EncryptedFileInfo, writable bool) (*os.File, error)
DownloadMediaToFile(ctx context.Context, uri id.ContentURIString, file *event.EncryptedFileInfo, writable bool, callback func(*os.File) error) error
UploadMedia(ctx context.Context, roomID id.RoomID, data []byte, fileName, mimeType string) (url id.ContentURIString, file *event.EncryptedFileInfo, err error)
UploadMediaStream(ctx context.Context, roomID id.RoomID, size int64, requireFile bool, cb FileStreamCallback) (url id.ContentURIString, file *event.EncryptedFileInfo, err error)