Added debug output to lemonade backend

Author: rupor-github

CMakeLists.txt

@@ -59,7 +59,7 @@ endif()
 
 # Project version number
 set(PRJ_VERSION_MAJOR 1)
-set(PRJ_VERSION_MINOR 1)
+set(PRJ_VERSION_MINOR 2)
 
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git" AND IS_DIRECTORY "${PROJECT_SOURCE_DIR}/.git")
     execute_process(COMMAND ${CMAKE_SOURCE_DIR}/cmake/githash.sh ${GIT_EXECUTABLE}

citrus/clipboard.go

@@ -1,6 +1,7 @@
 package citrus
 
 import (
+	"log"
 	"net"
 	"regexp"
 	"strings"
@@ -12,19 +13,24 @@ import (
 type Clipboard struct {
 	connCh chan net.Conn
 	params ParamsValue
+	debug  bool
 }
 
 // NewClipboard initializes Clipboard structure.
-func NewClipboard(ch chan net.Conn, params ParamsValue) *Clipboard {
+func NewClipboard(ch chan net.Conn, params ParamsValue, debug bool) *Clipboard {
 	return &Clipboard{
 		connCh: ch,
 		params: params,
+		debug:  debug,
 	}
 }
 
 // Copy is implementation of "lemonade" rpc "copy" command.
 func (c *Clipboard) Copy(text string, _ *struct{}) error {
 	<-c.connCh
+	if c.debug {
+		log.Printf("lemonade Copy request received len: %d", len(text))
+	}
 	// Logger instance needs to be passed here somehow?
 	return clipboard.WriteAll(convertLineEnding(text, c.params.LE))
 }
@@ -33,6 +39,9 @@ func (c *Clipboard) Copy(text string, _ *struct{}) error {
 func (c *Clipboard) Paste(_ struct{}, resp *string) error {
 	<-c.connCh
 	t, err := clipboard.ReadAll()
+	if c.debug {
+		log.Printf("lemonade Paste request received len: %d, error: '%+v'", len(t), err)
+	}
 	*resp = t
 	return err
 }

citrus/server.go

@@ -13,20 +13,22 @@ type Citrus struct {
 	params   ParamsValue
 	ra       *Range
 	listener *net.TCPListener
+	debug    bool
 }
 
 // NewCitrus initializes "lemonade" server.
-func NewCitrus(params ParamsValue) (*Citrus, error) {
+func NewCitrus(params ParamsValue, debug bool) (*Citrus, error) {
 
 	res := &Citrus{
 		connCh: make(chan net.Conn, 1),
 		params: params,
+		debug:  debug,
 	}
 
-	if err := rpc.Register(NewURI(res.connCh, res.params)); err != nil {
+	if err := rpc.Register(NewURI(res.connCh, res.params, res.debug)); err != nil {
 		return nil, fmt.Errorf("unable to register URI rpc: %w", err)
 	}
-	if err := rpc.Register(NewClipboard(res.connCh, res.params)); err != nil {
+	if err := rpc.Register(NewClipboard(res.connCh, res.params, res.debug)); err != nil {
 		return nil, fmt.Errorf("unable to register Clipboard rpc: %w", err)
 	}
 

citrus/uri.go

@@ -13,13 +13,15 @@ import (
 type URI struct {
 	connCh chan net.Conn
 	params ParamsValue
+	debug  bool
 }
 
 // NewURI initializes URI structure.
-func NewURI(ch chan net.Conn, params ParamsValue) *URI {
+func NewURI(ch chan net.Conn, params ParamsValue, debug bool) *URI {
 	return &URI{
 		connCh: ch,
 		params: params,
+		debug:  debug,
 	}
 }
 
@@ -32,10 +34,16 @@ type OpenParam struct {
 // Open is implementation of "lemonade" rpc "open" command.
 func (u *URI) Open(param *OpenParam, _ *struct{}) error {
 	conn := <-u.connCh
+	if u.debug {
+		log.Printf("lemonade URI parameters received: '%v'", *param)
+	}
 	uri := param.URI
 	if param.TransLoopback {
 		uri = translateLoopbackIP(param.URI, conn)
 	}
+	if u.debug {
+		log.Printf("lemonade run URI: '%s'", uri)
+	}
 	return open.Run(uri)
 }
 

gui.go

@@ -320,7 +320,7 @@ func main() {
 	var lemonade *citrus.Citrus
 	if lemon.IsSet() {
 		log.Printf("Starting lemonade server on '%s'", lemon.String())
-		if lemonade, err = citrus.NewCitrus(lemon); err != nil {
+		if lemonade, err = citrus.NewCitrus(lemon, debug); err != nil {
 			util.ShowOKMessage(util.MsgError, title, err.Error())
 			os.Exit(1)
 		} else {