current-downloads status: add SI, size, make numsegs 1-based

This commit is contained in:
Brian Warner 2008-02-26 15:02:35 -07:00
parent dd970d1a67
commit d4bf623b87
2 changed files with 5 additions and 4 deletions

View File

@ -389,6 +389,9 @@ class FileDownloader:
self._status = s = DownloadStatus()
s.set_status("Starting")
s.set_storage_index(self._storage_index)
s.set_size(self._size)
s.set_helper(False)
if IConsumer.providedBy(downloadable):
downloadable.registerProducer(self, True)
@ -717,7 +720,7 @@ class FileDownloader:
def _download_segment(self, res, segnum):
if self._status:
self._status.set_status("Downloading segment %d of %d" %
(segnum, self._total_segments))
(segnum+1, self._total_segments))
self.log("downloading seg#%d of %d (%d%%)"
% (segnum, self._total_segments,
100.0 * segnum / self._total_segments))
@ -798,8 +801,6 @@ class FileDownloader:
class LiteralDownloader:
implements(IDownloadStatus)
def __init__(self, client, u, downloadable):
self._uri = IFileURI(u)
assert isinstance(self._uri, uri.LiteralFileURI)

View File

@ -50,7 +50,7 @@
<td><n:slot name="progress"/></td>
<td><n:slot name="status"/></td>
</tr>
<tr n:pattern="empty"><td>No current uploads!</td></tr>
<tr n:pattern="empty"><td>No current downloads!</td></tr>
</table>
<div>Return to the <a href="/">Welcome Page</a></div>