From 0d33dcd4e5f0c07085c4d1d90effca155e5f5643 Mon Sep 17 00:00:00 2001 From: schnulller Date: Sun, 5 Jun 2022 17:22:48 +0200 Subject: [PATCH] Fixed a bug where the last modiefied Date would be in UTC --- HaDocumentV6/Document.cs | 1 - HaWeb/FileHelpers/XMLProvider.cs | 7 ++++++- HaWeb/Models/XMLRootDocument.cs | 15 +++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/HaDocumentV6/Document.cs b/HaDocumentV6/Document.cs index 7be4134..89eadfc 100644 --- a/HaDocumentV6/Document.cs +++ b/HaDocumentV6/Document.cs @@ -21,7 +21,6 @@ namespace HaDocument private static ILibrary _library; public static ILibrary Create(IHaDocumentOptions Settings) { - Console.WriteLine("PARSING"); SettingsValidator.Validate(Settings); _settings = Settings; _createReader(); diff --git a/HaWeb/FileHelpers/XMLProvider.cs b/HaWeb/FileHelpers/XMLProvider.cs index 1591aaa..91d2553 100644 --- a/HaWeb/FileHelpers/XMLProvider.cs +++ b/HaWeb/FileHelpers/XMLProvider.cs @@ -13,6 +13,11 @@ public class XMLProvider : IXMLProvider { _fileProvider = provider; _Roots = xmlservice.GetRootsDictionary(); _Files = _ScanFiles(); + + if (_Files != null) + foreach(var category in _Files) + if (category.Value != null) + xmlservice.AutoUse(category.Value); } public FileList? GetFiles(string prefix) @@ -41,7 +46,7 @@ public class XMLProvider : IXMLProvider { return; } - doc.SetFile(info); + doc.File = info; if (_Files == null) _Files = new Dictionary(); if (!_Files.ContainsKey(doc.Prefix)) _Files.Add(doc.Prefix, new FileList(doc.XMLRoot)); diff --git a/HaWeb/Models/XMLRootDocument.cs b/HaWeb/Models/XMLRootDocument.cs index dc04840..75d526e 100644 --- a/HaWeb/Models/XMLRootDocument.cs +++ b/HaWeb/Models/XMLRootDocument.cs @@ -8,6 +8,8 @@ using HaWeb.XMLParser; public class XMLRootDocument { private XElement? _Element; private string? _filename; + + [JsonIgnore] public IXMLRoot XMLRoot { get; private set; } [JsonIgnore] @@ -29,7 +31,7 @@ public class XMLRootDocument { } [JsonIgnore] - public IFileInfo? File { get; private set; } + public IFileInfo? File { get; set; } public string Prefix { get; private set; } public DateTime Date { get; private set; } @@ -40,7 +42,10 @@ public class XMLRootDocument { public XMLRootDocument(IXMLRoot xmlRoot, IFileInfo file) { XMLRoot = xmlRoot; Prefix = xmlRoot.Prefix; - SetFile(file); + File = file; + Date = file.LastModified.LocalDateTime; + _filename = file.Name; + _GenerateFieldsFromFilename(file.Name); } // Entry point for XML upload reading @@ -52,12 +57,6 @@ public class XMLRootDocument { _Element = element; } - public void SetFile(IFileInfo file) { - File = file; - Date = file.LastModified.DateTime; - _GenerateFieldsFromFilename(file.Name); - } - private string _CreateFilename() { var filename = _removeInvalidChars(Prefix) + "_"; if (!String.IsNullOrWhiteSpace(IdentificationString.Item1)) {