routing refactoring (get_answer.py => routing.py + postprocessing.py)

Author: chubin

lib/adapter/adapter.py

@@ -21,7 +21,7 @@ def get_list(self, prefix=None):
         if prefix in self._list:
             return self._list[prefix]
 
-        self._list[prefix] = self._get_list(prefix=prefix)
+        self._list[prefix] = set(self._get_list(prefix=prefix))
         return self._list[prefix]
 
     def is_found(self, topic):

lib/adapter/internal.py

@@ -124,3 +124,16 @@ def _get_page(self, topic, request_options=None):
 
 %s
     """ % possible_topics_text
+
+class Search(Adapter):
+
+    _adapter_name = 'search'
+    _output_format = 'text'
+    _cache_needed = False
+
+    @staticmethod
+    def get_list(prefix=None):
+        return []
+
+    def is_found(topic):
+        return True

lib/adapter/learnxiny.py

@@ -825,6 +825,9 @@ def is_found(self, topic):
         Return whether `topic` is a valid learnxiny topic
         """
 
+        if '/' not in topic:
+            return False
+
         lang, topic = topic.split('/', 1)
         if lang not in self.adapters:
             return False

lib/adapter/question.py

@@ -32,8 +32,10 @@ def _get_page(self, topic, request_options=None):
             section_name, topic = topic.split('/', 1)
             if ':' in section_name:
                 _, section_name = section_name.split(':', 1)
+            section_name = SO_NAME.get(section_name, section_name)
             topic = "%s/%s" % (section_name, topic)
 
+
         # some clients send queries with - instead of + so we have to rewrite them to
         topic = re.sub(r"(?<!-)-", ' ', topic)
 

lib/adapter/rosetta.py

@@ -23,7 +23,7 @@ class Rosetta(Adapter):
     Adapter for RosettaCode
     """
 
-    __section_name = 'rosetta'
+    __section_name = "rosetta"
     _adapter_name = "rosetta"
     _output_format = "code"
 

lib/cheat_wrapper.py

@@ -11,7 +11,11 @@
 import re
 import json
 
-from get_answer import get_answer, find_answer_by_keyword, get_topics_list
+from routing import get_answer_dict, get_topics_list
+from search import find_answers_by_keyword
+from languages_data import LANGUAGE_ALIAS, rewrite_editor_section_name
+import postprocessing
+
 import frontend.html
 import frontend.ansi
 
@@ -22,6 +26,28 @@ def cheat_wrapper(query, request_options=None, output_format='ansi'):
     Additional request options specified in `request_options`.
     """
 
+    def _rewrite_aliases(word):
+        if word == ':bash.completion':
+            return ':bash_completion'
+        return word
+
+    def _rewrite_section_name(query):
+        """
+        Rewriting special section names:
+        * EDITOR:NAME => emacs:go-mode
+        """
+
+        if '/' not in query:
+            return query
+
+        section_name, rest = query.split('/', 1)
+
+        if ':' in section_name:
+            section_name = rewrite_editor_section_name(section_name)
+        section_name = LANGUAGE_ALIAS.get(section_name, section_name)
+
+        return "%s/%s" % (section_name, rest)
+
     def _sanitize_query(query):
         return re.sub('[<>"]', '', query)
 
@@ -48,17 +74,26 @@ def _parse_query(query):
         return topic, keyword, search_options
 
     query = _sanitize_query(query)
+    query = _rewrite_aliases(query)
+    query = _rewrite_section_name(query)
+
 
     # at the moment, we just remove trailing slashes
     # so queries python/ and python are equal
     query = _strip_hyperlink(query.rstrip('/'))
     topic, keyword, search_options = _parse_query(query)
 
     if keyword:
-        answers = find_answer_by_keyword(
+        answers = find_answers_by_keyword(
             topic, keyword, options=search_options, request_options=request_options)
     else:
-        answers = [get_answer(topic, keyword, request_options=request_options)]
+        answers = [get_answer_dict(topic, request_options=request_options)]
+
+    answers = [
+        postprocessing.postprocess(
+            answer, keyword, search_options, request_options=request_options)
+        for answer in answers
+    ]
 
     answer_data = {
         'query': query,