Missing running tasks in terry ui

edomora97 · edomora97 · commit d68400d776ea · 2018-09-01T18:53:02.000+02:00
diff --git a/python/sanity_checks/ioi.py b/python/sanity_checks/ioi.py
@@ -34,7 +34,7 @@ def _check_graders(folder: str, languages: Set[Language],
 
 def _get_statement_path():
     for path in ["statement/statement.pdf", "testo/testo.pdf"]:
-        if os.path.exists(path):
+        if os.path.lexists(path):
             return path
     return None
 
diff --git a/python/uis/__init__.py b/python/uis/__init__.py
@@ -233,7 +233,8 @@ def _print_final_messages(self):
 class CursesUI(ABC):
     FPS = 30
 
-    def __init__(self):
+    def __init__(self, interface: UIInterface):
+        self.interface = interface
         self.thread = threading.Thread(
             target=curses.wrapper, args=(self._wrapper, ))
         self.stopped = False
@@ -291,6 +292,16 @@ def _wrapper(self, stdscr):
     def _loop(self, printer: CursesPrinter, loading: str):
         pass
 
+    def _print_running_tasks(self, printer: CursesPrinter):
+        printer.blue("Running tasks:\n", bold=True)
+        running = sorted(
+            (t, n) for n, t in self.interface.running.copy().items())
+        now = time.monotonic()
+        for start, task in running:
+            duration = now - start
+            printer.text(" - {0: <50} {1: .1f}s\n".format(
+                task.strip(), duration))
+
 
 def result_to_str(result: Result) -> str:
     status = result.status
diff --git a/python/uis/ioi_curses_ui.py b/python/uis/ioi_curses_ui.py
@@ -167,8 +167,7 @@ def print_solutions_result(printer: Printer, task: Task,
 
 class IOICursesUI(CursesUI):
     def __init__(self, interface: IOIUIInterface):
-        super().__init__()
-        self.interface = interface
+        super().__init__(interface)
 
     def _loop(self, printer: CursesPrinter, loading: str):
         max_sol_len = 1 + get_max_sol_len(self.interface)
@@ -204,11 +203,4 @@ def _loop(self, printer: CursesPrinter, loading: str):
 
         printer.text("\n")
 
-        printer.blue("Running tasks:\n", bold=True)
-        running = sorted(
-            (t, n) for n, t in self.interface.running.copy().items())
-        now = time.monotonic()
-        for start, task in running:
-            duration = now - start
-            printer.text(" - {0: <50} {1: .1f}s\n".format(
-                task.strip(), duration))
+        self._print_running_tasks(printer)
diff --git a/python/uis/terry_curses_ui.py b/python/uis/terry_curses_ui.py
@@ -53,8 +53,7 @@ def print_terry_solution_info(printer: CursesPrinter, solution: str,
 
 class TerryCursesUI(CursesUI):
     def __init__(self, interface: TerryUIInterface):
-        super().__init__()
-        self.interface = interface
+        super().__init__(interface)
 
     def _loop(self, printer: CursesPrinter, loading: str):
         printer.bold("Running... %s\n" % self.interface.task.name)
@@ -75,3 +74,7 @@ def _loop(self, printer: CursesPrinter, loading: str):
         for solution, info in self.interface.solutions_info.items():
             print_terry_solution_info(printer, solution, info, max_sol_len,
                                       loading, self.interface.task.max_score)
+
+        printer.text("\n")
+
+        self._print_running_tasks(printer)
