Use config object to get doctype

Author: stsewd

readthedocs/projects/models.py

@@ -595,16 +595,6 @@ def conf_dir(self, version=LATEST):
         if conf_file:
             return os.path.dirname(conf_file)
 
-    @property
-    def is_type_sphinx(self):
-        """Is project type Sphinx."""
-        return 'sphinx' in self.documentation_type
-
-    @property
-    def is_type_mkdocs(self):
-        """Is project type Mkdocs."""
-        return 'mkdocs' in self.documentation_type
-
     @property
     def is_imported(self):
         return bool(self.repo)

readthedocs/projects/tasks.py

@@ -614,6 +614,7 @@ def update_app_instances(self, html=False, localmedia=False, search=False,
             args=[
                 self.project.pk,
                 self.version.pk,
+                self.config,
             ],
             kwargs=dict(
                 hostname=socket.gethostname(),
@@ -695,10 +696,12 @@ def build_docs_html(self):
 
         # Gracefully attempt to move files via task on web workers.
         try:
-            broadcast(type='app', task=move_files,
-                      args=[self.version.pk, socket.gethostname()],
-                      kwargs=dict(html=True)
-                      )
+            broadcast(
+                type='app',
+                task=move_files,
+                args=[self.version.pk, socket.gethostname(), self.config],
+                kwargs=dict(html=True)
+            )
         except socket.error:
             log.exception('move_files task has failed on socket error.')
 
@@ -710,23 +713,23 @@ def build_docs_localmedia(self):
             return False
 
         if self.build_localmedia:
-            if self.project.is_type_sphinx:
+            if self.is_type_sphinx():
                 return self.build_docs_class('sphinx_singlehtmllocalmedia')
         return False
 
     def build_docs_pdf(self):
         """Build PDF docs."""
         if ('pdf' not in self.config.formats or
-            self.project.slug in HTML_ONLY or
-                not self.project.is_type_sphinx):
+                self.project.slug in HTML_ONLY or
+                not self.is_type_sphinx()):
             return False
         return self.build_docs_class('sphinx_pdf')
 
     def build_docs_epub(self):
         """Build ePub docs."""
         if ('epub' not in self.config.formats or
             self.project.slug in HTML_ONLY or
-                not self.project.is_type_sphinx):
+                not self.is_type_sphinx()):
             return False
         return self.build_docs_class('sphinx_epub')
 
@@ -750,16 +753,22 @@ def send_notifications(self):
         """Send notifications on build failure."""
         send_notifications.delay(self.version.pk, build_pk=self.build['id'])
 
+    def is_type_sphinx(self):
+        """Is documentation type Sphinx."""
+        return 'sphinx' in self.config.doctype
+
 
 # Web tasks
 @app.task(queue='web')
-def sync_files(project_pk, version_pk, hostname=None, html=False,
+def sync_files(project_pk, version_pk, config, hostname=None, html=False,
                localmedia=False, search=False, pdf=False, epub=False):
     """
     Sync build artifacts to application instances.
 
     This task broadcasts from a build instance on build completion and performs
     synchronization of build artifacts on each application instance.
+
+    :param config: A `readthedocs.config.BuildConfigBase` object
     """
     # Clean up unused artifacts
     version = Version.objects.get(pk=version_pk)
@@ -782,6 +791,7 @@ def sync_files(project_pk, version_pk, hostname=None, html=False,
     move_files(
         version_pk,
         hostname,
+        config,
         html=html,
         localmedia=localmedia,
         search=search,
@@ -797,13 +807,14 @@ def sync_files(project_pk, version_pk, hostname=None, html=False,
 
 
 @app.task(queue='web')
-def move_files(version_pk, hostname, html=False, localmedia=False, search=False,
-               pdf=False, epub=False):
+def move_files(version_pk, hostname, config, html=False, localmedia=False,
+               search=False, pdf=False, epub=False):
     """
     Task to move built documentation to web servers.
 
     :param version_pk: Version id to sync files for
     :param hostname: Hostname to sync to
+    :param config: A `readthedocs.config.BuildConfigBase` object
     :param html: Sync HTML
     :type html: bool
     :param localmedia: Sync local media files
@@ -827,12 +838,12 @@ def move_files(version_pk, hostname, html=False, localmedia=False, search=False,
     if html:
         from_path = version.project.artifact_path(
             version=version.slug,
-            type_=version.project.documentation_type,
+            type_=config.doctype,
         )
         target = version.project.rtd_build_path(version.slug)
         Syncer.copy(from_path, target, host=hostname)
 
-    if 'sphinx' in version.project.documentation_type:
+    if 'sphinx' in config.doctype:
         if search:
             from_path = version.project.artifact_path(
                 version=version.slug,
@@ -883,21 +894,21 @@ def move_files(version_pk, hostname, html=False, localmedia=False, search=False,
 
 
 @app.task(queue='web')
-def update_search(version_pk, commit, delete_non_commit_files=True):
+def update_search(version_pk, commit, config, delete_non_commit_files=True):
     """
     Task to update search indexes.
 
     :param version_pk: Version id to update
     :param commit: Commit that updated index
+    :param config: A `readthedocs.config.BuildConfigBase` object
     :param delete_non_commit_files: Delete files not in commit from index
     """
     version = Version.objects.get(pk=version_pk)
 
-    if version.project.is_type_sphinx:
+    if 'sphinx' in config.doctype:
         page_list = process_all_json_files(version, build_dir=False)
     else:
-        log.debug('Unknown documentation type: %s',
-                  version.project.documentation_type)
+        log.debug('Unknown documentation type: %s', config.doctype)
         return
 
     log_msg = ' '.join([page['path'] for page in page_list])