Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle symlink zip files (#5249)

Browse Source
This commit is contained in:
WithoutPants
2024-09-11 13:58:02 +10:00
committed by GitHub
parent d1c207e40b
commit a17199ba21
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/file/zip.go
View File

@@ -26,11 +26,10 @@ var (
type zipFS struct {
*zip.Reader
zipFileCloser io.Closer
zipInfo fs.FileInfo
zipPath string
}
func newZipFS(fs models.FS, path string, info fs.FileInfo) (*zipFS, error) {
func newZipFS(fs models.FS, path string, size int64) (*zipFS, error) {
reader, err := fs.Open(path)
if err != nil {
return nil, err
@@ -42,7 +41,7 @@ func newZipFS(fs models.FS, path string, info fs.FileInfo) (*zipFS, error) {
return nil, errNotReaderAt
}
zipReader, err := zip.NewReader(asReaderAt, info.Size())
zipReader, err := zip.NewReader(asReaderAt, size)
if err != nil {
reader.Close()
return nil, err
@@ -89,7 +88,6 @@ func newZipFS(fs models.FS, path string, info fs.FileInfo) (*zipFS, error) {
return &zipFS{
Reader: zipReader,
zipFileCloser: reader,
zipInfo: info,
zipPath: path,
}, nil
}
@@ -125,7 +123,7 @@ func (f *zipFS) Lstat(name string) (fs.FileInfo, error) {
return f.Stat(name)
}
func (f *zipFS) OpenZip(name string) (models.ZipFS, error) {
func (f *zipFS) OpenZip(name string, size int64) (models.ZipFS, error) {
return nil, errZipFSOpenZip
}