Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Windows output for non-BMP unicode characters

pull/2442/merge
Philipp Hagemeister 2014-04-07 23:23:48 +02:00
parent a5863bdf33
commit 89938c719e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/utils.py
View File

@ -923,6 +923,9 @@ def _windows_write_string(s, out):
2: -12, 2: -12,
} }
def ucs2_len(s):
return sum((2 if ord(c) > 0xffff else 1) for c in s)
fileno = out.fileno() fileno = out.fileno()
if fileno not in WIN_OUTPUT_IDS: if fileno not in WIN_OUTPUT_IDS:
return False return False
@ -956,10 +959,10 @@ def _windows_write_string(s, out):
if not_a_console(h): if not_a_console(h):
return False return False
remaining = len(s) remaining = ucs2_len(s)
while remaining > 0: while remaining > 0:
ret = WriteConsoleW( ret = WriteConsoleW(
h, s, min(len(s), 1024), ctypes.byref(written), None) h, s, min(remaining, 1024), ctypes.byref(written), None)
if ret == 0: if ret == 0:
raise OSError('Failed to write string') raise OSError('Failed to write string')
remaining -= written.value remaining -= written.value