Theodor-Springmann-Stiftung/hamann-ausgabe-core
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git synced 2025-10-29 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployment v1

Browse Source
This commit is contained in:
Simon Martens
2023-09-12 01:59:52 +02:00
parent 4cdd59cf89
commit 2c88f22f8e
40 changed files with 1093 additions and 39129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HaWeb/FileHelpers/ConfigurationMonitor.cs
View File

@@ -41,11 +41,11 @@ public class ConfigurationMonitor {
_h = h;
_timer = new(8000) { AutoReset = false };
_timer.Enabled = true;
_timer.Elapsed += OnChanged;
_timer.Elapsed += _OnChanged;
}
}
private void OnChanged(Object source, System.Timers.ElapsedEventArgs e) {
private void _OnChanged(Object source, System.Timers.ElapsedEventArgs e) {
Console.WriteLine("Configuration changed (ConfigurationMonitor Class)");
using IServiceScope serviceScope = _serviceProvider.CreateScope();
IServiceProvider provider = serviceScope.ServiceProvider;

6
HaWeb/FileHelpers/IXMLFileProvider.cs
View File

@@ -6,10 +6,14 @@ using HaWeb.Models;
using Microsoft.AspNetCore.Mvc.ModelBinding;
public interface IXMLFileProvider {
public event EventHandler<GitState?> FileChange;
public event EventHandler<XMLParsingState?> NewState;
public event EventHandler NewData;
public event EventHandler ConfigReload;
public List<IFileInfo>? GetWorkingTreeFiles();
public IFileInfo? SaveHamannFile(XElement element, string basefilepath, ModelStateDictionary ModelState);
public List<IFileInfo>? GetHamannFiles();
public (DateTime PullTime, string Hash)? GetGitData();
public GitState? GetGitState();
public void ParseConfiguration(IConfiguration config);
public bool HasChanged();
public void DeleteHamannFile(string filename);

16
HaWeb/FileHelpers/XMLFileHelpers.cs
View File

@@ -80,26 +80,26 @@ public static class XMLFileHelpers {
public static bool ProcessFile(
Stream file,
string fileName,
StringBuilder errorMessages,
Action<string> logger,
string[] permittedExtensions,
long sizeLimit) {
try {
// Check if the file is empty or exceeds the size limit.
if (file.Length == 0) {
errorMessages.AppendLine("Die Datei ist leer.");
logger("Die Datei ist leer.");
return false;
}
else if (file.Length > sizeLimit) {
var megabyteSizeLimit = sizeLimit / 1048576;
errorMessages.AppendLine($"Die Datei überschreitet das Größenlimit {megabyteSizeLimit:N1} MB.");
logger($"Die Datei überschreitet das Größenlimit {megabyteSizeLimit:N1} MB.");
return false;
}
// Return orderly, if signature & extension okay
else return IsValidFileExtensionAndSignature(fileName, file, errorMessages, permittedExtensions);
else return IsValidFileExtensionAndSignature(fileName, file, logger, permittedExtensions);
} catch (Exception ex) {
errorMessages.AppendLine($"The upload failed. Error: {ex.Message}");
logger($"The upload failed. Error: {ex.Message}");
return false;
}
}
@@ -118,13 +118,13 @@ public static class XMLFileHelpers {
}
}
private static bool IsValidFileExtensionAndSignature(string fileName, Stream data, StringBuilder errorMessages, string[] permittedExtensions) {
private static bool IsValidFileExtensionAndSignature(string fileName, Stream data, Action<string> logger, string[] permittedExtensions) {
if (string.IsNullOrEmpty(fileName) || data == null || data.Length == 0)
return false;
var ext = Path.GetExtension(fileName).ToLowerInvariant();
if (string.IsNullOrEmpty(ext) || !permittedExtensions.Contains(ext)) {
errorMessages.AppendLine("Dateiname endet nicht auf .xml");
logger("Dateiname endet nicht auf .xml");
return false;
}
@@ -134,7 +134,7 @@ public static class XMLFileHelpers {
var headerBytes = reader.ReadBytes(signatures.Max(m => m.Length));
if (!signatures.Any(signature =>
headerBytes.Take(signature.Length).SequenceEqual(signature))) {
errorMessages.AppendLine("Datei muss mit <?xml version=\"1.0\" encoding=\"utf-8\"?> oder <?xml version=\"1.0\"?> beginnen.");
logger("Datei muss mit <?xml version=\"1.0\" encoding=\"utf-8\"?> oder <?xml version=\"1.0\"?> beginnen.");
return false;
};
}

122
HaWeb/FileHelpers/XMLFileProvider.cs
View File

@@ -7,6 +7,7 @@ using HaWeb.XMLTests;
using System.Xml.Linq;
using System.Runtime.InteropServices;
using System.Diagnostics;
using Microsoft.Extensions.Primitives;
// XMLProvider provides a wrapper around the available XML data on a FILE basis
public class XMLFileProvider : IXMLFileProvider {
@@ -16,13 +17,20 @@ public class XMLFileProvider : IXMLFileProvider {
private IFileProvider _hamannFileProvider;
private IFileProvider _bareRepositoryFileProvider;
private IFileProvider _workingTreeFileProvider;
public event EventHandler<GitState?> FileChange;
public event EventHandler ConfigReload;
public event EventHandler<XMLParsingState?> NewState;
public event EventHandler NewData;
private string _Branch;
private string _URL;
private List<IFileInfo>? _WorkingTreeFiles;
private List<IFileInfo>? _HamannFiles;
private static (DateTime PullTime, string Hash)? _GitData;
private GitState? _GitState;
private System.Timers.Timer? _changeTokenTimer;
// Startup (LAST)
public XMLFileProvider(IXMLInteractionService xmlservice, IHaDocumentWrappper _lib, IConfiguration config) {
@@ -31,6 +39,7 @@ public class XMLFileProvider : IXMLFileProvider {
_XMLService = xmlservice;
_Branch = config.GetValue<string>("RepositoryBranch");
_URL = config.GetValue<string>("RepositoryURL");
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
_hamannFileProvider = new PhysicalFileProvider(config.GetValue<string>("HamannFileStoreWindows"));
_bareRepositoryFileProvider = new PhysicalFileProvider(config.GetValue<string>("BareRepositoryPathWindows"));
@@ -45,10 +54,12 @@ public class XMLFileProvider : IXMLFileProvider {
// Create File Lists; Here and in xmlservice, which does preliminary checking
Scan();
if (_WorkingTreeFiles != null && _WorkingTreeFiles.Any()) {
xmlservice.Collect(_WorkingTreeFiles);
var state = xmlservice.Collect(_WorkingTreeFiles, xmlservice.GetRootDefs());
xmlservice.SetState(state);
}
_HamannFiles = _ScanHamannFiles();
_RegisterChangeToken();
// Check if hamann file already is current working tree status
// -> YES: Load up the file via _lib.SetLibrary();
if (_IsAlreadyParsed()) {
@@ -57,7 +68,7 @@ public class XMLFileProvider : IXMLFileProvider {
}
// -> NO: Try to create a new file
var created = _XMLService.TryCreate();
var created = _XMLService.TryCreate(_XMLService.GetState());
if (created != null) {
var file = SaveHamannFile(created, _hamannFileProvider.GetFileInfo("./").PhysicalPath, null);
if (file != null) {
@@ -87,10 +98,11 @@ public class XMLFileProvider : IXMLFileProvider {
Scan();
// Reset XMLInteractionService
if (_WorkingTreeFiles != null && _WorkingTreeFiles.Any()) {
_XMLService.Collect(_WorkingTreeFiles);
var state = _XMLService.Collect(_WorkingTreeFiles, _XMLService.GetRootDefs());
_XMLService.SetState(state);
}
_HamannFiles = _ScanHamannFiles();
_XMLService.SetSCCache(null);
if (_HamannFiles != null && _HamannFiles.Select(x => x.Name).Contains(_Lib.GetActiveFile().Name)) {
_Lib.SetLibrary(_Lib.GetActiveFile(), null, null);
if (_Lib.GetLibrary() != null) return;
@@ -105,7 +117,7 @@ public class XMLFileProvider : IXMLFileProvider {
}
// -> NO: Try to create a new file
var created = _XMLService.TryCreate();
var created = _XMLService.TryCreate(_XMLService.GetState());
if (created != null) {
var file = SaveHamannFile(created, _hamannFileProvider.GetFileInfo("./").PhysicalPath, null);
if (file != null) {
@@ -132,7 +144,7 @@ public class XMLFileProvider : IXMLFileProvider {
// Getters and Setters
public List<IFileInfo>? GetWorkingTreeFiles() => _WorkingTreeFiles;
public (DateTime PullTime, string Hash)? GetGitData() => _GitData;
public GitState? GetGitState() => _GitState;
public List<IFileInfo>? GetHamannFiles() => this._HamannFiles;
@@ -148,12 +160,12 @@ public class XMLFileProvider : IXMLFileProvider {
public void Scan() {
_WorkingTreeFiles = _ScanWorkingTreeFiles();
_GitData = _ScanGitData();
_GitState = _ScanGitData();
}
public IFileInfo? SaveHamannFile(XElement element, string basefilepath, ModelStateDictionary? ModelState) {
if (!_GitData.HasValue) return null;
var filename = "hamann_" + _GitData.Value.PullTime.Year + "-" + _GitData.Value.PullTime.Month + "-" + _GitData.Value.PullTime.Day + "_" + _GitData.Value.PullTime.Hour + "-" + _GitData.Value.PullTime.Minute + "." + _GitData.Value.Hash.Substring(0,7) + ".xml";
if (_GitState == null) return null;
var filename = "hamann_" + _GitState.PullTime.Year + "-" + _GitState.PullTime.Month + "-" + _GitState.PullTime.Day + "_" + _GitState.PullTime.Hour + "-" + _GitState.PullTime.Minute + "." + _GitState.Commit.Substring(0,7) + ".xml";
var path = Path.Combine(basefilepath, filename);
try {
@@ -179,22 +191,29 @@ public class XMLFileProvider : IXMLFileProvider {
}
public bool HasChanged() {
if (!_GitData.HasValue) return true;
if (_GitState == null) return true;
var current = _ScanGitData();
if (current.Item2 != _GitData.Value.Hash) {
_GitData = current;
if (current != null && !String.Equals(current.Commit, _GitState.Commit)) {
_GitState = current;
return true;
}
return false;
}
private (DateTime, string) _ScanGitData() {
private GitState? _ScanGitData() {
var head = _bareRepositoryFileProvider.GetFileInfo("refs/heads/" + _Branch);
return (head.LastModified.DateTime, File.ReadAllText(head.PhysicalPath));
}
private void _RegisterChangeCallbacks() {
var cT = _bareRepositoryFileProvider.Watch("refs/heads/" + _Branch);
// TODO: Failsave reading from FIle
try {
return new GitState {
URL = _URL,
Branch = _Branch,
PullTime = head.LastModified.ToLocalTime().DateTime,
Commit = File.ReadAllText(head.PhysicalPath).Trim()
};
}
catch {
return null;
}
}
// Gets all XML Files
@@ -216,9 +235,70 @@ public class XMLFileProvider : IXMLFileProvider {
}
private bool _IsAlreadyParsed() {
if (_HamannFiles == null || !_HamannFiles.Any() || !_GitData.HasValue) return false;
if (_HamannFiles == null || !_HamannFiles.Any() || _GitState == null) return false;
var fhash = _GetHashFromHamannFilename(_HamannFiles.First().Name);
var ghash = _GitData.Value.Hash.Substring(0,7);
var ghash = _GitState.Commit.Substring(0,7);
return fhash == ghash;
}
private void _RegisterChangeToken() {
ChangeToken.OnChange(
() => _bareRepositoryFileProvider.Watch("refs/heads/" + _Branch),
async (state) => await this._InvokeChanged(state),
this._ScanGitData()
);
}
private async Task _InvokeChanged(GitState? gitdata) {
if (_changeTokenTimer != null) return;
Console.WriteLine("FILECHANGE DETECTED, RELOAD");
Scan();
OnFileChange(_ScanGitData());
// Reset XMLInteractionService
if (_WorkingTreeFiles != null && _WorkingTreeFiles.Any()) {
var state = _XMLService.Collect(_WorkingTreeFiles, _XMLService.GetRootDefs());
_XMLService.SetState(state);
OnNewState(state);
}
// -> Try to create a new file
var created = _XMLService.TryCreate(_XMLService.GetState());
if (created != null) {
var file = SaveHamannFile(created, _hamannFileProvider.GetFileInfo("./").PhysicalPath, null);
if (file != null) {
var ret = _Lib.SetLibrary(file, created.Document, null);
if (ret != null) OnNewData();
}
}
_XMLService.SetSCCache(null);
_GitState = _ScanGitData();
_changeTokenTimer = new(5000) { AutoReset = false, Enabled = true };
_changeTokenTimer.Elapsed += this._OnElapsed;
}
private void _OnElapsed(Object source, System.Timers.ElapsedEventArgs e) {
_changeTokenTimer = null;
}
protected virtual void OnFileChange(GitState? state) {
EventHandler<GitState?> eh = FileChange;
eh?.Invoke(this, state);
}
protected virtual void OnNewState(XMLParsingState? state) {
EventHandler<XMLParsingState?> eh = NewState;
eh?.Invoke(this, state);
}
protected virtual void OnConfigReload() {
EventHandler eh = ConfigReload;
eh?.Invoke(this, System.EventArgs.Empty);
}
protected virtual void OnNewData() {
EventHandler eh = NewData;
eh?.Invoke(this, System.EventArgs.Empty);
}
}