Linter fixes

This commit is contained in:
Sebastian Goscik
2022-03-18 21:07:11 +00:00
parent 649041f590
commit 1d80a330e5
2 changed files with 15 additions and 9 deletions

View File

@@ -61,7 +61,8 @@ def _parse_detection_types(ctx, param, value):
envvar='DETECTION_TYPES', envvar='DETECTION_TYPES',
default=','.join(DETECTION_TYPES), default=','.join(DETECTION_TYPES),
show_default=True, show_default=True,
help=f"A comma separated list of which types of detections to backup. Valid options are: {', '.join([f'`{t}`' for t in DETECTION_TYPES])}", help="A comma separated list of which types of detections to backup. "
f"Valid options are: {', '.join([f'`{t}`' for t in DETECTION_TYPES])}",
callback=_parse_detection_types, callback=_parse_detection_types,
) )
@click.option( @click.option(

View File

@@ -1,11 +1,11 @@
"""Main module.""" """Main module."""
import asyncio import asyncio
from datetime import datetime, timedelta, timezone import json
import logging import logging
import pathlib import pathlib
import shutil import shutil
import json
from asyncio.exceptions import TimeoutError from asyncio.exceptions import TimeoutError
from datetime import datetime, timedelta, timezone
from typing import Callable, List, Optional from typing import Callable, List, Optional
import aiocron import aiocron
@@ -211,7 +211,8 @@ class UnifiProtectBackup:
(https://rclone.org/filtering/#max-age-don-t-transfer-any-file-older-than-this) (https://rclone.org/filtering/#max-age-don-t-transfer-any-file-older-than-this)
rclone_args (str): A bandwidth limit which is passed to the `--bwlimit` argument of rclone_args (str): A bandwidth limit which is passed to the `--bwlimit` argument of
`rclone` (https://rclone.org/docs/#bwlimit-bandwidth-spec) `rclone` (https://rclone.org/docs/#bwlimit-bandwidth-spec)
ignore_cameras (List[str]): List of camera IDs for which to not backup events detection_types (List[str]): List of which detection types to backup.
ignore_cameras (List[str]): List of camera IDs for which to not backup events.
verbose (int): How verbose to setup logging, see :func:`setup_logging` for details. verbose (int): How verbose to setup logging, see :func:`setup_logging` for details.
""" """
setup_logging(verbose) setup_logging(verbose)
@@ -425,15 +426,17 @@ class UnifiProtectBackup:
if msg.new_obj.end is None: if msg.new_obj.end is None:
return return
if msg.new_obj.type is EventType.MOTION and "motion" not in self.detection_types: if msg.new_obj.type is EventType.MOTION and "motion" not in self.detection_types:
logger.extra_debug(f"Skipping unwanted motion detection event: {msg.new_obj.id}") logger.extra_debug(f"Skipping unwanted motion detection event: {msg.new_obj.id}") # type: ignore
return return
if msg.new_obj.type is EventType.RING and "ring" not in self.detection_types: if msg.new_obj.type is EventType.RING and "ring" not in self.detection_types:
logger.extra_debug(f"Skipping unwanted ring event: {msg.new_obj.id}") logger.extra_debug(f"Skipping unwanted ring event: {msg.new_obj.id}") # type: ignore
return return
elif msg.new_obj.type is EventType.SMART_DETECT: elif msg.new_obj.type is EventType.SMART_DETECT:
for event_smart_detection_type in msg.new_obj.smart_detect_types: for event_smart_detection_type in msg.new_obj.smart_detect_types:
if event_smart_detection_type not in self.detection_types: if event_smart_detection_type not in self.detection_types:
logger.extra_debug(f"Skipping unwanted {event_smart_detection_type} detection event: {msg.new_obj.id}") logger.extra_debug( # type: ignore
f"Skipping unwanted {event_smart_detection_type} detection event: {msg.new_obj.id}"
)
return return
self._download_queue.put_nowait(msg.new_obj) self._download_queue.put_nowait(msg.new_obj)
@@ -502,8 +505,10 @@ class UnifiProtectBackup:
if self._has_ffprobe: if self._has_ffprobe:
try: try:
downloaded_duration = await self._get_video_length(video) downloaded_duration = await self._get_video_length(video)
msg = f" Downloaded video length: {downloaded_duration:.3f}s" \ msg = (
f"({downloaded_duration - duration:+.3f}s)" f" Downloaded video length: {downloaded_duration:.3f}s"
f"({downloaded_duration - duration:+.3f}s)"
)
if downloaded_duration < duration: if downloaded_duration < duration:
logger.warning(msg) logger.warning(msg)
else: else: