From d297cf1cad3f9d06b9ef96a08579430a35962d33 Mon Sep 17 00:00:00 2001 From: bd_ Date: Thu, 21 Dec 2023 17:38:46 +0900 Subject: [PATCH] feat(error): Integrate with NDMF error reporting and localization system (#570) * chore(i18n): initial integration with NDMF localization system * feat(error): integrate with NDMF error reporting framework Note that as part of this, the pre-build validation system has been disabled for now. It didn't work very well with other NDMF plugins in the first place, so it's probably for the best... * chore: fix u2019 build errors --- ...m-manifest.json => vpm-manifest-2019.json} | 5 +- .github/ProjectRoot/vpm-manifest-2022.json | 5 +- .github/ProjectRoot/vpm-manifest.json | 22 -- Editor/ErrorReporting/ComponentValidation.cs | 137 +++---- Editor/ErrorReporting/ErrorElement.cs | 104 ----- Editor/ErrorReporting/ErrorElement.cs.meta | 3 - Editor/ErrorReporting/ErrorLog.cs | 356 +----------------- Editor/ErrorReporting/ErrorReportUI.cs | 308 --------------- Editor/ErrorReporting/ErrorReportUI.cs.meta | 3 - Editor/ErrorReporting/NominalException.cs | 28 -- .../ErrorReporting/NominalException.cs.meta | 3 - Editor/ErrorReporting/Resources.meta | 8 - .../Resources/ModularAvatarErrorReport.uss | 91 ----- .../ModularAvatarErrorReport.uss.meta | 11 - Editor/ErrorReporting/SelectionButton.cs | 31 -- Editor/ErrorReporting/SelectionButton.cs.meta | 3 - Editor/Localization/Localization.cs | 91 +++-- Editor/Localization/{en.json => en-us.json} | 76 +++- .../{en.json.meta => en-us.json.meta} | 0 Editor/Localization/{ja.json => ja-jp.json} | 5 + .../{ja.json.meta => ja-jp.json.meta} | 0 Editor/Localization/{ko.json => ko-kr.json} | 0 .../{ko.json.meta => ko-kr.json.meta} | 0 Editor/Localization/test.json | 3 - Editor/Localization/test.json.meta | 3 - Editor/MergeArmatureHook.cs | 2 +- .../OptimizationPasses/GCGameObjectsPass.cs | 2 +- .../PluginDefinition/ModularAvatarContext.cs | 21 +- Editor/PluginDefinition/PluginDefinition.cs | 3 + Editor/ReplaceObjectPass.cs | 6 +- UnitTests~/LocalizationTest.cs | 35 -- UnitTests~/LocalizationTest.cs.meta | 3 - .../ReplaceObject/ReplaceObjectTests.cs | 24 +- UnitTests~/TestBase.cs | 3 +- package.json | 2 +- 35 files changed, 203 insertions(+), 1194 deletions(-) rename .github/ProjectRoot/{Packages/vpm-manifest.json => vpm-manifest-2019.json} (77%) delete mode 100644 .github/ProjectRoot/vpm-manifest.json delete mode 100644 Editor/ErrorReporting/ErrorElement.cs delete mode 100644 Editor/ErrorReporting/ErrorElement.cs.meta delete mode 100644 Editor/ErrorReporting/ErrorReportUI.cs delete mode 100644 Editor/ErrorReporting/ErrorReportUI.cs.meta delete mode 100644 Editor/ErrorReporting/NominalException.cs delete mode 100644 Editor/ErrorReporting/NominalException.cs.meta delete mode 100644 Editor/ErrorReporting/Resources.meta delete mode 100644 Editor/ErrorReporting/Resources/ModularAvatarErrorReport.uss delete mode 100644 Editor/ErrorReporting/Resources/ModularAvatarErrorReport.uss.meta delete mode 100644 Editor/ErrorReporting/SelectionButton.cs delete mode 100644 Editor/ErrorReporting/SelectionButton.cs.meta rename Editor/Localization/{en.json => en-us.json} (70%) rename Editor/Localization/{en.json.meta => en-us.json.meta} (100%) rename Editor/Localization/{ja.json => ja-jp.json} (99%) rename Editor/Localization/{ja.json.meta => ja-jp.json.meta} (100%) rename Editor/Localization/{ko.json => ko-kr.json} (100%) rename Editor/Localization/{ko.json.meta => ko-kr.json.meta} (100%) delete mode 100644 Editor/Localization/test.json delete mode 100644 Editor/Localization/test.json.meta delete mode 100644 UnitTests~/LocalizationTest.cs delete mode 100644 UnitTests~/LocalizationTest.cs.meta diff --git a/.github/ProjectRoot/Packages/vpm-manifest.json b/.github/ProjectRoot/vpm-manifest-2019.json similarity index 77% rename from .github/ProjectRoot/Packages/vpm-manifest.json rename to .github/ProjectRoot/vpm-manifest-2019.json index 315afc36..553187b1 100644 --- a/.github/ProjectRoot/Packages/vpm-manifest.json +++ b/.github/ProjectRoot/vpm-manifest-2019.json @@ -4,7 +4,7 @@ "version": "3.4.2" }, "nadena.dev.ndmf": { - "version": "0.3.0" + "version": "1.3.0-alpha.0" } }, "locked": { @@ -17,6 +17,9 @@ "com.vrchat.base": { "version": "3.4.2", "dependencies": {} + }, + "nadena.dev.ndmf": { + "version": "1.3.0-alpha.0" } } } \ No newline at end of file diff --git a/.github/ProjectRoot/vpm-manifest-2022.json b/.github/ProjectRoot/vpm-manifest-2022.json index d1c81e55..e2c6a511 100644 --- a/.github/ProjectRoot/vpm-manifest-2022.json +++ b/.github/ProjectRoot/vpm-manifest-2022.json @@ -4,7 +4,7 @@ "version": "3.5.0" }, "nadena.dev.ndmf": { - "version": "0.3.0" + "version": "1.3.0-alpha.0" } }, "locked": { @@ -17,6 +17,9 @@ "com.vrchat.base": { "version": "3.5.0", "dependencies": {} + }, + "nadena.dev.ndmf": { + "version": "1.3.0-alpha.0" } } } \ No newline at end of file diff --git a/.github/ProjectRoot/vpm-manifest.json b/.github/ProjectRoot/vpm-manifest.json deleted file mode 100644 index 315afc36..00000000 --- a/.github/ProjectRoot/vpm-manifest.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "com.vrchat.avatars": { - "version": "3.4.2" - }, - "nadena.dev.ndmf": { - "version": "0.3.0" - } - }, - "locked": { - "com.vrchat.avatars": { - "version": "3.4.2", - "dependencies": { - "com.vrchat.base": "3.4.2" - } - }, - "com.vrchat.base": { - "version": "3.4.2", - "dependencies": {} - } - } -} \ No newline at end of file diff --git a/Editor/ErrorReporting/ComponentValidation.cs b/Editor/ErrorReporting/ComponentValidation.cs index 81bb0946..e80b2224 100644 --- a/Editor/ErrorReporting/ComponentValidation.cs +++ b/Editor/ErrorReporting/ComponentValidation.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using nadena.dev.modular_avatar.core; +using nadena.dev.ndmf; #if MA_VRCSDK3_AVATARS using nadena.dev.modular_avatar.core.menu; @@ -16,64 +17,61 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting /// /// /// Null if valid, otherwise a list of configuration errors - internal static List CheckComponent(this AvatarTagComponent tagComponent) + internal static void CheckComponent(this AvatarTagComponent tagComponent) { - switch (tagComponent) + ErrorReport.WithContextObject(tagComponent, () => { - case ModularAvatarBlendshapeSync bs: - return CheckInternal(bs); - case ModularAvatarBoneProxy bp: - return CheckInternal(bp); + switch (tagComponent) + { + case ModularAvatarBlendshapeSync bs: + CheckInternal(bs); + break; + case ModularAvatarBoneProxy bp: + CheckInternal(bp); + break; #if MA_VRCSDK3_AVATARS - case ModularAvatarMenuInstaller mi: - return CheckInternal(mi); - case ModularAvatarMergeAnimator obj: - return CheckInternal(obj); + case ModularAvatarMenuInstaller mi: + CheckInternal(mi); + break; + case ModularAvatarMergeAnimator obj: + CheckInternal(obj); + break; #endif - case ModularAvatarMergeArmature obj: - return CheckInternal(obj); - default: - return null; - } + case ModularAvatarMergeArmature obj: + CheckInternal(obj); + break; + default: + return; + } + }); } - internal static List ValidateAll(GameObject root) + internal static void ValidateAll(GameObject root) { - List logs = new List(); foreach (var component in root.GetComponentsInChildren(true)) { - var componentLogs = component.CheckComponent(); - if (componentLogs != null) - { - logs.AddRange(componentLogs); - } + component.CheckComponent(); } - - return logs; } - private static List CheckInternal(ModularAvatarBlendshapeSync bs) - { + private static void CheckInternal(ModularAvatarBlendshapeSync bs) + { var localMesh = bs.GetComponent(); if (localMesh == null) { - return new List - {new ErrorLog(ReportLevel.Validation, "validation.blendshape_sync.no_local_renderer", bs)}; + BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.no_local_renderer", bs); } if (localMesh.sharedMesh == null) { - return new List - {new ErrorLog(ReportLevel.Validation, "validation.blendshape_sync.no_local_mesh", bs)}; + BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.no_local_mesh", bs); } if (bs.Bindings == null || bs.Bindings.Count == 0) { - return new List - {new ErrorLog(ReportLevel.Validation, "validation.blendshape_sync.no_bindings", bs)}; + BuildReport.Log(ErrorSeverity.Information,"validation.blendshape_sync.no_bindings", bs); } - List errorLogs = new List(); foreach (var binding in bs.Bindings) { var localShape = string.IsNullOrWhiteSpace(binding.LocalBlendshape) @@ -82,113 +80,82 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting if (localMesh.sharedMesh.GetBlendShapeIndex(localShape) == -1) { - errorLogs.Add(new ErrorLog(ReportLevel.Validation, "validation.blendshape_sync.missing_local_shape", - new string[] {localShape}, bs)); + BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.missing_local_shape", + localShape, bs); } var targetObj = binding.ReferenceMesh.Get(bs.transform); if (targetObj == null) { - errorLogs.Add(new ErrorLog(ReportLevel.Validation, "validation.blendshape_sync.no_target", bs)); + BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.no_target", bs); continue; } var targetRenderer = targetObj.GetComponent(); if (targetRenderer == null) { - errorLogs.Add(new ErrorLog(ReportLevel.Validation, - "validation.blendshape_sync.missing_target_renderer", bs, targetRenderer)); + BuildReport.Log(ErrorSeverity.NonFatal, + "validation.blendshape_sync.missing_target_renderer", bs, targetRenderer); continue; } var targetMesh = targetRenderer.sharedMesh; if (targetMesh == null) { - errorLogs.Add(new ErrorLog(ReportLevel.Validation, "validation.blendshape_sync.missing_target_mesh", - bs, targetRenderer)); + BuildReport.Log(ErrorSeverity.NonFatal, "validation.blendshape_sync.missing_target_mesh", + bs, targetRenderer); continue; } if (targetMesh.GetBlendShapeIndex(binding.Blendshape) == -1) { - errorLogs.Add(new ErrorLog(ReportLevel.Validation, - "validation.blendshape_sync.missing_target_shape", new string[] {binding.Blendshape}, bs, - targetRenderer)); + BuildReport.Log(ErrorSeverity.NonFatal, + "validation.blendshape_sync.missing_target_shape", binding.Blendshape, bs, + targetRenderer); } } - - if (errorLogs.Count == 0) - { - return null; - } - else - { - return errorLogs; - } } - private static List CheckInternal(ModularAvatarBoneProxy bp) + private static void CheckInternal(ModularAvatarBoneProxy bp) { if (bp.target == null) { - return new List() - { - new ErrorLog(ReportLevel.Validation, "validation.bone_proxy.no_target", bp) - }; + BuildReport.Log(ErrorSeverity.NonFatal, "validation.bone_proxy.no_target", bp); } - - return null; } #if MA_VRCSDK3_AVATARS - private static List CheckInternal(ModularAvatarMenuInstaller mi) + private static void CheckInternal(ModularAvatarMenuInstaller mi) { // TODO - check that target menu is in the avatar if (mi.menuToAppend == null && mi.GetComponent() == null) { - return new List() - { - new ErrorLog(ReportLevel.Validation, "validation.menu_installer.no_menu", mi) - }; + BuildReport.Log(ErrorSeverity.NonFatal, "validation.menu_installer.no_menu", mi); } - - return null; } - private static List CheckInternal(ModularAvatarMergeAnimator ma) + private static void CheckInternal(ModularAvatarMergeAnimator ma) { if (ma.animator == null) { - return new List() - { - new ErrorLog(ReportLevel.Validation, "validation.merge_animator.no_animator", ma) - }; + BuildReport.Log(ErrorSeverity.NonFatal, "validation.merge_animator.no_animator", ma); } - - return null; } #endif - private static List CheckInternal(ModularAvatarMergeArmature ma) + private static void CheckInternal(ModularAvatarMergeArmature ma) { if (ma.mergeTargetObject == null) { - return new List() - { - new ErrorLog(ReportLevel.Validation, "validation.merge_armature.no_target", ma) - }; + BuildReport.Log(ErrorSeverity.NonFatal, "validation.merge_armature.no_target", ma); + return; } if (ma.mergeTargetObject == ma.gameObject || ma.mergeTargetObject.transform.IsChildOf(ma.transform)) { - return new List() - { - new ErrorLog(ReportLevel.Validation, "error.merge_armature.merge_into_self", ma, - ma.mergeTargetObject) - }; + BuildReport.Log(ErrorSeverity.Error, "error.merge_armature.circular_dependency", ma, + ma.mergeTargetObject); } - - return null; } } } \ No newline at end of file diff --git a/Editor/ErrorReporting/ErrorElement.cs b/Editor/ErrorReporting/ErrorElement.cs deleted file mode 100644 index 045d4fe1..00000000 --- a/Editor/ErrorReporting/ErrorElement.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using nadena.dev.modular_avatar.core.editor; -using UnityEditor; -using UnityEngine; -using UnityEngine.SceneManagement; -using UnityEngine.UIElements; - -namespace nadena.dev.modular_avatar.editor.ErrorReporting -{ - internal class ErrorElement : Box - { - private readonly ErrorLog log; - - Texture2D GetIcon() - { - switch (log.reportLevel) - { - case ReportLevel.Info: - return EditorGUIUtility.FindTexture("d_console.infoicon"); - case ReportLevel.Warning: - return EditorGUIUtility.FindTexture("d_console.warnicon"); - default: - return EditorGUIUtility.FindTexture("d_console.erroricon"); - } - } - - public ErrorElement(ErrorLog log, ObjectRefLookupCache cache) - { - this.log = log; - - AddToClassList("ErrorElement"); - var tex = GetIcon(); - if (tex != null) - { - var image = new Image(); - image.image = tex; - Add(image); - } - - var inner = new Box(); - Add(inner); - - var label = new Label(GetLabelText()); - inner.Add(label); - - foreach (var obj in log.referencedObjects) - { - var referenced = obj.Lookup(cache); - if (referenced != null) - { - inner.Add(new SelectionButton(obj.typeName, referenced)); - } - } - - if (!string.IsNullOrWhiteSpace(log.stacktrace)) - { - var foldout = new Foldout(); - foldout.text = Localization.S("error.stack_trace"); - var field = new TextField(); - field.value = log.stacktrace; - field.isReadOnly = true; - field.multiline = true; - foldout.Add(field); - foldout.value = false; - inner.Add(foldout); - } - } - - private static GameObject FindObject(string path) - { - var scene = SceneManager.GetActiveScene(); - foreach (var root in scene.GetRootGameObjects()) - { - if (root.name == path) return root; - if (path.StartsWith(root.name + "/")) - { - return root.transform.Find(path.Substring(root.name.Length + 1))?.gameObject; - } - } - - return null; - } - - private string GetLabelText() - { - var objArray = new object[log.substitutions.Length]; - for (int i = 0; i < log.substitutions.Length; i++) - { - objArray[i] = log.substitutions[i]; - } - - try - { - return string.Format(Localization.S(log.messageCode), objArray); - } - catch (FormatException e) - { - Debug.LogError("Error formatting message code: " + log.messageCode); - Debug.LogException(e); - return log.messageCode + "\n" + string.Join("\n", objArray); - } - } - } -} \ No newline at end of file diff --git a/Editor/ErrorReporting/ErrorElement.cs.meta b/Editor/ErrorReporting/ErrorElement.cs.meta deleted file mode 100644 index 763f54eb..00000000 --- a/Editor/ErrorReporting/ErrorElement.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a534edd7151c4cd49fe07919ae526004 -timeCreated: 1674132977 \ No newline at end of file diff --git a/Editor/ErrorReporting/ErrorLog.cs b/Editor/ErrorReporting/ErrorLog.cs index 52b279f9..2f068c18 100644 --- a/Editor/ErrorReporting/ErrorLog.cs +++ b/Editor/ErrorReporting/ErrorLog.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using nadena.dev.modular_avatar.core; +using nadena.dev.modular_avatar.core.editor; +using nadena.dev.ndmf; using Newtonsoft.Json; using UnityEngine; using UnityEditor; @@ -11,376 +13,38 @@ using Object = UnityEngine.Object; namespace nadena.dev.modular_avatar.editor.ErrorReporting { - internal class AvatarReport - { - [JsonProperty] internal ObjectRef objectRef; - - [JsonProperty] internal bool successful; - - [JsonProperty] internal List logs = new List(); - } - - internal class ObjectRefLookupCache - { - private Dictionary> _cache = - new Dictionary>(); - - internal UnityEngine.Object FindByGuidAndLocalId(string guid, long localId) - { - if (!_cache.TryGetValue(guid, out var fileContents)) - { - var path = AssetDatabase.GUIDToAssetPath(guid); - if (string.IsNullOrEmpty(path)) - { - return null; - } - - var assets = AssetDatabase.LoadAllAssetsAtPath(path); - fileContents = new Dictionary(assets.Length); - foreach (var asset in assets) - { - if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out var _, out long detectedId)) - { - fileContents[detectedId] = asset; - } - } - - _cache[guid] = fileContents; - } - - if (fileContents.TryGetValue(localId, out var obj)) - { - return obj; - } - else - { - return null; - } - } - } - - internal struct ObjectRef - { - [JsonProperty] internal string guid; - [JsonProperty] internal long? localId; - [JsonProperty] internal string path, name; - [JsonProperty] internal string typeName; - - internal ObjectRef(Object obj) - { - this.guid = null; - localId = null; - - if (obj == null) - { - this.guid = path = name = null; - localId = null; - typeName = null; - return; - } - - typeName = obj.GetType().Name; - - long id; - if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(obj, out var guid, out id)) - { - this.guid = guid; - localId = id; - } - - if (obj is Component c) - { - path = RuntimeUtil.RelativePath(null, c.gameObject); - } - else if (obj is GameObject go) - { - path = RuntimeUtil.RelativePath(null, go); - } - else - { - path = null; - } - - name = string.IsNullOrWhiteSpace(obj.name) ? "" : obj.name; - } - - internal UnityEngine.Object Lookup(ObjectRefLookupCache cache) - { - if (path != null) - { - return FindObject(path); - } - else if (guid != null && localId.HasValue) - { - return cache.FindByGuidAndLocalId(guid, localId.Value); - } - else - { - return null; - } - } - - private static GameObject FindObject(string path) - { - var scene = SceneManager.GetActiveScene(); - foreach (var root in scene.GetRootGameObjects()) - { - if (root.name == path) return root; - if (path.StartsWith(root.name + "/")) - { - return root.transform.Find(path.Substring(root.name.Length + 1))?.gameObject; - } - } - - return null; - } - - public ObjectRef Remap(string original, string cloned) - { - if (path == cloned) - { - path = original; - name = path.Substring(path.LastIndexOf('/') + 1); - } - else if (path != null && path.StartsWith(cloned + "/")) - { - path = original + path.Substring(cloned.Length); - name = path.Substring(path.LastIndexOf('/') + 1); - } - - return this; - } - } - - internal enum ReportLevel - { - Validation, - Info, - Warning, - Error, - InternalError, - } - - internal class ErrorLog - { - [JsonProperty] internal List referencedObjects; - [JsonProperty] internal ReportLevel reportLevel; - [JsonProperty] internal string messageCode; - [JsonProperty] internal string[] substitutions; - [JsonProperty] internal string stacktrace; - - internal ErrorLog(ReportLevel level, string code, string[] strings, params object[] args) - { - reportLevel = level; - - substitutions = strings.Select(s => s.ToString()).ToArray(); - - referencedObjects = args.Where(o => o is Component || o is GameObject) - .Select(o => new ObjectRef(o is Component c ? c.gameObject : (GameObject) o)) - .ToList(); - referencedObjects.AddRange(BuildReport.CurrentReport.GetActiveReferences()); - - messageCode = code; - stacktrace = null; - } - - internal ErrorLog(ReportLevel level, string code, params object[] args) : this(level, code, - Array.Empty(), args) - { - } - - internal ErrorLog(Exception e, string additionalStackTrace = "") - { - reportLevel = ReportLevel.InternalError; - messageCode = "error.internal_error"; - substitutions = new string[] {e.Message, e.TargetSite?.Name}; - referencedObjects = BuildReport.CurrentReport.GetActiveReferences().ToList(); - stacktrace = e.ToString() + additionalStackTrace; - } - - public override string ToString() - { - return "[" + reportLevel + "] " + messageCode + " " + "subst: " + string.Join(", ", substitutions); - } - } - internal class BuildReport { private const string Path = "Library/ModularAvatarBuildReport.json"; - private static BuildReport _report; - private AvatarReport _currentAvatar; - private Stack _references = new Stack(); - - [JsonProperty] internal List Avatars = new List(); - internal AvatarReport CurrentAvatar => _currentAvatar; - - public static BuildReport CurrentReport + internal static void Log(ErrorSeverity severity, string code, params object[] objects) { - get - { - if (_report == null) _report = LoadReport() ?? new BuildReport(); - return _report; - } + ErrorReport.ReportError(Localization.L, severity, code, objects); } - static BuildReport() + internal static void LogFatal(string code, params object[] objects) { - EditorApplication.playModeStateChanged += change => - { - switch (change) - { - case PlayModeStateChange.ExitingEditMode: - // TODO - skip if we're doing a VRCSDK build - _report = new BuildReport(); - break; - } - }; - } - - private static BuildReport LoadReport() - { - try - { - var data = File.ReadAllText(Path); - return JsonConvert.DeserializeObject(data); - } - catch (Exception) - { - return null; - } - } - - internal static void SaveReport() - { - var report = CurrentReport; - var json = JsonConvert.SerializeObject(report); - - File.WriteAllText(Path, json); - - ErrorReportUI.reloadErrorReport(); - } - - private class AvatarReportScope : IDisposable - { - public void Dispose() - { - var successful = CurrentReport._currentAvatar.successful; - CurrentReport._currentAvatar = null; - BuildReport.SaveReport(); - if (!successful) throw new Exception("Avatar processing failed"); - } - } - - internal IDisposable ReportingOnAvatar(GameObject avatarGameObject) - { - if (avatarGameObject != null) - { - AvatarReport report = new AvatarReport(); - report.objectRef = new ObjectRef(avatarGameObject); - Avatars.Add(report); - _currentAvatar = report; - _currentAvatar.successful = true; - - _currentAvatar.logs.AddRange(ComponentValidation.ValidateAll(avatarGameObject)); - } - - return new AvatarReportScope(); - } - - internal static void Log(ReportLevel level, string code, object[] strings, params Object[] objects) - { - ErrorLog errorLog = - new ErrorLog(level, code, strings: strings.Select(s => s.ToString()).ToArray(), objects); - - var avatarReport = CurrentReport._currentAvatar; - if (avatarReport == null) - { - Debug.LogWarning("Error logged when not processing an avatar: " + errorLog); - return; - } - - avatarReport.logs.Add(errorLog); - } - - internal static void LogFatal(string code, object[] strings, params Object[] objects) - { - Log(ReportLevel.Error, code, strings: strings, objects: objects); - if (CurrentReport._currentAvatar != null) - { - CurrentReport._currentAvatar.successful = false; - } - else - { - throw new Exception("Fatal error without error reporting scope"); - } + ErrorReport.ReportError(Localization.L, ErrorSeverity.Error, code, objects); } internal static void LogException(Exception e, string additionalStackTrace = "") { - var avatarReport = CurrentReport._currentAvatar; - if (avatarReport == null) - { - Debug.LogException(e); - return; - } - else - { - avatarReport.logs.Add(new ErrorLog(e, additionalStackTrace)); - } + ErrorReport.ReportException(e, additionalStackTrace); } internal static T ReportingObject(UnityEngine.Object obj, Func action) { - if (obj != null) CurrentReport._references.Push(obj); - try - { - return action(); - } - catch (Exception e) - { - var additionalStackTrace = string.Join("\n", Environment.StackTrace.Split('\n').Skip(1)) + "\n"; - LogException(e, additionalStackTrace); - return default; - } - finally - { - if (obj != null) CurrentReport._references.Pop(); - } + return ErrorReport.WithContextObject(obj, action); } internal static void ReportingObject(UnityEngine.Object obj, Action action) { - ReportingObject(obj, () => - { - action(); - return true; - }); - } - - internal IEnumerable GetActiveReferences() - { - return _references.Select(o => new ObjectRef(o)); - } - - public static void Clear() - { - _report = new BuildReport(); + ErrorReport.WithContextObject(obj, action); } + [Obsolete("Use NDMF's ObjectRegistry instead")] public static void RemapPaths(string original, string cloned) { - foreach (var av in CurrentReport.Avatars) - { - av.objectRef = av.objectRef.Remap(original, cloned); - - foreach (var log in av.logs) - { - log.referencedObjects = log.referencedObjects.Select(o => o.Remap(original, cloned)).ToList(); - } - } - - ErrorReportUI.reloadErrorReport(); } } } \ No newline at end of file diff --git a/Editor/ErrorReporting/ErrorReportUI.cs b/Editor/ErrorReporting/ErrorReportUI.cs deleted file mode 100644 index 97f9b3a9..00000000 --- a/Editor/ErrorReporting/ErrorReportUI.cs +++ /dev/null @@ -1,308 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using nadena.dev.modular_avatar.core; -using nadena.dev.modular_avatar.core.editor; -using UnityEditor; -using UnityEngine; -using UnityEngine.UIElements; - -namespace nadena.dev.modular_avatar.editor.ErrorReporting -{ - internal class ErrorReportUI : EditorWindow - { - internal static Action reloadErrorReport = () => { }; - - [MenuItem("Tools/Modular Avatar/Show error report", false, 100)] - public static void OpenErrorReportUI() - { - GetWindow().Show(); - } - - public static void MaybeOpenErrorReportUI() - { - if (Application.isBatchMode) return; // headless unit tests - - if (BuildReport.CurrentReport.Avatars.Any(av => av.logs.Count > 0)) - { - OpenErrorReportUI(); - } - } - - private Vector2 _avatarScrollPos, _errorScrollPos; - private int _selectedAvatar = -1; - private List