From 0a4898411b612747a2e4b8a34480f3fb2e630ede Mon Sep 17 00:00:00 2001 From: Bobrock Date: Fri, 18 Dec 2020 15:58:01 -0600 Subject: [PATCH] Complete second logic pass, remove underscore from package name --- {reolink_api => reolinkapi}/__init__.py | 0 {reolink_api => reolinkapi}/alarm.py | 0 {reolink_api => reolinkapi}/api_handler.py | 26 +++++++++---------- {reolink_api => reolinkapi}/camera.py | 0 {reolink_api => reolinkapi}/config_handler.py | 0 {reolink_api => reolinkapi}/device.py | 6 ++--- {reolink_api => reolinkapi}/display.py | 2 +- {reolink_api => reolinkapi}/download.py | 0 {reolink_api => reolinkapi}/image.py | 0 {reolink_api => reolinkapi}/motion.py | 2 +- {reolink_api => reolinkapi}/network.py | 4 +-- {reolink_api => reolinkapi}/ptz.py | 0 {reolink_api => reolinkapi}/recording.py | 2 +- {reolink_api => reolinkapi}/resthandle.py | 1 - {reolink_api => reolinkapi}/rtsp_client.py | 2 +- {reolink_api => reolinkapi}/system.py | 0 {reolink_api => reolinkapi}/user.py | 0 {reolink_api => reolinkapi}/util.py | 0 {reolink_api => reolinkapi}/zoom.py | 0 19 files changed, 22 insertions(+), 23 deletions(-) rename {reolink_api => reolinkapi}/__init__.py (100%) rename {reolink_api => reolinkapi}/alarm.py (100%) rename {reolink_api => reolinkapi}/api_handler.py (89%) rename {reolink_api => reolinkapi}/camera.py (100%) rename {reolink_api => reolinkapi}/config_handler.py (100%) rename {reolink_api => reolinkapi}/device.py (88%) rename {reolink_api => reolinkapi}/display.py (96%) rename {reolink_api => reolinkapi}/download.py (100%) rename {reolink_api => reolinkapi}/image.py (100%) rename {reolink_api => reolinkapi}/motion.py (97%) rename {reolink_api => reolinkapi}/network.py (95%) rename {reolink_api => reolinkapi}/ptz.py (100%) rename {reolink_api => reolinkapi}/recording.py (99%) rename {reolink_api => reolinkapi}/resthandle.py (99%) rename {reolink_api => reolinkapi}/rtsp_client.py (98%) rename {reolink_api => reolinkapi}/system.py (100%) rename {reolink_api => reolinkapi}/user.py (100%) rename {reolink_api => reolinkapi}/util.py (100%) rename {reolink_api => reolinkapi}/zoom.py (100%) diff --git a/reolink_api/__init__.py b/reolinkapi/__init__.py similarity index 100% rename from reolink_api/__init__.py rename to reolinkapi/__init__.py diff --git a/reolink_api/alarm.py b/reolinkapi/alarm.py similarity index 100% rename from reolink_api/alarm.py rename to reolinkapi/alarm.py diff --git a/reolink_api/api_handler.py b/reolinkapi/api_handler.py similarity index 89% rename from reolink_api/api_handler.py rename to reolinkapi/api_handler.py index aa5c61f..3ceae88 100644 --- a/reolink_api/api_handler.py +++ b/reolinkapi/api_handler.py @@ -1,18 +1,18 @@ import requests from typing import Dict, List, Optional, Union -from reolink_api.alarm import AlarmAPIMixin -from reolink_api.device import DeviceAPIMixin -from reolink_api.display import DisplayAPIMixin -from reolink_api.download import DownloadAPIMixin -from reolink_api.image import ImageAPIMixin -from reolink_api.motion import MotionAPIMixin -from reolink_api.network import NetworkAPIMixin -from reolink_api.ptz import PtzAPIMixin -from reolink_api.recording import RecordingAPIMixin -from reolink_api.resthandle import Request -from reolink_api.system import SystemAPIMixin -from reolink_api.user import UserAPIMixin -from reolink_api.zoom import ZoomAPIMixin +from reolinkapi.alarm import AlarmAPIMixin +from reolinkapi.device import DeviceAPIMixin +from reolinkapi.display import DisplayAPIMixin +from reolinkapi.download import DownloadAPIMixin +from reolinkapi.image import ImageAPIMixin +from reolinkapi.motion import MotionAPIMixin +from reolinkapi.network import NetworkAPIMixin +from reolinkapi.ptz import PtzAPIMixin +from reolinkapi.recording import RecordingAPIMixin +from reolinkapi.resthandle import Request +from reolinkapi.system import SystemAPIMixin +from reolinkapi.user import UserAPIMixin +from reolinkapi.zoom import ZoomAPIMixin class APIHandler(AlarmAPIMixin, diff --git a/reolink_api/camera.py b/reolinkapi/camera.py similarity index 100% rename from reolink_api/camera.py rename to reolinkapi/camera.py diff --git a/reolink_api/config_handler.py b/reolinkapi/config_handler.py similarity index 100% rename from reolink_api/config_handler.py rename to reolinkapi/config_handler.py diff --git a/reolink_api/device.py b/reolinkapi/device.py similarity index 88% rename from reolink_api/device.py rename to reolinkapi/device.py index 68f8179..684be45 100644 --- a/reolink_api/device.py +++ b/reolinkapi/device.py @@ -1,11 +1,11 @@ -from typing import List +from typing import List, Dict class DeviceAPIMixin: """API calls for getting device information.""" DEFAULT_HDD_ID = [0] - def get_hdd_info(self) -> object: + def get_hdd_info(self) -> Dict: """ Gets all HDD and SD card information from Camera See examples/response/GetHddInfo.json for example response data. @@ -14,7 +14,7 @@ class DeviceAPIMixin: body = [{"cmd": "GetHddInfo", "action": 0, "param": {}}] return self._execute_command('GetHddInfo', body) - def format_hdd(self, hdd_id: List[int] = None) -> bool: + def format_hdd(self, hdd_id: List[float] = None) -> bool: """ Format specified HDD/SD cards with their id's :param hdd_id: List of id's specified by the camera with get_hdd_info api. Default is 0 (SD card) diff --git a/reolink_api/display.py b/reolinkapi/display.py similarity index 96% rename from reolink_api/display.py rename to reolinkapi/display.py index 68fbb38..5c4c48c 100644 --- a/reolink_api/display.py +++ b/reolinkapi/display.py @@ -22,7 +22,7 @@ class DisplayAPIMixin: body = [{"cmd": "GetMask", "action": 1, "param": {"channel": 0}}] return self._execute_command('GetMask', body) - def set_osd(self, bg_color: bool = 0, channel: int = 0, osd_channel_enabled: bool = 0, + def set_osd(self, bg_color: bool = 0, channel: float = 0, osd_channel_enabled: bool = 0, osd_channel_name: str = "", osd_channel_pos: str = "Lower Right", osd_time_enabled: bool = 0, osd_time_pos: str = "Lower Right") -> bool: """ diff --git a/reolink_api/download.py b/reolinkapi/download.py similarity index 100% rename from reolink_api/download.py rename to reolinkapi/download.py diff --git a/reolink_api/image.py b/reolinkapi/image.py similarity index 100% rename from reolink_api/image.py rename to reolinkapi/image.py diff --git a/reolink_api/motion.py b/reolinkapi/motion.py similarity index 97% rename from reolink_api/motion.py rename to reolinkapi/motion.py index 63a8ecf..b95746d 100644 --- a/reolink_api/motion.py +++ b/reolinkapi/motion.py @@ -3,7 +3,7 @@ from datetime import datetime as dt # Type hints for input and output of the motion api response -RAW_MOTION_LIST_TYPE = List[Dict[str, Union[str, int, Dict[str, str]]]] +RAW_MOTION_LIST_TYPE = List[Dict[str, Union[str, float, Dict[str, str]]]] PROCESSED_MOTION_LIST_TYPE = List[Dict[str, Union[str, dt]]] diff --git a/reolink_api/network.py b/reolinkapi/network.py similarity index 95% rename from reolink_api/network.py rename to reolinkapi/network.py index 8ec0cc3..f4fe4a6 100644 --- a/reolink_api/network.py +++ b/reolinkapi/network.py @@ -3,8 +3,8 @@ from typing import Dict class NetworkAPIMixin: """API calls for network settings.""" - def set_net_port(self, http_port: int = 80, https_port: int = 443, media_port: int = 9000, - onvif_port: int = 8000, rtmp_port: int = 1935, rtsp_port: int = 554) -> bool: + def set_net_port(self, http_port: float = 80, https_port: float = 443, media_port: float = 9000, + onvif_port: float = 8000, rtmp_port: float = 1935, rtsp_port: float = 554) -> bool: """ Set network ports If nothing is specified, the default values will be used diff --git a/reolink_api/ptz.py b/reolinkapi/ptz.py similarity index 100% rename from reolink_api/ptz.py rename to reolinkapi/ptz.py diff --git a/reolink_api/recording.py b/reolinkapi/recording.py similarity index 99% rename from reolink_api/recording.py rename to reolinkapi/recording.py index 2170e42..41284f2 100644 --- a/reolink_api/recording.py +++ b/reolinkapi/recording.py @@ -5,7 +5,7 @@ from urllib import parse from io import BytesIO from typing import Dict, Any, Optional from PIL.Image import Image, open as open_image -from reolink_api.rtsp_client import RtspClient +from reolinkapi.rtsp_client import RtspClient class RecordingAPIMixin: diff --git a/reolink_api/resthandle.py b/reolinkapi/resthandle.py similarity index 99% rename from reolink_api/resthandle.py rename to reolinkapi/resthandle.py index aa4704d..66f172a 100644 --- a/reolink_api/resthandle.py +++ b/reolinkapi/resthandle.py @@ -1,4 +1,3 @@ -import json import requests from typing import List, Dict, Union, Optional diff --git a/reolink_api/rtsp_client.py b/reolinkapi/rtsp_client.py similarity index 98% rename from reolink_api/rtsp_client.py rename to reolinkapi/rtsp_client.py index 6213ad4..0c1db0e 100644 --- a/reolink_api/rtsp_client.py +++ b/reolinkapi/rtsp_client.py @@ -2,7 +2,7 @@ import os from threading import ThreadError from typing import Any import cv2 -from reolink_api.util import threaded +from reolinkapi.util import threaded class RtspClient: diff --git a/reolink_api/system.py b/reolinkapi/system.py similarity index 100% rename from reolink_api/system.py rename to reolinkapi/system.py diff --git a/reolink_api/user.py b/reolinkapi/user.py similarity index 100% rename from reolink_api/user.py rename to reolinkapi/user.py diff --git a/reolink_api/util.py b/reolinkapi/util.py similarity index 100% rename from reolink_api/util.py rename to reolinkapi/util.py diff --git a/reolink_api/zoom.py b/reolinkapi/zoom.py similarity index 100% rename from reolink_api/zoom.py rename to reolinkapi/zoom.py