sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

mediaapi/writers/upload: Simplify storeFileAndMetadata description

Browse source
This commit is contained in:
Robert Swain 2017-05-26 17:42:08 +02:00
parent 9ecf620ad9
commit 9678cb6ea1
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go
View file

@ -213,13 +213,11 @@ func (r *uploadRequest) Validate(maxFileSizeBytes types.FileSizeBytes) *util.JSO
return nil return nil
} }
// storeFileAndMetadata first moves a temporary file named content from tmpDir to its // storeFileAndMetadata moves the temporary file to its final path based on metadata and stores the metadata in the database
// final path (see getPathFromMediaMetadata for details.) Once the file is moved, the // See getPathFromMediaMetadata in fileutils for details of the final path.
// metadata about the file is written into the media repository database. This order // The order of operations is important as it avoids metadata entering the database before the file
// of operations is important as it avoids metadata entering the database before the file // is ready, and if we fail to move the file, it never gets added to the database.
// is ready and if we fail to move the file, it never gets added to the database. // Returns a util.JSONResponse error and cleans up directories in case of error.
// In case of any error, appropriate files and directories are cleaned up a
// util.JSONResponse error is returned.
func (r *uploadRequest) storeFileAndMetadata(tmpDir types.Path, absBasePath types.Path, db *storage.Database) *util.JSONResponse { func (r *uploadRequest) storeFileAndMetadata(tmpDir types.Path, absBasePath types.Path, db *storage.Database) *util.JSONResponse {
finalPath, duplicate, err := fileutils.MoveFileWithHashCheck(tmpDir, r.MediaMetadata, absBasePath, r.Logger) finalPath, duplicate, err := fileutils.MoveFileWithHashCheck(tmpDir, r.MediaMetadata, absBasePath, r.Logger)
if err != nil { if err != nil {