eswyft/homekit
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ipcam_ntp_util

Browse Source
This commit is contained in:
Evgeny Zinoviev 2024-02-17 13:39:01 +03:00
parent c5e69cf2c9
commit 77b80dd9b3
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/ipcam_ntp_util.py
View File

@ -151,6 +151,23 @@ class HikvisionISAPIClient:
ntp_port: int = 123): ntp_port: int = 123):
format = 'ipaddress' if validate_ipv4(ntp_host) else 'hostname' format = 'ipaddress' if validate_ipv4(ntp_host) else 'hostname'
# test ntp server first
data = f'<?xml version="1.0" encoding="UTF-8"?><NTPTestDescription><addressingFormatType>{format}</addressingFormatType><ipAddress>{ntp_host}</ipAddress><portNo>{ntp_port}</portNo></NTPTestDescription>'
r = requests.post(self.isapi_uri('System/time/ntpServers/test'), data=data, headers={
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'X-Requested-With': 'XMLHttpRequest',
}, cookies=self.cookies)
r.raise_for_status()
resp = xml_to_dict(r.text)['NTPTestResult']
error_code = int(resp['errorCode'][0])
error_description = resp['errorDescription'][0]
if error_code != 0 or error_description.lower() != 'ok':
raise ResponseError('response status looks bad')
# then set it
data = '<?xml version="1.0" encoding="UTF-8"?>' data = '<?xml version="1.0" encoding="UTF-8"?>'
data += f'<NTPServer><id>1</id><addressingFormatType>{format}</addressingFormatType><ipAddress>{ntp_host}</ipAddress><portNo>{ntp_port}</portNo><synchronizeInterval>1440</synchronizeInterval></NTPServer>' data += f'<NTPServer><id>1</id><addressingFormatType>{format}</addressingFormatType><ipAddress>{ntp_host}</ipAddress><portNo>{ntp_port}</portNo><synchronizeInterval>1440</synchronizeInterval></NTPServer>'
@ -194,6 +211,7 @@ def process_hikvision_camera(host: str,
print(f'[{host}] {client.get_ntp_server()}') print(f'[{host}] {client.get_ntp_server()}')
return return
client.set_ntp_server(ntp_server) client.set_ntp_server(ntp_server)
print(f'[{host}] done')
except AuthError as e: except AuthError as e:
print(f'[{host}] ({str(e)})') print(f'[{host}] ({str(e)})')
except ResponseError as e: except ResponseError as e:

2
include/py/homekit/camera/types.py
View File

@ -42,7 +42,7 @@ class CameraType(Enum):
return VideoContainerType.MP4 if self.get_codec(1) == VideoCodecType.H264 else VideoContainerType.MOV return VideoContainerType.MP4 if self.get_codec(1) == VideoCodecType.H264 else VideoContainerType.MOV
def is_hikvision(self) -> bool: def is_hikvision(self) -> bool:
return self in (CameraType.HIKVISION_264.value, CameraType.HIKVISION_265) return self in (CameraType.HIKVISION_264, CameraType.HIKVISION_265)
class TimeFilterType(Enum): class TimeFilterType(Enum):