Merge pull request #5121 from stsewd/remove-doctype-from-search

Remove doctype from search

readthedocs/projects/models.py

@@ -654,11 +654,11 @@ def full_dash_path(self, version=LATEST):
 
     def full_json_path(self, version=LATEST):
         """The path to the build json docs in the project."""
-        if 'sphinx' in self.documentation_type:
-            return os.path.join(self.conf_dir(version), '_build', 'json')
-
-        if 'mkdocs' in self.documentation_type:
-            return os.path.join(self.checkout_path(version), '_build', 'json')
+        json_path = os.path.join(
+            self.conf_dir(version),
+            '_build', 'json'
+        )
+        return json_path
 
     def full_singlehtml_path(self, version=LATEST):
         """The path to the build singlehtml docs in the project."""

readthedocs/projects/tasks.py

@@ -741,6 +741,7 @@ def update_app_instances(
             callback=sync_callback.s(
                 version_pk=self.version.pk,
                 commit=self.build['commit'],
+                search=search,
             ),
         )
 
@@ -1037,14 +1038,7 @@ def update_search(version_pk, commit, delete_non_commit_files=True):
     """
     version = Version.objects.get(pk=version_pk)
 
-    if 'sphinx' in version.project.documentation_type:
-        page_list = process_all_json_files(version, build_dir=False)
-    else:
-        log.debug(
-            'Unknown documentation type: %s',
-            version.project.documentation_type,
-        )
-        return
+    page_list = process_all_json_files(version, build_dir=False)
 
     log_msg = ' '.join([page['path'] for page in page_list])
     log.info(
@@ -1404,7 +1398,8 @@ def sync_callback(_, version_pk, commit, *args, **kwargs):
     The first argument is the result from previous tasks, which we discard.
     """
     fileify(version_pk, commit=commit)
-    update_search(version_pk, commit=commit)
+    if kwargs.get('search'):
+        update_search(version_pk, commit=commit)
 
 
 @app.task()