diff options
| author | Jouke Waleson <jouke.waleson@mendix.com> | 2014-11-23 21:23:05 +0100 |
|---|---|---|
| committer | Jouke Waleson <jouke.waleson@mendix.com> | 2014-11-23 21:23:05 +0100 |
| commit | 2514d2635e0c8ff0fb72d00a093a849001df2bdd (patch) | |
| tree | bcb5eefb145d720d03df24178c7bbd1c3e515cfe /youtube_dl/downloader/rtmp.py | |
| parent | 8bcc875676b56c062a4fdd81763a6adb0fb1390c (diff) | |
| download | youtube-dl-2514d2635e0c8ff0fb72d00a093a849001df2bdd.zip youtube-dl-2514d2635e0c8ff0fb72d00a093a849001df2bdd.tar.gz youtube-dl-2514d2635e0c8ff0fb72d00a093a849001df2bdd.tar.bz2 | |
PEP8: E225,E227
Diffstat (limited to 'youtube_dl/downloader/rtmp.py')
| -rw-r--r-- | youtube_dl/downloader/rtmp.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 642f13b..58ae200 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -46,13 +46,13 @@ class RtmpFD(FileDownloader): continue mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec \(([0-9]{1,2}\.[0-9])%\)', line) if mobj: - downloaded_data_len = int(float(mobj.group(1)) *1024) + downloaded_data_len = int(float(mobj.group(1)) * 1024) percent = float(mobj.group(2)) if not resume_percent: resume_percent = percent resume_downloaded_data_len = downloaded_data_len - eta = self.calc_eta(start, time.time(), 100 -resume_percent, percent -resume_percent) - speed = self.calc_speed(start, time.time(), downloaded_data_len -resume_downloaded_data_len) + eta = self.calc_eta(start, time.time(), 100 - resume_percent, percent - resume_percent) + speed = self.calc_speed(start, time.time(), downloaded_data_len - resume_downloaded_data_len) data_len = None if percent > 0: data_len = int(downloaded_data_len * 100 / percent) @@ -72,7 +72,7 @@ class RtmpFD(FileDownloader): # no percent for live streams mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec', line) if mobj: - downloaded_data_len = int(float(mobj.group(1)) *1024) + downloaded_data_len = int(float(mobj.group(1)) * 1024) time_now = time.time() speed = self.calc_speed(start, time_now, downloaded_data_len) self.report_progress_live_stream(downloaded_data_len, speed, time_now - start) @@ -88,7 +88,7 @@ class RtmpFD(FileDownloader): if not cursor_in_new_line: self.to_screen('') cursor_in_new_line = True - self.to_screen('[rtmpdump] ' +line) + self.to_screen('[rtmpdump] ' + line) proc.wait() if not cursor_in_new_line: self.to_screen('') |