Skip to content

Commit 0924be0

Browse files
ascholerChemeketarbeezer
authored andcommitted
Script: refactor setting Runestone stringparams (PR #2830)
1 parent 481c91c commit 0924be0

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

pretext/lib/pretext.py

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4394,6 +4394,12 @@ def _parse_runestone_services(et):
43944394

43954395
return (rs_js, rs_css, rs_cdn_url, rs_version)
43964396

4397+
# Update stringparams with Runestone Services information
4398+
def _set_runestone_stringparams(stringparams, rs_js, rs_css, rs_version):
4399+
stringparams["rs-js"] = rs_js
4400+
stringparams["rs-css"] = rs_css
4401+
stringparams["rs-version"] = rs_version
4402+
43974403
# A helper function to query the latest Runestone
43984404
# Services file, while failing gracefully
43994405

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

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

44764475
# Return, plus side-effect
4477-
stringparams["rs-js"] = rs_js
4478-
stringparams["rs-css"] = rs_css
4479-
stringparams["rs-version"] = rs_version
4476+
_set_runestone_stringparams(stringparams, rs_js, rs_css, rs_version)
44804477
return (rs_js, rs_css, rs_cdn_url, rs_version, services_xml)
44814478

4479+
def _runestone_debug_service_info():
4480+
"""Return hardcoded values used for debugging Runestone Services (debug.rs.dev)"""
4481+
rs_js = "prefix-runtime.bundle.js:prefix-runtime-libs.bundle.js:prefix-runestone.bundle.js"
4482+
rs_css = "prefix-runtime-libs.css:prefix-runestone.css"
4483+
rs_cdn_url = None
4484+
rs_version = "dev"
4485+
services_xml = None
4486+
return (rs_js, rs_css, rs_cdn_url, rs_version, services_xml)
44824487

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

0 commit comments

Comments
 (0)