From 45403f90588db72692ce7149d2a8bbcdcbfc3945 Mon Sep 17 00:00:00 2001 From: Keyvan Fatehi Date: Tue, 21 Feb 2023 20:37:01 -0800 Subject: [PATCH] sidestep face ui ambition by using image --- .gitignore | 3 ++- face.go | 26 +++++++++++++++++++++++++- main.go | 6 +++--- signaling | 2 +- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index cbd3c6c..f8b9155 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ __pycache__ secureput_identity.shelve -/dist \ No newline at end of file +/dist +/secret.jpg \ No newline at end of file diff --git a/face.go b/face.go index 0fa4f27..cba02de 100644 --- a/face.go +++ b/face.go @@ -1,10 +1,13 @@ package main import ( + "fmt" "image" "image/draw" "image/jpeg" + "image/png" "log" + "os" "secureput" ) @@ -29,7 +32,12 @@ func (qrd *QrDisplay) GenPairInfo() { qrd.Img = image.NewRGBA(img.Bounds()) draw.Draw(qrd.Img, img.Bounds(), img, image.Point{}, draw.Src) qrd.GeneratingQR = false - log.Println("QR Code is in memory right now") + err := WriteImageToFile(qrd.Img, "secret.jpg") + if err != nil { + log.Fatal(fmt.Errorf("face: save qr code to secret.jpg failed: %w", err)) + panic(err) + } + log.Println("QR Code written to secret.jpg") } } @@ -46,3 +54,19 @@ func (gui *Face) Changed() { func (gui *Face) Close() { log.Println("GUI closed") } + +func WriteImageToFile(img *image.RGBA, filePath string) error { + // Create a new file at the provided file path + file, err := os.Create(filePath) + if err != nil { + return err + } + defer file.Close() + + // Write the image to the file in PNG format + if err := png.Encode(file, img); err != nil { + return err + } + + return nil +} diff --git a/main.go b/main.go index 91bc460..0aa5b19 100644 --- a/main.go +++ b/main.go @@ -6,17 +6,17 @@ import ( ) func main() { - signal := secureput.Create() + signal := secureput.Create("go-webrtc-body") signal.Gui = &Face{app: &signal} go signal.RunDaemonMode() if !signal.Paired() { go signal.Gui.Show() log.Println("Waiting to pair.") - <-signal.PairChannel + <-signal.PairWaitChannel } - go TestVisionIPCTrack("roadEncodeData") + // go TestVisionIPCTrack("roadEncodeData") for { select {} diff --git a/signaling b/signaling index 47709f4..534077d 160000 --- a/signaling +++ b/signaling @@ -1 +1 @@ -Subproject commit 47709f4277b27de7a0693eb04c537cbf70cd8c52 +Subproject commit 534077d85865b386c9d0ba2df0733c67a16e7959