only initialize courses in directories that exist

This commit is contained in:
2023-12-04 16:49:20 -07:00
parent b0cf5d8189
commit 209e8f991f
4 changed files with 67 additions and 88 deletions

View File

@@ -72,49 +72,10 @@
</div> </div>
<div class="border rounded bg-dark-subtle p-3 my-3"> <div class="border rounded bg-dark-subtle p-3 my-3">
<InitializeYamlFromCanvas NewFileCreated="NewFileCreated" /> <InitializeNewCourse NewFileCreated="NewFileCreated" />
</div> </div>
} }
} }
@* @if(planner.LocalCourse != null)
{
<div class="mb-3 d-flex justify-content-between" style="height: 4em;">
<div class="my-auto">
<button
@onclick="planner.Clear"
class="btn btn-primary"
>
Select New Course
</button>
<CourseSettings />
<AssignmentTemplateManagement />
<button
class="btn btn-outline-primary"
@onclick="planner.SyncWithCanvas"
>
Sync With Canvas
</button>
<a
class="btn btn-outline-secondary"
target="_blank"
href="@($"{Environment.GetEnvironmentVariable("CANVAS_URL")}/courses/{planner.LocalCourse.CanvasId}")"
>
View In Canvas
</a>
<div class="my-auto ms-2 d-inline">
@planner.LocalCourse.Settings.Name
</div>
</div>
@if(planner.LoadingCanvasData)
{
<Spinner />
}
</div>
<CourseDetails />
} *@
<br> <br>

View File

@@ -25,7 +25,6 @@
{ {
_selectedTermId = value; _selectedTermId = value;
this.InvokeAsync(updateCourses); this.InvokeAsync(updateCourses);
@* updateCourses(); *@
} }
} }
private EnrollmentTermModel? selectedTerm private EnrollmentTermModel? selectedTerm
@@ -47,23 +46,29 @@
{ {
get => courses?.First(c => c.Id == selectedCourseId); get => courses?.First(c => c.Id == selectedCourseId);
} }
private List<DayOfWeek> days { get; set; } = new(); private List<DayOfWeek> days { get; set; } = new();
private IEnumerable<string> directoriesNotUsed { get; set; } = [];
private string? selectedStorageDirectory { get; set; } = null;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
loadingTerms = true; loadingTerms = true;
terms = await canvas.GetCurrentTermsFor(); terms = await canvas.GetCurrentTermsFor();
loadingTerms = false; loadingTerms = false;
directoriesNotUsed = await fileStorageManager.GetEmptyDirectories();
} }
private async Task YamlTrigger()
private async Task SaveNewCourse()
{ {
if (selectedCourse != null) if (selectedCourse != null && selectedStorageDirectory != null && selectedStorageDirectory != string.Empty)
{ {
var course = new LocalCourse var course = new LocalCourse
{ {
Modules = new LocalModule[] { }, Modules = new LocalModule[] { },
Settings = new LocalCourseSettings() Settings = new LocalCourseSettings()
{ {
Name = selectedCourse.Name, Name = Path.GetFileName(selectedStorageDirectory),
CanvasId = selectedCourse.Id, CanvasId = selectedCourse.Id,
StartDate = selectedTerm?.StartAt ?? new DateTime(), StartDate = selectedTerm?.StartAt ?? new DateTime(),
EndDate = selectedTerm?.EndAt ?? new DateTime(), EndDate = selectedTerm?.EndAt ?? new DateTime(),
@@ -105,7 +110,11 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-auto"> <div class="col-auto">
<label for="termselect">Select Term:</label> <label for="termselect">Select Term:</label>
<select id="termselect" class="form-select" @bind="selectedTermId"> <select
id="termselect"
class="form-select"
@bind="selectedTermId"
>
@foreach (var term in terms) @foreach (var term in terms)
{ {
<option value="@term.Id">@term.Name</option> <option value="@term.Id">@term.Name</option>
@@ -126,12 +135,28 @@
@if (courses != null) @if (courses != null)
{ {
<div class="row justify-content-center m-3"> <div class="row justify-content-center m-3">
<div class="col-auto"> <div class="col-auto">
<label for="courseselect">Select Course:</label> <label for="courseselect">Select Course:</label>
<select id="courseselect" class="form-select" @bind="selectedCourseId"> <select id="courseselect" class="form-select" @bind="selectedCourseId">
@foreach (var course in courses) @foreach (var course in courses)
{
<option value="@course.Id">@course.Name</option>
}
</select>
</div>
</div>
<div class="row justify-content-center m-3">
<div class="col-auto">
<label for="directorySelect">Select Storage Directory:</label>
<select
id="directorySelect"
class="form-select"
@bind="selectedStorageDirectory"
>
<option></option>
@foreach (var folder in directoriesNotUsed)
{ {
<option value="@course.Id">@course.Name</option> <option value="@folder">@folder</option>
} }
</select> </select>
</div> </div>
@@ -143,16 +168,19 @@
@foreach (DayOfWeek day in (DayOfWeek[])Enum.GetValues(typeof(DayOfWeek))) @foreach (DayOfWeek day in (DayOfWeek[])Enum.GetValues(typeof(DayOfWeek)))
{ {
<div class="col"> <div class="col">
<button class="@( <button
class="@(
days.Contains(day) days.Contains(day)
? "btn btn-secondary" ? "btn btn-secondary"
: "btn btn-outline-secondary" : "btn btn-outline-secondary"
)" @onclick="() => { )"
@onclick="() => {
if(days.Contains(day)) if(days.Contains(day))
days.Remove(day); days.Remove(day);
else else
days.Add(day); days.Add(day);
}"> }"
>
@day @day
</button> </button>
</div> </div>
@@ -161,8 +189,8 @@
<div class="text-center"> <div class="text-center">
<button @onclick="YamlTrigger" class="btn btn-primary"> <button @onclick="SaveNewCourse" class="btn btn-primary">
Save Yaml File Create Course Files
</button> </button>
</div> </div>
} }

View File

@@ -23,44 +23,14 @@ public class FileStorageManager
this.logger.Log("Using storage directory: " + _basePath); this.logger.Log("Using storage directory: " + _basePath);
} }
// public string CourseToYaml(LocalCourse course)
// {
// var serializer = new SerializerBuilder().DisableAliases().Build();
// var yaml = serializer.Serialize(course);
// return yaml;
// }
// public LocalCourse ParseCourse(string rawCourse)
// {
// var deserializer = new DeserializerBuilder().IgnoreUnmatchedProperties().Build();
// var course = deserializer.Deserialize<LocalCourse>(rawCourse);
// return course;
// }
public async Task SaveCourseAsync(LocalCourse course) public async Task SaveCourseAsync(LocalCourse course)
{ {
// var courseString = CourseToYaml(course);
// await File.WriteAllTextAsync($"{_basePath}/{course.Settings.Name}.yml", courseString);
await _saveMarkdownCourse.Save(course); await _saveMarkdownCourse.Save(course);
} }
public async Task<IEnumerable<LocalCourse>> LoadSavedCourses() public async Task<IEnumerable<LocalCourse>> LoadSavedCourses()
{ {
// var fileNames = Directory.GetFiles(_basePath);
// var courses = await Task.WhenAll(
// fileNames
// .Where(name => name.EndsWith(".yml"))
// .Select(async n => ParseCourse(await File.ReadAllTextAsync(n)))
// );
// return courses;
return await LoadSavedMarkdownCourses(); return await LoadSavedMarkdownCourses();
} }
@@ -69,4 +39,15 @@ public class FileStorageManager
return await _courseMarkdownLoader.LoadSavedMarkdownCourses(); return await _courseMarkdownLoader.LoadSavedMarkdownCourses();
} }
public async Task<IEnumerable<string>> GetEmptyDirectories()
{
if(!Directory.Exists(_basePath))
throw new DirectoryNotFoundException($"Cannot get empty directories, {_basePath} does not exist");
return Directory
.GetDirectories(_basePath, "*")
.Where(dir => !Directory.EnumerateFileSystemEntries(dir).Any())
.ToArray();
}
} }

View File

@@ -17,7 +17,13 @@ public class CourseMarkdownLoader
var courseDirectories = Directory.GetDirectories(_basePath); var courseDirectories = Directory.GetDirectories(_basePath);
var courses = await Task.WhenAll( var courses = await Task.WhenAll(
courseDirectories.Select(async n => await LoadCourseByPath(n)) courseDirectories
.Where(d =>
{
var settingsPath = $"{d}/settings.yml";
return File.Exists(settingsPath);
})
.Select(async d => await LoadCourseByPath(d))
); );
return courses; return courses;
} }
@@ -31,10 +37,13 @@ public class CourseMarkdownLoader
throw new LoadCourseFromFileException(errorMessage); throw new LoadCourseFromFileException(errorMessage);
} }
LocalCourseSettings settings = await loadCourseSettings(courseDirectory); LocalCourseSettings settings = await loadCourseSettings(courseDirectory);
var modules = await loadCourseModules(courseDirectory); var modules = await loadCourseModules(courseDirectory);
return new() { return new()
{
Settings = settings, Settings = settings,
Modules = modules Modules = modules
}; };