fix: zip structure

SELab-2 · May 23, 2024 · 891ddbc · 891ddbc
1 parent 6f47fe0
commit 891ddbc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/backend/api/fixtures/realistic/realistic.yaml b/backend/api/fixtures/realistic/realistic.yaml
@@ -139,15 +139,15 @@
 - model: api.structurecheck
   pk: 1
   fields:
-    path: "verslag/"
+    path: "verslag"
     project: 0
     obligated_extensions:
       - 3
     blocked_extensions: []
 - model: api.structurecheck
   pk: 2
   fields:
-    path: src/
+    path: src
     project: 1
     obligated_extensions:
       - 1
@@ -156,7 +156,7 @@
 - model: api.structurecheck
   pk: 3
   fields:
-    path: verslag/
+    path: verslag
     project: 1
     obligated_extensions:
       - 3

diff --git a/backend/api/logic/parse_zip_files.py b/backend/api/logic/parse_zip_files.py
@@ -24,7 +24,7 @@ def parse_zip(project: Project, zip_file: InMemoryUploadedFile) -> bool:
         if common_prefix[-1] != '/':
             prefixes = prefixes[:-1]
 
-        directories += [prefix + '/' for prefix in prefixes]
+        directories += [prefix for prefix in prefixes]
 
     # Add for each directory a structure check
     for directory in directories:

diff --git a/backend/api/tasks/structure_check.py b/backend/api/tasks/structure_check.py
@@ -89,4 +89,4 @@ def _get_all_name_ext(path: str) -> dict[str, str]:
                 with zipfile.ZipFile(zip_data, 'r') as inner_zip:
                     file_list = inner_zip.namelist()
 
-    return {file: file.split('.')[-1] for file in file_list}
+    return {'/'.join(file.split('/')[:-1]): file.split('.')[-1] for file in file_list}