kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(files): remove redundant seek operations in writeToStorage 

Move the seek-to-start into the local file branch only and simplify
contentLengthFromReadSeeker to seek to end then back to 0 instead of
saving/restoring the original position. This reduces the S3 upload
path from 5 seek operations to 2.
This commit is contained in:
kolaente 2026-02-08 14:57:11 +01:00
parent 56a0ea44cf
commit 0d395a9e5d
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/files/files.go
View File

@ -154,15 +154,11 @@ func (f *File) Delete(s *xorm.Session) (err error) {
}
// writeToStorage writes content to the given path, handling both local and S3 backends.
// The reader is always seeked to position 0 before writing to ensure consistent behavior.
func writeToStorage(path string, content io.ReadSeeker, size uint64) error {
// Seek to start to ensure we write the complete content regardless of
// the reader's current position
if _, err := content.Seek(0, io.SeekStart); err != nil {
return fmt.Errorf("failed to seek to start of content: %w", err)
}
if s3Client == nil {
if _, err := content.Seek(0, io.SeekStart); err != nil {
return fmt.Errorf("failed to seek to start of content: %w", err)
}
return afs.WriteReader(path, content)
}
@ -171,9 +167,8 @@ func writeToStorage(path string, content io.ReadSeeker, size uint64) error {
return fmt.Errorf("failed to determine S3 upload content length: %w", err)
}
_, err = content.Seek(0, io.SeekStart)
if err != nil {
return fmt.Errorf("failed to seek S3 upload body to start: %w", err)
if _, err = content.Seek(0, io.SeekStart); err != nil {
return fmt.Errorf("failed to seek to start before S3 upload: %w", err)
}
_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
@ -197,22 +192,13 @@ func (f *File) Save(fcontent io.ReadSeeker) error {
return keyvalue.IncrBy(metrics.FilesCountKey, 1)
}
// contentLengthFromReadSeeker determines the content length by seeking to the end.
func contentLengthFromReadSeeker(seeker io.ReadSeeker, expectedSize uint64) (int64, error) {
currentOffset, err := seeker.Seek(0, io.SeekCurrent)
if err != nil {
return 0, err
}
endOffset, err := seeker.Seek(0, io.SeekEnd)
if err != nil {
return 0, err
}
_, err = seeker.Seek(currentOffset, io.SeekStart)
if err != nil {
return 0, err
}
if expectedSize > 0 && expectedSize <= uint64(math.MaxInt64) && endOffset != int64(expectedSize) {
log.Warningf("File size mismatch for S3 upload: expected %d bytes but reader reports %d bytes", expectedSize, endOffset)
}