Added a "refresh" action that recalculates the result of the current selection.
Ideally this isn't necessary, but sometimes it is. For example a timed out report might succeed when tried again.
This commit is contained in:
parent
c0081e2bcb
commit
f000165859
2 changed files with 28 additions and 5 deletions
|
|
@ -36,6 +36,7 @@
|
||||||
│ [0m[38;2;0;255;0m[48;2;0;0;0mN[0m[38;2;255;255;255m[48;2;0;0;0m - Move to the next issue of the current tool. │
|
│ [0m[38;2;0;255;0m[48;2;0;0;0mN[0m[38;2;255;255;255m[48;2;0;0;0m - Move to the next issue of the current tool. │
|
||||||
│ [0m[38;2;0;255;0m[48;2;0;0;0mo[0m[38;2;255;255;255m[48;2;0;0;0m - Order files by type, or by directory location. (toggle) │
|
│ [0m[38;2;0;255;0m[48;2;0;0;0mo[0m[38;2;255;255;255m[48;2;0;0;0m - Order files by type, or by directory location. (toggle) │
|
||||||
│ [0m[38;2;0;255;0m[48;2;0;0;0mp[0m[38;2;255;255;255m[48;2;0;0;0m - Pause workers. (toggle) │
|
│ [0m[38;2;0;255;0m[48;2;0;0;0mp[0m[38;2;255;255;255m[48;2;0;0;0m - Pause workers. (toggle) │
|
||||||
|
│ [0m[38;2;0;255;0m[48;2;0;0;0mr[0m[38;2;255;255;255m[48;2;0;0;0m - Refresh the currently selected report. │
|
||||||
│ [0m[38;2;0;255;0m[48;2;0;0;0ms[0m[38;2;255;255;255m[48;2;0;0;0m - Change the appearance of result statuses. (toggle) │
|
│ [0m[38;2;0;255;0m[48;2;0;0;0ms[0m[38;2;255;255;255m[48;2;0;0;0m - Change the appearance of result statuses. (toggle) │
|
||||||
│ [0m[38;2;0;255;0m[48;2;0;0;0mq[0m[38;2;255;255;255m[48;2;0;0;0m - Quit. │
|
│ [0m[38;2;0;255;0m[48;2;0;0;0mq[0m[38;2;255;255;255m[48;2;0;0;0m - Quit. │
|
||||||
│ │
|
│ │
|
||||||
|
|
@ -46,6 +47,7 @@
|
||||||
│ [0m[38;2;100;100;100m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Not applicable │
|
│ [0m[38;2;100;100;100m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Not applicable │
|
||||||
│ [0m[38;2;90;90;255m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Running │
|
│ [0m[38;2;90;90;255m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Running │
|
||||||
│ [0m[38;2;255;255;0m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Paused │
|
│ [0m[38;2;255;255;0m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Paused │
|
||||||
|
│ [0m[38;2;200;0;200m[48;2;0;0;0m [0m[38;2;255;255;255m[48;2;0;0;0m Timed out │
|
||||||
│ . Pending │
|
│ . Pending │
|
||||||
│ [0m[38;2;255;0;0m[48;2;0;0;0mE [0m[38;2;255;255;255m[48;2;0;0;0m Error │
|
│ [0m[38;2;255;0;0m[48;2;0;0;0mE [0m[38;2;255;255;255m[48;2;0;0;0m Error │
|
||||||
│ │
|
│ │
|
||||||
|
|
@ -55,6 +57,4 @@
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
│ │
|
||||||
│ │
|
|
||||||
│ │
|
|
||||||
└──────────────────────────────────────────────────────────────────────────────────────────────────┘[0m
|
└──────────────────────────────────────────────────────────────────────────────────────────────────┘[0m
|
||||||
29
vigil
29
vigil
|
|
@ -42,6 +42,7 @@ Keys:
|
||||||
*N - Move to the next issue of the current tool.
|
*N - Move to the next issue of the current tool.
|
||||||
*o - Order files by type, or by directory location. (toggle)
|
*o - Order files by type, or by directory location. (toggle)
|
||||||
*p - Pause workers. (toggle)
|
*p - Pause workers. (toggle)
|
||||||
|
*r - Refresh the currently selected report.
|
||||||
*s - Change the appearance of result statuses. (toggle)
|
*s - Change the appearance of result statuses. (toggle)
|
||||||
*q - Quit.
|
*q - Quit.
|
||||||
"""
|
"""
|
||||||
|
|
@ -271,6 +272,10 @@ def change_background(str_, new_background):
|
||||||
return termstr.TermStr(str_).transform_style(change_background_style)
|
return termstr.TermStr(str_).transform_style(change_background_style)
|
||||||
|
|
||||||
|
|
||||||
|
def in_green(str_):
|
||||||
|
return termstr.TermStr(str_, termstr.CharStyle(termstr.Color.green))
|
||||||
|
|
||||||
|
|
||||||
UP, DOWN, LEFT, RIGHT = (0, -1), (0, 1), (-1, 0), (1, 0)
|
UP, DOWN, LEFT, RIGHT = (0, -1), (0, 1), (-1, 0), (1, 0)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -494,6 +499,20 @@ class Summary:
|
||||||
self.is_directory_sort = is_directory_sort
|
self.is_directory_sort = is_directory_sort
|
||||||
self.sync_with_filesystem(sync_paths=False)
|
self.sync_with_filesystem(sync_paths=False)
|
||||||
|
|
||||||
|
def refresh(self, log):
|
||||||
|
selection = self.get_selection()
|
||||||
|
if selection.status not in {tools.Status.running, tools.Status.paused,
|
||||||
|
tools.Status.pending}:
|
||||||
|
tool_name = tools._tool_name_colored(selection.tool, selection.path)
|
||||||
|
path_colored = tools._path_colored(selection.path)
|
||||||
|
log.log_message([in_green("Refreshing "), tool_name,
|
||||||
|
in_green(" result of "), path_colored,
|
||||||
|
in_green("...")])
|
||||||
|
selection.reset()
|
||||||
|
self.closest_placeholder_generator = None
|
||||||
|
self._jobs_added_event.set()
|
||||||
|
self.completed_total -= 1
|
||||||
|
|
||||||
|
|
||||||
class Log:
|
class Log:
|
||||||
|
|
||||||
|
|
@ -737,7 +756,8 @@ class Screen:
|
||||||
def edit_file(self):
|
def edit_file(self):
|
||||||
path = self._summary.get_selection().path
|
path = self._summary.get_selection().path
|
||||||
path_colored = tools._path_colored(path)
|
path_colored = tools._path_colored(path)
|
||||||
self._log.log_message("Editing " + path_colored + " in emacs.")
|
self._log.log_message([in_green("Editing "), path_colored,
|
||||||
|
in_green(" in emacs...")])
|
||||||
subprocess.Popen(["emacsclient", path],
|
subprocess.Popen(["emacsclient", path],
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
|
||||||
|
|
@ -765,6 +785,9 @@ class Screen:
|
||||||
def quit_(self):
|
def quit_(self):
|
||||||
raise KeyboardInterrupt
|
raise KeyboardInterrupt
|
||||||
|
|
||||||
|
def refresh(self):
|
||||||
|
self._summary.refresh(self._log)
|
||||||
|
|
||||||
def on_mouse_event(self, event):
|
def on_mouse_event(self, event):
|
||||||
if event[0] not in ["mouse press", "mouse drag"]:
|
if event[0] not in ["mouse press", "mouse drag"]:
|
||||||
return
|
return
|
||||||
|
|
@ -817,7 +840,7 @@ class Screen:
|
||||||
|
|
||||||
_STATUS_BAR = _highlight_chars(
|
_STATUS_BAR = _highlight_chars(
|
||||||
" *help *quit *d,*c,*j,*k,*f,*v:navigate *turn *log *edit *next *pause"
|
" *help *quit *d,*c,*j,*k,*f,*v:navigate *turn *log *edit *next *pause"
|
||||||
" *order *statuses", Log.GREEN_STYLE)
|
" *order *refresh *statuses", Log.GREEN_STYLE)
|
||||||
|
|
||||||
@functools.lru_cache(maxsize=2)
|
@functools.lru_cache(maxsize=2)
|
||||||
def _get_status_bar_appearance(self, width, is_directory_sort, is_paused,
|
def _get_status_bar_appearance(self, width, is_directory_sort, is_paused,
|
||||||
|
|
@ -868,7 +891,7 @@ class Screen:
|
||||||
({"K", "end"}, listing_right), ({"o"}, toggle_sort),
|
({"K", "end"}, listing_right), ({"o"}, toggle_sort),
|
||||||
({"n"}, move_to_next_issue), ({"N"}, move_to_next_issue_of_tool),
|
({"n"}, move_to_next_issue), ({"N"}, move_to_next_issue_of_tool),
|
||||||
({"e"}, edit_file), ({"s"}, toggle_status_style), ({"q"}, quit_),
|
({"e"}, edit_file), ({"s"}, toggle_status_style), ({"q"}, quit_),
|
||||||
({"p"}, toggle_pause)]
|
({"p"}, toggle_pause), ({"r"}, refresh)]
|
||||||
|
|
||||||
|
|
||||||
def get_cpu_temperature():
|
def get_cpu_temperature():
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue