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

Always use \n, not Environment.NewLine

Browse Source
This commit is contained in:
Jonathan Allen
2024-01-04 14:37:29 -07:00
parent 96c47faeb4
commit 9354eedb58
15 changed files with 145 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Management/Services/Files/FileConfiguration.cs
View File

@@ -1,10 +1,11 @@
using Management.Services;
using Microsoft.Extensions.Configuration;
public class FileConfiguration
public class FileConfiguration(IConfiguration config)
{
public static string GetBasePath()
public string GetBasePath()
{
string? storageDirectory = Environment.GetEnvironmentVariable("storageDirectory");
string? storageDirectory = config["storageDirectory"];
var basePath = storageDirectory ?? Path.GetFullPath("../storage");
if (!Directory.Exists(basePath))

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

@@ -15,7 +15,8 @@ public class FileStorageManager
MyLogger<FileStorageManager> logger,
CourseMarkdownLoader courseMarkdownLoader,
MarkdownCourseSaver saveMarkdownCourse,
ILogger<FileStorageManager> otherLogger
ILogger<FileStorageManager> otherLogger,
FileConfiguration fileConfig
)
{
using var activity = DiagnosticsConfig.Source.StartActivity("loading storage directory");
@@ -23,7 +24,7 @@ public class FileStorageManager
_courseMarkdownLoader = courseMarkdownLoader;
_saveMarkdownCourse = saveMarkdownCourse;
_otherLogger = otherLogger;
_basePath = FileConfiguration.GetBasePath();
_basePath = fileConfig.GetBasePath();
this.logger.Log("Using storage directory: " + _basePath);
}

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

@@ -6,10 +6,10 @@ public class CourseMarkdownLoader
private readonly MyLogger<CourseMarkdownLoader> logger;
private readonly string _basePath;
public CourseMarkdownLoader(MyLogger<CourseMarkdownLoader> logger)
public CourseMarkdownLoader(MyLogger<CourseMarkdownLoader> logger, FileConfiguration fileConfig)
{
this.logger = logger;
_basePath = FileConfiguration.GetBasePath();
_basePath = fileConfig.GetBasePath();
}
public async Task<IEnumerable<LocalCourse>> LoadSavedMarkdownCourses()
@@ -101,7 +101,7 @@ public class CourseMarkdownLoader
var assignmentPromises = assignmentFiles
.Select(async filePath =>
{
var rawFile = await File.ReadAllTextAsync(filePath);
var rawFile = (await File.ReadAllTextAsync(filePath)).Replace("\r\n", "\n");
return LocalAssignment.ParseMarkdown(rawFile);
})
.ToArray();
@@ -122,7 +122,7 @@ public class CourseMarkdownLoader
var quizPromises = quizFiles
.Select(async path =>
{
var rawQuiz = await File.ReadAllTextAsync(path);
var rawQuiz = (await File.ReadAllTextAsync(path)).Replace("\r\n", "\n");
return LocalQuiz.ParseMarkdown(rawQuiz);
});

4
Management/Services/Files/SaveMarkdownCourse.cs
View File

@@ -2,10 +2,10 @@ using System.Threading.Tasks.Sources;
using LocalModels;
namespace Management.Services;
public class MarkdownCourseSaver(MyLogger<MarkdownCourseSaver> logger)
public class MarkdownCourseSaver(MyLogger<MarkdownCourseSaver> logger, FileConfiguration fileConfig)
{
private readonly MyLogger<MarkdownCourseSaver> _logger = logger;
private readonly string _basePath = FileConfiguration.GetBasePath();
private readonly string _basePath = fileConfig.GetBasePath();
public async Task Save(LocalCourse course, LocalCourse? previouslyStoredCourse)
{

11
Management/Services/WebRequestor.cs
View File

@@ -1,19 +1,22 @@
using Microsoft.Extensions.Configuration;
using RestSharp;
public class WebRequestor : IWebRequestor
{
private string BaseUrl = Environment.GetEnvironmentVariable("CANVAS_URL") + "/api/v1/";
private string BaseUrl = "";
private string token;
private RestClient client;
private readonly IConfiguration _config;
public WebRequestor()
public WebRequestor(IConfiguration config)
{
_config = config;
token =
Environment.GetEnvironmentVariable("CANVAS_TOKEN")
_config["CANVAS_TOKEN"]
?? throw new Exception("CANVAS_TOKEN not in environment");
BaseUrl = _config["CANVAS_URL"] + "/api/v1/";
client = new RestClient(BaseUrl);
client.AddDefaultHeader("Authorization", $"Bearer {token}");
}
public async Task<(T[]?, RestResponse)> GetManyAsync<T>(RestRequest request)