From 0ebb587666573c452753613e39e0fb2e2bd6e36f Mon Sep 17 00:00:00 2001 From: meejah Date: Tue, 16 Jan 2018 13:12:40 -0700 Subject: [PATCH] report download sizes in magic-folder status --- src/allmydata/frontends/magic_folder.py | 5 +++-- src/allmydata/web/magic_folder.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 92673e7cc..c06bb8d93 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -975,8 +975,8 @@ class DownloadItem(QueuedItem): """ Represents a single item in the _deque of the Downloader """ - def __init__(self, relpath_u, progress, filenode, metadata): - super(DownloadItem, self).__init__(relpath_u, progress, None) + def __init__(self, relpath_u, progress, filenode, metadata, size): + super(DownloadItem, self).__init__(relpath_u, progress, size) self.file_node = filenode self.metadata = metadata @@ -1164,6 +1164,7 @@ class Downloader(QueueMixin, WriteFileMixin): PercentProgress(file_node.get_size()), file_node, metadata, + file_node.get_size(), ) to_dl.set_status('queued', self._clock.seconds()) self._deque.append(to_dl) diff --git a/src/allmydata/web/magic_folder.py b/src/allmydata/web/magic_folder.py index 4a907ed50..27d715d3a 100644 --- a/src/allmydata/web/magic_folder.py +++ b/src/allmydata/web/magic_folder.py @@ -46,6 +46,7 @@ class MagicFolderWebApi(TokenOnlyWebApi): for (status, ts) in item.status_history(): d[status + '_at'] = ts d['percent_done'] = item.progress.progress + d['size'] = item.size data.append(d) return json.dumps(data)