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

Support image clips/gifs (#3583)

Browse Source 
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
yoshnopa
2023-05-17 01:30:51 +02:00
committed by GitHub
parent 0e199a525f
commit a2e477e1a7
62 changed files with 999 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/image/import.go
View File

@@ -97,7 +97,7 @@ func (i *Importer) imageJSONToImage(imageJSON jsonschema.Image) models.Image {
}
func (i *Importer) populateFiles(ctx context.Context) error {
files := make([]*file.ImageFile, 0)
files := make([]file.File, 0)
for _, ref := range i.Input.Files {
path := ref
@@ -109,11 +109,11 @@ func (i *Importer) populateFiles(ctx context.Context) error {
if f == nil {
return fmt.Errorf("image file '%s' not found", path)
} else {
files = append(files, f.(*file.ImageFile))
files = append(files, f)
}
}
i.image.Files = models.NewRelatedImageFiles(files)
i.image.Files = models.NewRelatedFiles(files)
return nil
}
@@ -311,7 +311,7 @@ func (i *Importer) FindExistingID(ctx context.Context) (*int, error) {
var err error
for _, f := range i.image.Files.List() {
existing, err = i.ReaderWriter.FindByFileID(ctx, f.ID)
existing, err = i.ReaderWriter.FindByFileID(ctx, f.Base().ID)
if err != nil {
return nil, err
}