Fix: make Khanex and Quizly use new path to books

Author: bnmnetp

runestone/khanex/khanex.py

@@ -29,6 +29,7 @@
 from runestone.server.componentdb import addQuestionToDB, addHTMLToDB
 from runestone.common import RunestoneIdDirective, RunestoneIdNode
 from docutils import nodes
+
 __author__ = "rmorelli"
 
 # Debug flags
@@ -53,12 +54,14 @@ def setup(app):
     app.add_directive("khanex", Khanex)
     app.add_node(KhanexNode, html=(visit_khanex_html, depart_khanex_html))
 
+
 # The only content needed from khanex.py is the exercise name
 
 
 class KhanexNode(nodes.General, nodes.Element, RunestoneIdNode):
     pass
 
+
 # self for these functions is an instance of the writer class.  For example
 # in html, self is sphinx.writers.html.SmartyPantsHTMLTranslator
 # The node that is passed as a parameter is an instance of our node class.
@@ -69,28 +72,30 @@ def visit_khanex_html(self, node):
     node["delimiter"] = "_start__{}_".format(node["runestone_options"]["divid"])
     self.body.append(node["delimiter"])
 
-    print('DEBUG: visit_khanex_html exername = ' + node["exername"]) if DEBUG else None
-    print('DEBUG: visit_khanex_html template = ' + node["template"]) if DEBUG else None
-    print('DEBUG: visit_khanex_html options = '
-          + str(node["runestone_options"])) if DEBUG else None
+    print("DEBUG: visit_khanex_html exername = " + node["exername"]) if DEBUG else None
+    print("DEBUG: visit_khanex_html template = " + node["template"]) if DEBUG else None
+    print(
+        "DEBUG: visit_khanex_html options = " + str(node["runestone_options"])
+    ) if DEBUG else None
 
     res = node["template"] % (node["runestone_options"])
-    print('DEBUG: visit_khanex_html res = ' + res) if DEBUG else None
+    print("DEBUG: visit_khanex_html res = " + res) if DEBUG else None
     self.body.append(res)
 
 
 def depart_khanex_html(self, node):
-    """ This is called at the start of processing an activecode node.  If activecode had recursive nodes
-        etc and did not want to do all of the processing in visit_ac_html any finishing touches could be
-        added here.
+    """This is called at the start of processing an activecode node.  If activecode had recursive nodes
+    etc and did not want to do all of the processing in visit_ac_html any finishing touches could be
+    added here.
     """
-    print('DEBUG: depart_khanex_html') if DEBUG else None
+    print("DEBUG: depart_khanex_html") if DEBUG else None
     bc = node["runestone_options"]["basecourse"]
     addHTMLToDB(
         node["runestone_options"]["divid"],
         bc,
-        "".join(self.body[self.body.index(node["delimiter"]) + 1 :])
-        .replace("../_static", f"/runestone/books/published/{bc}/_static"),
+        "".join(self.body[self.body.index(node["delimiter"]) + 1 :]).replace(
+            "../_static", f"/ns/books/published/{bc}/_static"
+        ),
     )
     self.body.remove(node["delimiter"])
     pass
@@ -110,20 +115,21 @@ class Khanex(RunestoneIdDirective):
     """
     .. khanex:: some_unique_id, e.g., ex1
 
-       :exercise: unique-ex-name: 
+       :exercise: unique-ex-name:
     """
+
     required_arguments = 1
     optional_arguments = 0
-    has_content = True    
+    has_content = True
     option_spec = RunestoneIdDirective.option_spec.copy()
-    option_spec.update( {} )
+    option_spec.update({})
 
     # This invokes the rendering code in js/khanex.js
     def run(self):
         super(Khanex, self).run()
-        print('DEBUG; Khanex.run()') if DEBUG else None
+        print("DEBUG; Khanex.run()") if DEBUG else None
 
-        addQuestionToDB(self)   # Not sure whether this works?
+        addQuestionToDB(self)  # Not sure whether this works?
         document = self.state.document
         rel_filename, filename = document.settings.env.relfn2path(self.arguments[0])
 
@@ -136,12 +142,14 @@ def run(self):
 
         khanex_node = KhanexNode()
         khanex_node["runestone_options"] = self.options
-        khanex_node["exername"] = str(self.options['controls'][0])
+        khanex_node["exername"] = str(self.options["controls"][0])
         khanex_node["exername"] = str.strip(khanex_node["exername"][10:])
         khanex_node["template"] = KHANEX_TEMPLATE.replace(
-            '###', khanex_node["exername"])
-
-        khanex_node["source"], khanex_node["line"] = self.state_machine.get_source_and_line(
-            self.lineno
+            "###", khanex_node["exername"]
         )
+
+        (
+            khanex_node["source"],
+            khanex_node["line"],
+        ) = self.state_machine.get_source_and_line(self.lineno)
         return [khanex_node]

runestone/quizly/quizly.py

@@ -30,6 +30,7 @@
 from runestone.server.componentdb import addQuestionToDB, addHTMLToDB
 from runestone.common import RunestoneIdDirective, RunestoneIdNode
 from docutils import nodes
+
 __author__ = "rmorelli"
 
 # Debug flags
@@ -55,6 +56,7 @@ def setup(app):
     app.add_directive("quizly", Quizly)
     app.add_node(QuizlyNode, html=(visit_quizly_html, depart_quizly_html))
 
+
 # The only content needed from quizly.py is the quizname
 
 
@@ -72,28 +74,30 @@ def visit_quizly_html(self, node):
     node["delimiter"] = "_start__{}_".format(node["runestone_options"]["divid"])
     self.body.append(node["delimiter"])
 
-    print('DEBUG: visit_quizly_html quizname = ' + node["quizname"]) if DEBUG else None
-    print('DEBUG: visit_quizly_html template = ' + node["template"]) if DEBUG else None
-    print('DEBUG: visit_quizly_html options = '
-          + str(node["runestone_options"])) if DEBUG else None
+    print("DEBUG: visit_quizly_html quizname = " + node["quizname"]) if DEBUG else None
+    print("DEBUG: visit_quizly_html template = " + node["template"]) if DEBUG else None
+    print(
+        "DEBUG: visit_quizly_html options = " + str(node["runestone_options"])
+    ) if DEBUG else None
 
     res = node["template"] % (node["runestone_options"])
-    print('DEBUG: visit_quizly_html res = ' + res) if DEBUG else None
+    print("DEBUG: visit_quizly_html res = " + res) if DEBUG else None
     self.body.append(res)
 
 
 def depart_quizly_html(self, node):
-    """ This is called at the start of processing an activecode node.  If activecode had recursive nodes
-        etc and did not want to do all of the processing in visit_ac_html any finishing touches could be
-        added here.
+    """This is called at the start of processing an activecode node.  If activecode had recursive nodes
+    etc and did not want to do all of the processing in visit_ac_html any finishing touches could be
+    added here.
     """
-    print('DEBUG: depart_quizly_html') if DEBUG else None
+    print("DEBUG: depart_quizly_html") if DEBUG else None
     bc = node["runestone_options"]["basecourse"]
     addHTMLToDB(
         node["runestone_options"]["divid"],
         bc,
-        "".join(self.body[self.body.index(node["delimiter"]) + 1 :])
-        .replace("../_static", f"/runestone/books/published/{bc}/_static"),
+        "".join(self.body[self.body.index(node["delimiter"]) + 1 :]).replace(
+            "../_static", f"/ns/books/published/{bc}/_static"
+        ),
     )
     self.body.remove(node["delimiter"])
 
@@ -114,6 +118,7 @@ class Quizly(RunestoneIdDirective):
 
        :quizname: quiz_eval_expression
     """
+
     required_arguments = 1
     optional_arguments = 0
     has_content = True
@@ -122,9 +127,9 @@ class Quizly(RunestoneIdDirective):
 
     def run(self):
         super(Quizly, self).run()
-        print('DEBUG; Quizly.run()') if DEBUG else None
+        print("DEBUG; Quizly.run()") if DEBUG else None
 
-        addQuestionToDB(self)   # Not sure whether this works?
+        addQuestionToDB(self)  # Not sure whether this works?
         document = self.state.document
         rel_filename, filename = document.settings.env.relfn2path(self.arguments[0])
 
@@ -137,14 +142,16 @@ def run(self):
 
         quizly_node = QuizlyNode()
         quizly_node["runestone_options"] = self.options
-        quizly_node["quizname"] = str(self.options['controls'][0])
+        quizly_node["quizname"] = str(self.options["controls"][0])
         quizly_node["quizname"] = str.strip(quizly_node["quizname"][10:])
         quizly_node["template"] = QUIZLY_TEMPLATE.replace(
-            '###', quizly_node["quizname"])
-
-        quizly_node["source"], quizly_node["line"] = self.state_machine.get_source_and_line(
-            self.lineno
+            "###", quizly_node["quizname"]
         )
-        print('DEBUG: run() self.content = ' + str(self.content)) if DEBUG else None
-        print('DEBUG: run() quizly_node = ' + str(quizly_node)) if DEBUG else None
+
+        (
+            quizly_node["source"],
+            quizly_node["line"],
+        ) = self.state_machine.get_source_and_line(self.lineno)
+        print("DEBUG: run() self.content = " + str(self.content)) if DEBUG else None
+        print("DEBUG: run() quizly_node = " + str(quizly_node)) if DEBUG else None
         return [quizly_node]