EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove "beta" from search and add HTML_ONLY_PROJECTS

refactor-builder
Eric Holscher 2013-11-19 19:51:03 -08:00
parent 8ee7e2e205
commit c4833b92f0
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
readthedocs/projects/tasks.py
View File

@ -40,6 +40,7 @@ ghetto_hack = re.compile(
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
LOG_TEMPLATE = "(Build) [{project}:{version}] {msg}" LOG_TEMPLATE = "(Build) [{project}:{version}] {msg}"
HTML_ONLY = getattr(settings, 'HTML_ONLY_PROJECTS', ())
@task @task
def remove_dir(path): def remove_dir(path):
@ -491,6 +492,11 @@ def build_docs(version_pk, pdf, man, epub, dash, search, record, force):
"Project Skipped, Didn't build") "Project Skipped, Didn't build")
# Only build everything else if the html build changed. # Only build everything else if the html build changed.
if html_builder.changed and not project.skip: if html_builder.changed and not project.skip:
if search:
search_builder = builder_loading.get('sphinx_search')(version)
search_results = search_builder.build()
if search_results[0] == 0:
search_builder.upload()
if dash: if dash:
dash_builder = builder_loading.get('sphinx_dash')(version) dash_builder = builder_loading.get('sphinx_dash')(version)
dash_results = dash_builder.build() dash_results = dash_builder.build()
@ -498,38 +504,30 @@ def build_docs(version_pk, pdf, man, epub, dash, search, record, force):
dash_builder.move() dash_builder.move()
else: else:
dash_results = fake_results dash_results = fake_results
if pdf: if version.project.slug not in HTML_ONLY:
pdf_builder = builder_loading.get('sphinx_pdf')(version) if pdf:
latex_results, pdf_results = pdf_builder.build() pdf_builder = builder_loading.get('sphinx_pdf')(version)
# Always move pdf results even when there's an error. latex_results, pdf_results = pdf_builder.build()
#if pdf_results[0] == 0: # Always move pdf results even when there's an error.
pdf_builder.move() #if pdf_results[0] == 0:
else: pdf_builder.move()
pdf_results = latex_results = fake_results else:
if man: pdf_results = latex_results = fake_results
man_builder = builder_loading.get('sphinx_man')(version) if man:
man_results = man_builder.build() man_builder = builder_loading.get('sphinx_man')(version)
if man_results[0] == 0: man_results = man_builder.build()
man_builder.move() if man_results[0] == 0:
else: man_builder.move()
man_results = fake_results else:
if epub: man_results = fake_results
epub_builder = builder_loading.get('sphinx_epub')(version) if epub:
epub_results = epub_builder.build() epub_builder = builder_loading.get('sphinx_epub')(version)
if epub_results[0] == 0: epub_results = epub_builder.build()
epub_builder.move() if epub_results[0] == 0:
else: epub_builder.move()
epub_results = fake_results else:
epub_results = fake_results
if search:
try:
# BETA
search_builder = builder_loading.get('sphinx_search')(version)
search_results = search_builder.build()
if search_results[0] == 0:
search_builder.upload()
except Exception, e:
log.error(LOG_TEMPLATE.format(project=project.slug, version=version.slug, msg=e.message), exc_info=True)
return (html_results, latex_results, pdf_results, man_results, return (html_results, latex_results, pdf_results, man_results,
epub_results, dash_results, search_results) epub_results, dash_results, search_results)