beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Backend: stream album ZIP files (#492)

Browse source 
ZIP files generated for albums will no longer be written to disk prior
serving them to users. The zip file will be written directly into the
HTTP response.
This commit is contained in:
Andreas Rammhold 2020-09-06 14:58:08 +02:00 committed by GitHub
parent d1def762ba
commit 2a827739e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
internal/api/album.go
View file

@ -4,8 +4,6 @@ import (
"archive/zip"
"fmt"
"net/http"
"os"
"path"
"strconv"
"strings"
"time"
@ -425,7 +423,6 @@ func DownloadAlbum(router *gin.RouterGroup) {
}
start := time.Now()
conf := service.Config()
a, err := query.AlbumByUID(c.Param("uid"))
if err != nil {
@ -440,28 +437,12 @@ func DownloadAlbum(router *gin.RouterGroup) {
return
}
zipPath := path.Join(conf.TempPath(), "album")
zipToken := rnd.Token(3)
zipBaseName := fmt.Sprintf("%s-%s.zip", strings.Title(a.AlbumSlug), zipToken)
zipFileName := path.Join(zipPath, zipBaseName)
zipFileName := fmt.Sprintf("%s-%s.zip", strings.Title(a.AlbumSlug), zipToken)
if err := os.MkdirAll(zipPath, 0700); err != nil {
log.Error(err)
Abort(c, http.StatusInternalServerError, i18n.ErrCreateFolder)
return
}
c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", zipFileName))
newZipFile, err := os.Create(zipFileName)
if err != nil {
log.Error(err)
Abort(c, http.StatusInternalServerError, i18n.ErrCreateFile)
return
}
defer newZipFile.Close()
zipWriter := zip.NewWriter(newZipFile)
zipWriter := zip.NewWriter(c.Writer)
defer func() { _ = zipWriter.Close() }()
for _, f := range p {
@ -481,22 +462,7 @@ func DownloadAlbum(router *gin.RouterGroup) {
}
}
log.Infof("album: archive %s created in %s", txt.Quote(zipBaseName), time.Since(start))
log.Infof("album: archive %s created in %s", txt.Quote(zipFileName), time.Since(start))
_ = zipWriter.Close()
newZipFile.Close()
if !fs.FileExists(zipFileName) {
log.Errorf("could not find zip file: %s", zipFileName)
c.Data(http.StatusNotFound, "image/svg+xml", photoIconSvg)
return
}
c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", zipBaseName))
c.File(zipFileName)
if err := os.Remove(zipFileName); err != nil {
log.Errorf("album: could not remove %s (%s)", txt.Quote(zipFileName), err.Error())
}
})
}