Skip to content

Script: refactor runestone stringparam setting #2830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ascholerChemeketa wants to merge 1 commit into from
+17 −12
Closed

Script: refactor runestone stringparam setting #2830

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions pretext/lib/pretext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4394,6 +4394,12 @@ def _parse_runestone_services(et):

return (rs_js, rs_css, rs_cdn_url, rs_version)

# Update stringparams with Runestone Services information
def _set_runestone_stringparams(stringparams, rs_js, rs_css, rs_version):
stringparams["rs-js"] = rs_js
stringparams["rs-css"] = rs_css
stringparams["rs-version"] = rs_version

# A helper function to query the latest Runestone
# Services file, while failing gracefully

Expand Down Expand Up @@ -4439,15 +4445,8 @@ def _runestone_services(stringparams, ext_rs_methods):
# Developer is responsible for placement of the right files in _static
# ** Simply return early with stock values (or None) **
if "debug.rs.dev" in stringparams:
rs_js = "prefix-runtime.bundle.js:prefix-runtime-libs.bundle.js:prefix-runestone.bundle.js"
rs_css = "prefix-runtime-libs.css:prefix-runestone.css"
rs_cdn_url = None
rs_version = "dev"
services_xml = None
# Return, plus side-effect
stringparams["rs-js"] = rs_js
stringparams["rs-css"] = rs_css
stringparams["rs-version"] = rs_version
rs_js, rs_css, rs_cdn_url, rs_version, services_xml = _runestone_debug_service_info()
_set_runestone_stringparams(stringparams, rs_js, rs_css, rs_version)
return (rs_js, rs_css, rs_cdn_url, rs_version, services_xml)

# Otherwise, we have a URL pointing to the Runestone server/CDN
Expand All @@ -4474,11 +4473,17 @@ def _runestone_services(stringparams, ext_rs_methods):
rs_js, rs_css, rs_cdn_url, rs_version = _parse_runestone_services(services)

# Return, plus side-effect
stringparams["rs-js"] = rs_js
stringparams["rs-css"] = rs_css
stringparams["rs-version"] = rs_version
_set_runestone_stringparams(stringparams, rs_js, rs_css, rs_version)
return (rs_js, rs_css, rs_cdn_url, rs_version, services_xml)

def _runestone_debug_service_info():
"""Return hardcoded values used for debugging Runestone Services (debug.rs.dev)"""
rs_js = "prefix-runtime.bundle.js:prefix-runtime-libs.bundle.js:prefix-runestone.bundle.js"
rs_css = "prefix-runtime-libs.css:prefix-runestone.css"
rs_cdn_url = None
rs_version = "dev"
services_xml = None
return (rs_js, rs_css, rs_cdn_url, rs_version, services_xml)

def _cdn_runestone_services(stringparams, ext_rs_methods):
"""Version of _runestone_services function to query the Runestone Services file from the PreTeXt html-static CDN"""
Expand Down