added filetype handling for adapters (#187)

Author: chubin

lib/adapter/adapter.py

@@ -117,6 +117,14 @@ def _get_output_format(self, topic):
             return 'text'
         return self._output_format
 
+    # pylint: disable=unused-argument
+    @staticmethod
+    def _get_filetype(topic):
+        """
+        Return language name (filetype) for `topic`
+        """
+        return None
+
     def get_page_dict(self, topic, request_options=None):
         """
         Return page dict for `topic`
@@ -139,6 +147,11 @@ def get_page_dict(self, topic, request_options=None):
             'format': self._get_output_format(topic),
             }
         answer_dict.update(answer)
+
+        # pylint: disable=assignment-from-none
+        filetype = self._get_filetype(topic)
+        if filetype:
+            answer_dict["filetype"] = filetype
         return answer_dict
 
     @classmethod

lib/adapter/cmd.py

@@ -111,7 +111,7 @@ def _get_list(self, prefix=None):
         return list("rfc/%s" % x for x in range(1, 8649))
 
     def is_found(self, topic):
-        return True 
+        return True
 
 class AdapterOeis(CommandAdapter):
     """
@@ -124,6 +124,13 @@ class AdapterOeis(CommandAdapter):
     _cache_needed = True
     _command = ["share/adapters/oeis.sh"]
 
+    @staticmethod
+    def _get_filetype(topic):
+        if "/" in topic:
+            language = topic.split("/")[-1].lower()
+            return language
+        return "bash"
+
     def _get_command(self, topic, request_options=None):
         cmd = self._command[:]
         if not cmd[0].startswith("/"):

lib/frontend/ansi.py

@@ -58,12 +58,15 @@ def _limited_answer(answer):
 
 def _colorize_ansi_answer(topic, answer, color_style,       # pylint: disable=too-many-arguments
                           highlight_all=True, highlight_code=False,
-                          unindent_code=False):
+                          unindent_code=False, language=None):
 
     color_style = color_style or "native"
     lexer_class = languages_data.LEXER['bash']
     if '/' in topic:
-        section_name = topic.split('/', 1)[0].lower()
+        if language is None:
+            section_name = topic.split('/', 1)[0].lower()
+        else:
+            section_name = language
         section_name = languages_data.get_lexer_name(section_name)
         lexer_class = languages_data.LEXER.get(section_name, lexer_class)
         if section_name == 'php':
@@ -127,7 +130,8 @@ def _visualize(answers, request_options, search_mode=False):
                 highlight_all=highlight,
                 highlight_code=(topic_type == 'question'
                                 and not request_options.get('add_comments')
-                                and not request_options.get('remove_text')))
+                                and not request_options.get('remove_text')),
+                language=answer_dict.get("filetype"))
 
     if request_options.get('no-terminal'):
         result = remove_ansi(result)

lib/postprocessing.py

@@ -12,15 +12,19 @@ def _answer_add_comments(answer, request_options=None):
         return answer
 
     topic = answer['topic']
-    filetype = 'bash'
-    if '/' in topic:
-        filetype = topic.split('/', 1)[0]
-        if filetype.startswith('q:'):
-            filetype = filetype[2:]
+    if "filetype" in answer:
+        filetype = answer["filetype"]
+    else:
+        filetype = 'bash'
+        if '/' in topic:
+            filetype = topic.split('/', 1)[0]
+            if filetype.startswith('q:'):
+                filetype = filetype[2:]
 
     answer['answer'] = fmt.comments.beautify(
         answer['answer'], filetype, request_options)
     answer['format'] = 'code'
+    answer['filetype'] = filetype
     return answer
 
 def _answer_filter_by_keyword(answer, keyword, options, request_options=None):