projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8265478
)
Use unicode literals
author
Sergey M․
<dstftw@gmail.com>
Wed, 5 Mar 2014 15:24:07 +0000
(22:24 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 5 Mar 2014 15:24:07 +0000
(22:24 +0700)
youtube_dl/downloader/rtmp.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/rtmp.py
b/youtube_dl/downloader/rtmp.py
index 489381da679b689effc4093b9ead21ebe160f7ed..fc02987a78890d02bfd0a13a9308bb6fd6c0fdab 100644
(file)
--- a/
youtube_dl/downloader/rtmp.py
+++ b/
youtube_dl/downloader/rtmp.py
@@
-1,3
+1,5
@@
+from __future__ import unicode_literals
+
import os
import re
import subprocess
import os
import re
import subprocess
@@
-22,7
+24,7
@@
class RtmpFD(FileDownloader):
proc_stderr_closed = False
while not proc_stderr_closed:
# read line from stderr
proc_stderr_closed = False
while not proc_stderr_closed:
# read line from stderr
- line =
u
''
+ line = ''
while True:
char = proc.stderr.read(1)
if not char:
while True:
char = proc.stderr.read(1)
if not char:
@@
-46,7
+48,7
@@
class RtmpFD(FileDownloader):
data_len = None
if percent > 0:
data_len = int(downloaded_data_len * 100 / percent)
data_len = None
if percent > 0:
data_len = int(downloaded_data_len * 100 / percent)
- data_len_str =
u
'~' + format_bytes(data_len)
+ data_len_str = '~' + format_bytes(data_len)
self.report_progress(percent, data_len_str, speed, eta)
cursor_in_new_line = False
self._hook_progress({
self.report_progress(percent, data_len_str, speed, eta)
cursor_in_new_line = False
self._hook_progress({
@@
-76,12
+78,12
@@
class RtmpFD(FileDownloader):
})
elif self.params.get('verbose', False):
if not cursor_in_new_line:
})
elif self.params.get('verbose', False):
if not cursor_in_new_line:
- self.to_screen(
u
'')
+ self.to_screen('')
cursor_in_new_line = True
cursor_in_new_line = True
- self.to_screen(
u
'[rtmpdump] '+line)
+ self.to_screen('[rtmpdump] '+line)
proc.wait()
if not cursor_in_new_line:
proc.wait()
if not cursor_in_new_line:
- self.to_screen(
u
'')
+ self.to_screen('')
return proc.returncode
url = info_dict['url']
return proc.returncode
url = info_dict['url']
@@
-102,7
+104,7
@@
class RtmpFD(FileDownloader):
try:
subprocess.call(['rtmpdump', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
except (OSError, IOError):
try:
subprocess.call(['rtmpdump', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
except (OSError, IOError):
- self.report_error(
u
'RTMP download detected but "rtmpdump" could not be run')
+ self.report_error('RTMP download detected but "rtmpdump" could not be run')
return False
# Download using rtmpdump. rtmpdump returns exit code 2 when
return False
# Download using rtmpdump. rtmpdump returns exit code 2 when
@@
-150,7
+152,7
@@
class RtmpFD(FileDownloader):
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))
except ImportError:
shell_quote = repr
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))
except ImportError:
shell_quote = repr
- self.to_screen(
u
'[debug] rtmpdump command line: ' + shell_quote(str_args))
+ self.to_screen('[debug] rtmpdump command line: ' + shell_quote(str_args))
RD_SUCCESS = 0
RD_FAILED = 1
RD_SUCCESS = 0
RD_FAILED = 1
@@
-160,12
+162,12
@@
class RtmpFD(FileDownloader):
retval = run_rtmpdump(args)
if retval == RD_NO_CONNECT:
retval = run_rtmpdump(args)
if retval == RD_NO_CONNECT:
- self.report_error(
u
'[rtmpdump] Could not connect to RTMP server.')
+ self.report_error('[rtmpdump] Could not connect to RTMP server.')
return False
while (retval == RD_INCOMPLETE or retval == RD_FAILED) and not test:
prevsize = os.path.getsize(encodeFilename(tmpfilename))
return False
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)
+ self.to_screen('[rtmpdump] %s bytes' % prevsize)
time.sleep(5.0) # This seems to be needed
retval = run_rtmpdump(basic_args + ['-e'] + [[], ['-k', '1']][retval == RD_FAILED])
cursize = os.path.getsize(encodeFilename(tmpfilename))
time.sleep(5.0) # This seems to be needed
retval = run_rtmpdump(basic_args + ['-e'] + [[], ['-k', '1']][retval == RD_FAILED])
cursize = os.path.getsize(encodeFilename(tmpfilename))
@@
-173,12
+175,12
@@
class RtmpFD(FileDownloader):
break
# Some rtmp streams seem abort after ~ 99.8%. Don't complain for those
if prevsize == cursize and retval == RD_INCOMPLETE and cursize > 1024:
break
# Some rtmp streams seem abort after ~ 99.8%. Don't complain for those
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.')
+ self.to_screen('[rtmpdump] Could not download the whole video. This can happen for some advertisements.')
retval = RD_SUCCESS
break
if retval == RD_SUCCESS or (test and retval == RD_INCOMPLETE):
fsize = os.path.getsize(encodeFilename(tmpfilename))
retval = RD_SUCCESS
break
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.to_screen('[rtmpdump] %s bytes' % fsize)
self.try_rename(tmpfilename, filename)
self._hook_progress({
'downloaded_bytes': fsize,
self.try_rename(tmpfilename, filename)
self._hook_progress({
'downloaded_bytes': fsize,
@@
-188,6
+190,6
@@
class RtmpFD(FileDownloader):
})
return True
else:
})
return True
else:
- self.to_stderr(
u"\n"
)
- self.report_error(
u
'rtmpdump exited with code %d' % retval)
+ self.to_stderr(
'\n'
)
+ self.report_error('rtmpdump exited with code %d' % retval)
return False
return False