ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-02 01:08:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Render abbreviated rate and time values

Browse Source
This commit is contained in:
Sajith Sasidharan 2020-05-22 14:53:33 -04:00 committed by Sajith Sasidharan
parent c0d83def22
commit 118ea4267c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/allmydata/web/status.py
View File

@ -99,7 +99,7 @@ class UploadResultsRendererMixin(RateAndTimeMixin):
def _get_time(self, name): def _get_time(self, name):
d = self.upload_results() d = self.upload_results()
d.addCallback(lambda res: str(res.get_timings().get(name))) d.addCallback(lambda res: abbreviate_time(res.get_timings().get(name)))
return d return d
@renderer @renderer
@ -147,7 +147,7 @@ class UploadResultsRendererMixin(RateAndTimeMixin):
def _convert(r): def _convert(r):
file_size = r.get_file_size() file_size = r.get_file_size()
duration = r.get_timings().get(name) duration = r.get_timings().get(name)
return str(compute_rate(file_size, duration)) return abbreviate_rate(compute_rate(file_size, duration))
d.addCallback(_convert) d.addCallback(_convert)
return d return d
@ -175,9 +175,9 @@ class UploadResultsRendererMixin(RateAndTimeMixin):
time1 = r.get_timings().get("cumulative_encoding") time1 = r.get_timings().get("cumulative_encoding")
time2 = r.get_timings().get("cumulative_sending") time2 = r.get_timings().get("cumulative_sending")
if (time1 is None or time2 is None): if (time1 is None or time2 is None):
return str(None) return abbreviate_rate(None)
else: else:
return str(compute_rate(file_size, time1+time2)) return abbreviate_rate(compute_rate(file_size, time1+time2))
d.addCallback(_convert) d.addCallback(_convert)
return d return d
@ -187,7 +187,7 @@ class UploadResultsRendererMixin(RateAndTimeMixin):
def _convert(r): def _convert(r):
fetch_size = r.get_ciphertext_fetched() fetch_size = r.get_ciphertext_fetched()
duration = r.get_timings().get("cumulative_fetch") duration = r.get_timings().get("cumulative_fetch")
return str(compute_rate(fetch_size, duration)) return abbreviate_rate(compute_rate(fetch_size, duration))
d.addCallback(_convert) d.addCallback(_convert)
return d return d