mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-08 15:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

mediaapi/writers/download: Set more metadata fields for remote files

Browse source
This commit is contained in:
Robert Swain 2017-05-09 20:58:44 +02:00
parent 5bb5a28366
commit c7c3a36e1b
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
View file

@ -230,6 +230,11 @@ func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName,
} }
r.MediaMetadata.ContentLength = types.ContentLength(contentLength) r.MediaMetadata.ContentLength = types.ContentLength(contentLength)
r.MediaMetadata.ContentType = types.ContentType(resp.Header.Get("Content-Type"))
r.MediaMetadata.ContentDisposition = types.ContentDisposition(resp.Header.Get("Content-Disposition"))
// FIXME: parse from Content-Disposition header if possible, else fall back
//r.MediaMetadata.UploadName = types.Filename()
logger.WithFields(log.Fields{ logger.WithFields(log.Fields{
"MediaID": r.MediaMetadata.MediaID, "MediaID": r.MediaMetadata.MediaID,
"Origin": r.MediaMetadata.Origin, "Origin": r.MediaMetadata.Origin,
@ -355,6 +360,9 @@ func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName,
// Note: After this point we have responded to the client's request and are just dealing with local caching. // Note: After this point we have responded to the client's request and are just dealing with local caching.
// As we have responded with 200 OK, any errors are ineffectual to the client request and so we just log and return. // As we have responded with 200 OK, any errors are ineffectual to the client request and so we just log and return.
r.MediaMetadata.ContentLength = types.ContentLength(bytesWritten)
r.MediaMetadata.UserID = types.MatrixUserID("@unknown:" + string(r.MediaMetadata.Origin))
logger.WithFields(log.Fields{ logger.WithFields(log.Fields{
"MediaID": r.MediaMetadata.MediaID, "MediaID": r.MediaMetadata.MediaID,
"Origin": r.MediaMetadata.Origin, "Origin": r.MediaMetadata.Origin,