mirror of
https://github.com/stashapp/stash.git
synced 2025-12-06 08:26:00 +01:00
* Make the script scraper context-aware Connect the context to the command execution. This means command execution can be aborted if the context is canceled. The context is usually bound to user-interaction, i.e., a scraper operation issued by the user. Hence, it seems correct to abort a command if the user aborts. * Enable errchkjson Some json marshal calls are *safe* in that they can never fail. This is conditional on the types of the the data being encoded. errchkjson finds those calls which are unsafe, and also not checked for errors. Add logging warnings to the place where unsafe encodings might happen. This can help uncover usage bugs early in stash if they are tripped, making debugging easier. While here, keep the checker enabled in the linter to capture future uses of json marshalling. * Pass the context for zip file scanning. * Pass the context in scanning * Pass context, replace context.TODO() Where applicable, pass the context down toward the lower functions in the call stack. Replace uses of context.TODO() with the passed context. This makes the code more context-aware, and you can rely on aborting contexts to clean up subsystems to a far greater extent now. I've left the cases where there is a context in a struct. My gut feeling is that they have solutions that are nice, but they require more deep thinking to unveil how to handle it. * Remove context from task-structs As a rule, contexts are better passed explicitly to functions than they are passed implicitly via structs. In the case of tasks, we already have a valid context in scope when creating the struct, so remove ctx from the struct and use the scoped context instead. With this change it is clear that the scanning functions are under a context, and the task-starting caller has jurisdiction over the context and its lifetime. A reader of the code don't have to figure out where the context are coming from anymore. While here, connect context.TODO() to the newly scoped context in most of the scan code. * Remove context from autotag struct too * Make more context-passing explicit In all of these cases, there is an applicable context which is close in the call-tree. Hook up to this context. * Simplify context passing in manager The managers context handling generally wants to use an outer context if applicable. However, the code doesn't pass it explicitly, but stores it in a struct. Pull out the context from the struct and use it to explicitly pass it. At a later point in time, we probably want to handle this by handing over the job to a different (program-lifetime) context for background jobs, but this will do for a start.
169 lines
4.4 KiB
Go
169 lines
4.4 KiB
Go
package manager
|
|
|
|
import (
|
|
"archive/zip"
|
|
"context"
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/remeh/sizedwaitgroup"
|
|
"github.com/stashapp/stash/internal/manager/config"
|
|
"github.com/stashapp/stash/pkg/file"
|
|
"github.com/stashapp/stash/pkg/gallery"
|
|
"github.com/stashapp/stash/pkg/logger"
|
|
"github.com/stashapp/stash/pkg/models"
|
|
)
|
|
|
|
func (t *ScanTask) scanGallery(ctx context.Context) {
|
|
var g *models.Gallery
|
|
path := t.file.Path()
|
|
images := 0
|
|
scanImages := false
|
|
|
|
if err := t.TxnManager.WithReadTxn(ctx, func(r models.ReaderRepository) error {
|
|
var err error
|
|
g, err = r.Gallery().FindByPath(path)
|
|
|
|
if g != nil && err != nil {
|
|
images, err = r.Image().CountByGalleryID(g.ID)
|
|
if err != nil {
|
|
return fmt.Errorf("error getting images for zip gallery %s: %s", path, err.Error())
|
|
}
|
|
}
|
|
|
|
return err
|
|
}); err != nil {
|
|
logger.Error(err.Error())
|
|
return
|
|
}
|
|
|
|
scanner := gallery.Scanner{
|
|
Scanner: gallery.FileScanner(&file.FSHasher{}),
|
|
ImageExtensions: instance.Config.GetImageExtensions(),
|
|
StripFileExtension: t.StripFileExtension,
|
|
CaseSensitiveFs: t.CaseSensitiveFs,
|
|
TxnManager: t.TxnManager,
|
|
Paths: instance.Paths,
|
|
PluginCache: instance.PluginCache,
|
|
MutexManager: t.mutexManager,
|
|
}
|
|
|
|
var err error
|
|
if g != nil {
|
|
g, scanImages, err = scanner.ScanExisting(ctx, g, t.file)
|
|
if err != nil {
|
|
logger.Error(err.Error())
|
|
return
|
|
}
|
|
|
|
// scan the zip files if the gallery has no images
|
|
scanImages = scanImages || images == 0
|
|
} else {
|
|
g, scanImages, err = scanner.ScanNew(ctx, t.file)
|
|
if err != nil {
|
|
logger.Error(err.Error())
|
|
}
|
|
}
|
|
|
|
if g != nil {
|
|
if scanImages {
|
|
t.scanZipImages(ctx, g)
|
|
} else {
|
|
// in case thumbnails have been deleted, regenerate them
|
|
t.regenerateZipImages(ctx, g)
|
|
}
|
|
}
|
|
}
|
|
|
|
// associates a gallery to a scene with the same basename
|
|
func (t *ScanTask) associateGallery(ctx context.Context, wg *sizedwaitgroup.SizedWaitGroup) {
|
|
path := t.file.Path()
|
|
if err := t.TxnManager.WithTxn(ctx, func(r models.Repository) error {
|
|
qb := r.Gallery()
|
|
sqb := r.Scene()
|
|
g, err := qb.FindByPath(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if g == nil {
|
|
// associate is run after scan is finished
|
|
// should only happen if gallery is a directory or an io error occurs during hashing
|
|
logger.Warnf("associate: gallery %s not found in DB", path)
|
|
return nil
|
|
}
|
|
|
|
basename := strings.TrimSuffix(path, filepath.Ext(path))
|
|
var relatedFiles []string
|
|
vExt := config.GetInstance().GetVideoExtensions()
|
|
// make a list of media files that can be related to the gallery
|
|
for _, ext := range vExt {
|
|
related := basename + "." + ext
|
|
// exclude gallery extensions from the related files
|
|
if !isGallery(related) {
|
|
relatedFiles = append(relatedFiles, related)
|
|
}
|
|
}
|
|
for _, scenePath := range relatedFiles {
|
|
scene, _ := sqb.FindByPath(scenePath)
|
|
// found related Scene
|
|
if scene != nil {
|
|
sceneGalleries, _ := sqb.FindByGalleryID(g.ID) // check if gallery is already associated to the scene
|
|
isAssoc := false
|
|
for _, sg := range sceneGalleries {
|
|
if scene.ID == sg.ID {
|
|
isAssoc = true
|
|
break
|
|
}
|
|
}
|
|
if !isAssoc {
|
|
logger.Infof("associate: Gallery %s is related to scene: %d", path, scene.ID)
|
|
if err := sqb.UpdateGalleries(scene.ID, []int{g.ID}); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}); err != nil {
|
|
logger.Error(err.Error())
|
|
}
|
|
wg.Done()
|
|
}
|
|
|
|
func (t *ScanTask) scanZipImages(ctx context.Context, zipGallery *models.Gallery) {
|
|
err := walkGalleryZip(zipGallery.Path.String, func(f *zip.File) error {
|
|
// copy this task and change the filename
|
|
subTask := *t
|
|
|
|
// filepath is the zip file and the internal file name, separated by a null byte
|
|
subTask.file = file.ZipFile(zipGallery.Path.String, f)
|
|
subTask.zipGallery = zipGallery
|
|
|
|
// run the subtask and wait for it to complete
|
|
subTask.Start(ctx)
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
logger.Warnf("failed to scan zip file images for %s: %s", zipGallery.Path.String, err.Error())
|
|
}
|
|
}
|
|
|
|
func (t *ScanTask) regenerateZipImages(ctx context.Context, zipGallery *models.Gallery) {
|
|
var images []*models.Image
|
|
if err := t.TxnManager.WithReadTxn(ctx, func(r models.ReaderRepository) error {
|
|
iqb := r.Image()
|
|
|
|
var err error
|
|
images, err = iqb.FindByGalleryID(zipGallery.ID)
|
|
return err
|
|
}); err != nil {
|
|
logger.Warnf("failed to find gallery images: %s", err.Error())
|
|
return
|
|
}
|
|
|
|
for _, img := range images {
|
|
t.generateThumbnail(img)
|
|
}
|
|
}
|