Move use of record_url out of models

Managing links should be the job of views or the freezer

Author: encukou

naucse/models.py

@@ -14,7 +14,6 @@
 import naucse.utils.views
 from naucse.utils.models import Model, YamlProperty, DataProperty, DirProperty, MultipleModelDirProperty, ForkProperty
 from naucse.utils.models import reify, arca
-from naucse.freezer import record_url
 from naucse.validation import AllowedElementsParser
 from naucse.templates import setup_jinja_env, vars_functions
 from naucse.utils.markdown import convert_markdown
@@ -644,13 +643,6 @@ def render(self, page_type, *args, **kwargs):
         if page_type != "calendar_ics" and result.output["content"] is not None:
             allowed_elements_parser.reset_and_feed(result.output["content"])
 
-        if "urls" in result.output:
-            # Freeze URLs generated by the code in fork, but only if
-            # they start with the slug of the course
-            for url in result.output["urls"]:
-                if url.startswith(f"/{self.slug}/"):
-                    record_url(url)
-
         return result.output
 
     def render_course(self, **kwargs):
@@ -708,9 +700,9 @@ def validate_link(link, key):
         for link_type in "prev_link", "session_link", "next_link":
             link = result.output.get(link_type)
 
-            if isinstance(link, dict) and validate_link(link, "url") and validate_link(link, "title"):
-                if link["url"].startswith(f"/{self.slug}/"):
-                    record_url(link["url"])
+            if (isinstance(link, dict) and
+                    validate_link(link, "url") and
+                    validate_link(link, "title")):
                 to_return.append(link)
             else:
                 to_return.append(None)

naucse/views.py

@@ -276,6 +276,13 @@ def lesson_static_generator():
             yield from lesson_static_generator_dir(lesson.slug, static, static)
 
 
+def record_content_urls(data_from_fork, prefix):
+    # Freeze URLs generated by the code in fork, but only if
+    # they start with the given prefix
+    for url in data_from_fork.get("urls", ()):
+        if url.startswith(prefix):
+            record_url(url)
+
 def course_content(course):
     def lesson_url(lesson, *args, **kwargs):
         if kwargs.get("page") == "index":
@@ -319,6 +326,7 @@ def course(course):
                 root_slug=model.meta.slug,
                 travis_build_id=os.environ.get("TRAVIS_BUILD_ID"),
             )
+        record_content_urls(data_from_fork, f"/{course.slug}/")
         kwargs = {
             "course_content": content,
             "edit_info": edit_info,
@@ -464,7 +472,6 @@ def content_creator():
                     subpage_url=subpage_url,
                     vars=variables
                 )
-
             absolute_urls = [url_for(logged[0], **logged[1]) for logged in logger.logged_calls]
 
         relative_urls = [get_relative_url(request.path, x) for x in absolute_urls]
@@ -529,7 +536,10 @@ def course_page(course, lesson, page, solution=None):
             if content_offer:
                 fork_kwargs["content_key"] = content_key
 
-            data_from_fork = course.render_page(lesson_slug, page, solution, **fork_kwargs)
+            data_from_fork = course.render_page(
+                lesson_slug, page, solution,
+                **fork_kwargs)
+            record_content_urls(data_from_fork, f"/{course.slug}/")
 
             content = data_from_fork["content"]
 
@@ -572,8 +582,17 @@ def course_page(course, lesson, page, solution=None):
                     title = '{}: {}'.format(course.title, page.title)
 
                     try:
-                        prev_link, session_link, next_link = course.get_footer_links(lesson.slug, page_slug,
-                                                                                     request_url=request.path)
+                        footer_links = course.get_footer_links(
+                            lesson.slug,
+                            page_slug,
+                            request_url=request.path,
+                        )
+                        for link in footer_links:
+                            _prefix = f"/{course.slug}/"
+                            if link and link["url"].startswith(_prefix):
+                                record_url(link["url"])
+                        prev_link, session_link, next_link = footer_links
+
                     except POSSIBLE_FORK_EXCEPTIONS as e:
                         if raise_errors_from_forks():
                             raise
@@ -725,7 +744,9 @@ def session_coverpage(course, session, coverpage):
         naucse.utils.views.forks_raise_if_disabled()
 
         try:
-            data_from_fork = course.render_session_coverpage(session, coverpage, request_url=request.path)
+            data_from_fork = course.render_session_coverpage(
+                session, coverpage, request_url=request.path)
+            record_content_urls(data_from_fork, f"/{course.slug}/")
 
             content = data_from_fork.get("content")
             if content is None:
@@ -789,6 +810,7 @@ def course_calendar(course):
 
         try:
             data_from_fork = course.render_calendar(request_url=request.path)
+            record_content_urls(data_from_fork, f"/{course.slug}/")
 
             course = process_course_data(data_from_fork.get("course"), slug=course.slug)
             edit_info = links.process_edit_info(data_from_fork.get("edit_info"))
@@ -864,7 +886,9 @@ def course_calendar_ics(course):
         naucse.utils.views.forks_raise_if_disabled()
 
         try:
-            data_from_fork = course.render_calendar_ics(request_url=request.path)
+            data_from_fork = course.render_calendar_ics(
+                request_url=request.path)
+            record_content_urls(data_from_fork, f"/{course.slug}/")
 
             calendar = data_from_fork.get("calendar")