From 407bc9d2852d0b8b42d86930eeb968592dfb845c Mon Sep 17 00:00:00 2001 From: Levi Neely Date: Mon, 8 Jun 2026 18:05:32 +0200 Subject: [PATCH] dia --- dia/README.md | 11 +++++ dia/cmd/Uml/main.go | 100 ++++++++++++++++++++++++++++++++++++++++++++ dia/go.mod | 5 +++ dia/go.sum | 34 +++++++++++++++ dia/mkfile | 5 +++ 5 files changed, 155 insertions(+) create mode 100644 dia/README.md create mode 100644 dia/cmd/Uml/main.go create mode 100644 dia/go.mod create mode 100644 dia/go.sum create mode 100644 dia/mkfile diff --git a/dia/README.md b/dia/README.md new file mode 100644 index 0000000..49b28c2 --- /dev/null +++ b/dia/README.md @@ -0,0 +1,11 @@ +# acme-dia + +Programs for previewing diagrams from acme. + +- `Uml` accepts PlantUML input, renders the diagram, and passes the result to the `plumber` for preview. + +Perhaps others programs in the future. + +# Usage + +Highlight the diagram text in an acme window. 2-1 chord it to `Uml`. diff --git a/dia/cmd/Uml/main.go b/dia/cmd/Uml/main.go new file mode 100644 index 0000000..f7fc2bc --- /dev/null +++ b/dia/cmd/Uml/main.go @@ -0,0 +1,100 @@ +package main + +import ( + "fmt" + "io" + "log" + "os" + "os/exec" + "strings" + + "9fans.net/go/acme" +) + +var plantumlJar = os.Getenv("HOME") + "/.local/share/plantuml/plantuml.jar" + +func min(a, b int) int { + if a < b { + return a + } + return b +} + +func main() { + tmpDir := os.Getenv("TMPDIR") + if tmpDir == "" { + tmpDir = "/tmp" + } + + var input string + + // Check if input is from argument (2-1 chord), stdin, or Acme window + if len(os.Args) > 1 { + input = strings.Join(os.Args[1:], " ") + } else if stat, _ := os.Stdin.Stat(); (stat.Mode() & os.ModeCharDevice) == 0 { + data, err := io.ReadAll(os.Stdin) + if err != nil { + log.Fatal(err) + } + input = string(data) + } else { + winid := os.Getenv("winid") + if winid == "" { + log.Fatal("no input provided and not running in acme window") + } + + win, err := acme.Open(0, nil) + if err != nil { + log.Fatal(err) + } + defer win.CloseFiles() + + body, err := win.ReadAll("body") + if err != nil { + log.Fatal(err) + } + input = string(body) + } + + if len(input) == 0 { + log.Fatal("no input received") + } + + // Create temp input file + inputFile, err := os.CreateTemp(tmpDir, "plantuml-*.puml") + if err != nil { + log.Fatal(err) + } + defer os.Remove(inputFile.Name()) + + if _, err := inputFile.WriteString(input); err != nil { + log.Fatal(err) + } + inputFile.Close() + + // Run plantuml + cmd := exec.Command("java", "-jar", plantumlJar, "-tpng", inputFile.Name()) + output, err := cmd.CombinedOutput() + if err != nil { + log.Fatalf("plantuml failed: %v\nOutput: %s", err, output) + } + if len(output) > 0 { + fmt.Fprintf(os.Stderr, "PlantUML output: %s\n", output) + } + + // PlantUML creates output with .png extension + outputFile := strings.TrimSuffix(inputFile.Name(), ".puml") + ".png" + + // Check if output file was created + if _, err := os.Stat(outputFile); err != nil { + log.Fatalf("output file not created: %v", err) + } + + // Plumb the image + if err := exec.Command("plumb", outputFile).Run(); err != nil { + log.Fatalf("plumb failed: %v", err) + } + + fmt.Print(input) + fmt.Fprintf(os.Stderr, "%s\n", outputFile) +} diff --git a/dia/go.mod b/dia/go.mod new file mode 100644 index 0000000..e15e9b8 --- /dev/null +++ b/dia/go.mod @@ -0,0 +1,5 @@ +module github.com/lkn/acme-dia + +go 1.21 + +require 9fans.net/go v0.0.5 diff --git a/dia/go.sum b/dia/go.sum new file mode 100644 index 0000000..5089ea2 --- /dev/null +++ b/dia/go.sum @@ -0,0 +1,34 @@ +9fans.net/go v0.0.5 h1:u0H3Et5NowdVm56FDD+aWcDOao9zEo+zolNFsr8qyQk= +9fans.net/go v0.0.5/go.mod h1:Rxvbbc1e+1TyGMjAvLthGTyO97t+6JMQ6ly+Lcs9Uf0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/exp v0.0.0-20210405174845-4513512abef3/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= +golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/dia/mkfile b/dia/mkfile new file mode 100644 index 0000000..43aae39 --- /dev/null +++ b/dia/mkfile @@ -0,0 +1,5 @@ +install:V: + go build -o $HOME/bin/Uml ./cmd/Uml + +clean:V: + rm -f $HOME/bin/Uml