alex/canvasManagement
1
0
Fork 0
mirror of https://github.com/alexmickelson/canvasManagement.git synced 2026-03-25 23:28:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

only actors can save me

Browse Source
This commit is contained in:
Alex Mickelson
2024-05-03 16:12:24 -06:00
parent 7bb4744f5c
commit aab38c3e9b
8 changed files with 114 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Management.Test/Markdown/FileStorageTests.cs
View File

@@ -63,7 +63,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
loadedCourse.Should().BeEquivalentTo(testCourse);
@@ -88,7 +88,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
loadedCourse.Settings.Should().BeEquivalentTo(testCourse.Settings);
@@ -113,7 +113,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
loadedCourse.Modules.Should().BeEquivalentTo(testCourse.Modules);
@@ -151,7 +151,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
var actualAssignments = loadedCourse.Modules.First().Assignments;
@@ -197,7 +197,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
loadedCourse.Modules.First().Quizzes.Should().BeEquivalentTo(testCourse.Modules.First().Quizzes);
@@ -264,7 +264,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
loadedCourse.Should().BeEquivalentTo(testCourse);
@@ -303,7 +303,7 @@ public class FileStorageTests
await fileManager.SaveCourseAsync(testCourse, null);
var loadedCourses = await fileManager.LoadSavedMarkdownCourses();
var loadedCourses = await fileManager.LoadSavedCourses();
var loadedCourse = loadedCourses.First(c => c.Settings.Name == testCourse.Settings.Name);
loadedCourse.Should().BeEquivalentTo(testCourse);

7
Management.Web/Program.cs
View File

@@ -82,7 +82,12 @@ builder.Services.AddScoped<ICanvasService, CanvasService>();
builder.Services.AddScoped<MarkdownCourseSaver>();
builder.Services.AddScoped<CourseMarkdownLoader>();
builder.Services.AddScoped<IFileStorageManager,FileStorageManager>();
builder.Services.AddScoped<IFileStorageManager>(sp =>
{
var manager = ActivatorUtilities.CreateInstance<FileStorageManager>(sp);
var logger = sp.GetRequiredService<ILogger<FileStorageManagerCached>>();
return new FileStorageManagerCached(manager, logger);
});
builder.Services.AddScoped<CoursePlanner>();
builder.Services.AddScoped<AssignmentEditorContext>();

1
Management.Web/Shared/InitializeNewCourse.razor
View File

@@ -26,6 +26,7 @@
this.InvokeAsync(updateCourses);
}
}
private EnrollmentTermModel? selectedTerm
{
get => terms?.FirstOrDefault(t => t.Id == selectedTermId);

68
Management/Features/Configuration/CoursePlanner.cs
View File

@@ -39,6 +39,7 @@ public class CoursePlanner
private int _debounceInterval = 1000;
private LocalCourse? _localCourse { get; set; }
private LocalCourse? _lastSavedCourse { get; set; }
private string loadedCourseName = "";
public LocalCourse? LocalCourse
{
get => _localCourse;
@@ -48,10 +49,13 @@ public class CoursePlanner
{
_localCourse = null;
StateHasChanged?.Invoke();
loadedCourseName = "";
return;
}
var verifiedCourse = value.GeneralCourseCleanup();
loadedCourseName = verifiedCourse.Settings.Name;
if (_localCourse == null)
{
@@ -61,46 +65,54 @@ public class CoursePlanner
return;
}
_debounceTimer?.Dispose();
_debounceTimer = new Timer(
async (_) => await saveCourseToFile(verifiedCourse),
null,
_debounceInterval,
Timeout.Infinite
);
saveCourseToFile(verifiedCourse);
_localCourse = verifiedCourse;
StateHasChanged?.Invoke();
}
}
private async Task saveCourseToFile(LocalCourse courseAsOfDebounce)
public async Task LoadCourseByName(string courseName)
{
}
private void saveCourseToFile(LocalCourse courseAsOfDebounce)
{
_debounceTimer?.Dispose();
_debounceTimer = new Timer(
async (_) =>
{
_debounceTimer?.Dispose();
// ignore initial load of course
if (LocalCourse == null)
{
logger.Trace("saving course as of debounce call time");
await fileStorageManager.SaveCourseAsync(courseAsOfDebounce, null);
_lastSavedCourse = courseAsOfDebounce;
}
else
{
if (_lastSavedCourse == null)
{
logger.Trace("not saving course, no prevous saved course");
_lastSavedCourse = LocalCourse ?? courseAsOfDebounce;
return;
}
// ignore initial load of course
if (LocalCourse == null)
{
logger.Trace("saving course as of debounce call time");
await fileStorageManager.SaveCourseAsync(courseAsOfDebounce, null);
_lastSavedCourse = courseAsOfDebounce;
}
else
{
if (_lastSavedCourse == null)
{
logger.Trace("not saving course, no prevous saved course");
_lastSavedCourse = LocalCourse ?? courseAsOfDebounce;
return;
}
logger.Trace("Saving latest version of file");
var courseToSave = LocalCourse;
await fileStorageManager.SaveCourseAsync(courseToSave, _lastSavedCourse);
_lastSavedCourse = courseToSave;
logger.Trace("Saving latest version of file");
var courseToSave = LocalCourse;
await fileStorageManager.SaveCourseAsync(courseToSave, _lastSavedCourse);
_lastSavedCourse = courseToSave;
}
}
},
null,
_debounceInterval,
Timeout.Infinite
);
}
public event Action? StateHasChanged;

16
Management/Services/Files/FileStorageManager.cs
View File

@@ -1,14 +1,6 @@
using LocalModels;
using Management.Services;
public interface IFileStorageManager
{
Task SaveCourseAsync(LocalCourse course, LocalCourse? previouslyStoredCourse);
Task<IEnumerable<LocalCourse>> LoadSavedCourses();
Task<IEnumerable<LocalCourse>> LoadSavedMarkdownCourses();
IEnumerable<string> GetEmptyDirectories();
}
public class FileStorageManager : IFileStorageManager
{
private readonly MyLogger<FileStorageManager> logger;
@@ -44,13 +36,7 @@ public class FileStorageManager : IFileStorageManager
public async Task<IEnumerable<LocalCourse>> LoadSavedCourses()
{
return await LoadSavedMarkdownCourses();
}
public async Task<IEnumerable<LocalCourse>> LoadSavedMarkdownCourses()
{
return await _courseMarkdownLoader.LoadSavedMarkdownCourses();
return await _courseMarkdownLoader.LoadSavedCourses();
}
public IEnumerable<string> GetEmptyDirectories()

50
Management/Services/Files/FileStorageManagerCached.cs Normal file
View File

@@ -0,0 +1,50 @@
using System.Diagnostics.CodeAnalysis;
using LocalModels;
public class FileStorageManagerCached : IFileStorageManager
{
private readonly FileStorageManager manager;
private readonly object cacheLock = new object(); // Lock object for synchronization
private DateTime? cacheTime { get; set; } = null;
private IEnumerable<LocalCourse>? cachedCourses { get; set; } = null;
private ILogger<FileStorageManagerCached> logger { get; }
private readonly int cacheSeconds = 2;
public FileStorageManagerCached(FileStorageManager manager, ILogger<FileStorageManagerCached> logger)
{
this.manager = manager;
this.logger = logger;
}
public IEnumerable<string> GetEmptyDirectories()
{
return manager.GetEmptyDirectories();
}
public async Task<IEnumerable<LocalCourse>> LoadSavedCourses()
{
var secondsFromLastLoad = (DateTime.Now - cacheTime)?.Seconds;
if (cachedCourses != null && secondsFromLastLoad < cacheSeconds)
{
logger.LogInformation("returning cached courses from file");
return cachedCourses;
}
cachedCourses = await manager.LoadSavedCourses();
cacheTime = DateTime.Now;
return cachedCourses;
}
public async Task SaveCourseAsync(LocalCourse course, LocalCourse? previouslyStoredCourse)
{
// race condition...
cacheTime = null;
cachedCourses = null;
await manager.SaveCourseAsync(course, previouslyStoredCourse);
}
}

8
Management/Services/Files/IFileStorageManager.cs Normal file
View File

@@ -0,0 +1,8 @@
using LocalModels;
public interface IFileStorageManager
{
Task SaveCourseAsync(LocalCourse course, LocalCourse? previouslyStoredCourse);
Task<IEnumerable<LocalCourse>> LoadSavedCourses();
IEnumerable<string> GetEmptyDirectories();
}

2
Management/Services/Files/LoadMarkdownCourse.cs
View File

@@ -12,7 +12,7 @@ public class CourseMarkdownLoader
_basePath = fileConfig.GetBasePath();
}
public async Task<IEnumerable<LocalCourse>> LoadSavedMarkdownCourses()
public async Task<IEnumerable<LocalCourse>> LoadSavedCourses()
{
var courseDirectories = Directory.GetDirectories(_basePath);