diff --git a/dr1p4ns1.py b/dr1p4ns1.py index d214b24..ab956a4 100644 --- a/dr1p4ns1.py +++ b/dr1p4ns1.py @@ -662,7 +662,7 @@ class UI: print(f'{C}{self.files[index]} {M}was not copied') sleep(1) print('\x1bc') - decoder.as_terminal() + decoder.as_terminal() elif k == 'q': self.QUEUE.append((self.files[index],d.width)) print(f'{C}{self.files[index]} {B}added to pumpqueue') @@ -794,7 +794,6 @@ class ANSIDecoder: while len(self.current_line) < self.x: self.current_line.append((self.DEFAULT_ATTR, ' ')) self.current_line.append((self.current_attr, char)) - self.x += 1 if self.x >= self.width: self.write_newline() @@ -804,7 +803,6 @@ class ANSIDecoder: self.x = max(x, 0) if y is not None: self.y = max(y, 0) - try: self.current_line = self.buffer[self.y] except IndexError: @@ -825,7 +823,6 @@ class ANSIDecoder: bright = self.current_attr.bright if underline is None: underline = self.current_attr.underline - self.current_attr = self.Attribute(fg=fg, bg=bg, bright=bright, underline=underline) ######################################################################################################################### def write_escape(self, code, params): @@ -887,7 +884,6 @@ class ANSIDecoder: else: if self.strict: raise ANSIDecodeError("Unrecognised parameters to 'K' escape sequence: %r" % params) - elif code == 'A': # move cursor up N lines if not params: @@ -896,7 +892,6 @@ class ANSIDecoder: self.set_cursor(y=(self.y - params[0])) elif self.strict: raise ANSIDecodeError("Expected 0 or 1 param to 'A' escape sequence, got %d" % len(params)) - elif code == 'B': # move cursor down N lines if not params: @@ -905,7 +900,6 @@ class ANSIDecoder: self.set_cursor(y=(self.y + params[0])) elif self.strict: raise ANSIDecodeError("Expected 0 or 1 param to 'B' escape sequence, got %d" % len(params)) - elif code == 'C': # move cursor right N cols if not params: @@ -914,7 +908,6 @@ class ANSIDecoder: self.set_cursor(x=(self.x + params[0])) elif self.strict: raise ANSIDecodeError("Expected 0 or 1 param to 'C' escape sequence, got %d" % len(params)) - elif code == 'D': # move cursor left N cols if not params: @@ -923,7 +916,6 @@ class ANSIDecoder: self.set_cursor(x=(self.x - params[0])) elif self.strict: raise ANSIDecodeError("Expected 0 or 1 param to 'D' escape sequence, got %d" % len(params)) - elif code == 'E': # move cursor to beginning of next line, N lines down if not params: @@ -932,7 +924,6 @@ class ANSIDecoder: self.set_cursor(x=0, y=(self.y + params[0])) elif self.strict: raise ANSIDecodeError("Expected 0 or 1 param to 'E' escape sequence, got %d" % len(params)) - elif code == 'F': # move cursor to beginning of previous line, N lines up if not params: @@ -941,14 +932,12 @@ class ANSIDecoder: self.set_cursor(x=0, y=(self.y - params[0])) elif self.strict: raise ANSIDecodeError("Expected 0 or 1 param to 'F' escape sequence, got %d" % len(params)) - elif code == 'G': # move cursor to column N if len(params) == 1: self.set_cursor(x=params[0]) elif self.strict: raise ANSIDecodeError("Expected 1 param to 'G' escape sequence, got %d" % len(params)) - elif code == 'H' or code == 'f': # move cursor to (line, col) if not params: @@ -957,27 +946,23 @@ class ANSIDecoder: self.set_cursor(x=params[1] - 1, y=params[0] - 1) elif self.strict: raise ANSIDecodeError("Expected 0 or 2 param to '%s' escape sequence, got %d" % (code, len(params))) - elif code == 'h': if params == [7]: # enable line wrapping pass elif self.strict: raise ANSIDecodeError("Unrecognised params to 'h' - got %r" % params) - elif code == 's': # save cursor position if params and self.strict: raise ANSIDecodeError("Unrecognised params to 's' - got %r" % params) self.saved_x = self.x self.saved_y = self.y - elif code == 'u': # restore cursor position if params and self.strict: raise ANSIDecodeError("Unrecognised params to 'u' - got %r" % params) self.set_cursor(x=self.saved_x, y=self.saved_y) - else: if self.strict: raise ANSIDecodeError("Unrecognised escape code: %r" % code)