diff --git a/device.go b/device.go index 42cd9c0..f1a61e2 100644 --- a/device.go +++ b/device.go @@ -1,7 +1,6 @@ package onvif import ( - "fmt" "strings" ) @@ -43,25 +42,6 @@ func (device Device) GetInformation() (DeviceInformation, error) { return result, nil } -// GetSystemDateAndTime fetch date and time from ONVIF camera -func (device Device) GetSystemDateAndTime() (string, error) { - // Create SOAP - soap := SOAP{ - Body: "", - XMLNs: deviceXMLNs, - } - - // Send SOAP request - response, err := soap.SendRequest(device.XAddr) - if err != nil { - return "", err - } - - // Parse response - dateTime, _ := response.ValueForPathString("Envelope.Body.GetSystemDateAndTimeResponse.SystemDateAndTime") - return dateTime, nil -} - // GetCapabilities fetch info of ONVIF camera's capabilities func (device Device) GetCapabilities() (DeviceCapabilities, error) { // Create SOAP @@ -211,62 +191,7 @@ func (device Device) GetHostname() (HostnameInformation, error) { if mapHostInfo, ok := ifaceHostInfo.(map[string]interface{}); ok { hostnameInfo.Name = interfaceToString(mapHostInfo["Name"]) hostnameInfo.FromDHCP = interfaceToBool(mapHostInfo["FromDHCP"]) - hostnameInfo.Extension = interfaceToString(mapHostInfo["Extension"]) } return hostnameInfo, nil } - -// GetDNS fetch DNS of an ONVIF camera -func (device Device) GetDNS() (string, error) { - // Create SOAP - soap := SOAP{ - Body: "", - XMLNs: deviceXMLNs, - } - - // Send SOAP request - response, err := soap.SendRequest(device.XAddr) - if err != nil { - return "", err - } - - bt, _ := response.JsonIndent("", " ") - fmt.Println(string(bt)) - - // Parse response - DNS, _ := response.ValueForPathString("Envelope.Body.GetDNSResponse.DNSInformation") - return DNS, nil -} - -// GetDNS fetch DNS of an ONVIF camera -func (device Device) GetNetworkInterfaces() (string, error) { - // Create SOAP - soap := SOAP{ - Body: "", - XMLNs: deviceXMLNs, - } - - // Send SOAP request - response, err := soap.SendRequest(device.XAddr) - if err != nil { - return "", err - } - - bt, _ := response.JsonIndent("", " ") - fmt.Println(string(bt)) - - // Parse response - DNS, _ := response.ValueForPathString("Envelope.Body.GetDNSResponse.DNSInformation") - return DNS, nil -} - -func interfaceToString(src interface{}) string { - str, _ := src.(string) - return str -} - -func interfaceToBool(src interface{}) bool { - strBool := interfaceToString(src) - return strings.ToLower(strBool) == "true" -} diff --git a/model.go b/model.go index 1b60b52..bd704c5 100644 --- a/model.go +++ b/model.go @@ -35,7 +35,6 @@ type DeviceCapabilities struct { // HostnameInformation contains hostname info of an ONVIF camera type HostnameInformation struct { - Name string - FromDHCP bool - Extension string + Name string + FromDHCP bool } diff --git a/utils.go b/utils.go new file mode 100644 index 0000000..e02fea3 --- /dev/null +++ b/utils.go @@ -0,0 +1,21 @@ +package onvif + +import ( + "encoding/json" + "strings" +) + +func interfaceToString(src interface{}) string { + str, _ := src.(string) + return str +} + +func interfaceToBool(src interface{}) bool { + strBool := interfaceToString(src) + return strings.ToLower(strBool) == "true" +} + +func prettyJSON(src interface{}) string { + result, _ := json.MarshalIndent(&src, "", " ") + return string(result) +}