diff options
| author | Simon Schampijer <simon@schampijer.de> | 2007-09-06 15:15:24 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2007-09-06 15:15:24 (GMT) |
| commit | 2a354fb8961e934f90889c5d3f0be84fb91d5b5b (patch) | |
| tree | 6fce54fd74270f8a126a34ffc07f8e293d683d72 | |
| parent | cafb4bcbc2df8e6300bb74573e02e8b9d992b91f (diff) | |
| parent | 5fabaf63f981412eace3b0fa448f8ac604536404 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | downloadmanager.py | 11 |
2 files changed, 8 insertions, 4 deletions
@@ -1,4 +1,5 @@ * Added missing fill_color in icon (erikos) +* #2555: Report download progress to the Journal via the DataStore. (tomeu) 48 diff --git a/downloadmanager.py b/downloadmanager.py index ed0b0f1..3ffe4d0 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -113,6 +113,7 @@ class Download: self._dl_jobject.metadata['title'] = _('File %s downloaded from\n%s.') % \ (file_name, self._source.spec) + self._dl_jobject.metadata['progress'] = '100' self._dl_jobject.file_path = self._target_file.path if self._mime_type == 'application/octet-stream': @@ -151,16 +152,17 @@ class Download: path, file_name = os.path.split(self._target_file.path) percent = (cur_self_progress * 100) / max_self_progress - if (time.time() - self._last_update_time) < 10 and \ - (percent - self._last_update_percent) < 10: + if (time.time() - self._last_update_time) < 5 and \ + (percent - self._last_update_percent) < 5: return self._last_update_time = time.time() self._last_update_percent = percent if percent < 100: - self._dl_jobject.metadata['title'] = _('Downloading %s from\n%s. Progress %i%%.') % \ - (file_name, self._source.spec, percent) + self._dl_jobject.metadata['title'] = _('Downloading %s from\n%s.') % \ + (file_name, self._source.spec) + self._dl_jobject.metadata['progress'] = str(percent) datastore.write(self._dl_jobject) cb_service = clipboardservice.get_instance() @@ -176,6 +178,7 @@ class Download: self._dl_jobject.metadata['title'] = _('Downloading %s from \n%s.') % \ (file_name, self._source.spec) + self._dl_jobject.metadata['progress'] = '0' self._dl_jobject.metadata['keep'] = '0' self._dl_jobject.metadata['buddies'] = '' self._dl_jobject.metadata['preview'] = '' |