speckij
/
Hochwasser
mirror of https://github.com/SpeckiJ/Hochwasser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add -hevring-preview flag 

enables storing of the current task image to a local file
This commit is contained in:
Norwin 2022-01-02 08:34:51 +01:00
parent 4e0cc35c26
commit 9071a1800a
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.go
View File

@ -18,16 +18,17 @@ import (
) )
var ( var (
imgPath = flag.String("image", "", "Filepath of an image to flut") imgPath = flag.String("image", "", "Filepath of an image to flut")
ránAddr = flag.String("rán", "", "Start RPC server to distribute jobs, listening on the given address/port") ránAddr = flag.String("rán", "", "Start RPC server to distribute jobs, listening on the given address/port")
hevringAddr = flag.String("hevring", "", "Connect to PRC server at given address/port") hevringAddr = flag.String("hevring", "", "Connect to RPC server at given address/port")
address = flag.String("host", ":1234", "Target server address") address = flag.String("host", ":1234", "Target server address")
connections = flag.Int("connections", 4, "Number of simultaneous connections. Each connection posts a subimage") connections = flag.Int("connections", 4, "Number of simultaneous connections. Each connection posts a subimage")
x = flag.Int("x", 0, "Offset of posted image from left border") x = flag.Int("x", 0, "Offset of posted image from left border")
y = flag.Int("y", 0, "Offset of posted image from top border") y = flag.Int("y", 0, "Offset of posted image from top border")
order = flag.String("order", "rtl", "Draw order (shuffle, ltr, rtl, ttb, btt)") order = flag.String("order", "rtl", "Draw order (shuffle, ltr, rtl, ttb, btt)")
fetchImgPath = flag.String("fetch", "", "Enable fetching the screen area to the given local file, updating it each second") fetchImgPath = flag.String("fetch", "", "Enable fetching the screen area to the given local file, updating it each second")
cpuprofile = flag.String("cpuprofile", "", "Destination file for CPU Profile") hevringImgPath = flag.String("hevring-preview", "", "Write the current task image to the given PNG file")
cpuprofile = flag.String("cpuprofile", "", "Destination file for CPU Profile")
) )
func main() { func main() {
@ -83,7 +84,8 @@ func taskFromFlags(stop chan bool, wg *sync.WaitGroup) {
} }
if startClient { if startClient {
rpc.ConnectHevring(hev, stop, wg) hevring := rpc.ConnectHevring(hev, stop, wg)
hevring.PreviewPath = *hevringImgPath
} }
if fetchImg { if fetchImg {

27
rpc/dottir.go
View File

@ -2,6 +2,7 @@ package rpc
import ( import (
"fmt" "fmt"
"image"
"log" "log"
"net" "net"
"net/rpc" "net/rpc"
@ -9,9 +10,10 @@ import (
"time" "time"
"github.com/SpeckiJ/Hochwasser/pixelflut" "github.com/SpeckiJ/Hochwasser/pixelflut"
"github.com/SpeckiJ/Hochwasser/render"
) )
func ConnectHevring(ránAddress string, stop chan bool, wg *sync.WaitGroup) { func ConnectHevring(ránAddress string, stop chan bool, wg *sync.WaitGroup) *Hevring {
h := new(Hevring) h := new(Hevring)
rpc.Register(h) rpc.Register(h)
@ -35,13 +37,16 @@ func ConnectHevring(ránAddress string, stop chan bool, wg *sync.WaitGroup) {
} }
h.wg.Done() h.wg.Done()
}() }()
return h
} }
type Hevring struct { type Hevring struct {
task pixelflut.FlutTask PreviewPath string
taskQuit chan bool task pixelflut.FlutTask
quit chan bool taskQuit chan bool
wg *sync.WaitGroup quit chan bool
wg *sync.WaitGroup
} }
type FlutAck struct{ Ok bool } type FlutAck struct{ Ok bool }
@ -63,6 +68,8 @@ func (h *Hevring) Flut(task pixelflut.FlutTask, reply *FlutAck) error {
h.taskQuit = make(chan bool) h.taskQuit = make(chan bool)
go pixelflut.Flut(task, h.taskQuit, nil) go pixelflut.Flut(task, h.taskQuit, nil)
go h.savePreview(task.Img)
reply.Ok = true reply.Ok = true
return nil return nil
} }
@ -99,3 +106,13 @@ func (h *Hevring) Die(x int, reply *FlutAck) error {
reply.Ok = true reply.Ok = true
return nil return nil
} }
func (h Hevring) savePreview(img image.Image) {
if h.PreviewPath != "" && img != nil {
err := render.WriteImage(h.PreviewPath, img)
if err != nil {
fmt.Printf("[hevring] unable to write preview: %s\n", err)
}
}
}