Merge pull request #582 from DomCR/issue-580_dxfclasses-dwgreader-fix

Dwg DxfClasses reader fix

Author: DomCR

src/ACadSharp/Exceptions/CadNotSupportedException.cs

@@ -5,7 +5,7 @@ namespace ACadSharp.Exceptions
 	[Serializable]
 	public class CadNotSupportedException : NotSupportedException
 	{
-		public CadNotSupportedException() : base($"File version not recognised") { }
+		public CadNotSupportedException() : base($"File version not recognized") { }
 
 		public CadNotSupportedException(ACadVersion version) : base($"File version not supported: {version}") { }
 	}

src/ACadSharp/IO/DWG/DwgStreamReaders/DwgClassesReader.cs

@@ -65,7 +65,7 @@ public DxfClassCollection Read()
 
 			if (this._fileHeader.AcadVersion == ACadVersion.AC1018)
 			{
-				//BS : Maxiumum class number
+				//BS : Maximum class number
 				this._sreader.ReadBitShort();
 				//RC: 0x00
 				this._sreader.ReadRawChar();
@@ -113,20 +113,10 @@ public DxfClassCollection Read()
 					//BL : Number of objects created of this type in the current DB(DXF 91).
 					dxfClass.InstanceCount = this._sreader.ReadBitLong();
 
-					if (this._fileHeader.AcadVersion == ACadVersion.AC1018)
-					{
-						//BS : Dwg Version
-						dxfClass.DwgVersion = (ACadVersion)this._sreader.ReadBitShort();
-						//BS : Maintenance release version.
-						dxfClass.MaintenanceVersion = this._sreader.ReadBitShort();
-					}
-					else if (this._fileHeader.AcadVersion > ACadVersion.AC1018)
-					{
-						//BS : Dwg Version
-						dxfClass.DwgVersion = (ACadVersion)this._sreader.ReadBitLong();
-						//BS : Maintenance release version.
-						dxfClass.MaintenanceVersion = (short)this._sreader.ReadBitLong();
-					}
+					//BS : Dwg Version
+					dxfClass.DwgVersion = (ACadVersion)this._sreader.ReadBitLong();
+					//BS : Maintenance release version.
+					dxfClass.MaintenanceVersion = (short)this._sreader.ReadBitLong();
 
 					//BL : Unknown(normally 0L)
 					this._sreader.ReadBitLong();

src/ACadSharp/IO/DWG/DwgStreamReaders/DwgStreamReaderBase.cs

@@ -4,8 +4,8 @@
 using CSUtilities.IO;
 using CSUtilities.Text;
 using System;
-using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 namespace ACadSharp.IO.DWG
@@ -41,7 +41,6 @@ public static IDwgStreamReader GetStreamHandler(ACadVersion version, Stream stre
 			switch (version)
 			{
 				case ACadVersion.Unknown:
-					throw new Exception();
 				case ACadVersion.MC0_0:
 				case ACadVersion.AC1_2:
 				case ACadVersion.AC1_4:
@@ -52,7 +51,7 @@ public static IDwgStreamReader GetStreamHandler(ACadVersion version, Stream stre
 				case ACadVersion.AC1004:
 				case ACadVersion.AC1006:
 				case ACadVersion.AC1009:
-					throw new NotSupportedException($"Dwg version not supported: {version}");
+					throw new CadNotSupportedException(version);
 				case ACadVersion.AC1012:
 				case ACadVersion.AC1014:
 					reader = new DwgStreamReaderAC12(stream, resetPositon);
@@ -72,7 +71,7 @@ public static IDwgStreamReader GetStreamHandler(ACadVersion version, Stream stre
 					reader = new DwgStreamReaderAC24(stream, resetPositon);
 					break;
 				default:
-					throw new NotSupportedException($"Dwg version not supported: {version}");
+					throw new CadNotSupportedException();
 			}
 
 			if (encoding != null)
@@ -105,7 +104,7 @@ public static Dictionary<string, object> Explore(IDwgStreamReader reader)
 			tryGetValue(reader, values, reader.ReadRawChar);
 			tryGetValue(reader, values, reader.ReadRawLong);
 			tryGetValue(reader, values, reader.Read2RawDouble);
-			
+
 			tryGetValue(reader, values, reader.HandleReference);
 
 			tryGetValue(reader, values, reader.ReadTextUnicode);
@@ -271,7 +270,7 @@ public short ReadBitShort()
 					value = 256;
 					break;
 				default:
-					throw new Exception();
+					throw this.throwException();
 			}
 			return value;
 		}
@@ -308,7 +307,7 @@ public int ReadBitLong()
 					break;
 				default:
 					//11 : not used
-					throw new Exception();
+					throw new Exception("Failed to read ReadBitLong");
 			}
 			return value;
 		}
@@ -344,7 +343,7 @@ public double ReadBitDouble()
 					value = 0.0;
 					break;
 				default:
-					throw new Exception();
+					throw this.throwException();
 			}
 
 			return value;
@@ -824,7 +823,7 @@ public double ReadBitDoubleWithDefault(double def)
 				case 3:
 					return this.ReadDouble();
 				default:
-					throw new Exception();
+					throw this.throwException();
 			}
 		}
 
@@ -859,7 +858,6 @@ public TimeSpan ReadTimeSpan()
 			if (hours < 0 || hours > TimeSpan.MaxValue.TotalHours || milliseconds < 0 || milliseconds > TimeSpan.MaxValue.TotalMilliseconds)
 			{
 				return TimeSpan.FromHours(0) + TimeSpan.FromMilliseconds(0);
-
 			}
 
 			return TimeSpan.FromHours(hours) + TimeSpan.FromMilliseconds(milliseconds);
@@ -963,6 +961,11 @@ protected byte applyShiftToLasByte()
 			return (byte)((uint)value | (byte)((uint)this._lastByte >> 8 - this.BitShift));
 		}
 
+		protected DwgException throwException([CallerMemberName] string callerName = null)
+		{
+			return new DwgException($"Failed to read {callerName}");
+		}
+
 		private void applyShiftToArr(int length, byte[] arr)
 		{
 			//Empty Stream

src/CodeMaid.config

@@ -89,6 +89,10 @@
                 serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="Cleaning_InsertBlankLinePaddingBeforeCaseStatements"
+                serializeAs="String">
+                <value>False</value>
+            </setting>
         </SteveCadwallader.CodeMaid.Properties.Settings>
     </userSettings>
 </configuration>