sammyette
/
Hilbish
mirror of https://github.com/Hilbis/Hilbish
2
2
Fork 0
Code Issues Releases Wiki Activity

feat: add job output

extended-job-api
TorchedSammy 2022-05-21 19:55:05 -04:00
parent 8fdde4aa58
commit 3bcff3e350
Signed by: sammyette
GPG Key ID: 904FC49417B44DCD
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
job.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"bytes"
"errors" "errors"
"io" "io"
"os" "os"
@ -27,9 +28,10 @@ type job struct {
// would just be so itll be the same binary command always (path changes) // would just be so itll be the same binary command always (path changes)
path string path string
handle *exec.Cmd handle *exec.Cmd
stdin io.Reader cmdout io.Writer
stdout io.Writer cmderr io.Writer
stderr io.Writer stdout *bytes.Buffer
stderr *bytes.Buffer
} }
func (j *job) start() error { func (j *job) start() error {
@ -38,13 +40,19 @@ func (j *job) start() error {
cmd := exec.Cmd{ cmd := exec.Cmd{
Path: j.path, Path: j.path,
Args: j.args, Args: j.args,
Stdin: j.stdin,
Stdout: j.stdout,
Stderr: j.stderr,
} }
j.setHandle(&cmd) j.setHandle(&cmd)
} }
// bgProcAttr is defined in execfile_<os>.go, it holds a procattr struct
// in a simple explanation, it makes signals from hilbish (sigint)
// not go to it
j.handle.SysProcAttr = bgProcAttr j.handle.SysProcAttr = bgProcAttr
// reset output buffers
j.stdout.Reset()
j.stderr.Reset()
// make cmd write to both standard output and output buffers for lua ccess
j.handle.Stdout = io.MultiWriter(j.cmdout, j.stdout)
j.handle.Stderr = io.MultiWriter(j.cmderr, j.stderr)
if !j.once { if !j.once {
j.once = true j.once = true
@ -82,9 +90,12 @@ func (j *job) setHandle(handle *exec.Cmd) {
j.handle = handle j.handle = handle
j.args = handle.Args j.args = handle.Args
j.path = handle.Path j.path = handle.Path
j.stdin = handle.Stdin if handle.Stdout != nil {
j.stdout = handle.Stdout j.cmdout = handle.Stdout
j.stderr = handle.Stderr }
if handle.Stderr != nil {
j.cmderr = handle.Stderr
}
} }
func (j *job) getProc() *os.Process { func (j *job) getProc() *os.Process {
@ -109,6 +120,8 @@ func (j *job) lua() rt.Value {
luaJob.Set(rt.StringValue("id"), rt.IntValue(int64(j.id))) luaJob.Set(rt.StringValue("id"), rt.IntValue(int64(j.id)))
luaJob.Set(rt.StringValue("pid"), rt.IntValue(int64(j.pid))) luaJob.Set(rt.StringValue("pid"), rt.IntValue(int64(j.pid)))
luaJob.Set(rt.StringValue("exitCode"), rt.IntValue(int64(j.exitCode))) luaJob.Set(rt.StringValue("exitCode"), rt.IntValue(int64(j.exitCode)))
luaJob.Set(rt.StringValue("stdout"), rt.StringValue(string(j.stdout.Bytes())))
luaJob.Set(rt.StringValue("stderr"), rt.StringValue(string(j.stderr.Bytes())))
return rt.TableValue(luaJob) return rt.TableValue(luaJob)
} }
@ -158,9 +171,10 @@ func (j *jobHandler) add(cmd string, args []string, path string) *job {
id: j.latestID, id: j.latestID,
args: args, args: args,
path: path, path: path,
stdin: os.Stdin, cmdout: os.Stdout,
stdout: os.Stdout, cmderr: os.Stderr,
stderr: os.Stderr, stdout: &bytes.Buffer{},
stderr: &bytes.Buffer{},
} }
j.jobs[j.latestID] = jb j.jobs[j.latestID] = jb
hooks.Em.Emit("job.add", jb.lua()) hooks.Em.Emit("job.add", jb.lua())
@ -303,4 +317,3 @@ func (j *jobHandler) luaLastJob(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
return c.PushingNext1(t.Runtime, job.lua()), nil return c.PushingNext1(t.Runtime, job.lua()), nil
} }