Add device get-system-time command.

osery · osery · commit cb03b9446e0a · 2024-05-15T12:35:57.000+02:00
diff --git a/cmd/gonvif/device/cmd.go b/cmd/gonvif/device/cmd.go
@@ -22,6 +22,7 @@ func init() {
 		getDeviceInformation,
 		getNetworkInterfaces,
 		getServices,
+		getSystemTime,
 		setSystemFactoryDefault,
 		systemReboot,
 	)
diff --git a/cmd/gonvif/device/get-device-information.go b/cmd/gonvif/device/get-device-information.go
@@ -11,7 +11,7 @@ var getDeviceInformation = &cobra.Command{
 	Use:   "get-device-information",
 	Short: "Show Onvif device information",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/device/get-network-interfaces.go b/cmd/gonvif/device/get-network-interfaces.go
@@ -11,7 +11,7 @@ var getNetworkInterfaces = &cobra.Command{
 	Use:   "get-network-interfaces",
 	Short: "List Onvif device network interfaces",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/device/get-services.go b/cmd/gonvif/device/get-services.go
@@ -11,7 +11,7 @@ var getServices = &cobra.Command{
 	Use:   "get-services",
 	Short: "List Onvif device services",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/device/get-system-time.go b/cmd/gonvif/device/get-system-time.go
@@ -0,0 +1,29 @@
+package device
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/eyetowers/gonvif/cmd/gonvif/root"
+	"github.com/eyetowers/gonvif/pkg/generated/onvif/www_onvif_org/ver10/device/wsdl"
+)
+
+var getSystemTime = &cobra.Command{
+	Use:   "get-system-time",
+	Short: "Show Onvif device system date and time",
+	Args:  cobra.NoArgs,
+	RunE: func(*cobra.Command, []string) error {
+		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
+		if err != nil {
+			return err
+		}
+		return runGetSystemTime(client)
+	},
+}
+
+func runGetSystemTime(client wsdl.Device) error {
+	resp, err := client.GetSystemDateAndTime(&wsdl.GetSystemDateAndTime{})
+	if err != nil {
+		return err
+	}
+	return root.OutputJSON(resp)
+}
diff --git a/cmd/gonvif/device/set-system-factory-default.go b/cmd/gonvif/device/set-system-factory-default.go
@@ -16,7 +16,7 @@ var setSystemFactoryDefault = &cobra.Command{
 	Use:   "set-system-factory-default",
 	Short: "Set Onvif device system factory default",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/device/system-reboot.go b/cmd/gonvif/device/system-reboot.go
@@ -11,7 +11,7 @@ var systemReboot = &cobra.Command{
 	Use:   "system-reboot",
 	Short: "Reboot Onvif device",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/events/create-pull-point-subscription.go b/cmd/gonvif/events/create-pull-point-subscription.go
@@ -11,7 +11,7 @@ var createPullPointSubscription = &cobra.Command{
 	Use:   "create-pull-point-subscription",
 	Short: "Create Onvif events pull point subscription",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/events/get-event-brokers.go b/cmd/gonvif/events/get-event-brokers.go
@@ -15,7 +15,7 @@ var getEventBrokers = &cobra.Command{
 	Use:   "get-event-brokers",
 	Short: "List Onvif event brokers",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/events/get-event-properties.go b/cmd/gonvif/events/get-event-properties.go
@@ -11,7 +11,7 @@ var getEventProperties = &cobra.Command{
 	Use:   "get-event-properties",
 	Short: "Show Onvif detailed event propeties",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/events/get-service-capabilities.go b/cmd/gonvif/events/get-service-capabilities.go
@@ -11,7 +11,7 @@ var getServiceCapabilities = &cobra.Command{
 	Use:   "get-service-capabilities",
 	Short: "Show Onvif events capabilities",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/events/stream-events.go b/cmd/gonvif/events/stream-events.go
@@ -25,7 +25,7 @@ var streamEvents = &cobra.Command{
 	Use:   "stream-events",
 	Short: "Stream live Onvif events from the device.",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		onvif, err := gonvif.New(context.Background(), root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/get-imaging-settings.go b/cmd/gonvif/imaging/get-imaging-settings.go
@@ -16,7 +16,7 @@ var getImagingSettings = &cobra.Command{
 	Use:   "get-imaging-settings",
 	Short: "Show Onvif device imaging settings",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/get-move-options.go b/cmd/gonvif/imaging/get-move-options.go
@@ -12,7 +12,7 @@ var getMoveOptions = &cobra.Command{
 	Use:   "get-move-options",
 	Short: "Show Onvif device focus move options",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/get-options.go b/cmd/gonvif/imaging/get-options.go
@@ -12,7 +12,7 @@ var getOptions = &cobra.Command{
 	Use:   "get-options",
 	Short: "Show Onvif device imaging options",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/get-service-capabilities.go b/cmd/gonvif/imaging/get-service-capabilities.go
@@ -11,7 +11,7 @@ var getServiceCapabilities = &cobra.Command{
 	Use:   "get-service-capabilities",
 	Short: "Show Onvif device imaging capabilities",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/get-status.go b/cmd/gonvif/imaging/get-status.go
@@ -12,7 +12,7 @@ var getStatus = &cobra.Command{
 	Use:   "get-status",
 	Short: "Show Onvif device imaging status",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/move-continuous.go b/cmd/gonvif/imaging/move-continuous.go
@@ -17,7 +17,7 @@ var moveContinuous = &cobra.Command{
 	Use:   "move-continuous",
 	Short: "Start Onvif device continuous focusing",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/imaging/set-imaging-settings-auto-focus.go b/cmd/gonvif/imaging/set-imaging-settings-auto-focus.go
@@ -17,7 +17,7 @@ var setImagingSettingsAutoFocus = &cobra.Command{
 	Use:   "set-imaging-settings-auto-focus",
 	Short: "Set Onvif device imaging settings autofocus",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media/get-profiles.go b/cmd/gonvif/media/get-profiles.go
@@ -11,7 +11,7 @@ var getProfiles = &cobra.Command{
 	Use:   "get-profiles",
 	Short: "List Onvif device media profiles",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media/get-snapshot-uri.go b/cmd/gonvif/media/get-snapshot-uri.go
@@ -16,7 +16,7 @@ var getSnapshotURI = &cobra.Command{
 	Use:   "get-snapshot-uri",
 	Short: "Get Onvif device media snapshot URI",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media/get-stream-uri.go b/cmd/gonvif/media/get-stream-uri.go
@@ -18,7 +18,7 @@ var getStreamURI = &cobra.Command{
 	Use:   "get-stream-uri",
 	Short: "Get Onvif device media stream URI",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media/set-synchronization-point.go b/cmd/gonvif/media/set-synchronization-point.go
@@ -12,7 +12,7 @@ var setSynchronizationPoint = &cobra.Command{
 	Use:   "set-synchronization-point",
 	Short: "Request Onvif device to insert a key frame into all streams for the given profile",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/get-analytics-configurations.go b/cmd/gonvif/media2/get-analytics-configurations.go
@@ -12,7 +12,7 @@ var getAnalyticsConfigurations = &cobra.Command{
 	Use:   "get-analytics-configurations",
 	Short: "Show Onvif device video analytics configurations",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/get-profiles.go b/cmd/gonvif/media2/get-profiles.go
@@ -15,7 +15,7 @@ var getProfiles = &cobra.Command{
 	Use:   "get-profiles",
 	Short: "List Onvif device media profiles",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/get-snapshot-uri.go b/cmd/gonvif/media2/get-snapshot-uri.go
@@ -12,7 +12,7 @@ var getSnapshotURI = &cobra.Command{
 	Use:   "get-snapshot-uri",
 	Short: "Get Onvif device media snapshot URI",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/get-stream-uri.go b/cmd/gonvif/media2/get-stream-uri.go
@@ -16,7 +16,7 @@ var getStreamURI = &cobra.Command{
 	Use:   "get-stream-uri",
 	Short: "Get Onvif device media stream URI",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/get-video-encoder-configurations.go b/cmd/gonvif/media2/get-video-encoder-configurations.go
@@ -12,7 +12,7 @@ var getVideoEncoderConfigurations = &cobra.Command{
 	Use:   "get-video-encoder-configurations",
 	Short: "List Onvif device video encoder configurations",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/get-video-source-configurations.go b/cmd/gonvif/media2/get-video-source-configurations.go
@@ -17,7 +17,7 @@ var getVideoSourceConfigurations = &cobra.Command{
 	Use:   "get-video-source-configurations",
 	Short: "List Onvif device video source configurations",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/media2/set-synchronization-point.go b/cmd/gonvif/media2/set-synchronization-point.go
@@ -12,7 +12,7 @@ var setSynchronizationPoint = &cobra.Command{
 	Use:   "set-synchronization-point",
 	Short: "Request Onvif device to insert a key frame into all streams for the given profile",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/ptz/get-configurations.go b/cmd/gonvif/ptz/get-configurations.go
@@ -11,7 +11,7 @@ var getConfigurations = &cobra.Command{
 	Use:   "get-configurations",
 	Short: "List PTZ device configurations",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/ptz/get-nodes.go b/cmd/gonvif/ptz/get-nodes.go
@@ -11,7 +11,7 @@ var getNodes = &cobra.Command{
 	Use:   "get-nodes",
 	Short: "List PTZ device nodes",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/ptz/get-presets.go b/cmd/gonvif/ptz/get-presets.go
@@ -16,7 +16,7 @@ var getPresets = &cobra.Command{
 	Use:   "get-presets",
 	Short: "List PTZ device presets",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/ptz/get-service-capabilities.go b/cmd/gonvif/ptz/get-service-capabilities.go
@@ -11,7 +11,7 @@ var getServiceCapabilities = &cobra.Command{
 	Use:   "get-service-capabilities",
 	Short: "Show Onvif device PTZ capabilities",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, root.Verbose)
 		if err != nil {
 			return err
diff --git a/cmd/gonvif/subscription/pull-messages.go b/cmd/gonvif/subscription/pull-messages.go
@@ -11,7 +11,7 @@ var pullMessages = &cobra.Command{
 	Use:   "pull-messages",
 	Short: "Pulls Onvif events from a pull point subscription",
 	Args:  cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(*cobra.Command, []string) error {
 		client, err := ServiceClient(root.URL, root.Username, root.Password, subscription, root.Verbose)
 		if err != nil {
 			return err
diff --git a/pkg/gonvif/client.go b/pkg/gonvif/client.go
@@ -222,15 +222,15 @@ func logRequest(req *http.Request) {
 
 func logBodyAndHeaders(body io.ReadCloser, headers http.Header) io.ReadCloser {
 	defer body.Close()
-	bytes, copy := readAndDuplicate(body)
+	bytes, dupe := readAndDuplicate(body)
 	log.Printf("HEADERS:\n")
 	for k, vals := range headers {
 		for _, val := range vals {
 			log.Printf("%s: %s\n", k, val)
 		}
 	}
 	log.Printf("BODY:\n%s", string(bytes))
-	return copy
+	return dupe
 }
 
 func readAndDuplicate(body io.ReadCloser) ([]byte, io.ReadCloser) {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ func init() {`
`22`	`22`	`getDeviceInformation,`
`23`	`23`	`getNetworkInterfaces,`
`24`	`24`	`getServices,`
	`25`	`+ getSystemTime,`
`25`	`26`	`setSystemFactoryDefault,`
`26`	`27`	`systemReboot,`
`27`	`28`	`)`