From 1b113b7fb0e9c2f07709a1c8fb5b094fdeebbc13 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Fri, 5 Jan 2024 13:36:34 -0700 Subject: [PATCH] be more lenient about assignments or quizzes folders not existing in module on load. Git will not save empty folders --- Management/Services/Files/LoadMarkdownCourse.cs | 11 +++++------ docker-compose.yml | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Management/Services/Files/LoadMarkdownCourse.cs b/Management/Services/Files/LoadMarkdownCourse.cs index a172815..0018413 100644 --- a/Management/Services/Files/LoadMarkdownCourse.cs +++ b/Management/Services/Files/LoadMarkdownCourse.cs @@ -93,10 +93,10 @@ public class CourseMarkdownLoader var assignmentsPath = $"{modulePath}/assignments"; if (!Directory.Exists(assignmentsPath)) { - var errorMessage = $"error loading course by name, assignments folder does not exist in {modulePath}"; - logger.Log(errorMessage); - throw new LoadCourseFromFileException(errorMessage); + logger.Log($"error loading course by name, assignments folder does not exist in {modulePath}"); + Directory.CreateDirectory(assignmentsPath); } + var assignmentFiles = Directory.GetFiles(assignmentsPath); var assignmentPromises = assignmentFiles .Select(async filePath => @@ -113,9 +113,8 @@ public class CourseMarkdownLoader var quizzesPath = $"{modulePath}/quizzes"; if (!Directory.Exists(quizzesPath)) { - var errorMessage = $"error loading course by name, quizzes folder does not exist in {modulePath}"; - logger.Log(errorMessage); - throw new LoadCourseFromFileException(errorMessage); + logger.Log($"quizzes folder does not exist in {modulePath}, creating now"); + Directory.CreateDirectory(quizzesPath); } var quizFiles = Directory.GetFiles(quizzesPath); diff --git a/docker-compose.yml b/docker-compose.yml index c4b9c3c..59f78e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,8 @@ services: volumes: # - ./storage:/app/storage # - ~/projects/faculty/1410/2023-fall-alex/modules:/app/storage/1410 - - ~/projects/faculty/1810/2024-spring-alex/modules:/app/storage/web_intro + - ~/projects/faculty/1810/2024-spring-alex/modules:/app/storage/web + - ~/projects/faculty/1810/2024-spring-alex/modules_online:/app/storage/web_online - ~/projects/faculty/1400/2024_spring_alex/modules:/app/storage/1400 - ~/projects/faculty/1405/2024_spring_alex/modules:/app/storage/1405 - ~/projects/faculty/4620_Distributed/2024Spring/modules:/app/storage/distributed @@ -33,7 +34,6 @@ services: zipkin: image: ghcr.io/openzipkin/zipkin-slim - container_name: zipkin # Environment settings are defined here https://github.com/openzipkin/zipkin/blob/master/zipkin-server/README.md#environment-variables environment: - STORAGE_TYPE=mem