adding some apis

Author: Benehiko

.gitignore

@@ -13,3 +13,5 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+.idea/

.idea/codeStyles/codeStyleConfig.xml

@@ -11,7 +11,7 @@ func BasicUsage() {
 		panic(err)
 	}
 
-	ok, err := camera.API.FormatHdd()(camera.API.RestHandler)
+	ok, err := camera.API.FormatHdd(0)(camera.API.RestHandler)
 
 	if err != nil {
 		panic(err)

.idea/modules.xml

@@ -18,9 +18,9 @@ func NewApiHandler(username string, password string, restHandler *network.RestHa
 	authMixin := &api.AuthMixin{
 		Username: username,
 		Password: password,
-		Token:    "",
 	}
 
+	// pass the restHandler object to the Login function
 	ok, err := authMixin.Login()(restHandler)
 
 	if err != nil {

.idea/reolink-go-api.iml

@@ -1,7 +1,6 @@
 package api
 
 import (
-	"encoding/json"
 	"fmt"
 	"github.com/ReolinkCameraAPI/reolink-go-api/internal/pkg/network"
 )
@@ -13,32 +12,30 @@ type AuthMixin struct {
 }
 
 func (am *AuthMixin) Login() func(handler *network.RestHandler) (bool, error) {
-	payload := map[string]interface{}{
-		"cmd":    "Login",
-		"action": 0,
-		"params": map[string]interface{}{
-			"User": map[string]interface{}{
-				"userName": am.Username,
-				"password": am.Password,
-			},
-		},
-	}
-
-	data, err := json.Marshal([]interface{}{payload})
-
 	return func(handler *network.RestHandler) (bool, error) {
 
-		if err != nil {
-			return false, err
+		payload := map[string]interface{}{
+			"cmd":    "Login",
+			"action": 0,
+			"params": map[string]interface{}{
+				"User": map[string]interface{}{
+					"userName": am.Username,
+					"password": am.Password,
+				},
+			},
 		}
 
-		resp, err := handler.Request("POST", data)
+		result, err := handler.Request("POST", payload, false)
 
 		if err != nil {
 			return false, err
 		}
 
-		if resp.StatusCode == 200 {
+		// Set the token
+		if result.Code == 0 {
+			tokenData := result.Value.(network.LoginData)
+			am.Token = tokenData.Token.Name
+			handler.SetToken(am.Token)
 			return true, nil
 		}
 

.idea/vcs.xml

@@ -1,20 +1,66 @@
 package api
 
-import "github.com/ReolinkCameraAPI/reolink-go-api/internal/pkg/network"
+import (
+	"fmt"
+	"github.com/ReolinkCameraAPI/reolink-go-api/internal/pkg/network"
+)
 
 type DeviceMixin struct {
 }
 
-func (dm *DeviceMixin) GetHddInfo() func(handler *network.RestHandler) (bool, error) {
-	return func(handler *network.RestHandler) (bool, error) {
-		// TODO: implement
-		return false, nil
+
+// Get the Camera's HDD information
+// TODO: Better error messages
+func (dm *DeviceMixin) GetHddInfo() func(handler *network.RestHandler) (*network.GetHddInfoData, error) {
+	return func(handler *network.RestHandler) (*network.GetHddInfoData, error) {
+		payload := map[string]interface{}{
+			"cmd":    "GetHddInfo",
+			"action": 0,
+			"params": map[string]interface{}{},
+		}
+
+		result, err := handler.Request("GET", payload, true)
+
+		if err != nil {
+			return nil, err
+		}
+
+		if result.Code == 0 {
+			hddInfoData := result.Value.(*network.GetHddInfoData)
+			return hddInfoData, nil
+		}
+
+		return nil, fmt.Errorf("could not retrieve hdd info data")
 	}
 }
 
-func (dm *DeviceMixin) FormatHdd() func(handler *network.RestHandler) (bool, error) {
+// Format the camera HDD.
+// Default hddId: 0
+// TODO: better error messages
+func (dm *DeviceMixin) FormatHdd(hddId int) func(handler *network.RestHandler) (bool, error) {
 	return func(handler *network.RestHandler) (bool, error) {
-		// TODO: implement
-		return false, nil
+		payload := map[string]interface{}{
+			"cmd":    "Format",
+			"action": 0,
+			"params": map[string]interface{}{
+				"HddInfo": map[string]interface{}{
+					"id": hddId,
+				},
+			},
+		}
+
+		result, err := handler.Request("GET", payload, true)
+
+		if err != nil {
+			return false, err
+		}
+
+		formatHdd := result.Value.(*network.FormatHddData)
+
+		if formatHdd.RspCode == 200 {
+			return true, nil
+		}
+
+		return false, fmt.Errorf("could not format camera hdd")
 	}
 }

.idea/workspace.xml

@@ -1,14 +1,30 @@
 package api
 
-import "github.com/ReolinkCameraAPI/reolink-go-api/internal/pkg/network"
+import (
+	"github.com/ReolinkCameraAPI/reolink-go-api/internal/pkg/network"
+)
 
 type DisplayMixin struct {
 }
 
-func (dm *DisplayMixin) GetOSD() func(handler *network.RestHandler) (bool, error) {
-	return func(handler *network.RestHandler) (bool, error) {
-		// TODO: implement
-		return false, nil
+func (dm *DisplayMixin) GetOSD() func(handler *network.RestHandler) (*network.OsdData, error) {
+	return func(handler *network.RestHandler) (*network.OsdData, error) {
+		payload := map[string]interface{}{
+			"cmd":    "GetOSD",
+			"action": 1,
+			"params": map[string]interface{}{
+				"channel": 0,
+			},
+		}
+
+		result, err := handler.Request("GET", payload, true)
+
+		if err != nil {
+			return nil, err
+		}
+
+		osdData := result.Value.(*network.OsdData)
+		return osdData, nil
 	}
 }
 

examples/basic_usage.go

@@ -0,0 +1,46 @@
+package network
+
+type GeneralData struct {
+	Code    int         `json:"code"`
+	Value   interface{} `json:"value;omitempty"`
+	Initial interface{} `json:"initial;omitempty"`
+	Range   interface{} `json:"range;omitempty"`
+}
+
+type LoginTokenData struct {
+	Name string `json:"name"`
+}
+
+type LoginData struct {
+	Token LoginTokenData `json:"Token"`
+}
+
+type GetHddInfoData struct {
+	Capacity int `json:"capacity"`
+	Format   int `json:"format"`
+	ID       int `json:"id"`
+	Mount    int `json:"mount"`
+	Size     int `json:"size"`
+}
+
+type FormatHddData struct {
+	RspCode int `json:"rspCode"`
+}
+
+type OsdChannelData struct {
+	Enable bool   `json:"enable"`
+	Name   string `json:"name"`
+	Pos    string `json:"pos"`
+}
+
+type OsdTimeData struct {
+	Enable bool   `json:"enable"`
+	Pos    string `json:"pos"`
+}
+
+type OsdData struct {
+	BgColor    int            `json:"bgcolor"`
+	Channel    int            `json:"channel"`
+	OsdChannel OsdChannelData `json:"osdChannel"`
+	OsdTime    OsdTimeData    `json:"osdTime"`
+}