Merge pull request #20 from open-olive/SIDE-980-whisper-ldk-new-list-whisper-type

Side 980 whisper ldk new list whisper type

Author: BillyMurrayOlive

ldk/go/Makefile

@@ -39,6 +39,7 @@ test-examples:
 	cd examples/storage && make test
 	cd examples/whisper-confirm && make test
 	cd examples/whisper-form && make test
+	cd examples/whisper-list && make test
 	cd examples/whisper-markdown && make test
 
 test: test-examples

ldk/go/clipboardServer.go

@@ -15,8 +15,13 @@ type ClipboardServer struct {
 
 // ClipboardRead is used by plugins to get the value of an entry
 func (m *ClipboardServer) ClipboardRead(ctx context.Context, req *proto.ClipboardReadRequest) (*proto.ClipboardReadResponse, error) {
+	session, err := NewSessionFromProto(req.Session)
+	if err != nil {
+		return nil, err
+	}
+
 	value, err := m.Impl.Read(
-		context.WithValue(ctx, Session{}, NewSessionFromProto(req.Session)),
+		context.WithValue(ctx, Session{}, session),
 	)
 	if err != nil {
 		return nil, err
@@ -29,6 +34,11 @@ func (m *ClipboardServer) ClipboardRead(ctx context.Context, req *proto.Clipboar
 
 // ClipboardReadStream is used by plugins to get the value of an entry
 func (m *ClipboardServer) ClipboardReadStream(req *proto.ClipboardReadStreamRequest, stream proto.Clipboard_ClipboardReadStreamServer) error {
+	session, err := NewSessionFromProto(req.Session)
+	if err != nil {
+		return err
+	}
+
 	handler := func(text string, err error) {
 		var errText string
 		if err != nil {
@@ -45,7 +55,7 @@ func (m *ClipboardServer) ClipboardReadStream(req *proto.ClipboardReadStreamRequ
 
 	go func() {
 		err := m.Impl.Listen(
-			context.WithValue(stream.Context(), Session{}, NewSessionFromProto(req.Session)),
+			context.WithValue(stream.Context(), Session{}, session),
 			handler,
 		)
 		// TODO: move this to a real logger once we move this into sidekick
@@ -62,8 +72,13 @@ func (m *ClipboardServer) ClipboardReadStream(req *proto.ClipboardReadStreamRequ
 
 // ClipboardWrite is used by plugins to set an entry
 func (m *ClipboardServer) ClipboardWrite(ctx context.Context, req *proto.ClipboardWriteRequest) (*emptypb.Empty, error) {
-	err := m.Impl.Write(
-		context.WithValue(ctx, Session{}, NewSessionFromProto(req.Session)),
+	session, err := NewSessionFromProto(req.Session)
+	if err != nil {
+		return nil, err
+	}
+
+	err = m.Impl.Write(
+		context.WithValue(ctx, Session{}, session),
 		req.Text,
 	)
 	if err != nil {

ldk/go/cursorServer.go

@@ -12,8 +12,13 @@ type CursorServer struct {
 }
 
 func (c *CursorServer) CursorPosition(ctx context.Context, req *proto.CursorPositionRequest) (*proto.CursorPositionResponse, error) {
+	session, err := NewSessionFromProto(req.Session)
+	if err != nil {
+		return nil, err
+	}
+
 	value, err := c.Impl.Position(
-		context.WithValue(ctx, Session{}, NewSessionFromProto(req.Session)),
+		context.WithValue(ctx, Session{}, session),
 	)
 	if err != nil {
 		return nil, err
@@ -26,6 +31,11 @@ func (c *CursorServer) CursorPosition(ctx context.Context, req *proto.CursorPosi
 }
 
 func (c *CursorServer) CursorPositionStream(req *proto.CursorPositionStreamRequest, stream proto.Cursor_CursorPositionStreamServer) error {
+	session, err := NewSessionFromProto(req.Session)
+	if err != nil {
+		return err
+	}
+
 	handler := func(msg CursorPosition, err error) {
 		var errText string
 		if err != nil {
@@ -43,7 +53,7 @@ func (c *CursorServer) CursorPositionStream(req *proto.CursorPositionStreamReque
 
 	go func() {
 		err := c.Impl.ListenPosition(
-			context.WithValue(stream.Context(), Session{}, NewSessionFromProto(req.Session)),
+			context.WithValue(stream.Context(), Session{}, session),
 			handler,
 		)
 		if err != nil {

ldk/go/examples/whisper-list/.gitignore

@@ -0,0 +1 @@
+build/

ldk/go/examples/whisper-list/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Olive
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

ldk/go/examples/whisper-list/Makefile

@@ -0,0 +1,48 @@
+REPO := github.com/open-olive/loop-development-kit/ldk/go/examples/whisper-list
+PKG := examplego
+
+GIT_COMMIT := $(shell git rev-list -1 HEAD)
+GIT_BRANCH := $(if $(shell echo $$BRANCH_NAME),$(shell echo $$BRANCH_NAME),$(shell git rev-parse --abbrev-ref HEAD))
+VERSION := $(if $(shell echo $$VERSION),$(shell echo $$VERSION),"0.0.0-localdev-unset")
+GOPATH := $(shell go env GOPATH)
+
+install:
+# The following command is needed to allow go get to clone from private bitbucket repos
+	@ git config --global url."[email protected]:".insteadOf "https://bitbucket.org/"
+	go mod download
+	go mod tidy
+
+build/darwin-amd64/plugin:
+	go build \
+	     -ldflags "-X ${REPO}/loop.GitBranch=${GIT_BRANCH} -X ${REPO}/loop.GitCommit=${GIT_COMMIT} -X ${REPO}/loop.Version=${VERSION}" \
+	     -o build/darwin-amd64/plugin ./
+
+build/windows-amd64/plugin:
+	GOOS=windows go build  \
+	     -ldflags "-X ${REPO}/loop.GitBranch=${GIT_BRANCH} -X ${REPO}/loop.GitCommit=${GIT_COMMIT} -X ${REPO}/loop.Version=${VERSION}" \
+	     -o build/windows-amd64/plugin.exe ./
+
+clean:
+	rm -rf ./build
+
+build: clean build/darwin-amd64/plugin build/windows-amd64/plugin
+
+# TODO: remove before merging to master
+deploy-local: build
+	cp build/darwin-amd64/plugin ~/Library/Application\ Support/Olive\ Helps/loops/1/plugin
+
+test:
+	go test -v ./...
+
+test-race:
+	go test -v -race ./...
+
+bench:
+	go test -v -bench=. ./...
+
+golangci: 
+	go get github.com/golangci/golangci-lint/cmd/[email protected]
+	go mod tidy
+	golangci-lint run
+
+.PHONY: install build clean lint test test-race bench golangci

ldk/go/examples/whisper-list/go.mod

@@ -0,0 +1,10 @@
+module github.com/open-olive/loop-development-kit/ldk/go/examples/whisper-list
+
+go 1.14
+
+replace github.com/open-olive/loop-development-kit/ldk/go => ../..
+
+require (
+	github.com/google/go-cmp v0.5.2
+	github.com/open-olive/loop-development-kit/ldk/go v0.0.0-00010101000000-000000000000
+)