Mirrors/tg
2
0
Fork 0
mirror of https://github.com/paul-nameless/tg synced 2025-02-16 18:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reorder some functions in controller to keep them logically together

Browse source
This commit is contained in:
Paul Nameless 2020-05-22 13:36:53 +08:00
parent 97730646d3
commit 2e22cb9728
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tg/controllers.py
View file

@ -103,13 +103,6 @@ class Controller:
if self.model.jump_bottom():
self.refresh_msgs()
def handle_msgs(self, _: int):
rc = self.handle(self.msg_bindings, 0.2)
if rc == "QUIT":
return rc
self.chat_size = 0.5
self.resize()
def next_chat(self, repeat_factor: int):
if self.model.next_chat(repeat_factor):
self.render()
@ -226,12 +219,6 @@ class Controller:
self.tg.send_voice(file_path, chat_id, duration, waveform)
self.present_info(f"Sent voice msg: {file_path}")
def run(self) -> None:
try:
self.handle(self.chat_bindings, 0.5)
except Exception:
log.exception("Error happened in main loop")
def download_current_file(self):
msg = MsgProxy(self.model.current_msg)
log.debug("Downloading msg: %s", msg.msg)
@ -310,6 +297,34 @@ class Controller:
self.model.send_message(text=msg)
self.present_info("Message sent")
def run(self) -> None:
try:
self.handle(self.chat_bindings, 0.5)
except Exception:
log.exception("Error happened in main loop")
def handle_msgs(self, _: int):
rc = self.handle(self.msg_bindings, 0.2)
if rc == "QUIT":
return rc
self.chat_size = 0.5
self.resize()
def handle(
self, key_bindings: Dict[str, key_bind_handler_type], size: float
):
self.chat_size = size
self.resize()
while True:
repeat_factor, keys = self.view.get_keys()
handler = key_bindings.get(keys, lambda _: None)
res = handler(repeat_factor)
if res == "QUIT":
return res
elif res == "BACK":
return res
def resize_handler(self, signum, frame):
curses.endwin()
self.view.stdscr.refresh()
@ -328,19 +343,6 @@ class Controller:
self.view.status.resize(rows, cols)
self.render()
def handle(self, key_bindings: Dict[str, key_bind_handler_type], size: float):
self.chat_size = size
self.resize()
while True:
repeat_factor, keys = self.view.get_keys()
handler = key_bindings.get(keys, lambda _: None)
res = handler(repeat_factor)
if res == "QUIT":
return res
elif res == "BACK":
return res
def render(self) -> None:
with self.lock:
# using lock here, because render is used from another