Merge branch 'master' of github.com:FrontMage/dynamo.cli

Author: xinbg

db/dbsession.go

@@ -23,7 +23,7 @@ func GetDynamoSession(accessKeyID, secretAccessKey, region string) *dynamodb.Dyn
 	return DynamoDB
 }
 
-// ListTables returns all table names from dynamoDB
+// ListTable returns all table names from dynamoDB
 func ListTable(receiver []*string, lastEvaluatedTableName *string) ([]*string, error) {
 	if result, err := DynamoDB.ListTables(&dynamodb.ListTablesInput{
 		ExclusiveStartTableName: lastEvaluatedTableName,

main.go

@@ -17,7 +17,7 @@ import (
 	cli "gopkg.in/urfave/cli.v2"
 )
 
-// TODO better suggest
+// TODO better suggest, suggest based on hash key and range key
 var tableNameSuggestions []prompt.Suggest
 
 // Key bindings, reserved, might use them oneday
@@ -71,16 +71,13 @@ func executor(in string) {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		sigCh := make(chan os.Signal, 1)
-		signal.Notify(sigCh, os.Interrupt)
+		signal.Notify(sigCh, os.Interrupt) // sigCh only listens to os.Interrupt
 		// Listen to the os interrupt signal which is ctrl+c
 		// when ctrl+c is pressed, cancel current query
-		// killSigCh for notify this goroutine to terminate, otherwise it will keep listening
-		killSigCh := make(chan struct{}, 1)
 		go func() {
 			select {
 			case <-sigCh:
 				cancel()
-			case <-killSigCh:
 				return
 			}
 		}()
@@ -93,13 +90,10 @@ func executor(in string) {
 		// so that new prompts won't popup
 		select {
 		case <-ctx.Done():
-			killSigCh <- struct{}{}
 			return
 		case r := <-resultCh:
-			killSigCh <- struct{}{}
 			fmt.Println(r)
 		case e := <-errCh:
-			killSigCh <- struct{}{}
 			fmt.Println(e)
 		}
 	}
@@ -179,6 +173,7 @@ func completer(d prompt.Document) []prompt.Suggest {
 
 func main() {
 	// grmon.Start()
+	defer recover()
 	var accessKeyID string
 	var secretAccessKey string
 	var region string
@@ -235,5 +230,4 @@ func main() {
 	if err := app.Run(os.Args); err != nil {
 		fmt.Println(err.Error())
 	}
-	defer recover()
 }

signal/define.go

@@ -0,0 +1,61 @@
+package signal
+
+import (
+	"fmt"
+)
+
+// KeyValueStore stores key value pairs, proved simple set get functions
+type KeyValueStore interface {
+	// Set sets a key value pair
+	Set(key string, value interface{})
+	// Get gets a value by key
+	Get(key string) interface{}
+}
+
+// Context is the context for router handler functions
+type Context interface {
+	// IsNext returns a flag indicates whether the next function should be called
+	IsNext() bool
+	// Next can set a flag, tell the trigger to call next function
+	Next()
+	// ResetIsNext resets the next flag, makes IsNext return false
+	ResetIsNext()
+	// Context needs KeyValueStore to pass payloads
+	KeyValueStore
+}
+
+// Signal defines a signal dispatcher
+type Signal struct {
+	PathMap map[string][]func(Context)
+}
+
+// Register register a handler function after some path
+func (r *Signal) Register(path string, handlers ...func(Context)) {
+	if path == "" {
+		panic("Invalid path")
+	} else if r.PathMap[path] == nil {
+		r.PathMap[path] = handlers
+	} else {
+		for _, h := range handlers {
+			r.PathMap[path] = append(r.PathMap[path], h)
+		}
+	}
+}
+
+// Trigger triggers a bunch of handlers registered unser some path
+func (r *Signal) Trigger(path string, ctx Context) {
+	if path == "" {
+		panic("Invalid path")
+	} else if r.PathMap[path] == nil {
+		panic(fmt.Sprintf("Path %s not exits", path))
+	} else {
+		for _, h := range r.PathMap[path] {
+			h(ctx)
+			if ctx.IsNext() {
+				ctx.ResetIsNext()
+			} else {
+				break
+			}
+		}
+	}
+}