Merge pull request DomCR#799 from DomCR/issue-724_invalid-characters-dxf

Issue 724 invalid characters dxf

Author: DomCR

src/ACadSharp.Tests/Tables/TableEntryCommonTests.cs

@@ -11,7 +11,7 @@ public abstract class TableEntryCommonTests<T>
 	{
 		public static string DefaultName = "table_entry";
 
-		[Fact()]
+		[Fact]
 		public void ChangeName()
 		{
 			T entry = this.createEntry();
@@ -43,6 +43,17 @@ public void DetachCloneEvents()
 			Assert.False(doc.Layers.Contains(name));
 		}
 
+		[Fact]
+		public void IsValidNameTest()
+		{
+			for (int i = 0; i < INamedCadObjectExtensions.InvalidCharacters.Length; i++)
+			{
+				var entry = this.createEntry($"{DefaultName}{INamedCadObjectExtensions.InvalidCharacters[i]}");
+
+				Assert.False(entry.IsValidDxfName());
+			}
+		}
+
 		[Fact]
 		public void SetFlagUsingMapper()
 		{
@@ -54,11 +65,16 @@ public void SetFlagUsingMapper()
 			Assert.True(entry.Flags.HasFlag(StandardFlags.XrefResolved));
 		}
 
-		protected abstract Table<T> getTable(CadDocument document);
+		protected T createEntry()
+		{
+			return this.createEntry(DefaultName);
+		}
 
-		protected virtual T createEntry()
+		protected virtual T createEntry(string name)
 		{
-			return (T)Activator.CreateInstance(typeof(T), DefaultName);
+			return (T)Activator.CreateInstance(typeof(T), name);
 		}
+
+		protected abstract Table<T> getTable(CadDocument document);
 	}
 }

src/ACadSharp/ACadSharp.csproj

@@ -17,7 +17,7 @@
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<Version>3.2.8</Version>
+		<Version>3.2.9</Version>
 		<PackageOutputPath>../nupkg</PackageOutputPath>
 	</PropertyGroup>
 

src/ACadSharp/Extensions/INamedCadObjectExtensions.cs

@@ -0,0 +1,32 @@
+namespace ACadSharp.Extensions
+{
+	public static class INamedCadObjectExtensions
+	{
+		public static readonly char[] InvalidCharacters = { '\\', '/', ':', '*', '?', '"', '<', '>', '|', ';', ',', '=', '`' };
+
+		/// <summary>
+		/// Check if the name of the object is valid for dxf format.
+		/// </summary>
+		/// <param name="namedCadObject"></param>
+		/// <param name="version"></param>
+		/// <returns></returns>
+		public static bool IsValidDxfName(this INamedCadObject namedCadObject, ACadVersion version = ACadVersion.AC1032)
+		{
+			if (string.IsNullOrEmpty(namedCadObject.Name))
+			{
+				return false;
+			}
+
+			if (version <= ACadVersion.AC1015 && namedCadObject.Name.Length > 31)
+			{
+				return false;
+			}
+			else if (namedCadObject.Name.Length > 255)
+			{
+				return false;
+			}
+
+			return namedCadObject.Name.IndexOfAny(InvalidCharacters) == -1;
+		}
+	}
+}

src/ACadSharp/IO/DXF/DxfWriter.cs

@@ -23,7 +23,7 @@ public class DxfWriter : CadWriterBase<DxfWriterConfiguration>
 		/// <param name="filename">The file to write into.</param>
 		/// <param name="document"></param>
 		/// <param name="binary"></param>
-		public DxfWriter(string filename, CadDocument document, bool binary)
+		public DxfWriter(string filename, CadDocument document, bool binary = false)
 			: this(File.Create(filename), document, binary)
 		{
 		}
@@ -34,7 +34,7 @@ public DxfWriter(string filename, CadDocument document, bool binary)
 		/// <param name="stream">The stream to write into</param>
 		/// <param name="document"></param>
 		/// <param name="binary"></param>
-		public DxfWriter(Stream stream, CadDocument document, bool binary) : base(stream, document)
+		public DxfWriter(Stream stream, CadDocument document, bool binary = false) : base(stream, document)
 		{
 			this.IsBinary = binary;
 		}
@@ -86,18 +86,9 @@ public override void Dispose()
 		/// <param name="binary"></param>
 		/// <param name="configuration"></param>
 		/// <param name="notification"></param>
-		public static void Write(string filename, CadDocument document, bool binary, DxfWriterConfiguration configuration = null, NotificationEventHandler notification = null)
+		public static void Write(string filename, CadDocument document, bool binary = false, DxfWriterConfiguration configuration = null, NotificationEventHandler notification = null)
 		{
-			using (DxfWriter writer = new DxfWriter(filename, document, binary))
-			{
-				if (configuration != null)
-				{
-					writer.Configuration = configuration;
-				}
-
-				writer.OnNotification += notification;
-				writer.Write();
-			}
+			Write(File.Create(filename), document, binary, configuration, notification);
 		}
 
 		/// <summary>
@@ -108,7 +99,7 @@ public static void Write(string filename, CadDocument document, bool binary, Dxf
 		/// <param name="binary"></param>
 		/// <param name="configuration"></param>
 		/// <param name="notification"></param>
-		public static void Write(Stream stream, CadDocument document, bool binary, DxfWriterConfiguration configuration = null, NotificationEventHandler notification = null)
+		public static void Write(Stream stream, CadDocument document, bool binary = false, DxfWriterConfiguration configuration = null, NotificationEventHandler notification = null)
 		{
 			using (DxfWriter writer = new DxfWriter(stream, document, binary))
 			{