Fix #321: Glob subdirectories of data/{sample,secret} as well

RagnarGrootKoerkamp · Oct 31, 2023 · 641f11b · 641f11b
1 parent b8fb7be
commit 641f11b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/bin/export.py b/bin/export.py
@@ -107,10 +107,10 @@ def build_problem_zip(problem, output, statement_language):
             ('.timelimit', True),
             (f'problem.{statement_language}.pdf', True),
             ('problem_statement/*', True),
-            ('data/sample/*.in', True),
-            ('data/sample/*.ans', True),
-            ('data/secret/*.in', True),
-            ('data/secret/*.ans', True),
+            ('data/sample/**/*.in', True),
+            ('data/sample/**/*.ans', True),
+            ('data/secret/**/*.in', True),
+            ('data/secret/**/*.ans', True),
             ('submissions/accepted/**/*', True),
             ('submissions/*/**/*', False),
             ('attachments/**/*', False),
@@ -123,12 +123,12 @@ def build_problem_zip(problem, output, statement_language):
             (f'problem.{statement_language}.pdf', True),
             ('problem_statement/*', True),
             # Either .interaction or .in.statement should be present, but we only care about .interaction here.
-            ('data/sample/*.interaction', False),
-            ('data/sample/*.in.statement', False),
-            ('data/sample/*.ans.statement', False),
-            ('data/secret/*.in', True),
+            ('data/sample/**/*.interaction', False),
+            ('data/sample/**/*.in.statement', False),
+            ('data/sample/**/*.ans.statement', False),
+            ('data/secret/**/*.in', True),
             # Not really needed, but otherwise problemtools will complain.
-            ('data/secret/*.ans', True),
+            ('data/secret/**/*.ans', True),
             ('submissions/accepted/**/*', True),
             ('submissions/*/**/*', False),
             ('attachments/**/*', False),