Nicer downloads when size is unknown

This commit is contained in:
Florian Bruhin 2014-06-24 17:57:52 +02:00
parent 7a74ecf8a6
commit 9b4cc6ab76

View File

@ -128,11 +128,15 @@ class DownloadItem(QObject):
Example: foo.pdf [699.2kB/s|0.34|16%|4.253/25.124]
"""
perc = 0 if self.percentage is None else round(self.percentage)
remaining = (utils.format_seconds(self.remaining_time)
if self.remaining_time is not None else '?')
speed = utils.format_size(self.speed, suffix='B/s')
down = utils.format_size(self.bytes_done, suffix='B')
if all(e is None for e in (self.percentage, self.remaining_time,
self.bytes_total)):
return ('{name} [{speed:>10}|{down}]'.format(
name=self.basename, speed=speed, down=down))
perc = '??' if self.percentage is None else round(self.percentage)
remaining = (utils.format_seconds(self.remaining_time)
if self.remaining_time is not None else '?')
total = utils.format_size(self.bytes_total, suffix='B')
return ('{name} [{speed:>10}|{remaining:>5}|{perc:>2}%|'
'{down}/{total}]'.format(name=self.basename, speed=speed,