github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-05 03:00:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

get_time_points must return valid traffic times.

Browse Source
This commit is contained in:
Brian Simpson
2013-10-16 18:48:39 -04:00
parent b0c6e48840
commit 59ec220dd0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
r2/r2/models/traffic.py
View File

@@ -193,17 +193,23 @@ def get_time_points(interval, start_time=None, stop_time=None):
"""
def truncate_datetime(dt):
dt = dt.replace(minute=0, second=0, microsecond=0)
if interval in ("day", "month"):
dt = dt.replace(hour=0)
if interval == "month":
dt = dt.replace(day=1)
return dt
if start_time and stop_time:
start_time, stop_time = sorted([start_time, stop_time])
# truncate stop_time to an actual traffic time point
stop_time = truncate_datetime(stop_time)
else:
# the stop time is the most recent slice-time; get this by truncating
# the appropriate amount from the current time
stop_time = datetime.datetime.utcnow()
stop_time = stop_time.replace(minute=0, second=0, microsecond=0)
if interval in ("day", "month"):
stop_time = stop_time.replace(hour=0)
if interval == "month":
stop_time = stop_time.replace(day=1)
stop_time = truncate_datetime(stop_time)
# then the start time is easy to work out
range = time_range_by_interval[interval]