Log when a ChaFile fails to load.

im-mi · Sep 19, 2018 · 55f62b2 · 55f62b2
1 parent 8da9b8e
commit 55f62b2
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/Plugins/Koikatu/ChaFile.cs b/Plugins/Koikatu/ChaFile.cs
@@ -22,22 +22,30 @@ public ChaFile(Stream stream)
         {
             using (var br = new BinaryReader(stream))
             {
-                PngFile.SkipPng(stream);
-
                 try
                 {
-                    br.ReadByte();
-                    stream.Position -= sizeof(byte);
+                    PngFile.SkipPng(stream);
+
+                    try
+                    {
+                        br.ReadByte();
+                        stream.Position -= sizeof(byte);
+                    }
+                    catch (EndOfStreamException)
+                    {
+                        throw new IOException("File is just a plain image with no card data.");
+                    }
+
+                    loadProductNo = br.ReadInt32();
+                    var title = br.ReadString();
+                    if (title != ChaFileDefine.CharaFileMark)
+                        throw new IOException("Not a character card.");
                 }
-                catch (EndOfStreamException)
+                catch (Exception ex)
                 {
-                    throw new IOException("File is just a plain image with no card data.");
+                    throw new FileTypeException("File is not a Koikatu character card or the file type could not be determined.", ex);
                 }
 
-                loadProductNo = br.ReadInt32();
-                var title = br.ReadString();
-                if (title != ChaFileDefine.CharaFileMark)
-                    throw new IOException("Not a character card.");
                 var version = new Version(br.ReadString());
                 var facePngDataLength = br.ReadInt32();
                 stream.Position += facePngDataLength;

diff --git a/Plugins/Koikatu/FileTypeException.cs b/Plugins/Koikatu/FileTypeException.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace KoiCatalog.Plugins.Koikatu
+{
+    public sealed class FileTypeException : Exception
+    {
+        public FileTypeException(
+            string message, Exception innerException = null) : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/Plugins/Koikatu/Koikatu.csproj b/Plugins/Koikatu/Koikatu.csproj
@@ -63,6 +63,7 @@
     <Compile Include="ChaFileStatus.cs" />
     <Compile Include="ClubActivity.cs" />
     <Compile Include="ColorFilters.cs" />
+    <Compile Include="FileTypeException.cs" />
     <Compile Include="HairStyle.cs" />
     <Compile Include="HeightType.cs" />
     <Compile Include="KoikatuCharacterCard.cs" />

diff --git a/Plugins/Koikatu/KoikatuFileHandler.cs b/Plugins/Koikatu/KoikatuFileHandler.cs
@@ -18,6 +18,9 @@ public override void HandleFile(FileLoader loader)
 
             var fileInfo = loader.Entity.GetComponent(FileInfo.TypeCode);
 
+            if (fileInfo == null)
+                throw new InvalidOperationException("Missing required component.");
+
             ChaFile chaFile;
             try
             {
@@ -26,7 +29,7 @@ public override void HandleFile(FileLoader loader)
                     chaFile = new ChaFile(stream);
                 }
             }
-            catch (Exception)
+            catch (FileTypeException)
             {
                 return;
             }