ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add a 'size' to pending uploads

Browse Source
This commit is contained in:
meejah 2018-01-15 18:10:43 -07:00
parent 8ac63cf5bd
commit 42766da553
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/frontends/magic_folder.py
View File

@ -484,10 +484,11 @@ class IQueuedItem(Interface):
@implementer(IQueuedItem)
class QueuedItem(object):
def __init__(self, relpath_u, progress):
def __init__(self, relpath_u, progress, size):
self.relpath_u = relpath_u
self.progress = progress
self._status_history = dict()
self.size = size
def set_status(self, status, current_time=None):
if current_time is None:
@ -615,8 +616,11 @@ class Uploader(QueueMixin):
return
self._pending.add(relpath_u)
fp = self._get_filepath(relpath_u)
pathinfo = get_pathinfo(unicode_from_filepath(fp))
progress = PercentProgress()
item = UploadItem(relpath_u, progress)
self._log("add pending size: {}: {}".format(relpath_u, pathinfo.size))
item = UploadItem(relpath_u, progress, pathinfo.size)
item.set_status('queued', self._clock.seconds())
self._deque.append(item)
self._count('objects_queued')
@ -694,6 +698,7 @@ class Uploader(QueueMixin):
now = time.time()
fp = self._get_filepath(relpath_u)
pathinfo = get_pathinfo(unicode_from_filepath(fp))
item.size = pathinfo.size
self._log("about to remove %r from pending set %r" %
(relpath_u, self._pending))
@ -963,7 +968,7 @@ 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)
super(DownloadItem, self).__init__(relpath_u, progress, None)
self.file_node = filenode
self.metadata = metadata

1
src/allmydata/web/magic_folder.py
View File

@ -34,6 +34,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)
for item in magic_folder.downloader.get_status():