Rooba
/
boltons
mirror of https://github.com/mahmoud/boltons.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

redo plain-english relative_time() to have a decimal rounding factor and handle future dates

This commit is contained in:
Mahmoud Hashemi 2013-06-02 01:32:58 -07:00
parent 77b536d516
commit 78a35e4d4c
1 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
boltons/timeutils.py
View File

@ -41,45 +41,34 @@ def decimal_relative_time(d, other=None, ndigits=0):
(1.0, 'day') (1.0, 'day')
>>> decimal_relative_time(now - timedelta(seconds=0.002), now, ndigits=5) >>> decimal_relative_time(now - timedelta(seconds=0.002), now, ndigits=5)
(0.002, 'seconds') (0.002, 'seconds')
>>> '%g %s' % _
'0.002 seconds'
""" """
if other is None: if other is None:
other = datetime.datetime.utcnow() other = datetime.datetime.utcnow()
diff = other - d diff = other - d
diff_seconds = total_seconds(diff) diff_seconds = total_seconds(diff)
abs_diff = abs(diff) abs_diff = abs(diff)
b_idx = bisect.bisect_left(_BOUND_DELTAS, abs_diff) - 1 b_idx = bisect.bisect(_BOUND_DELTAS, abs_diff) - 1
bbound, bunit, bname = _BOUNDS[b_idx] bbound, bunit, bname = _BOUNDS[b_idx]
float_diff = diff_seconds / total_seconds(bunit) #f_diff, f_mod = divmod(diff_seconds, total_seconds(bunit))
rounded_diff = round(float_diff, ndigits) f_diff = diff_seconds / total_seconds(bunit)
return rounded_diff, cardinalize(bname, rounded_diff) rounded_diff = round(f_diff, ndigits)
return rounded_diff, cardinalize(bname, abs(rounded_diff))
def relative_time(d, other=None): def relative_time(d, other=None, ndigits=0):
# TODO: add decimal rounding factor (default 0) """\
if other is None: >>> now = datetime.datetime.utcnow()
other = datetime.datetime.utcnow() >>> relative_time(now, ndigits=1)
diff = other - d '0 seconds ago'
s, days = diff.seconds, diff.days >>> relative_time(now - timedelta(days=1, seconds=36000), ndigits=1)
if days > 7 or days < 0: '1.4 days ago'
return d.strftime('%d %b %y') >>> relative_time(now + timedelta(days=7), now, ndigits=1)
elif days == 1: '1 week from now'
return '1 day ago' """
elif days > 1: drt, unit = decimal_relative_time(d, other, ndigits)
return '{0} days ago'.format(diff.days) phrase = 'ago'
elif s < 5: if drt < 0:
return 'just now' phrase = 'from now'
elif s < 60: return '%g %s %s' % (abs(drt), unit, phrase)
return '{0} seconds ago'.format(s)
elif s < 120:
return '1 minute ago'
elif s < 3600:
return '{0} minutes ago'.format(s / 60)
elif s < 7200:
return '1 hour ago'
else:
return '{0} hours ago'.format(s / 3600)
if __name__ == '__main__':
print decimal_relative_time(datetime.datetime.utcnow(), ndigits=5)
print decimal_relative_time(datetime.datetime.utcnow() - timedelta(days=1, seconds=3600))