From 6c0e6090375494951f7e056ae9a41f20f55184c1 Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Fri, 19 Feb 2021 02:20:57 +0000 Subject: [PATCH] Remove AppleScript. --- color_darwin.go | 6 +++++- go.sum | 6 ++---- internal/zenutil/osa_generated.go | 13 +++++++------ internal/zenutil/osascripts/color.applescript | 5 ----- internal/zenutil/osascripts/color.gojs | 9 +++++++++ internal/zenutil/run_darwin.go | 11 +++-------- 6 files changed, 26 insertions(+), 24 deletions(-) delete mode 100644 internal/zenutil/osascripts/color.applescript create mode 100644 internal/zenutil/osascripts/color.gojs diff --git a/color_darwin.go b/color_darwin.go index b32a5c8..f724dff 100644 --- a/color_darwin.go +++ b/color_darwin.go @@ -18,7 +18,11 @@ func selectColor(options []Option) (color.Color, error) { } r, g, b, _ := col.RGBA() - out, err := zenutil.Run(opts.ctx, "color", []uint32{r, g, b}) + out, err := zenutil.Run(opts.ctx, "color", []float32{ + float32(r) / 0xffff, + float32(g) / 0xffff, + float32(b) / 0xffff, + }) if err, ok := err.(*exec.ExitError); ok && err.ExitCode() == 1 { return nil, nil } diff --git a/go.sum b/go.sum index 5675ec1..50c158b 100644 --- a/go.sum +++ b/go.sum @@ -8,9 +8,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo= go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -38,6 +37,5 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/zenutil/osa_generated.go b/internal/zenutil/osa_generated.go index ada7c6b..4e83046 100644 --- a/internal/zenutil/osa_generated.go +++ b/internal/zenutil/osa_generated.go @@ -11,11 +11,13 @@ var scripts = template.Must(template.New("").Funcs(template.FuncMap{"json": func return string(b), err }}).Parse(` {{define "color" -}} -tell application "SystemUIServer" -activate -set c to choose color default color { {{index . 0}},{{index . 1}},{{index . 2}} } -"rgb(" & (item 1 of c) div 256 & "," & (item 2 of c) div 256 & "," & (item 3 of c) div 256 & ")" -end tell +var app = Application.currentApplication() +app.includeStandardAdditions = true +app.activate() +var opts = {} +opts.defaultColor = {{json .}} +var res = app.chooseColor(opts) +'rgb(' + res.map(x => Math.round(x * 255)) + ')' {{- end}} {{define "file" -}} var app = Application.currentApplication() @@ -90,7 +92,6 @@ void 0 {{define "notify" -}} var app = Application.currentApplication() app.includeStandardAdditions = true -app.activate() var opts = {} {{if .Title -}} opts.withTitle = {{json .Title}} diff --git a/internal/zenutil/osascripts/color.applescript b/internal/zenutil/osascripts/color.applescript deleted file mode 100644 index ed7393b..0000000 --- a/internal/zenutil/osascripts/color.applescript +++ /dev/null @@ -1,5 +0,0 @@ -tell application "SystemUIServer" - activate - set c to choose color default color { {{index . 0}},{{index . 1}},{{index . 2}} } - "rgb(" & (item 1 of c) div 256 & "," & (item 2 of c) div 256 & "," & (item 3 of c) div 256 & ")" -end tell \ No newline at end of file diff --git a/internal/zenutil/osascripts/color.gojs b/internal/zenutil/osascripts/color.gojs new file mode 100644 index 0000000..d9ea9fd --- /dev/null +++ b/internal/zenutil/osascripts/color.gojs @@ -0,0 +1,9 @@ +var app = Application.currentApplication() +app.includeStandardAdditions = true +app.activate() + +var opts = {} +opts.defaultColor = {{json .}} + +var res = app.chooseColor(opts) +'rgb(' + res.map(x => Math.round(x * 255)) + ')' \ No newline at end of file diff --git a/internal/zenutil/run_darwin.go b/internal/zenutil/run_darwin.go index b612697..ac01172 100644 --- a/internal/zenutil/run_darwin.go +++ b/internal/zenutil/run_darwin.go @@ -18,21 +18,16 @@ func Run(ctx context.Context, script string, data interface{}) ([]byte, error) { } script = buf.String() - lang := "AppleScript" - if strings.HasPrefix(script, "var app") { - lang = "JavaScript" - } - if Command { path, err := exec.LookPath("osascript") if err == nil { os.Stderr.Close() - syscall.Exec(path, []string{"osascript", "-l", lang, "-e", script}, nil) + syscall.Exec(path, []string{"osascript", "-l", "JavaScript", "-e", script}, nil) } } if ctx != nil { - cmd := exec.CommandContext(ctx, "osascript", "-l", lang) + cmd := exec.CommandContext(ctx, "osascript", "-l", "JavaScript") cmd.Stdin = strings.NewReader(script) out, err := cmd.Output() if ctx.Err() != nil { @@ -40,7 +35,7 @@ func Run(ctx context.Context, script string, data interface{}) ([]byte, error) { } return out, err } - cmd := exec.Command("osascript", "-l", lang) + cmd := exec.Command("osascript", "-l", "JavaScript") cmd.Stdin = strings.NewReader(script) return cmd.Output() }