Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
16d2e8e8fd | |||
713a6bd6be | |||
580b7d5a3a | |||
837fec3f8f |
2
do.go
2
do.go
@ -5,7 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (c *Client) Action(action Action) error {
|
func (c *Client) DoAction(action Action) error {
|
||||||
// print request and response to console:
|
// print request and response to console:
|
||||||
//
|
//
|
||||||
// io.Copy(os.Stdout, asJsonReader(action))
|
// io.Copy(os.Stdout, asJsonReader(action))
|
||||||
|
@ -2,7 +2,7 @@ package niri
|
|||||||
|
|
||||||
import "encoding/json"
|
import "encoding/json"
|
||||||
|
|
||||||
type OutputName string
|
type OutputName = string
|
||||||
|
|
||||||
type Output struct {
|
type Output struct {
|
||||||
Name OutputName `json:"name"`
|
Name OutputName `json:"name"`
|
||||||
|
@ -7,7 +7,7 @@ type WorkspaceID int
|
|||||||
type Workspace struct {
|
type Workspace struct {
|
||||||
ID WorkspaceID `json:"id"`
|
ID WorkspaceID `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Output string `json:"output"`
|
Output OutputName `json:"output"`
|
||||||
Urgent bool `json:"is_urgent"`
|
Urgent bool `json:"is_urgent"`
|
||||||
Active bool `json:"is_active"`
|
Active bool `json:"is_active"`
|
||||||
Focused bool `json:"is_focused"`
|
Focused bool `json:"is_focused"`
|
||||||
|
4
utils.go
4
utils.go
@ -77,9 +77,11 @@ func readSocketGeneric[T any](ctx context.Context, socket string, body io.Reader
|
|||||||
defer close(out)
|
defer close(out)
|
||||||
defer r.Close()
|
defer r.Close()
|
||||||
|
|
||||||
|
dec := json.NewDecoder(r)
|
||||||
|
|
||||||
for ctx.Err() == nil {
|
for ctx.Err() == nil {
|
||||||
value := new(T)
|
value := new(T)
|
||||||
if err := json.NewDecoder(r).Decode(value); err != nil {
|
if err := dec.Decode(value); err != nil {
|
||||||
if errors.Is(err, io.EOF) {
|
if errors.Is(err, io.EOF) {
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user