From 6a660b980cb4c666ca293e29156126a8e6ac47a4 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Mon, 16 Jan 2023 07:59:35 -0600 Subject: [PATCH] cleanup --- frigate/http.py | 13 ++++--------- frigate/util.py | 4 +++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/frigate/http.py b/frigate/http.py index 1c929aa86..a83b94751 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -1164,16 +1164,11 @@ def vod_hour_no_timezone(year_month, day, hour, camera_name): # TODO make this nicer when vod module is removed @bp.route("/vod/////") def vod_hour(year_month, day, hour, camera_name, tz_name): - tz_offset_minutes = int( - datetime.now(pytz.timezone(tz_name.replace(",", "/"))) - .utcoffset() - .total_seconds() - / 60 - ) parts = year_month.split("-") - start_date = datetime( - int(parts[0]), int(parts[1]), int(day), int(hour), tzinfo=timezone.utc - ) - timedelta(minutes=tz_offset_minutes) + start_date = ( + datetime(int(parts[0]), int(parts[1]), int(day), int(hour), tzinfo=timezone.utc) + - datetime.now(pytz.timezone(tz_name.replace(",", "/"))).utcoffset() + ) end_date = start_date + timedelta(hours=1) - timedelta(milliseconds=1) start_ts = start_date.timestamp() end_ts = end_date.timestamp() diff --git a/frigate/util.py b/frigate/util.py index 11c0acfde..69ead2a7a 100755 --- a/frigate/util.py +++ b/frigate/util.py @@ -1044,7 +1044,9 @@ class SharedMemoryFrameManager(FrameManager): def get_tz_modifiers(tz_name: str) -> Tuple[str, str]: - seconds_offset = datetime.now(pytz.timezone(tz_name)).utcoffset().total_seconds() + seconds_offset = ( + datetime.datetime.now(pytz.timezone(tz_name)).utcoffset().total_seconds() + ) hours_offset = int(seconds_offset / 60 / 60) minutes_offset = int(seconds_offset / 60 - hours_offset * 60) hour_modifier = f"{hours_offset} hour"