add strict mode for excel sheets, version bump

NotAdam · May 23, 2020 · efcc271 · efcc271
1 parent 2081c1a
commit efcc271
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/Lumina/Excel/ExcelSheetImpl.cs b/Lumina/Excel/ExcelSheetImpl.cs
@@ -60,7 +60,7 @@ public ExcelSheetImpl( ExcelHeaderFile headerFile, string name, Language request
 
         public Language RequestedLanguage { get; protected set; }
 
-        protected readonly Lumina _Lumina;
+        internal readonly Lumina _Lumina;
 
         protected string GenerateFilePath( string name, uint startId, Language language )
         {

diff --git a/Lumina/Excel/RowParser.cs b/Lumina/Excel/RowParser.cs
@@ -212,6 +212,11 @@ private T ReadField< T >( ExcelColumnDataType type )
                     throw new ArgumentOutOfRangeException( "type", $"invalid excel column type: {type}" );
             }
 
+            if( _Sheet._Lumina.Options.ExcelSheetStrictCastingEnabled )
+            {
+                return (T)data;
+            }
+
             if( data is T castedData )
             {
                 return castedData;

diff --git a/Lumina/Lumina.csproj b/Lumina/Lumina.csproj
@@ -8,7 +8,7 @@
         <PackageProjectUrl>https://github.com/NotAdam/Lumina</PackageProjectUrl>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <RepositoryUrl>https://github.com/NotAdam/Lumina</RepositoryUrl>
-        <PackageVersion>1.1.2</PackageVersion>
+        <PackageVersion>1.1.3</PackageVersion>
         <Description>Lumina is a small, performant and simple library for interacting with FINAL FANTASY XIV game data.</Description>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>

diff --git a/Lumina/LuminaOptions.cs b/Lumina/LuminaOptions.cs
@@ -26,5 +26,10 @@ public class LuminaOptions
         /// which do not define a column checksum.
         /// </summary>
         public bool PanicOnSheetChecksumMismatch { get; set; } = true;
+
+        /// <summary>
+        /// If enabled, if a cast fails in an excel sheet, an InvalidCastException will be thrown instead of the types default value being inserted instead.
+        /// </summary>
+        public bool ExcelSheetStrictCastingEnabled { get; set; } = false;
     }
 }