mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 12:54:38 +03:00
File storage rewrite (#2676)
* Restructure data layer part 2 (#2599) * Refactor and separate image model * Refactor image query builder * Handle relationships in image query builder * Remove relationship management methods * Refactor gallery model/query builder * Add scenes to gallery model * Convert scene model * Refactor scene models * Remove unused methods * Add unit tests for gallery * Add image tests * Add scene tests * Convert unnecessary scene value pointers to values * Convert unnecessary pointer values to values * Refactor scene partial * Add scene partial tests * Refactor ImagePartial * Add image partial tests * Refactor gallery partial update * Add partial gallery update tests * Use zero/null package for null values * Add files and scan system * Add sqlite implementation for files/folders * Add unit tests for files/folders * Image refactors * Update image data layer * Refactor gallery model and creation * Refactor scene model * Refactor scenes * Don't set title from filename * Allow galleries to freely add/remove images * Add multiple scene file support to graphql and UI * Add multiple file support for images in graphql/UI * Add multiple file for galleries in graphql/UI * Remove use of some deprecated fields * Remove scene path usage * Remove gallery path usage * Remove path from image * Move funscript to video file * Refactor caption detection * Migrate existing data * Add post commit/rollback hook system * Lint. Comment out import/export tests * Add WithDatabase read only wrapper * Prepend tasks to list * Add 32 pre-migration * Add warnings in release and migration notes
This commit is contained in:
WithoutPants
@@ -1,250 +1,12 @@
|
||||
package image
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"image"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/stashapp/stash/pkg/file"
|
||||
"github.com/stashapp/stash/pkg/fsutil"
|
||||
"github.com/stashapp/stash/pkg/hash/md5"
|
||||
"github.com/stashapp/stash/pkg/logger"
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
_ "golang.org/x/image/webp"
|
||||
)
|
||||
|
||||
func GetSourceImage(i *models.Image) (image.Image, error) {
|
||||
f, err := openSourceImage(i.Path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
srcImage, _, err := image.Decode(f)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return srcImage, nil
|
||||
}
|
||||
|
||||
func DecodeSourceImage(i *models.Image) (*image.Config, *string, error) {
|
||||
f, err := openSourceImage(i.Path)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
config, format, err := image.DecodeConfig(f)
|
||||
|
||||
return &config, &format, err
|
||||
}
|
||||
|
||||
func CalculateMD5(path string) (string, error) {
|
||||
f, err := openSourceImage(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
return md5.FromReader(f)
|
||||
}
|
||||
|
||||
func FileExists(path string) bool {
|
||||
f, err := openSourceImage(path)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
type imageReadCloser struct {
|
||||
src io.ReadCloser
|
||||
zrc *zip.ReadCloser
|
||||
}
|
||||
|
||||
func (i *imageReadCloser) Read(p []byte) (n int, err error) {
|
||||
return i.src.Read(p)
|
||||
}
|
||||
|
||||
func (i *imageReadCloser) Close() error {
|
||||
err := i.src.Close()
|
||||
var err2 error
|
||||
if i.zrc != nil {
|
||||
err2 = i.zrc.Close()
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return err2
|
||||
}
|
||||
|
||||
func openSourceImage(path string) (io.ReadCloser, error) {
|
||||
// may need to read from a zip file
|
||||
zipFilename, filename := file.ZipFilePath(path)
|
||||
if zipFilename != "" {
|
||||
r, err := zip.OpenReader(zipFilename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// defer closing of zip to the calling function, unless an error
|
||||
// is returned, in which case it should be closed immediately
|
||||
|
||||
// find the file matching the filename
|
||||
for _, f := range r.File {
|
||||
if f.Name == filename {
|
||||
src, err := f.Open()
|
||||
if err != nil {
|
||||
r.Close()
|
||||
return nil, err
|
||||
}
|
||||
return &imageReadCloser{
|
||||
src: src,
|
||||
zrc: r,
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
r.Close()
|
||||
return nil, fmt.Errorf("file with name '%s' not found in zip file '%s'", filename, zipFilename)
|
||||
}
|
||||
|
||||
return os.Open(filename)
|
||||
}
|
||||
|
||||
// GetFileDetails returns a pointer to an Image object with the
|
||||
// width, height and size populated.
|
||||
func GetFileDetails(path string) (*models.Image, error) {
|
||||
i := &models.Image{
|
||||
Path: path,
|
||||
}
|
||||
|
||||
err := SetFileDetails(i)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return i, nil
|
||||
}
|
||||
|
||||
func SetFileDetails(i *models.Image) error {
|
||||
f, err := stat(i.Path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
config, _, err := DecodeSourceImage(i)
|
||||
|
||||
if err == nil {
|
||||
i.Width = sql.NullInt64{
|
||||
Int64: int64(config.Width),
|
||||
Valid: true,
|
||||
}
|
||||
i.Height = sql.NullInt64{
|
||||
Int64: int64(config.Height),
|
||||
Valid: true,
|
||||
}
|
||||
}
|
||||
|
||||
i.Size = sql.NullInt64{
|
||||
Int64: int64(f.Size()),
|
||||
Valid: true,
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetFileModTime gets the file modification time, handling files in zip files.
|
||||
func GetFileModTime(path string) (time.Time, error) {
|
||||
fi, err := stat(path)
|
||||
if err != nil {
|
||||
return time.Time{}, fmt.Errorf("error performing stat on %s: %s", path, err.Error())
|
||||
}
|
||||
|
||||
ret := fi.ModTime()
|
||||
// truncate to seconds, since we don't store beyond that in the database
|
||||
ret = ret.Truncate(time.Second)
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func stat(path string) (os.FileInfo, error) {
|
||||
// may need to read from a zip file
|
||||
zipFilename, filename := file.ZipFilePath(path)
|
||||
if zipFilename != "" {
|
||||
r, err := zip.OpenReader(zipFilename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer r.Close()
|
||||
|
||||
// find the file matching the filename
|
||||
for _, f := range r.File {
|
||||
if f.Name == filename {
|
||||
return f.FileInfo(), nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("file with name '%s' not found in zip file '%s'", filename, zipFilename)
|
||||
}
|
||||
|
||||
return os.Stat(filename)
|
||||
}
|
||||
|
||||
func Serve(w http.ResponseWriter, r *http.Request, path string) {
|
||||
zipFilename, _ := file.ZipFilePath(path)
|
||||
w.Header().Add("Cache-Control", "max-age=604800000") // 1 Week
|
||||
if zipFilename == "" {
|
||||
http.ServeFile(w, r, path)
|
||||
} else {
|
||||
rc, err := openSourceImage(path)
|
||||
if err != nil {
|
||||
// assume not found
|
||||
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
defer rc.Close()
|
||||
|
||||
data, err := io.ReadAll(rc)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if k, err := w.Write(data); err != nil {
|
||||
logger.Warnf("failure while serving image (wrote %v bytes out of %v): %v", k, len(data), err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func IsCover(img *models.Image) bool {
|
||||
_, fn := file.ZipFilePath(img.Path)
|
||||
return strings.HasSuffix(fn, "cover.jpg")
|
||||
}
|
||||
|
||||
func GetTitle(s *models.Image) string {
|
||||
if s.Title.String != "" {
|
||||
return s.Title.String
|
||||
}
|
||||
|
||||
_, fn := file.ZipFilePath(s.Path)
|
||||
return filepath.Base(fn)
|
||||
}
|
||||
|
||||
// GetFilename gets the base name of the image file
|
||||
// If stripExt is set the file extension is omitted from the name
|
||||
func GetFilename(s *models.Image, stripExt bool) string {
|
||||
_, fn := file.ZipFilePath(s.Path)
|
||||
return fsutil.GetNameFromPath(fn, stripExt)
|
||||
return strings.HasSuffix(img.Path(), "cover.jpg")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user