From 02c3cdc8b98655e6b9860c5cf4ed13bf64298154 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sun, 20 Sep 2020 19:14:50 +0200 Subject: [PATCH] Backend: Code clean-up in album download API Signed-off-by: Michael Mayer --- internal/api/album.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/internal/api/album.go b/internal/api/album.go index cb7b2c1dc..95afd0730 100644 --- a/internal/api/album.go +++ b/internal/api/album.go @@ -447,13 +447,12 @@ func DownloadAlbum(router *gin.RouterGroup) { for _, f := range p { fileName := photoprism.FileName(f.FileRoot, f.FileName) - fileAlias := f.ShareFileName() if fs.FileExists(fileName) { if err := addFileToZip(zipWriter, fileName, fileAlias); err != nil { log.Error(err) - Abort(c, http.StatusInternalServerError, i18n.ErrCreateFile) + Abort(c, http.StatusInternalServerError, i18n.ErrZipFailed) return } log.Infof("album: added %s as %s", txt.Quote(f.FileName), txt.Quote(fileAlias)) @@ -463,6 +462,5 @@ func DownloadAlbum(router *gin.RouterGroup) { } log.Infof("album: archive %s created in %s", txt.Quote(zipFileName), time.Since(start)) - _ = zipWriter.Close() }) }