mirrors/yt-dlp-deezer
1
0
Fork 0
mirror of https://github.com/LucBerge/yt-dlp.git synced 2025-03-17 19:57:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

[minicurses] Fix when printing to file

Browse source 
Closes #1215
This commit is contained in:
pukkandan 2021-10-10 07:08:22 +05:30
parent 2e01ba6218
commit d1d5c08f29
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
4 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

42
yt_dlp/minicurses.py
View file

@ -1,6 +1,6 @@
import functools
from threading import Lock
from .utils import supports_terminal_sequences, TERMINAL_SEQUENCES
from .utils import supports_terminal_sequences, TERMINAL_SEQUENCES, write_string
class MultilinePrinterBase:
@ -25,20 +25,26 @@ class MultilinePrinterBase:
return f'{line + 1}: {text}'
return text
def write(self, *text):
write_string(''.join(text), self.stream)
class QuietMultilinePrinter(MultilinePrinterBase):
pass
class MultilineLogger(MultilinePrinterBase):
def write(self, *text):
self.stream.debug(''.join(text))
def print_at_line(self, text, pos):
# stream is the logger object, not an actual stream
self.stream.debug(self._add_line_number(text, pos))
self.write(self._add_line_number(text, pos))
class BreaklineStatusPrinter(MultilinePrinterBase):
def print_at_line(self, text, pos):
self.stream.write(self._add_line_number(text, pos) + '\n')
self.write(self._add_line_number(text, pos), '\n')
class MultilinePrinter(MultilinePrinterBase):
@ -58,50 +64,46 @@ class MultilinePrinter(MultilinePrinterBase):
def _move_cursor(self, dest):
current = min(self._lastline, self.maximum)
self.stream.write('\r')
yield '\r'
distance = dest - current
if distance < 0:
self.stream.write(TERMINAL_SEQUENCES['UP'] * -distance)
yield TERMINAL_SEQUENCES['UP'] * -distance
elif distance > 0:
self.stream.write(TERMINAL_SEQUENCES['DOWN'] * distance)
yield TERMINAL_SEQUENCES['DOWN'] * distance
self._lastline = dest
@lock
def print_at_line(self, text, pos):
if self._HAVE_FULLCAP:
self._move_cursor(pos)
self.stream.write(TERMINAL_SEQUENCES['ERASE_LINE'])
self.stream.write(text)
return
self.write(*self._move_cursor(pos), TERMINAL_SEQUENCES['ERASE_LINE'], text)
text = self._add_line_number(text, pos)
textlen = len(text)
if self._lastline == pos:
# move cursor at the start of progress when writing to same line
self.stream.write('\r')
prefix = '\r'
if self._lastlength > textlen:
text += ' ' * (self._lastlength - textlen)
self._lastlength = textlen
else:
# otherwise, break the line
self.stream.write('\n')
prefix = '\n'
self._lastlength = textlen
self.stream.write(text)
self.write(prefix, text)
self._lastline = pos
@lock
def end(self):
# move cursor to the end of the last line, and write line break
# so that other to_screen calls can precede
if self._HAVE_FULLCAP:
self._move_cursor(self.maximum)
text = self._move_cursor(self.maximum) if self._HAVE_FULLCAP else []
if self.preserve_output:
self.stream.write('\n')
self.write(*text, '\n')
return
if self._HAVE_FULLCAP:
self.stream.write(
TERMINAL_SEQUENCES['ERASE_LINE']
+ f'{TERMINAL_SEQUENCES["UP"]}{TERMINAL_SEQUENCES["ERASE_LINE"]}' * self.maximum)
self.write(
*text, TERMINAL_SEQUENCES['ERASE_LINE'],
f'{TERMINAL_SEQUENCES["UP"]}{TERMINAL_SEQUENCES["ERASE_LINE"]}' * self.maximum)
else:
self.stream.write(' ' * self._lastlength)
self.write(*text, ' ' * self._lastlength)