fix flags and listEgress (#14)

Author: frostbyte73

cmd/livekit-cli/egress.go

@@ -27,6 +27,7 @@ var (
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
 				&cli.StringFlag{
 					Name:     "request",
 					Usage:    "StartEgressRequest as json file (see https://github.com/livekit/livekit-recorder#request)",
@@ -164,9 +165,13 @@ func startEgress(c *cli.Context) error {
 }
 
 func listEgress(c *cli.Context) error {
-	_, err := egressClient.ListEgress(context.Background(), &livekit.ListEgressRequest{
+	res, err := egressClient.ListEgress(context.Background(), &livekit.ListEgressRequest{
 		RoomName: c.String("room"),
 	})
+
+	for _, item := range res.Items {
+		fmt.Printf("%v (%v)\n", item.EgressId, item.Status)
+	}
 	return err
 }
 

cmd/livekit-cli/recording.go

@@ -6,10 +6,11 @@ import (
 	"io/ioutil"
 
 	"github.com/ggwhite/go-masker"
-	"github.com/livekit/protocol/livekit"
-	lksdk "github.com/livekit/server-sdk-go"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/protobuf/encoding/protojson"
+
+	"github.com/livekit/protocol/livekit"
+	lksdk "github.com/livekit/server-sdk-go"
 )
 
 const recordingCategory = "Recording"
@@ -26,6 +27,7 @@ var (
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
 				&cli.StringFlag{
 					Name:     "request",
 					Usage:    "StartRecordingRequest as json file (see https://github.com/livekit/livekit-recorder#request)",
@@ -43,6 +45,7 @@ var (
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
 				&cli.StringFlag{
 					Name:     "id",
 					Usage:    "id of the recording",
@@ -65,6 +68,7 @@ var (
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
 				&cli.StringFlag{
 					Name:     "id",
 					Usage:    "id of the recording",
@@ -87,6 +91,7 @@ var (
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
 				&cli.StringFlag{
 					Name:     "id",
 					Usage:    "id of the recording",

cmd/livekit-cli/room.go

@@ -6,9 +6,10 @@ import (
 	"fmt"
 
 	"github.com/ggwhite/go-masker"
+	"github.com/urfave/cli/v2"
+
 	"github.com/livekit/protocol/livekit"
 	lksdk "github.com/livekit/server-sdk-go"
-	"github.com/urfave/cli/v2"
 )
 
 const roomCategory = "RoomService"
@@ -22,13 +23,14 @@ var (
 			Category: roomCategory,
 			Flags: []cli.Flag{
 				urlFlag,
+				apiKeyFlag,
+				secretFlag,
+				verboseFlag,
 				&cli.StringFlag{
 					Name:     "name",
 					Usage:    "name of the room",
 					Required: true,
 				},
-				apiKeyFlag,
-				secretFlag,
 				&cli.StringFlag{
 					Name:     "recording-config",
 					Usage:    "path to json recording config file",
@@ -45,6 +47,7 @@ var (
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
 			},
 		},
 		{
@@ -53,10 +56,11 @@ var (
 			Action:   deleteRoom,
 			Category: roomCategory,
 			Flags: []cli.Flag{
-				roomFlag,
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
+				roomFlag,
 			},
 		},
 		{
@@ -65,10 +69,11 @@ var (
 			Action:   listParticipants,
 			Category: roomCategory,
 			Flags: []cli.Flag{
-				roomFlag,
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
+				roomFlag,
 			},
 		},
 		{
@@ -77,11 +82,12 @@ var (
 			Action:   getParticipant,
 			Category: roomCategory,
 			Flags: []cli.Flag{
-				roomFlag,
-				identityFlag,
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
+				roomFlag,
+				identityFlag,
 			},
 		},
 		{
@@ -90,11 +96,12 @@ var (
 			Action:   removeParticipant,
 			Category: roomCategory,
 			Flags: []cli.Flag{
-				roomFlag,
-				identityFlag,
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
+				roomFlag,
+				identityFlag,
 			},
 		},
 		{
@@ -103,11 +110,12 @@ var (
 			Action:   updateParticipant,
 			Category: roomCategory,
 			Flags: []cli.Flag{
-				roomFlag,
-				identityFlag,
 				urlFlag,
 				apiKeyFlag,
 				secretFlag,
+				verboseFlag,
+				roomFlag,
+				identityFlag,
 				&cli.StringFlag{
 					Name: "metadata",
 				},
@@ -123,6 +131,10 @@ var (
 			Action:   muteTrack,
 			Category: roomCategory,
 			Flags: []cli.Flag{
+				urlFlag,
+				apiKeyFlag,
+				secretFlag,
+				verboseFlag,
 				roomFlag,
 				identityFlag,
 				&cli.StringFlag{
@@ -134,9 +146,6 @@ var (
 					Name:  "muted",
 					Usage: "set to true to mute, false to unmute",
 				},
-				urlFlag,
-				apiKeyFlag,
-				secretFlag,
 			},
 		},
 		{
@@ -145,6 +154,10 @@ var (
 			Action:   updateSubscriptions,
 			Category: roomCategory,
 			Flags: []cli.Flag{
+				urlFlag,
+				apiKeyFlag,
+				secretFlag,
+				verboseFlag,
 				roomFlag,
 				identityFlag,
 				&cli.StringSliceFlag{
@@ -156,9 +169,6 @@ var (
 					Name:  "subscribe",
 					Usage: "set to true to subscribe, otherwise it'll unsubscribe",
 				},
-				urlFlag,
-				apiKeyFlag,
-				secretFlag,
 			},
 		},
 	}

cmd/livekit-cli/utils.go

@@ -37,6 +37,10 @@ var (
 		Usage:    "identity of participant",
 		Required: true,
 	}
+	verboseFlag = &cli.BoolFlag{
+		Name:     "verbose",
+		Required: false,
+	}
 )
 
 func PrintJSON(obj interface{}) {