Split validators in scholar

trojsten · Nov 25, 2024 · 9273449 · 9273449
1 parent fd0d152
commit 9273449
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/modules/scholar/builder/contexts/buildable.py b/modules/scholar/builder/contexts/buildable.py
@@ -4,12 +4,10 @@
 from .base import ContextScholar
 from .hierarchy import ContextCourse, ContextYear
 from .i18n import ContextI18n
-from .validators import ScholarValidator
 
 
 class ContextIssueBase(BuildableFileSystemContext, ContextScholar, metaclass=ABCMeta):
     _issue_context_class = None
-    _validator_class = ScholarValidator
 
     def populate(self, course: str, year: int, issue: int):
         self.adopt(

diff --git a/modules/scholar/builder/contexts/handout.py b/modules/scholar/builder/contexts/handout.py
@@ -3,6 +3,7 @@
 
 from .hierarchy import ContextIssue, ContextIssueSub
 from .buildable import ContextIssueBase
+from .validators import HandoutValidator
 
 
 class HandoutMixin:
@@ -33,4 +34,5 @@ class ContextHandoutIssue(HandoutMixin, ContextIssue):
 
 class ContextHandout(HandoutMixin, ContextIssueBase):
     _schema = Schema({})
+    _validator_class = HandoutValidator
     _issue_context_class = ContextHandoutIssue
diff --git a/modules/scholar/builder/contexts/homework.py b/modules/scholar/builder/contexts/homework.py
@@ -3,6 +3,7 @@
 
 from .hierarchy import ContextIssue, ContextIssueSub, ContextIssueSubSub
 from .buildable import ContextIssueBase
+from .validators import HomeworkValidator
 
 
 class HomeworkMixin:
@@ -39,5 +40,6 @@ class ContextHomeworkIssue(HomeworkMixin, ContextIssue):
 
 
 class ContextHomework(HomeworkMixin, ContextIssueBase):
-    _issue_context_class = ContextHomeworkIssue
     _schema = Schema({})
+    _validator_class = HomeworkValidator
+    _issue_context_class = ContextHomeworkIssue
diff --git a/modules/scholar/builder/contexts/validators.py b/modules/scholar/builder/contexts/validators.py
@@ -3,19 +3,42 @@
 from core.builder.validator import FileSystemValidator, File, FileOrLink
 
 
-class ScholarValidator(FileSystemValidator):
+data = Regex(r'[\w-]+\.(png|jpg|svg|gp|py|dat|tsv)')
+
+
+class HandoutValidator(FileSystemValidator):
+    _schema = Schema({
+        Optional(data): FileOrLink,
+        Optional(Regex(r'[\w-]+')): {
+            Optional('problem.md'): File,
+            Optional('solution.md'): File,
+            Optional('meta.yaml'): File,
+            Optional(data): FileOrLink,
+            Optional(Regex(r'[\w-]+')): {
+                Optional('problem.md'): File,
+                Optional('solution.md'): File,
+                'meta.yaml': File,
+                Optional(data): FileOrLink,
+            },
+        },
+        Optional('text.md'): File,
+        'meta.yaml': File,
+    })
+
+
+class HomeworkValidator(FileSystemValidator):
     _schema = Schema({
-        Optional(Regex(r'[\w-]+\.(png|jpg|svg|gp|py|dat|tsv)')): FileOrLink,
+        Optional(data): FileOrLink,
         Optional(Regex(r'[\w-]+')): {
             Optional('problem.md'): File,
             Optional('solution.md'): File,
-            'meta.yaml': File,
-            Optional(Regex(r'[\w-]+\.(png|jpg|svg|gp|py|dat|tsv)')): FileOrLink,
+            Optional('meta.yaml'): File,
+            Optional(data): FileOrLink,
             Optional(Regex(r'[\w-]+')): {
                 Optional('problem.md'): File,
                 Optional('solution.md'): File,
                 'meta.yaml': File,
-                Optional(Regex(r'[\w-]+\.(png|jpg|svg|gp|py|dat|tsv)')): FileOrLink,
+                Optional(data): FileOrLink,
             },
         },
         Optional('text.md'): File,