From c4f87ddad4058c0f331446fdfd8d762b8fc26c18 Mon Sep 17 00:00:00 2001 From: Evgeny Zinoviev Date: Sun, 25 Feb 2024 23:07:46 +0300 Subject: [PATCH] homekit: move hikvision and xmeye api stuff out of homekit package --- bin/ipcam_ntp_util.py | 5 ++--- include/py/{homekit/camera => }/hikvision/__init__.py | 0 include/py/{homekit/camera => }/hikvision/isapi.py | 0 include/py/{homekit/camera => }/hikvision/util.py | 0 .../HorrificallyBrokenPasswordFunction.py | 0 include/py/{homekit/camera/alinoname => xmeye}/__init__.py | 0 include/py/{homekit/camera/alinoname => xmeye}/nwipcam.py | 0 7 files changed, 2 insertions(+), 3 deletions(-) rename include/py/{homekit/camera => }/hikvision/__init__.py (100%) rename include/py/{homekit/camera => }/hikvision/isapi.py (100%) rename include/py/{homekit/camera => }/hikvision/util.py (100%) rename include/py/{homekit/camera/alinoname => xmeye}/HorrificallyBrokenPasswordFunction.py (100%) rename include/py/{homekit/camera/alinoname => xmeye}/__init__.py (100%) rename include/py/{homekit/camera/alinoname => xmeye}/nwipcam.py (100%) diff --git a/bin/ipcam_ntp_util.py b/bin/ipcam_ntp_util.py index 81f6fe0..077b00c 100755 --- a/bin/ipcam_ntp_util.py +++ b/bin/ipcam_ntp_util.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import __py_include -import homekit.camera.hikvision as hikvision -import homekit.camera.alinoname as alinoname +import hikvision, xmeye from enum import Enum, auto from typing import Optional @@ -42,7 +41,7 @@ def process_camera(host: str, elif camera_type.is_ali(): try: - client = alinoname.XMEyeCamera(hostname=host, username=login, password=password) + client = xmeye.XMEyeCamera(hostname=host, username=login, password=password) client.login() if action == Action.GET_NTP: diff --git a/include/py/homekit/camera/hikvision/__init__.py b/include/py/hikvision/__init__.py similarity index 100% rename from include/py/homekit/camera/hikvision/__init__.py rename to include/py/hikvision/__init__.py diff --git a/include/py/homekit/camera/hikvision/isapi.py b/include/py/hikvision/isapi.py similarity index 100% rename from include/py/homekit/camera/hikvision/isapi.py rename to include/py/hikvision/isapi.py diff --git a/include/py/homekit/camera/hikvision/util.py b/include/py/hikvision/util.py similarity index 100% rename from include/py/homekit/camera/hikvision/util.py rename to include/py/hikvision/util.py diff --git a/include/py/homekit/camera/alinoname/HorrificallyBrokenPasswordFunction.py b/include/py/xmeye/HorrificallyBrokenPasswordFunction.py similarity index 100% rename from include/py/homekit/camera/alinoname/HorrificallyBrokenPasswordFunction.py rename to include/py/xmeye/HorrificallyBrokenPasswordFunction.py diff --git a/include/py/homekit/camera/alinoname/__init__.py b/include/py/xmeye/__init__.py similarity index 100% rename from include/py/homekit/camera/alinoname/__init__.py rename to include/py/xmeye/__init__.py diff --git a/include/py/homekit/camera/alinoname/nwipcam.py b/include/py/xmeye/nwipcam.py similarity index 100% rename from include/py/homekit/camera/alinoname/nwipcam.py rename to include/py/xmeye/nwipcam.py