Merge remote-tracking branch 'origin/develop' into feature/blazor_import

r-koubou · Nov 6, 2023 · 74558cc · 74558cc
2 parents f9fc103 + 4e3cf94
commit 74558cc
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 54 deletions.
diff --git a/KeySwitchManager/Sources/Runtime/Commons/Data/Extensions/UtcDateTimeExtension.cs b/KeySwitchManager/Sources/Runtime/Commons/Data/Extensions/UtcDateTimeExtension.cs
@@ -4,12 +4,13 @@ namespace KeySwitchManager.Commons.Data.Extensions
 {
     public static class UtcDateTimeExtension
     {
-        public static DateTime As(this UtcDateTime utcDateTime)
+        public static DateTime As( this UtcDateTime utcDateTime )
         {
             return new DateTime(
+                kind: DateTimeKind.Utc,
                 year: utcDateTime.Year,
                 month: utcDateTime.Month,
-                day:utcDateTime.Day,
+                day: utcDateTime.Day,
                 hour: utcDateTime.Hour,
                 minute: utcDateTime.Minute,
                 second: utcDateTime.Second,

diff --git a/KeySwitchManager/Sources/Runtime/Commons/Helpers/EncodingHelper.cs b/KeySwitchManager/Sources/Runtime/Commons/Helpers/EncodingHelper.cs
@@ -0,0 +1,12 @@
+using System.Text;
+
+namespace KeySwitchManager.Commons.Helpers
+{
+    public static class EncodingHelper
+    {
+        // ReSharper disable InconsistentNaming
+        public static Encoding UTF8 => Encoding.UTF8;
+        public static Encoding UTF8N { get; } = new UTF8Encoding( false );
+        // ReSharper restore InconsistentNaming
+    }
+}
diff --git a/KeySwitchManager/Sources/Runtime/Commons/Helpers/UtcDateTimeHelper.cs b/KeySwitchManager/Sources/Runtime/Commons/Helpers/UtcDateTimeHelper.cs
diff --git a/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Helpers/KeySwitchFactoryHelper.cs b/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Helpers/KeySwitchFactoryHelper.cs
@@ -27,12 +27,14 @@ public static KeySwitch CreateTemplate(
             IMidiNoteOnFactory midiNoteOnFactory,
             IMidiControlChangeFactory midiControlChangeFactory,
             IMidiProgramChangeFactory midiProgramChangeFactory )
-            => factory.Create(
+        {
+            var now = UtcDateTime.NowAsDateTime;
+            return factory.Create(
                 Guid.NewGuid(),
                 "Author",
                 "Description",
-                UtcDateTime.NowAsDateTime,
-                UtcDateTime.NowAsDateTime,
+                now,
+                now,
                 "Developer Name",
                 "Product name",
                 "Instrument name",
@@ -65,5 +67,6 @@ public static KeySwitch CreateTemplate(
                     { "extra2 key", "extra2 value" },
                 }
             );
+        }
     }
 }
diff --git a/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Models/Factory/IKeySwitchFactory.cs b/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Models/Factory/IKeySwitchFactory.cs
@@ -39,9 +39,6 @@ public KeySwitch Create(
                 IEnumerable<Articulation> articulations,
                 IReadOnlyDictionary<string, string> extraData )
             {
-                created     = DateTimeHelper.ToUtc( created );
-                lastUpdated = DateTimeHelper.ToUtc( lastUpdated );
-
                 return new KeySwitch(
                     new KeySwitchId( id ),
                     new Author( author ),
@@ -57,4 +54,4 @@ public KeySwitch Create(
             }
         }
     }
-}
+}
diff --git a/...nfrastructures/Storage.Spreadsheet/KeySwitches/Translators/SpreadsheetImportTranslator.cs b/...nfrastructures/Storage.Spreadsheet/KeySwitches/Translators/SpreadsheetImportTranslator.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using KeySwitchManager.Commons.Data;
+using KeySwitchManager.Commons.Data.Extensions;
 using KeySwitchManager.Domain.KeySwitches.Models;
 using KeySwitchManager.Domain.KeySwitches.Models.Aggregations;
 using KeySwitchManager.Domain.KeySwitches.Models.Factory;
@@ -33,7 +34,7 @@ public IReadOnlyCollection<KeySwitch> Translate( Workbook source )
 
         private KeySwitch TranslateWorkSheet( Worksheet sheet, ICollection<Guid> parsedGuidList )
         {
-            var now = DateTimeHelper.NowUtc();
+            var now = UtcDateTime.NowAsDateTime;
             var articulations = new List<Articulation>();
             var extraData = new Dictionary<string, string>();
 
@@ -143,4 +144,4 @@ private IReadOnlyCollection<MidiProgramChange> TranslateMidiProgramChangeMapping
         }
 
     }
-}
+}
diff --git a/...ources/Runtime/Infrastructures/Storage.Yaml/KeySwitches/Import/YamlImportContentReader.cs b/...ources/Runtime/Infrastructures/Storage.Yaml/KeySwitches/Import/YamlImportContentReader.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
 using KeySwitchManager.Commons.Data;
+using KeySwitchManager.Commons.Helpers;
 using KeySwitchManager.Domain.KeySwitches.Models;
 using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches.Translators;
 using KeySwitchManager.UseCase.KeySwitches.Import;
@@ -16,7 +16,7 @@ public class YamlImportContentReader : IImportContentReader
         public async Task<IReadOnlyCollection<KeySwitch>> ReadAsync( IContent content, CancellationToken cancellationToken = default )
         {
             await using var stream = await content.GetContentStreamAsync( cancellationToken );
-            using var reader = new StreamReader( stream, Encoding.UTF8, true );
+            using var reader = new StreamReader( stream, EncodingHelper.UTF8N );
 
             var jsonText = await reader.ReadToEndAsync();
 

diff --git a/...hManager/Sources/Runtime/Infrastructures/Storage.Yaml/KeySwitches/YamlMemoryRepository.cs b/...hManager/Sources/Runtime/Infrastructures/Storage.Yaml/KeySwitches/YamlMemoryRepository.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 
 using KeySwitchManager.Commons.Data;
+using KeySwitchManager.Commons.Helpers;
 using KeySwitchManager.Domain.KeySwitches;
 using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches.Translators;
 
@@ -20,7 +21,7 @@ protected YamlMemoryRepository( Stream stream, bool leaveOpen = false ) : base()
 
             try
             {
-                reader = new StreamReader( stream, Encoding.UTF8 );
+                reader = new StreamReader( stream, EncodingHelper.UTF8N );
                 var yaml = reader.ReadToEnd();
                 KeySwitches.AddRange( new YamlKeySwitchImportTranslator().Translate( new PlainText( yaml ) ) );
             }
@@ -36,7 +37,7 @@ protected YamlMemoryRepository( Stream stream, bool leaveOpen = false ) : base()
 
         public override async Task WriteBinaryToAsync( Stream stream, CancellationToken cancellationToken = default )
         {
-            await using var writer = new StreamWriter( stream, Encoding.UTF8 );
+            await using var writer = new StreamWriter( stream, EncodingHelper.UTF8N );
 
             var yaml = new ReadOnlyMemory<char>(
                 new YamlKeySwitchExportTranslator().Translate( KeySwitches ).Value.ToCharArray()

diff --git a/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Export/StringContent.cs b/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Export/StringContent.cs
@@ -2,14 +2,16 @@
 using System.Text;
 using System.Threading.Tasks;
 
+using KeySwitchManager.Commons.Helpers;
+
 namespace KeySwitchManager.UseCase.KeySwitches.Export
 {
     public class StringContent : IContent
     {
         private readonly string data;
         private readonly Encoding encoding;
 
-        public StringContent( string data ) : this( data, Encoding.UTF8 ) {}
+        public StringContent( string data ) : this( data, EncodingHelper.UTF8N ) {}
 
         public StringContent( string data, Encoding encoding )
         {