From 174f616e5c5ea9057dc169dbbf1d936c9552ea09 Mon Sep 17 00:00:00 2001
From: PopSlime <popslime@qq.com>
Date: Tue, 15 Nov 2022 13:31:39 +0800
Subject: [PATCH] Add error notice popup for resource import.

---
 Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs | 9 ++++++++-
 Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs       | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs
index 6ba3b91..e136ec6 100644
--- a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs
+++ b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs
@@ -116,7 +116,14 @@ namespace Cryville.Crtr.Browsing {
 			var file = new FileInfo(path);
 			if (!converters.ContainsKey(file.Extension)) return false;
 			foreach (var converter in converters[file.Extension]) {
-				var resources = converter.ConvertFrom(file);
+				IEnumerable<Resource> resources = null;
+				try {
+					resources = converter.ConvertFrom(file);
+				}
+				catch (Exception ex) {
+					CallHelper.ShowMessageBox(ex.Message);
+					return false;
+				}
 				foreach (var res in resources) {
 					if (!res.Valid) {
 						Logger.Log("main", 3, "Resource", "Attempt to import invalid resource {0}", res);
diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs b/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs
index 64c3792..44ad453 100644
--- a/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs
+++ b/Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs
@@ -59,11 +59,11 @@ namespace Cryville.Crtr.Browsing {
 		private void OnAddDialogClosed() {
 			if (_dialog.FileName == null) return;
 			if (ResourceManager.ImportItemFrom(_dialog.FileName)) {
-				Debug.Log("Import succeeded"); // TODO
+				CallHelper.ShowMessageBox("Import succeeded");
 				OnPathClicked(ResourceManager.CurrentDirectory.Length - 1);
 			}
 			else {
-				Debug.Log("Import failed"); // TODO
+				CallHelper.ShowMessageBox("Import failed");
 			}
 		}
 	}