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

[GUI] A bit better(?) error handling

Browse Source
This commit is contained in:
VaDiM 2023-03-08 17:10:21 +03:00
parent 629c6248a4
commit 679e7041a6
5 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
AssetStudio/AssetsManager.cs
View File

@ -135,9 +135,14 @@ namespace AssetStudio
} }
} }
} }
catch (NotSupportedException e)
{
Logger.Error(e.Message, e);
reader.Dispose();
}
catch (Exception e) catch (Exception e)
{ {
Logger.Error($"Error while reading assets file {reader.FullPath}", e); Logger.Warning($"Error while reading assets file {reader.FullPath}\r\n{e}");
reader.Dispose(); reader.Dispose();
} }
} }
@ -164,9 +169,14 @@ namespace AssetStudio
assetsFileList.Add(assetsFile); assetsFileList.Add(assetsFile);
assetsFileListHash.Add(assetsFile.fileName); assetsFileListHash.Add(assetsFile.fileName);
} }
catch (NotSupportedException e)
{
Logger.Error(e.Message, e);
resourceFileReaders.Add(reader.FileName, reader);
}
catch (Exception e) catch (Exception e)
{ {
Logger.Error($"Error while reading assets file {reader.FullPath} from {Path.GetFileName(originalPath)}", e); Logger.Warning($"Error while reading assets file {reader.FullPath} from {Path.GetFileName(originalPath)}\r\n{e}");
resourceFileReaders.Add(reader.FileName, reader); resourceFileReaders.Add(reader.FileName, reader);
} }
} }
@ -201,7 +211,7 @@ namespace AssetStudio
{ {
str += $" from {Path.GetFileName(originalPath)}"; str += $" from {Path.GetFileName(originalPath)}";
} }
Logger.Error(str, e); Logger.Warning($"{str}\r\n{e}");
} }
finally finally
{ {
@ -298,7 +308,7 @@ namespace AssetStudio
} }
catch (Exception e) catch (Exception e)
{ {
Logger.Error($"Error while reading zip split file {basePath}", e); Logger.Warning($"Error while reading zip split file {basePath}\r\n{e}");
} }
} }
@ -335,7 +345,7 @@ namespace AssetStudio
} }
catch (Exception e) catch (Exception e)
{ {
Logger.Error($"Error while reading zip entry {entry.FullName}", e); Logger.Warning($"Error while reading zip entry {entry.FullName}\r\n{e}");
} }
} }
} }
@ -354,7 +364,7 @@ namespace AssetStudio
{ {
if (assetsFile.IsVersionStripped && string.IsNullOrEmpty(SpecifyUnityVersion)) if (assetsFile.IsVersionStripped && string.IsNullOrEmpty(SpecifyUnityVersion))
{ {
throw new Exception("The Unity version has been stripped, please set the version in the options"); throw new NotSupportedException("The Unity version has been stripped, please set the version in the options");
} }
if (!string.IsNullOrEmpty(SpecifyUnityVersion)) if (!string.IsNullOrEmpty(SpecifyUnityVersion))
{ {
@ -496,7 +506,7 @@ namespace AssetStudio
.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.Warning(sb.ToString());
} }
Progress.Report(++i, progressCount); Progress.Report(++i, progressCount);

1
AssetStudio/Logger.cs
View File

@ -19,6 +19,7 @@ namespace AssetStudio
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine(message); sb.AppendLine(message);
sb.AppendLine();
sb.AppendLine(e.ToString()); sb.AppendLine(e.ToString());
Default.Log(LoggerEvent.Error, sb.ToString()); Default.Log(LoggerEvent.Error, sb.ToString());
} }

14
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -186,7 +186,7 @@ namespace AssetStudioGUI
var fileNames = openFileDialog1.FileNames; var fileNames = openFileDialog1.FileNames;
var savePath = saveFolderDialog.Folder; var savePath = saveFolderDialog.Folder;
var extractedCount = await Task.Run(() => ExtractFile(fileNames, savePath)); var extractedCount = await Task.Run(() => ExtractFile(fileNames, savePath));
StatusStripUpdate($"Finished extracting {extractedCount} files."); Logger.Info($"Finished extracting {extractedCount} files.");
} }
} }
} }
@ -203,7 +203,7 @@ namespace AssetStudioGUI
var path = openFolderDialog.Folder; var path = openFolderDialog.Folder;
var savePath = saveFolderDialog.Folder; var savePath = saveFolderDialog.Folder;
var extractedCount = await Task.Run(() => ExtractFolder(path, savePath)); var extractedCount = await Task.Run(() => ExtractFolder(path, savePath));
StatusStripUpdate($"Finished extracting {extractedCount} files."); Logger.Info($"Finished extracting {extractedCount} files.");
} }
} }
} }
@ -213,7 +213,7 @@ namespace AssetStudioGUI
if (assetsManager.assetsFileList.Count == 0) if (assetsManager.assetsFileList.Count == 0)
{ {
filterExcludeModeCheck(assetsManager.assetsFileList.Count); filterExcludeModeCheck(assetsManager.assetsFileList.Count);
StatusStripUpdate("No Unity file can be loaded."); Logger.Info("No Unity file can be loaded.");
return; return;
} }
@ -274,7 +274,7 @@ namespace AssetStudioGUI
{ {
log += $" and {m_ObjectsCount - objectsCount} assets failed to read"; log += $" and {m_ObjectsCount - objectsCount} assets failed to read";
} }
StatusStripUpdate(log); Logger.Info(log);
} }
private void typeToolStripMenuItem_Click(object sender, EventArgs e) private void typeToolStripMenuItem_Click(object sender, EventArgs e)
@ -397,7 +397,7 @@ namespace AssetStudioGUI
Progress.Report(++i, count); Progress.Report(++i, count);
} }
StatusStripUpdate("Finished exporting class structures"); Logger.Info("Finished exporting class structures");
} }
} }
} }
@ -1780,7 +1780,7 @@ namespace AssetStudioGUI
ERRCHECK(result); ERRCHECK(result);
if (version < FMOD.VERSION.number) if (version < FMOD.VERSION.number)
{ {
MessageBox.Show($"Error! You are using an old version of FMOD {version:X}. This program requires {FMOD.VERSION.number:X}."); Logger.Error($"Error! You are using an old version of FMOD {version:X}. This program requires {FMOD.VERSION.number:X}.");
Application.Exit(); Application.Exit();
} }
@ -2036,7 +2036,7 @@ namespace AssetStudioGUI
if (result != FMOD.RESULT.OK) if (result != FMOD.RESULT.OK)
{ {
FMODreset(); FMODreset();
StatusStripUpdate($"FMOD error! {result} - {FMOD.Error.String(result)}"); Logger.Warning($"FMOD error! {result} - {FMOD.Error.String(result)}");
return true; return true;
} }
return false; return false;

10
AssetStudioGUI/GUILogger.cs
View File

@ -19,16 +19,22 @@ namespace AssetStudioGUI
switch (loggerEvent) switch (loggerEvent)
{ {
case LoggerEvent.Error: case LoggerEvent.Error:
MessageBox.Show(message, "Error");
break;
case LoggerEvent.Warning:
if (ShowErrorMessage) if (ShowErrorMessage)
{ {
MessageBox.Show(message); MessageBox.Show(message, "Warning");
}
else
{
action("An error has occurred. Turn on \"Show all error messages\" to see details next time.");
} }
break; break;
default: default:
action(message); action(message);
break; break;
} }
} }
} }
} }

50
AssetStudioGUI/Studio.cs
View File

@ -84,7 +84,7 @@ namespace AssetStudioGUI
private static int ExtractBundleFile(FileReader reader, string savePath) private static int ExtractBundleFile(FileReader reader, string savePath)
{ {
StatusStripUpdate($"Decompressing {reader.FileName} ..."); Logger.Info($"Decompressing {reader.FileName} ...");
var bundleFile = new BundleFile(reader); var bundleFile = new BundleFile(reader);
reader.Dispose(); reader.Dispose();
if (bundleFile.fileList.Length > 0) if (bundleFile.fileList.Length > 0)
@ -97,7 +97,7 @@ namespace AssetStudioGUI
private static int ExtractWebDataFile(FileReader reader, string savePath) private static int ExtractWebDataFile(FileReader reader, string savePath)
{ {
StatusStripUpdate($"Decompressing {reader.FileName} ..."); Logger.Info($"Decompressing {reader.FileName} ...");
var webFile = new WebFile(reader); var webFile = new WebFile(reader);
reader.Dispose(); reader.Dispose();
if (webFile.fileList.Length > 0) if (webFile.fileList.Length > 0)
@ -134,7 +134,7 @@ namespace AssetStudioGUI
public static (string, List<TreeNode>) BuildAssetData() public static (string, List<TreeNode>) BuildAssetData()
{ {
StatusStripUpdate("Building asset list..."); Logger.Info("Building asset list...");
string productName = null; string productName = null;
var objectCount = assetsManager.assetsFileList.Sum(x => x.Objects.Count); var objectCount = assetsManager.assetsFileList.Sum(x => x.Objects.Count);
@ -256,7 +256,7 @@ namespace AssetStudioGUI
visibleAssets = exportableAssets; visibleAssets = exportableAssets;
StatusStripUpdate("Building tree structure..."); Logger.Info("Building tree structure...");
var treeNodeCollection = new List<TreeNode>(); var treeNodeCollection = new List<TreeNode>();
var treeNodeDictionary = new Dictionary<GameObject, GameObjectTreeNode>(); var treeNodeDictionary = new Dictionary<GameObject, GameObjectTreeNode>();
@ -414,7 +414,7 @@ namespace AssetStudioGUI
break; break;
} }
exportPath += Path.DirectorySeparatorChar; exportPath += Path.DirectorySeparatorChar;
StatusStripUpdate($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}"); Logger.Info($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}");
try try
{ {
switch (exportType) switch (exportType)
@ -441,7 +441,7 @@ namespace AssetStudioGUI
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show($"Export {asset.Type}:{asset.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}"); Logger.Error($"Export {asset.Type}:{asset.Text} error", ex);
} }
Progress.Report(++i, toExportCount); Progress.Report(++i, toExportCount);
@ -454,7 +454,7 @@ namespace AssetStudioGUI
statusText += $" {toExportCount - exportedCount} assets skipped (not extractable or files already exist)"; statusText += $" {toExportCount - exportedCount} assets skipped (not extractable or files already exist)";
} }
StatusStripUpdate(statusText); Logger.Info(statusText);
if (Properties.Settings.Default.openAfterExport && exportedCount > 0) if (Properties.Settings.Default.openAfterExport && exportedCount > 0)
{ {
@ -499,7 +499,7 @@ namespace AssetStudioGUI
var statusText = $"Finished exporting asset list with {toExportAssets.Count()} items."; var statusText = $"Finished exporting asset list with {toExportAssets.Count()} items.";
StatusStripUpdate(statusText); Logger.Info(statusText);
if (Properties.Settings.Default.openAfterExport && toExportAssets.Count() > 0) if (Properties.Settings.Default.openAfterExport && toExportAssets.Count() > 0)
{ {
@ -547,25 +547,25 @@ namespace AssetStudioGUI
} }
Directory.CreateDirectory(targetPath); Directory.CreateDirectory(targetPath);
//导出FBX //导出FBX
StatusStripUpdate($"Exporting {filename}.fbx"); Logger.Info($"Exporting {filename}.fbx");
try try
{ {
ExportGameObject(j.gameObject, targetPath); ExportGameObject(j.gameObject, targetPath);
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show($"Export GameObject:{j.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}"); Logger.Error($"Export GameObject:{j.Text} error", ex);
} }
Progress.Report(++k, count); Progress.Report(++k, count);
StatusStripUpdate($"Finished exporting {filename}.fbx"); Logger.Info($"Finished exporting {filename}.fbx");
} }
} }
if (Properties.Settings.Default.openAfterExport) if (Properties.Settings.Default.openAfterExport)
{ {
OpenFolderInExplorer(savePath); OpenFolderInExplorer(savePath);
} }
StatusStripUpdate("Finished"); Logger.Info("Finished");
}); });
} }
@ -583,7 +583,7 @@ namespace AssetStudioGUI
ThreadPool.QueueUserWorkItem(state => ThreadPool.QueueUserWorkItem(state =>
{ {
Progress.Reset(); Progress.Reset();
StatusStripUpdate($"Exporting {animator.Text}"); Logger.Info($"Exporting {animator.Text}");
try try
{ {
ExportAnimator(animator, exportPath, animationList); ExportAnimator(animator, exportPath, animationList);
@ -592,12 +592,12 @@ namespace AssetStudioGUI
OpenFolderInExplorer(exportPath); OpenFolderInExplorer(exportPath);
} }
Progress.Report(1, 1); Progress.Report(1, 1);
StatusStripUpdate($"Finished exporting {animator.Text}"); Logger.Info($"Finished exporting {animator.Text}");
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show($"Export Animator:{animator.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}"); Logger.Error($"Export Animator:{animator.Text} error", ex);
StatusStripUpdate("Error in export"); Logger.Info("Error in export");
} }
}); });
} }
@ -615,16 +615,16 @@ namespace AssetStudioGUI
Progress.Reset(); Progress.Reset();
foreach (var gameObject in gameObjects) foreach (var gameObject in gameObjects)
{ {
StatusStripUpdate($"Exporting {gameObject.m_Name}"); Logger.Info($"Exporting {gameObject.m_Name}");
try try
{ {
ExportGameObject(gameObject, exportPath, animationList); ExportGameObject(gameObject, exportPath, animationList);
StatusStripUpdate($"Finished exporting {gameObject.m_Name}"); Logger.Info($"Finished exporting {gameObject.m_Name}");
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show($"Export GameObject:{gameObject.m_Name} error\r\n{ex.Message}\r\n{ex.StackTrace}"); Logger.Error($"Export GameObject:{gameObject.m_Name} error", ex);
StatusStripUpdate("Error in export"); Logger.Info("Error in export");
} }
Progress.Report(++i, count); Progress.Report(++i, count);
@ -636,7 +636,7 @@ namespace AssetStudioGUI
} }
else else
{ {
StatusStripUpdate("No Object selected for export."); Logger.Info("No Object selected for export.");
} }
}); });
} }
@ -647,17 +647,17 @@ namespace AssetStudioGUI
{ {
var name = Path.GetFileName(exportPath); var name = Path.GetFileName(exportPath);
Progress.Reset(); Progress.Reset();
StatusStripUpdate($"Exporting {name}"); Logger.Info($"Exporting {name}");
try try
{ {
ExportGameObjectMerge(gameObjects, exportPath, animationList); ExportGameObjectMerge(gameObjects, exportPath, animationList);
Progress.Report(1, 1); Progress.Report(1, 1);
StatusStripUpdate($"Finished exporting {name}"); Logger.Info($"Finished exporting {name}");
} }
catch (Exception ex) catch (Exception ex)
{ {
MessageBox.Show($"Export Model:{name} error\r\n{ex.Message}\r\n{ex.StackTrace}"); Logger.Error($"Export Model:{name} error", ex);
StatusStripUpdate("Error in export"); Logger.Info("Error in export");
} }
if (Properties.Settings.Default.openAfterExport) if (Properties.Settings.Default.openAfterExport)
{ {