issue 163 Implement version AC1009 for DxfReader

ACadSharp.Tests/IO/CadReaderTestsBase.cs

@@ -38,6 +38,13 @@ public virtual void AssertDocumentDefaults(string test)
 		{
 			CadDocument doc = this.getDocument(test);
 
+			if (doc.Header.Version < ACadVersion.AC1012)
+			{
+				//Older version do not keep the handles for tables and other objects like block_records
+				//This can be fixed if the document creates the default entries manually
+				return;
+			}
+
 			this._docIntegrity.AssertDocumentDefaults(doc);
 		}
 
@@ -59,6 +66,12 @@ public virtual void AssertDocumentContent(string test)
 		{
 			CadDocument doc = this.getDocument(test, false);
 
+			if (doc.Header.Version < ACadVersion.AC1012)
+			{
+				//Older version do not keep the handles for tables and other objects like block_records
+				return;
+			}
+
 			this._docIntegrity.AssertDocumentContent(doc);
 		}
 

ACadSharp.Tests/IO/DXF/DxfReaderTests.cs

@@ -124,6 +124,12 @@ public override void AssertDocumentTree(string test)
 				doc = reader.Read();
 			}
 
+			if(doc.Header.Version < ACadVersion.AC1012)
+			{
+				//Older version do not keep the handles for tables and other objects like block_records
+				return;
+			}
+
 			this._docIntegrity.AssertDocumentTree(doc);
 		}
 

ACadSharp.Tests/IO/IOTests.cs

@@ -56,6 +56,11 @@ public void DxfToDxf(string test)
 		{
 			CadDocument doc = DxfReader.Read(test);
 
+			if(doc.Header.Version < ACadVersion.AC1012)
+			{
+				return;
+			}
+
 			string file = Path.GetFileNameWithoutExtension(test);
 			string pathOut = Path.Combine(samplesOutFolder, $"{file}_rewrite_out.dxf");
 			this.writeDxfFile(pathOut, doc);

ACadSharp/IO/CadDocumentBuilder.cs

@@ -35,7 +35,7 @@ internal abstract class CadDocumentBuilder
 
 		public abstract bool KeepUnknownEntities { get; }
 
-		protected ulong maxHandle = 0;
+		public ulong InitialHandSeed { get; set; } = 0;
 
 		protected Dictionary<ulong, CadTemplate> cadObjectsTemplates = new();
 
@@ -276,12 +276,12 @@ private void addToMap(ICadObjectTemplate template)
 		{
 			if (template.CadObject.Handle == 0)
 			{
-				template.CadObject.Handle = this.maxHandle + 1;
+				template.CadObject.Handle = this.InitialHandSeed + 1;
 			}
 
-			if (template.CadObject.Handle > this.maxHandle)
+			if (template.CadObject.Handle > this.InitialHandSeed)
 			{
-				this.maxHandle = template.CadObject.Handle;
+				this.InitialHandSeed = template.CadObject.Handle;
 			}
 
 			this.templatesMap.Add(template.CadObject.Handle, template);

ACadSharp/IO/DXF/DxfReader.cs

@@ -72,10 +72,14 @@ public static bool IsBinary(Stream stream, bool resetPos = false)
 			sio.Position = 0;
 			string sn = sio.ReadString(DxfBinaryReader.Sentinel.Length);
 
+			bool isBinary = sn == DxfBinaryReader.Sentinel;
+
 			if (resetPos)
+			{
 				stream.Position = 0;
+			}
 
-			return sn == DxfBinaryReader.Sentinel;
+			return isBinary;
 		}
 
 		/// <summary>
@@ -121,7 +125,7 @@ public override CadDocument Read()
 
 			this._reader = this._reader ?? this.getReader();
 
-			this._builder = new DxfDocumentBuilder(this._version,this._document, this.Configuration);
+			this._builder = new DxfDocumentBuilder(this._version, this._document, this.Configuration);
 			this._builder.OnNotification += this.onNotificationEvent;
 
 			while (this._reader.ValueAsString != DxfFileToken.EndOfFile)
@@ -140,6 +144,7 @@ public override CadDocument Read()
 				{
 					case DxfFileToken.HeaderSection:
 						this._document.Header = this.ReadHeader();
+						this._builder.InitialHandSeed = this._document.Header.HandleSeed;
 						break;
 					case DxfFileToken.ClassesSection:
 						this._document.Classes = this.readClasses();
@@ -450,16 +455,20 @@ private IDxfStreamReader getReader()
 			IDxfStreamReader tmpReader = null;
 			this._version = ACadVersion.Unknown;
 
-			bool isBinary = this.IsBinary();
-			if (isBinary)
-			{
-				tmpReader = new DxfBinaryReader(this._fileStream.Stream, Encoding.ASCII);
-			}
-			else
+			bool isBinary = IsBinary(this._fileStream.Stream, false);
+			bool isAC1009Format = false;
+
+			if (isBinary && this._fileStream.Stream.ReadByte() != -1)
 			{
-				tmpReader = new DxfTextReader(this._fileStream.Stream);
+				int flag = this._fileStream.ReadByte();
+				if (flag != -1 && flag != 0)
+				{
+					isAC1009Format = true;
+				}
 			}
 
+			tmpReader = this.createReader(isBinary, isAC1009Format);
+
 			tmpReader.Find(DxfFileToken.HeaderSection);
 
 			while (tmpReader.ValueAsString != DxfFileToken.EndSection)
@@ -474,7 +483,7 @@ private IDxfStreamReader getReader()
 						break;
 					}
 
-					if (this._version < ACadVersion.AC1012)
+					if (this._version < ACadVersion.AC1002)
 					{
 						if (this._version == ACadVersion.Unknown)
 						{
@@ -500,14 +509,7 @@ private IDxfStreamReader getReader()
 				tmpReader.ReadNext();
 			}
 
-			if (isBinary)
-			{
-				return new DxfBinaryReader(this._fileStream.Stream, this._encoding);
-			}
-			else
-			{
-				return new DxfTextReader(this._fileStream.Stream, this._encoding);
-			}
+			return this.createReader(isBinary, isAC1009Format);
 		}
 
 		private IDxfStreamReader goToSection(string sectionName)
@@ -523,5 +525,24 @@ private IDxfStreamReader goToSection(string sectionName)
 
 			return this._reader;
 		}
+
+		private IDxfStreamReader createReader(bool isBinary, bool isAC1009Format)
+		{
+			if (isBinary)
+			{
+				if (isAC1009Format)
+				{
+					return new DxfBinaryReaderAC1009(this._fileStream.Stream, Encoding.ASCII);
+				}
+				else
+				{
+					return new DxfBinaryReader(this._fileStream.Stream, Encoding.ASCII);
+				}
+			}
+			else
+			{
+				return new DxfTextReader(this._fileStream.Stream);
+			}
+		}
 	}
 }

ACadSharp/IO/DXF/DxfStreamReader/DxfBinaryReader.cs

@@ -7,15 +7,15 @@ namespace ACadSharp.IO.DXF
 {
 	internal class DxfBinaryReader : DxfStreamReaderBase, IDxfStreamReader
 	{
-		public const string Sentinel = "AutoCAD Binary DXF";
+		public const string Sentinel = "AutoCAD Binary DXF\r\n\u001a\0";
 
 		public override int Position { get { return (int)this.baseStream.Position; } }
 
 		protected override Stream baseStream { get { return this._stream.BaseStream; } }
 
-		private Encoding _encoding;
+		protected BinaryReader _stream;
 
-		private BinaryReader _stream;
+		private Encoding _encoding;
 
 		public DxfBinaryReader(Stream stream) : this(stream, Encoding.ASCII) { }
 
@@ -32,6 +32,7 @@ protected override void start()
 			base.start();
 
 			byte[] sentinel = this._stream.ReadBytes(22);
+			//AutoCAD Binary DXF\r\n\u001a\0
 			string s = Encoding.ASCII.GetString(sentinel);
 		}
 

ACadSharp/IO/DXF/DxfStreamReader/DxfBinaryReaderAC1009.cs

@@ -0,0 +1,23 @@
+using System.IO;
+using System.Text;
+
+namespace ACadSharp.IO.DXF
+{
+	internal class DxfBinaryReaderAC1009 : DxfBinaryReader
+	{
+		public DxfBinaryReaderAC1009(Stream stream, Encoding encoding) : base(stream, encoding)
+		{
+		}
+
+		protected override DxfCode readCode()
+		{
+			int code = this._stream.ReadByte();
+			if (code == byte.MaxValue)
+			{
+				code = this._stream.ReadInt16();
+			}
+
+			return (DxfCode)code;
+		}
+	}
+}

ACadSharp/IO/DXF/DxfStreamReader/DxfBlockSectionReader.cs

@@ -67,6 +67,15 @@ private void readBlock()
 					case 2:
 					case 3:
 						name = this._reader.ValueAsString;
+						if (name.Equals("$MODEL_SPACE", StringComparison.OrdinalIgnoreCase))
+						{
+							name = BlockRecord.ModelSpaceName;
+						}
+						else if (name.Equals("$PAPER_SPACE", StringComparison.OrdinalIgnoreCase))
+						{
+							name = BlockRecord.PaperSpaceName;
+						}
+
 						if (record == null && this._builder.TryGetTableEntry(name, out record))
 						{
 							record.BlockEntity = blckEntity;
@@ -101,11 +110,16 @@ private void readBlock()
 
 			if (record == null)
 			{
-				//record = new BlockRecord(name);
-				//record.BlockEntity = blckEntity;
+				record = new BlockRecord(name);
+				record.BlockEntity = blckEntity;
+				CadBlockRecordTemplate recordTemplate = new CadBlockRecordTemplate(record);
+
+				this._builder.BlockRecords.Add(record);
 
-				//this._builder.DocumentToBuild.BlockRecords.Add(record);
-				throw new DxfException($"Could not find the block record for {name} and handle {blckEntity.Handle}");
+				if (recordTemplate.CadObject.Name.Equals(BlockRecord.ModelSpaceName, StringComparison.OrdinalIgnoreCase))
+				{
+					this._builder.ModelSpaceTemplate = recordTemplate;
+				}
 			}
 
 			while (this._reader.ValueAsString != DxfFileToken.EndBlock)

ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs

@@ -81,7 +81,7 @@ private void readTable()
 							this.readExtendedData(edata);
 							break;
 						default:
-							this._builder.Notify($"Unhandeled dxf code {this._reader.Code} at line {this._reader.Position}.");
+							this._builder.Notify($"[AcDbSymbolTable] Unhandeled dxf code {this._reader.Code} at line {this._reader.Position}.");
 							break;
 					}
 

ACadSharp/Tables/Collections/BlockRecordsTable.cs

@@ -1,6 +1,4 @@
-using ACadSharp.Blocks;
-
-namespace ACadSharp.Tables.Collections
+namespace ACadSharp.Tables.Collections
 {
 	public class BlockRecordsTable : Table<BlockRecord>
 	{