Merge lp:~enli/lernid/async-slide-download into lp:lernid

Proposed by Peeyoosh Sangolekar
Status: Merged
Merge reported by: Michael Budde
Merged at revision: not available
Proposed branch: lp:~enli/lernid/async-slide-download
Merge into: lp:lernid
Diff against target: 17 lines (+5/-2)
1 file modified
lernid/widgets/Slide.py (+5/-2)
To merge this branch: bzr merge lp:~enli/lernid/async-slide-download
Reviewer Review Type Date Requested Status
Michael Budde Pending
Review via email: mp+20823@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lernid/widgets/Slide.py'
2--- lernid/widgets/Slide.py 2010-03-04 12:40:09 +0000
3+++ lernid/widgets/Slide.py 2010-03-06 16:05:28 +0000
4@@ -143,8 +143,11 @@
5 path = os.path.join(save_cache_path('lernid'), 'slides.pdf')
6 try:
7 logging.debug('downloading slides from %s' % session.slides)
8- Statusbar.push_message(_('Downloading session slides...'), 'slidesession')
9- urllib.urlretrieve(session.slides, path)
10+ def reporthook(blocks, bs, size):
11+ Statusbar.pop_message('slidesession')
12+ msg = _('Downloading session slides ({0} % of {1:.1} MB)...').format(100*blocks*bs/size, float(size)/float(1024*1024))
13+ Statusbar.push_message(msg, 'slidesession')
14+ urllib.urlretrieve(session.slides, path, reporthook)
15 Statusbar.push_message(_('Slides have been downloaded'), 'slidesession')
16 self._session_slide_downloaded = True
17 self.emit('slides-downloaded')

Subscribers

People subscribed via source and target branches