updates to allow nested data in the scaffolding folder

Author: nathan sprague

jmu_gradescope_utils/build_utils.py

@@ -112,9 +112,10 @@ def build_zip(autograder_folder, zip_location):
 
     # Add scaffolding code
     scaffold_path = Path(autograder_folder) / 'scaffolding'
-    for path in scaffold_path.glob('*'):
-        logging.info(f"Adding {path.name} to zip file")
-        zip_file.write(path, arcname=path.name)
+    for path in scaffold_path.glob('**/*'):
+        lname = str(path).split(str(scaffold_path) + os.sep)[1]
+        logging.info(f"Adding  {lname} to zip file")
+        zip_file.write(path, arcname=lname)
 
     # Add the files that just need to be added...
     for file_name in files_to_copy:

jmu_gradescope_utils/utils.py

@@ -19,24 +19,20 @@ def full_submission_path(filename=None):
 
     if filename is None:
         return SUBMISSION_BASE
-    elif os.path.dirname(filename) == SUBMISSION_BASE:
+    elif SUBMISSION_BASE in os.path.dirname(filename):
         return filename
-    elif os.path.dirname(filename) == '':
-        return os.path.join(SUBMISSION_BASE, filename)
     else:
-        raise ValueError("bad submission file path: " + filename)
+        return os.path.join(SUBMISSION_BASE, filename)
 
 
 def full_source_path(filename=None):
 
     if filename is None:
         return SOURCE_BASE
-    elif os.path.dirname(filename) == SOURCE_BASE:
+    elif SOURCE_BASE in os.path.dirname(filename):
         return filename
-    elif os.path.dirname(filename) == '':
-        return os.path.join(SOURCE_BASE, filename)
     else:
-        raise ValueError("bad source file path: " + filename)
+        return os.path.join(SOURCE_BASE, filename)
 
 
 def count_regex_matches(regex, filename, strip_comments=True):

scripts/convert.py

@@ -18,7 +18,10 @@ def convert_autograder(folder, backup=True):
 
     config_files = ['docstring.cfg', 'flake8.cfg', 'requirements.txt']
     for f in config_files:
-        shutil.copy(path / 'autograder' / f, path /'configurations' /f)
+        try:
+            shutil.copy(path / 'autograder' / f, path /'configurations' /f)
+        except FileNotFoundError:
+            print(f'{f} not in original autograder.')
 
     for item in (path / 'autograder').glob('*.py'):
         if item.name != 'run_tests.py': # no need for this