[BMSPT-279] filedata for internal documents, refactoring

bimspot · Jul 19, 2024 · 4cd6322 · 4cd6322
1 parent 62b8b2e
commit 4cd6322
Show file tree

Hide file tree

Showing 90 changed files with 311 additions and 156 deletions.
diff --git a/bcf-toolkit.sln.DotSettings.user b/bcf-toolkit.sln.DotSettings.user
@@ -14,12 +14,13 @@
 
 
 
+
+
+
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=87607a24_002D24bc_002D46e1_002Da035_002D28c18ba9b643/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;Solution /&gt;
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=970b5a86_002D220f_002D4852_002Da8e2_002D88c1c17f952c/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution #3" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
-  &lt;Solution /&gt;
-&lt;/SessionState&gt;</s:String>
+
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=b2d5c176_002Dc751_002D42d4_002Da842_002D3ad7ad02438d/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="WorkerTests" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;TestAncestor&gt;
     &lt;TestId&gt;NUnit3x::8113526D-8A68-4E3E-B4DB-CE235875DDD1::net8.0::Tests.WorkerTests&lt;/TestId&gt;

diff --git a/src/bcf-toolkit/Builder/Bcf21/BcfBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/BcfBuilder.cs
@@ -3,6 +3,7 @@
 using BcfToolkit.Builder.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf21;
 

diff --git a/src/bcf-toolkit/Builder/Bcf21/ComponentColoringColorBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/ComponentColoringColorBuilder.cs
@@ -3,6 +3,7 @@
 using BcfToolkit.Builder.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf21;
 

diff --git a/src/bcf-toolkit/Builder/Bcf21/Interfaces/IMarkupBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/Interfaces/IMarkupBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using BcfToolkit.Builder.Interfaces;
+using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
 
 namespace BcfToolkit.Builder.Bcf21.Interfaces;
@@ -173,7 +174,7 @@ public interface IMarkupBuilder<
   TBuilder AddViewPoint(
     string viewpoint,
     string snapshot,
-    string snapshotData,
+    FileData snapshotData,
     int index,
     string guid,
     Action<TVisualizationInfoBuilder> builder);

diff --git a/src/bcf-toolkit/Builder/Bcf21/Interfaces/IViewPointBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/Interfaces/IViewPointBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using BcfToolkit.Builder.Interfaces;
+using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
 
 namespace BcfToolkit.Builder.Bcf21.Interfaces;
@@ -28,7 +29,7 @@ public interface IViewPointBuilder<out TBuilder, out TVisualizationInfoBuilder>
   /// </summary>
   /// <param name="snapshotData">Base64 string of snapshot data.</param>
   /// <returns>Returns the builder object.</returns>
-  TBuilder SetSnapshotData(string snapshotData);
+  TBuilder SetSnapshotData(FileData snapshotData);
 
   /// <summary>
   ///   Returns the builder object set with the `Index`, which is the

diff --git a/src/bcf-toolkit/Builder/Bcf21/MarkupBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/MarkupBuilder.cs
@@ -3,6 +3,7 @@
 using BcfToolkit.Builder.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf21;
 
@@ -136,7 +137,7 @@ public MarkupBuilder AddComment(Action<CommentBuilder> builder) {
   }
 
   public MarkupBuilder AddViewPoint(string viewpoint, string snapshot,
-    string snapshotData, int index, string guid,
+    FileData snapshotData, int index, string guid,
     Action<VisualizationInfoBuilder> builder) {
     var visInfo =
       (VisualizationInfo)BuilderUtils

diff --git a/src/bcf-toolkit/Builder/Bcf21/ViewPointBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/ViewPointBuilder.cs
@@ -2,6 +2,7 @@
 using BcfToolkit.Builder.Bcf21.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf21;
 
@@ -43,7 +44,7 @@ public ViewPointBuilder SetGuid(string guid) {
     return this;
   }
 
-  public ViewPointBuilder SetSnapshotData(string? snapshotData) {
+  public ViewPointBuilder SetSnapshotData(FileData? snapshotData) {
     _viewPoint.SnapshotData = snapshotData;
     return this;
   }

diff --git a/src/bcf-toolkit/Builder/Bcf21/VisibilityBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/VisibilityBuilder.cs
@@ -2,6 +2,7 @@
 using BcfToolkit.Builder.Bcf21.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf21;
 

diff --git a/src/bcf-toolkit/Builder/Bcf21/VisualizationInfoBuilder.cs b/src/bcf-toolkit/Builder/Bcf21/VisualizationInfoBuilder.cs
@@ -3,6 +3,7 @@
 using BcfToolkit.Builder.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf21;
 

diff --git a/src/bcf-toolkit/Builder/Bcf30/ComponentColoringColorBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/ComponentColoringColorBuilder.cs
@@ -3,6 +3,7 @@
 using BcfToolkit.Builder.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf30;
 

diff --git a/src/bcf-toolkit/Builder/Bcf30/DocumentInfoBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/DocumentInfoBuilder.cs
@@ -2,6 +2,7 @@
 using BcfToolkit.Builder.Bcf30.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf30;
 

diff --git a/src/bcf-toolkit/Builder/Bcf30/Interfaces/IMarkupBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/Interfaces/IMarkupBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using BcfToolkit.Builder.Interfaces;
+using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
 
 namespace BcfToolkit.Builder.Bcf30.Interfaces;
@@ -173,7 +174,7 @@ public interface IMarkupBuilder<
   TBuilder AddViewPoint(
     string viewpoint,
     string snapshot,
-    string snapshotData,
+    FileData snapshotData,
     int index,
     string guid,
     Action<TVisualizationInfoBuilder> builder);

diff --git a/src/bcf-toolkit/Builder/Bcf30/Interfaces/IViewPointBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/Interfaces/IViewPointBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using BcfToolkit.Builder.Interfaces;
+using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
 
 namespace BcfToolkit.Builder.Bcf30.Interfaces;
@@ -28,7 +29,7 @@ public interface IViewPointBuilder<out TBuilder, out TVisualizationInfoBuilder>
   /// </summary>
   /// <param name="snapshotData">Base64 string of snapshot data.</param>
   /// <returns>Returns the builder object.</returns>
-  TBuilder SetSnapshotData(string snapshotData);
+  TBuilder SetSnapshotData(FileData snapshotData);
 
   /// <summary>
   ///   Returns the builder object set with the `Index`, which is the

diff --git a/src/bcf-toolkit/Builder/Bcf30/MarkupBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/MarkupBuilder.cs
@@ -3,6 +3,7 @@
 using BcfToolkit.Builder.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf30;
 
@@ -138,7 +139,7 @@ public MarkupBuilder AddComment(Action<CommentBuilder> builder) {
   public MarkupBuilder AddViewPoint(
     string viewpoint,
     string snapshot,
-    string snapshotData,
+    FileData snapshotData,
     int index,
     string guid,
     Action<VisualizationInfoBuilder> builder) {

diff --git a/src/bcf-toolkit/Builder/Bcf30/ViewPointBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/ViewPointBuilder.cs
@@ -2,6 +2,7 @@
 using BcfToolkit.Builder.Bcf30.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf30;
 
@@ -38,7 +39,7 @@ public ViewPointBuilder SetGuid(string guid) {
     return this;
   }
 
-  public ViewPointBuilder SetSnapshotData(string? snapshotData) {
+  public ViewPointBuilder SetSnapshotData(FileData? snapshotData) {
     _viewPoint.SnapshotData = snapshotData;
     return this;
   }

diff --git a/src/bcf-toolkit/Builder/Bcf30/VisibilityBuilder.cs b/src/bcf-toolkit/Builder/Bcf30/VisibilityBuilder.cs
@@ -2,6 +2,7 @@
 using BcfToolkit.Builder.Bcf30.Interfaces;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Builder.Bcf30;
 

diff --git a/src/bcf-toolkit/Converter/Bcf21/Converter.cs b/src/bcf-toolkit/Converter/Bcf21/Converter.cs
@@ -9,6 +9,7 @@
 using BcfToolkit.Utils;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Converter.Bcf21;
 

diff --git a/src/bcf-toolkit/Converter/Bcf21/FileWriter.cs b/src/bcf-toolkit/Converter/Bcf21/FileWriter.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf21;
+using BcfToolkit.Model.Interfaces;
 using BcfToolkit.Utils;
 using Version = BcfToolkit.Model.Bcf21.Version;
 
@@ -114,11 +115,9 @@ public static void SerializeAndWriteBcfToStream(
       zip.CreateEntryFromObject($"{topicFolder}/viewpoint.bcfv", visInfo);
 
       var snapshotFileName = markup.GetFirstViewPoint()?.Snapshot;
-      var base64String = markup.GetFirstViewPoint()?.SnapshotData;
+      var base64String = markup.GetFirstViewPoint()?.SnapshotData?.Data;
       if (snapshotFileName == null || base64String == null) continue;
-      const string pattern = @"^data:image\/[a-zA-Z]+;base64,";
-      var result = Regex.Replace(base64String, pattern, string.Empty);
-      var bytes = Convert.FromBase64String(result);
+      var bytes = Convert.FromBase64String(base64String);
       zip.CreateEntryFromBytes($"{topicFolder}/{snapshotFileName}", bytes);
     }
 
@@ -190,16 +189,11 @@ public static async Task<string> SerializeAndWriteBcfToFolder(
           visInfo));
 
       var snapshotFileName = markup.GetFirstViewPoint()?.Snapshot;
-
-      var base64String = markup.GetFirstViewPoint()?.SnapshotData;
-
+      var base64String = markup.GetFirstViewPoint()?.SnapshotData?.Data;
       if (snapshotFileName == null || base64String == null) continue;
-      const string pattern = @"^data:image\/[a-zA-Z]+;base64,";
-      var result = Regex.Replace(base64String,
-        pattern, string.Empty);
       writeTasks.Add(File.WriteAllBytesAsync(
         $"{topicFolder}/{snapshotFileName}",
-        Convert.FromBase64String(result)));
+        Convert.FromBase64String(base64String)));
     }
 
     writeTasks.Add(

diff --git a/src/bcf-toolkit/Converter/Bcf30/Converter.cs b/src/bcf-toolkit/Converter/Bcf30/Converter.cs
@@ -9,6 +9,7 @@
 using BcfToolkit.Utils;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 using Version = BcfToolkit.Model.Bcf30.Version;
 
 namespace BcfToolkit.Converter.Bcf30;

diff --git a/src/bcf-toolkit/Converter/Bcf30/FileWriter.cs b/src/bcf-toolkit/Converter/Bcf30/FileWriter.cs
@@ -9,6 +9,7 @@
 using System.Xml.Serialization;
 using BcfToolkit.Model;
 using BcfToolkit.Model.Bcf30;
+using BcfToolkit.Model.Interfaces;
 using BcfToolkit.Utils;
 using File = System.IO.File;
 using Version = BcfToolkit.Model.Bcf30.Version;
@@ -134,11 +135,9 @@ public static void SerializeAndWriteBcfToStream(IBcf bcf, ZipArchive zip,
 
       // Write snapshot
       var snapshotFileName = markup.GetFirstViewPoint()?.Snapshot;
-      var base64String = markup.GetFirstViewPoint()?.SnapshotData;
+      var base64String = markup.GetFirstViewPoint()?.SnapshotData?.Data;
       if (snapshotFileName == null || base64String == null) continue;
-      const string pattern = @"^data:image\/[a-zA-Z]+;base64,";
-      var result = Regex.Replace(base64String, pattern, string.Empty);
-      var bytes = Convert.FromBase64String(result);
+      var bytes = Convert.FromBase64String(base64String);
       zip.CreateEntryFromBytes($"{topicFolder}/{snapshotFileName}", bytes);
     }
 
@@ -208,14 +207,11 @@ public static async Task<string> SerializeAndWriteBcfToFolder(
         visInfo));
 
       var snapshotFileName = markup.GetFirstViewPoint()?.Snapshot;
-      var base64String = markup.GetFirstViewPoint()?.SnapshotData;
+      var base64String = markup.GetFirstViewPoint()?.SnapshotData?.Data;
       if (snapshotFileName == null || base64String == null) continue;
-      const string pattern = @"^data:image\/[a-zA-Z]+;base64,";
-      var result = Regex.Replace(base64String,
-        pattern, string.Empty);
       writeTasks.Add(File.WriteAllBytesAsync(
         $"{topicFolder}/{snapshotFileName}",
-        Convert.FromBase64String(result)));
+        Convert.FromBase64String(base64String)));
     }
 
     writeTasks.Add(BcfExtensions.SerializeAndWriteXmlFile(tmpFolder,

diff --git a/src/bcf-toolkit/Converter/IConverter.cs b/src/bcf-toolkit/Converter/IConverter.cs
@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BcfToolkit.Model;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Converter;
 

diff --git a/src/bcf-toolkit/Model/Bcf21/Bcf.cs b/src/bcf-toolkit/Model/Bcf21/Bcf.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Model.Bcf21;
 

diff --git a/src/bcf-toolkit/Model/Bcf21/MarkupExtensions.cs b/src/bcf-toolkit/Model/Bcf21/MarkupExtensions.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Serialization;
+using BcfToolkit.Model.Interfaces;
 using Newtonsoft.Json;
 
 namespace BcfToolkit.Model.Bcf21;
@@ -16,7 +17,7 @@ public ITopic GetTopic() {
 
   public void SetViewPoints<TVisualizationInfo>(
     Dictionary<string, TVisualizationInfo>? visInfos,
-    Dictionary<string, string>? snapshots) where TVisualizationInfo : IVisualizationInfo {
+    Dictionary<string, FileData>? snapshots) where TVisualizationInfo : IVisualizationInfo {
     this.Viewpoints.ToList().ForEach(viewPoint => {
       if (visInfos is not null) {
         visInfos.TryGetValue(viewPoint.Viewpoint, out var visInfo);
@@ -33,7 +34,7 @@ public void SetViewPoints<TVisualizationInfo>(
 
   public void SetViewPoint(
     Dictionary<string, IVisualizationInfo> visInfos,
-    Dictionary<string, string> snapshots) {
+    Dictionary<string, FileData> snapshots) {
     this.Viewpoints.ToList().ForEach(viewPoint => {
       visInfos.TryGetValue(viewPoint.Viewpoint, out var visInfo);
       if (visInfo is not null)
@@ -63,7 +64,7 @@ public void SetVisualizationInfo(IVisualizationInfo? visInfo) {
   /// </summary>
   [XmlIgnore]
   [JsonProperty("snapshot_data")]
-  public string? SnapshotData { get; set; }
+  public FileData? SnapshotData { get; set; }
 }
 
 public partial class HeaderFile : IHeaderFile { }

diff --git a/src/bcf-toolkit/Model/Bcf21/ProjectExtensions.cs b/src/bcf-toolkit/Model/Bcf21/ProjectExtensions.cs
@@ -1,3 +1,5 @@
+using BcfToolkit.Model.Interfaces;
+
 namespace BcfToolkit.Model.Bcf21;
 
 public partial class ProjectExtension : IProject {

diff --git a/src/bcf-toolkit/Model/Bcf21/Root.cs b/src/bcf-toolkit/Model/Bcf21/Root.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Model.Bcf21;
 

diff --git a/src/bcf-toolkit/Model/Bcf21/VersionExtensions.cs b/src/bcf-toolkit/Model/Bcf21/VersionExtensions.cs
@@ -1,3 +1,5 @@
+using BcfToolkit.Model.Interfaces;
+
 namespace BcfToolkit.Model.Bcf21;
 
 public partial class Version : IVersion {

diff --git a/src/bcf-toolkit/Model/Bcf21/VisInfoExtensions.cs b/src/bcf-toolkit/Model/Bcf21/VisInfoExtensions.cs
@@ -1,3 +1,5 @@
+using BcfToolkit.Model.Interfaces;
+
 namespace BcfToolkit.Model.Bcf21;
 
 public partial class VisualizationInfo : IVisualizationInfo {

diff --git a/src/bcf-toolkit/Model/Bcf30/Bcf.cs b/src/bcf-toolkit/Model/Bcf30/Bcf.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using BcfToolkit.Model.Interfaces;
 
 namespace BcfToolkit.Model.Bcf30;