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.
147 lines
2.9 KiB
Go
147 lines
2.9 KiB
Go
package plugin
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os/exec"
|
|
"sync"
|
|
|
|
stashExec "github.com/stashapp/stash/pkg/exec"
|
|
"github.com/stashapp/stash/pkg/logger"
|
|
"github.com/stashapp/stash/pkg/plugin/common"
|
|
"github.com/stashapp/stash/pkg/python"
|
|
)
|
|
|
|
type rawTaskBuilder struct{}
|
|
|
|
func (*rawTaskBuilder) build(task pluginTask) Task {
|
|
return &rawPluginTask{
|
|
pluginTask: task,
|
|
}
|
|
}
|
|
|
|
type rawPluginTask struct {
|
|
pluginTask
|
|
|
|
started bool
|
|
waitGroup sync.WaitGroup
|
|
cmd *exec.Cmd
|
|
done chan bool
|
|
}
|
|
|
|
func (t *rawPluginTask) Start() error {
|
|
if t.started {
|
|
return errors.New("task already started")
|
|
}
|
|
|
|
command := t.plugin.getExecCommand(t.operation)
|
|
if len(command) == 0 {
|
|
return fmt.Errorf("empty exec value in operation %s", t.operation.Name)
|
|
}
|
|
|
|
var cmd *exec.Cmd
|
|
if python.IsPythonCommand(command[0]) {
|
|
pythonPath := t.serverConfig.GetPythonPath()
|
|
var p *python.Python
|
|
if pythonPath != "" {
|
|
p = python.New(pythonPath)
|
|
} else {
|
|
p, _ = python.Resolve()
|
|
}
|
|
|
|
if p != nil {
|
|
cmd = p.Command(context.TODO(), command[1:])
|
|
}
|
|
|
|
// if could not find python, just use the command args as-is
|
|
}
|
|
|
|
if cmd == nil {
|
|
cmd = stashExec.Command(command[0], command[1:]...)
|
|
}
|
|
|
|
stdin, err := cmd.StdinPipe()
|
|
if err != nil {
|
|
return fmt.Errorf("error getting plugin process stdin: %v", err)
|
|
}
|
|
|
|
go func() {
|
|
defer stdin.Close()
|
|
|
|
inBytes, err := json.Marshal(t.input)
|
|
if err != nil {
|
|
logger.Warnf("error marshalling raw command input")
|
|
}
|
|
if k, err := io.WriteString(stdin, string(inBytes)); err != nil {
|
|
logger.Warnf("error writing input to plugins stdin (wrote %v bytes out of %v): %v", k, len(string(inBytes)), err)
|
|
}
|
|
}()
|
|
|
|
stderr, err := cmd.StderrPipe()
|
|
if err != nil {
|
|
logger.Error("plugin stderr not available: " + err.Error())
|
|
}
|
|
|
|
stdout, err := cmd.StdoutPipe()
|
|
if nil != err {
|
|
logger.Error("plugin stdout not available: " + err.Error())
|
|
}
|
|
|
|
t.waitGroup.Add(1)
|
|
t.done = make(chan bool, 1)
|
|
if err = cmd.Start(); err != nil {
|
|
return fmt.Errorf("error running plugin: %v", err)
|
|
}
|
|
|
|
go t.handlePluginStderr(t.plugin.Name, stderr)
|
|
t.cmd = cmd
|
|
|
|
// send the stdout to the plugin output
|
|
go func() {
|
|
defer t.waitGroup.Done()
|
|
defer close(t.done)
|
|
stdoutData, _ := io.ReadAll(stdout)
|
|
stdoutString := string(stdoutData)
|
|
|
|
output := t.getOutput(stdoutString)
|
|
|
|
err := cmd.Wait()
|
|
if err != nil && output.Error == nil {
|
|
errStr := err.Error()
|
|
output.Error = &errStr
|
|
}
|
|
|
|
t.result = &output
|
|
}()
|
|
|
|
t.started = true
|
|
return nil
|
|
}
|
|
|
|
func (t *rawPluginTask) getOutput(output string) common.PluginOutput {
|
|
// try to parse the output as a PluginOutput json. If it fails just
|
|
// get the raw output
|
|
ret := common.PluginOutput{}
|
|
decodeErr := json.Unmarshal([]byte(output), &ret)
|
|
|
|
if decodeErr != nil {
|
|
ret.Output = &output
|
|
}
|
|
|
|
return ret
|
|
}
|
|
|
|
func (t *rawPluginTask) Wait() {
|
|
t.waitGroup.Wait()
|
|
}
|
|
|
|
func (t *rawPluginTask) Stop() error {
|
|
if t.cmd == nil {
|
|
return nil
|
|
}
|
|
|
|
return t.cmd.Process.Kill()
|
|
}
|