Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

zip creation: avoid stat if not strictly required

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2025-01-02 18:05:47 +01:00
parent 37f8fb3a0e
commit ff13be4616
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/httpd/api_utils.go
View File

@@ -396,7 +396,7 @@ func renderCompressedFiles(w http.ResponseWriter, conn *Connection, baseDir stri
for _, file := range files {
fullPath := util.CleanPath(path.Join(baseDir, file))
if err := addZipEntry(wr, conn, fullPath, baseDir, 0); err != nil {
if err := addZipEntry(wr, conn, fullPath, baseDir, nil, 0); err != nil {
if share != nil {
dataprovider.UpdateShareLastUse(share, -1) //nolint:errcheck
}
@@ -412,16 +412,19 @@ func renderCompressedFiles(w http.ResponseWriter, conn *Connection, baseDir stri
}
}
func addZipEntry(wr *zip.Writer, conn *Connection, entryPath, baseDir string, recursion int) error {
func addZipEntry(wr *zip.Writer, conn *Connection, entryPath, baseDir string, info os.FileInfo, recursion int) error {
if recursion >= util.MaxRecursion {
conn.Log(logger.LevelDebug, "unable to add zip entry %q, recursion too depth: %d", entryPath, recursion)
return util.ErrRecursionTooDeep
}
recursion++
info, err := conn.Stat(entryPath, 1)
if err != nil {
conn.Log(logger.LevelDebug, "unable to add zip entry %q, stat error: %v", entryPath, err)
return err
var err error
if info == nil {
info, err = conn.Stat(entryPath, 1)
if err != nil {
conn.Log(logger.LevelDebug, "unable to add zip entry %q, stat error: %v", entryPath, err)
return err
}
}
entryName, err := getZipEntryName(entryPath, baseDir)
if err != nil {
@@ -453,7 +456,7 @@ func addZipEntry(wr *zip.Writer, conn *Connection, entryPath, baseDir string, re
}
for _, info := range contents {
fullPath := util.CleanPath(path.Join(entryPath, info.Name()))
if err := addZipEntry(wr, conn, fullPath, baseDir, recursion); err != nil {
if err := addZipEntry(wr, conn, fullPath, baseDir, info, recursion); err != nil {
return err
}
}