Skip to content

Commit 0a48984

Browse files
author
Bobrock
committed
Complete second logic pass, remove underscore from package name
1 parent 7283bd3 commit 0a48984

19 files changed

+22
-23
lines changed
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import requests
22
from typing import Dict, List, Optional, Union
3-
from reolink_api.alarm import AlarmAPIMixin
4-
from reolink_api.device import DeviceAPIMixin
5-
from reolink_api.display import DisplayAPIMixin
6-
from reolink_api.download import DownloadAPIMixin
7-
from reolink_api.image import ImageAPIMixin
8-
from reolink_api.motion import MotionAPIMixin
9-
from reolink_api.network import NetworkAPIMixin
10-
from reolink_api.ptz import PtzAPIMixin
11-
from reolink_api.recording import RecordingAPIMixin
12-
from reolink_api.resthandle import Request
13-
from reolink_api.system import SystemAPIMixin
14-
from reolink_api.user import UserAPIMixin
15-
from reolink_api.zoom import ZoomAPIMixin
3+
from reolinkapi.alarm import AlarmAPIMixin
4+
from reolinkapi.device import DeviceAPIMixin
5+
from reolinkapi.display import DisplayAPIMixin
6+
from reolinkapi.download import DownloadAPIMixin
7+
from reolinkapi.image import ImageAPIMixin
8+
from reolinkapi.motion import MotionAPIMixin
9+
from reolinkapi.network import NetworkAPIMixin
10+
from reolinkapi.ptz import PtzAPIMixin
11+
from reolinkapi.recording import RecordingAPIMixin
12+
from reolinkapi.resthandle import Request
13+
from reolinkapi.system import SystemAPIMixin
14+
from reolinkapi.user import UserAPIMixin
15+
from reolinkapi.zoom import ZoomAPIMixin
1616

1717

1818
class APIHandler(AlarmAPIMixin,
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from typing import List
1+
from typing import List, Dict
22

33

44
class DeviceAPIMixin:
55
"""API calls for getting device information."""
66
DEFAULT_HDD_ID = [0]
77

8-
def get_hdd_info(self) -> object:
8+
def get_hdd_info(self) -> Dict:
99
"""
1010
Gets all HDD and SD card information from Camera
1111
See examples/response/GetHddInfo.json for example response data.
@@ -14,7 +14,7 @@ def get_hdd_info(self) -> object:
1414
body = [{"cmd": "GetHddInfo", "action": 0, "param": {}}]
1515
return self._execute_command('GetHddInfo', body)
1616

17-
def format_hdd(self, hdd_id: List[int] = None) -> bool:
17+
def format_hdd(self, hdd_id: List[float] = None) -> bool:
1818
"""
1919
Format specified HDD/SD cards with their id's
2020
:param hdd_id: List of id's specified by the camera with get_hdd_info api. Default is 0 (SD card)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def get_mask(self) -> Dict:
2222
body = [{"cmd": "GetMask", "action": 1, "param": {"channel": 0}}]
2323
return self._execute_command('GetMask', body)
2424

25-
def set_osd(self, bg_color: bool = 0, channel: int = 0, osd_channel_enabled: bool = 0,
25+
def set_osd(self, bg_color: bool = 0, channel: float = 0, osd_channel_enabled: bool = 0,
2626
osd_channel_name: str = "", osd_channel_pos: str = "Lower Right", osd_time_enabled: bool = 0,
2727
osd_time_pos: str = "Lower Right") -> bool:
2828
"""
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
# Type hints for input and output of the motion api response
6-
RAW_MOTION_LIST_TYPE = List[Dict[str, Union[str, int, Dict[str, str]]]]
6+
RAW_MOTION_LIST_TYPE = List[Dict[str, Union[str, float, Dict[str, str]]]]
77
PROCESSED_MOTION_LIST_TYPE = List[Dict[str, Union[str, dt]]]
88

99

0 commit comments

Comments
 (0)