greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2900 from ariel-anieli/issue-2801-catch-key 

Reduced complexity of `_GlancesCurses.__catch_key()`
pull/2913/head
Nicolas Hennion 2024-08-09 17:15:53 +02:00 committed by GitHub
parent c5f06b3847 1b199ada75
commit e40aa05e8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
glances/outputs/glances_curses.py
View File

@ -235,24 +235,16 @@ class _GlancesCurses:
# TODO: Check issue #163
return window.getch()
def __catch_key(self, return_to_browser=False):
# Catch the pressed key
self.pressedkey = self.get_key(self.term_window)
if self.pressedkey == -1:
return -1
def catch_actions_from_hotkey(self, hotkey):
if self.pressedkey == ord(hotkey) and 'switch' in self._hotkeys[hotkey]:
self._handle_switch(hotkey)
elif self.pressedkey == ord(hotkey) and 'sort_key' in self._hotkeys[hotkey]:
self._handle_sort_key(hotkey)
if self.pressedkey == ord(hotkey) and 'handler' in self._hotkeys[hotkey]:
action = getattr(self, self._hotkeys[hotkey]['handler'])
action()
# Actions (available in the global hotkey dict)...
logger.debug(f"Keypressed (code: {self.pressedkey})")
for hotkey in self._hotkeys:
if self.pressedkey == ord(hotkey) and 'switch' in self._hotkeys[hotkey]:
self._handle_switch(hotkey)
elif self.pressedkey == ord(hotkey) and 'sort_key' in self._hotkeys[hotkey]:
self._handle_sort_key(hotkey)
if self.pressedkey == ord(hotkey) and 'handler' in self._hotkeys[hotkey]:
action = getattr(self, self._hotkeys[hotkey]['handler'])
action()
# Other actions with key > 255 (ord will not work) and/or additional test...
def catch_other_actions_maybe_return_to_browser(self, return_to_browser):
if self.pressedkey == ord('e') and not self.args.programs:
self._handle_process_extended()
elif self.pressedkey == ord('k') and not self.args.disable_cursor:
@ -270,6 +262,19 @@ class _GlancesCurses:
elif self.pressedkey == curses.KEY_F5 or self.pressedkey == 18:
self._handle_refresh()
def __catch_key(self, return_to_browser=False):
# Catch the pressed key
self.pressedkey = self.get_key(self.term_window)
if self.pressedkey == -1:
return self.pressedkey
# Actions (available in the global hotkey dict)...
logger.debug(f"Keypressed (code: {self.pressedkey})")
[self.catch_actions_from_hotkey(hotkey) for hotkey in self._hotkeys]
# Other actions with key > 255 (ord will not work) and/or additional test...
self.catch_other_actions_maybe_return_to_browser(return_to_browser)
# Return the key code
return self.pressedkey