quiz: Add Quiz.introduction for an optional intro message

[quizzer.git] / quizzer / ui / cli.py

diff --git a/quizzer/ui/cli.py b/quizzer/ui/cli.py
index b799e1e209ecc74879f323e31521bfeddf8ce36f..7d7c70117907c889e417927cf9ed9a8ba6377c91 100644 (file)
--- a/quizzer/ui/cli.py
+++ b/quizzer/ui/cli.py
@@ -20,6 +20,13 @@ try:
 except ImportError as _readline_import_error:
     _readline = None
 
+try:
+    from pygments.console import colorize as _colorize
+except ImportError as e:
+    def _colorize(color_key=None, text=None):
+        return text
+    print(e)
+
 from . import UserInterface
 
 
@@ -35,6 +42,8 @@ class QuestionCommandLine (_cmd.Cmd):
     def __init__(self, ui):
         super(QuestionCommandLine, self).__init__()
         self.ui = ui
+        if self.ui.quiz.introduction:
+            self.intro = '\n\n'.join([self.intro, self.ui.quiz.introduction])
 
     def preloop(self):
         self.question = self.ui.get_question()
@@ -48,13 +57,15 @@ class QuestionCommandLine (_cmd.Cmd):
         "Pose a question and prompt"
         if self.question:
             self.prompt = '\n{}\n{}'.format(
-                self.question.format_prompt(), self._prompt)
+                _colorize(
+                    self.ui.colors['question'], self.question.format_prompt()),
+                _colorize(self.ui.colors['prompt'], self._prompt))
         else:
-            self.prompt = self._prompt
+            self.prompt = _colorize(self.ui.colors['prompt'], self._prompt)
 
     def _set_ps2(self):
         "Just prompt (without the question, e.g. for multi-line answers)"
-        self.prompt = self._prompt
+        self.prompt = _colorize(self.ui.colors['prompt'], self._prompt)
 
     def default(self, line):
         self.answers.append(line)
@@ -75,9 +86,9 @@ class QuestionCommandLine (_cmd.Cmd):
             answer = ''
         correct = self.ui.process_answer(question=self.question, answer=answer)
         if correct:
-            print('correct\n')
+            print(_colorize(self.ui.colors['correct'], 'correct\n'))
         else:
-            print('incorrect\n')
+            print(_colorize(self.ui.colors['incorrect'], 'incorrect\n'))
         self.question = self.ui.get_question()
         if not self.question:
             return True  # out of questions
@@ -98,6 +109,14 @@ class QuestionCommandLine (_cmd.Cmd):
         self._reset()
         return True
 
+    def do_skip(self, arg):
+        "Skip the current question, and continue with the quiz"
+        self.ui.stack.append(self.question)
+        self.question = self.ui.get_question()
+        if not self.question:
+            return True  # out of questions
+        self._reset()
+
     def do_hint(self, arg):
         "Show a hint for the current question"
         self._reset()
@@ -111,6 +130,14 @@ class QuestionCommandLine (_cmd.Cmd):
 
 
 class CommandLineInterface (UserInterface):
+    colors = {  # listed in pygments.console.light_colors
+        'question': 'turquoise',
+        'prompt': 'blue',
+        'correct': 'green',
+        'incorrect': 'red',
+        'result': 'fuchsia',
+        }
+
     def run(self):
         if not self.stack:
             return
@@ -119,7 +146,7 @@ class CommandLineInterface (UserInterface):
         print()
 
     def display_results(self):
-        print('results:')
+        print(_colorize(self.colors['result'], 'results:'))
         for question in self.quiz:
             if question.id in self.answers:
                 self.display_result(question=question)
@@ -129,7 +156,10 @@ class CommandLineInterface (UserInterface):
     def display_result(self, question):
         answers = self.answers.get(question.id, [])
         print('question:')
-        print('  {}'.format(question.format_prompt(newline='\n  ')))
+        print('  {}'.format(
+            _colorize(
+                self.colors['question'],
+                question.format_prompt(newline='\n  '))))
         la = len(answers)
         lc = len([a for a in answers if a['correct']])
         print('answers: {}/{} ({:.2f})'.format(lc, la, float(lc)/la))
@@ -138,7 +168,11 @@ class CommandLineInterface (UserInterface):
                 correct = 'correct'
             else:
                 correct = 'incorrect'
-            print('  you answered: {}'.format(answer['answer']))
+            correct = _colorize(self.colors[correct], correct)
+            ans = answer['answer']
+            if question.multiline:
+                ans = '\n                '.join(ans)
+            print('  you answered: {}'.format(ans))
             print('     which was: {}'.format(correct))
 
     def display_totals(self):