mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve the error message

Browse Source
This commit is contained in:
Perfare 2021-05-28 03:27:50 +08:00
parent 4002bdecb8
commit d14c232015
4 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
AssetStudio/AssetsManager.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using static AssetStudio.ImportHelper; using static AssetStudio.ImportHelper;
namespace AssetStudio namespace AssetStudio
@ -108,10 +109,10 @@ namespace AssetStudio
} }
} }
} }
catch catch (Exception e)
{ {
Logger.Error($"Error while reading assets file {fileName}", e);
reader.Dispose(); reader.Dispose();
//Logger.Warning($"Unable to load assets file {fileName}");
} }
} }
else else
@ -136,9 +137,9 @@ namespace AssetStudio
assetsFileList.Add(assetsFile); assetsFileList.Add(assetsFile);
assetsFileListHash.Add(assetsFile.fileName); assetsFileListHash.Add(assetsFile.fileName);
} }
catch catch (Exception e)
{ {
//Logger.Error($"Unable to load assets file {fileName} from {Path.GetFileName(originalPath)}"); Logger.Error($"Error while reading assets file {fileName} from {Path.GetFileName(originalPath)}", e);
resourceFileReaders.Add(fileName, reader); resourceFileReaders.Add(fileName, reader);
} }
} }
@ -165,14 +166,14 @@ namespace AssetStudio
} }
} }
} }
catch catch (Exception e)
{ {
/*var str = $"Unable to load bundle file {fileName}"; var str = $"Error while reading bundle file {fileName}";
if (parentPath != null) if (parentPath != null)
{ {
str += $" from {Path.GetFileName(parentPath)}"; str += $" from {Path.GetFileName(parentPath)}";
} }
Logger.Error(str);*/ Logger.Error(str, e);
} }
finally finally
{ {
@ -207,9 +208,9 @@ namespace AssetStudio
} }
} }
} }
catch catch (Exception e)
{ {
//Logger.Error($"Unable to load web file {fileName}"); Logger.Error($"Error while reading web file {fileName}", e);
} }
finally finally
{ {
@ -344,13 +345,13 @@ namespace AssetStudio
} }
catch (Exception e) catch (Exception e)
{ {
/*var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine("Unable to load object") sb.AppendLine("Unable to load object")
.AppendLine($"Assets {assetsFile.fileName}") .AppendLine($"Assets {assetsFile.fileName}")
.AppendLine($"Type {objectReader.type}") .AppendLine($"Type {objectReader.type}")
.AppendLine($"PathID {objectInfo.m_PathID}") .AppendLine($"PathID {objectInfo.m_PathID}")
.Append(e); .Append(e);
Logger.Error(sb.ToString());*/ Logger.Error(sb.ToString());
} }
Progress.Report(++i, progressCount); Progress.Report(++i, progressCount);

8
AssetStudio/Logger.cs
View File

@ -14,5 +14,13 @@ namespace AssetStudio
public static void Info(string message) => Default.Log(LoggerEvent.Info, message); public static void Info(string message) => Default.Log(LoggerEvent.Info, message);
public static void Warning(string message) => Default.Log(LoggerEvent.Warning, message); public static void Warning(string message) => Default.Log(LoggerEvent.Warning, message);
public static void Error(string message) => Default.Log(LoggerEvent.Error, message); public static void Error(string message) => Default.Log(LoggerEvent.Error, message);
public static void Error(string message, Exception e)
{
var sb = new StringBuilder();
sb.AppendLine(message);
sb.AppendLine(e.ToString());
Default.Log(LoggerEvent.Error, sb.ToString());
}
} }
} }

4
AssetStudio/TypeTreeHelper.cs
View File

@ -17,7 +17,7 @@ namespace AssetStudio
var readed = reader.Position - reader.byteStart; var readed = reader.Position - reader.byteStart;
if (readed != reader.byteSize) if (readed != reader.byteSize)
{ {
Logger.Error($"Error while read type, read {readed} bytes but expected {reader.byteSize} bytes"); Logger.Info($"Error while read type, read {readed} bytes but expected {reader.byteSize} bytes");
} }
} }
@ -169,7 +169,7 @@ namespace AssetStudio
var readed = reader.Position - reader.byteStart; var readed = reader.Position - reader.byteStart;
if (readed != reader.byteSize) if (readed != reader.byteSize)
{ {
Logger.Error($"Error while read type, read {readed} bytes but expected {reader.byteSize} bytes"); Logger.Info($"Error while read type, read {readed} bytes but expected {reader.byteSize} bytes");
} }
return obj; return obj;
} }

19
AssetStudioGUI/GUILogger.cs
View File

@ -1,8 +1,6 @@
using System; using AssetStudio;
using System.Collections.Generic; using System;
using System.Linq; using System.Windows.Forms;
using System.Text;
using AssetStudio;
namespace AssetStudioGUI namespace AssetStudioGUI
{ {
@ -17,7 +15,16 @@ namespace AssetStudioGUI
public void Log(LoggerEvent loggerEvent, string message) public void Log(LoggerEvent loggerEvent, string message)
{ {
action(message); switch (loggerEvent)
{
case LoggerEvent.Error:
MessageBox.Show(message);
break;
default:
action(message);
break;
}
} }
} }
} }