Mirrors/tg
2
0
Fork 0
mirror of https://github.com/paul-nameless/tg synced 2024-11-22 11:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not fail if addstr raises error (#214)

Browse source 
* Do not fail if addstr raises error

* Fix black formatting

* Fix formatting of last_msg

* Add types

* Fix sort imports
This commit is contained in:
Nameless 2021-04-21 19:33:11 +03:00 committed by GitHub
parent d78792e71e
commit 617badc1de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tg/views.py
View file

@ -28,6 +28,24 @@ MULTICHAR_KEYBINDINGS = (
) )
class Win:
"""Proxy for win object to log error and continue working"""
def __init__(self, win: window):
self.win = win
def addstr(self, y: int, x: int, _str: str, attr: Any = None) -> None:
try:
return self.win.addstr(y, x, _str, attr)
except Exception:
log.exception(f"Error drawing: {y=}, {x=}, {_str=}, {attr=}")
def __getattribute__(self, name: str) -> Any:
if name in ("win", "addstr"):
return object.__getattribute__(self, name)
return self.win.__getattribute__(name)
class View: class View:
def __init__( def __init__(
self, self,
@ -92,7 +110,7 @@ class StatusView:
self.y = curses.LINES - 1 self.y = curses.LINES - 1
self.x = 0 self.x = 0
self.stdscr = stdscr self.stdscr = stdscr
self.win = stdscr.subwin(self.h, self.w, self.y, self.x) self.win = Win(stdscr.subwin(self.h, self.w, self.y, self.x))
self._refresh = self.win.refresh self._refresh = self.win.refresh
def resize(self, rows: int, cols: int) -> None: def resize(self, rows: int, cols: int) -> None:
@ -143,7 +161,7 @@ class ChatView:
self.stdscr = stdscr self.stdscr = stdscr
self.h = 0 self.h = 0
self.w = 0 self.w = 0
self.win = stdscr.subwin(self.h, self.w, 0, 0) self.win = Win(stdscr.subwin(self.h, self.w, 0, 0))
self._refresh = self.win.refresh self._refresh = self.win.refresh
self.model = model self.model = model
@ -218,6 +236,7 @@ class ChatView:
item = truncate_to_len( item = truncate_to_len(
elem, max(0, width - offset - flags_len) elem, max(0, width - offset - flags_len)
) )
if len(item) > 1: if len(item) > 1:
self.win.addstr(i, offset, item, attr) self.win.addstr(i, offset, item, attr)
offset += string_len_dwc(elem) offset += string_len_dwc(elem)
@ -228,6 +247,7 @@ class ChatView:
self, chat: Dict[str, Any] self, chat: Dict[str, Any]
) -> Tuple[Optional[str], Optional[str]]: ) -> Tuple[Optional[str], Optional[str]]:
user, last_msg = get_last_msg(chat, self.model.users) user, last_msg = get_last_msg(chat, self.model.users)
last_msg = last_msg.replace("\n", " ")
if user: if user:
last_msg_sender = self.model.users.get_user_label(user) last_msg_sender = self.model.users.get_user_label(user)
chat_type = get_chat_type(chat) chat_type = get_chat_type(chat)
@ -292,7 +312,7 @@ class MsgView:
self.h = 0 self.h = 0
self.w = 0 self.w = 0
self.x = 0 self.x = 0
self.win = self.stdscr.subwin(self.h, self.w, 0, self.x) self.win = Win(self.stdscr.subwin(self.h, self.w, 0, self.x))
self._refresh = self.win.refresh self._refresh = self.win.refresh
self.states = { self.states = {
"messageSendingStateFailed": "failed", "messageSendingStateFailed": "failed",