aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/downloader/rtmp.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2014-03-05 22:12:02 +0700
committerSergey M․ <dstftw@gmail.com>2014-03-05 22:12:02 +0700
commit3524175625a88824798ee38d59314844318232e3 (patch)
tree9031e3ff6a48fedc5c4e40f7267d26089c504bcd /youtube_dl/downloader/rtmp.py
parent7b9965ea9342455a7d60e4472695c6ce0ee407b4 (diff)
downloadyoutube-dl-3524175625a88824798ee38d59314844318232e3.zip
youtube-dl-3524175625a88824798ee38d59314844318232e3.tar.gz
youtube-dl-3524175625a88824798ee38d59314844318232e3.tar.bz2
Use meaningful return value constants for rtmpdump
Diffstat (limited to 'youtube_dl/downloader/rtmp.py')
-rw-r--r--youtube_dl/downloader/rtmp.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py
index e93c28d..c3194cb 100644
--- a/youtube_dl/downloader/rtmp.py
+++ b/youtube_dl/downloader/rtmp.py
@@ -152,22 +152,26 @@ class RtmpFD(FileDownloader):
shell_quote = repr
self.to_screen(u'[debug] rtmpdump command line: ' + shell_quote(str_args))
+ RD_SUCCESS = 0
+ RD_FAILED = 1
+ RD_INCOMPLETE = 2
+
retval = run_rtmpdump(args)
- while (retval == 2 or retval == 1) and not test:
+ while (retval == RD_INCOMPLETE or retval == RD_ FAILED) and not test:
prevsize = os.path.getsize(encodeFilename(tmpfilename))
self.to_screen(u'[rtmpdump] %s bytes' % prevsize)
time.sleep(5.0) # This seems to be needed
- retval = run_rtmpdump(basic_args + ['-e'] + [[], ['-k', '1']][retval == 1])
+ retval = run_rtmpdump(basic_args + ['-e'] + [[], ['-k', '1']][retval == RD_FAILED])
cursize = os.path.getsize(encodeFilename(tmpfilename))
- if prevsize == cursize and retval == 1:
+ if prevsize == cursize and retval == RD_FAILED:
break
# Some rtmp streams seem abort after ~ 99.8%. Don't complain for those
- if prevsize == cursize and retval == 2 and cursize > 1024:
+ if prevsize == cursize and retval == RD_INCOMPLETE and cursize > 1024:
self.to_screen(u'[rtmpdump] Could not download the whole video. This can happen for some advertisements.')
- retval = 0
+ retval = RD_SUCCESS
break
- if retval == 0 or (test and retval == 2):
+ if retval == RD_SUCCESS or (test and retval == RD_INCOMPLETE):
fsize = os.path.getsize(encodeFilename(tmpfilename))
self.to_screen(u'[rtmpdump] %s bytes' % fsize)
self.try_rename(tmpfilename, filename)