From 5f3e1dcf86219169e991faa18e15ac47db8bb5ee Mon Sep 17 00:00:00 2001
From: kaikoga <info@mail.kaikoga.net>
Date: Thu, 9 Nov 2023 14:46:57 +0900
Subject: [PATCH] Refactor: Delete unused code for MAAssetBundle generation
 (#515)

* refactor: delete unused code for MAAssetBundle generation

* fix unit tests
---
 Editor/Util.cs         | 52 ------------------------------------------
 UnitTests~/TestBase.cs |  3 ++-
 2 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/Editor/Util.cs b/Editor/Util.cs
index 9795096c..14e87f44 100644
--- a/Editor/Util.cs
+++ b/Editor/Util.cs
@@ -25,7 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using JetBrains.Annotations;
 using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
@@ -34,24 +33,9 @@ using Object = UnityEngine.Object;
 
 namespace nadena.dev.modular_avatar.core.editor
 {
-    internal class CleanupTempAssets : IVRCSDKPostprocessAvatarCallback
-    {
-        public int callbackOrder => 99999;
-
-        public void OnPostprocessAvatar()
-        {
-            Util.DeleteTemporaryAssets();
-        }
-    }
-
     [InitializeOnLoad]
     internal static class Util
     {
-        private const string generatedAssetsSubdirectory = "999_Modular_Avatar_Generated";
-        private const string generatedAssetsPath = "Assets/" + generatedAssetsSubdirectory;
-
-        [CanBeNull] public static string OverridePath;
-
         static Util()
         {
             RuntimeUtil.delayCall = (cb) => EditorApplication.delayCall += cb.Invoke;
@@ -153,42 +137,6 @@ namespace nadena.dev.modular_avatar.core.editor
             return component;
         }
 
-        public static string GenerateAssetPath()
-        {
-            return GetGeneratedAssetsFolder() + "/" + GUID.Generate() + ".asset";
-        }
-
-        private static string GetGeneratedAssetsFolder()
-        {
-            var path = OverridePath ?? generatedAssetsPath;
-
-            var pathParts = path.Split('/');
-
-            for (int i = 1; i < pathParts.Length; i++)
-            {
-                var subPath = string.Join("/", pathParts, 0, i + 1);
-                if (!AssetDatabase.IsValidFolder(subPath))
-                {
-                    AssetDatabase.CreateFolder(string.Join("/", pathParts, 0, i), pathParts[i]);
-                }
-            }
-
-            return path;
-        }
-
-        internal static void DeleteTemporaryAssets()
-        {
-            EditorApplication.delayCall += () =>
-            {
-                AssetDatabase.SaveAssets();
-
-                var subdir = generatedAssetsPath;
-
-                AssetDatabase.DeleteAsset(subdir);
-                FileUtil.DeleteFileOrDirectory(subdir);
-            };
-        }
-
         public static Type FindType(string typeName)
         {
             Type avatarValidation = null;
diff --git a/UnitTests~/TestBase.cs b/UnitTests~/TestBase.cs
index ed5ff7e0..84890282 100644
--- a/UnitTests~/TestBase.cs
+++ b/UnitTests~/TestBase.cs
@@ -48,7 +48,8 @@ namespace modular_avatar_tests
                 Object.DestroyImmediate(obj);
             }
 
-            Util.DeleteTemporaryAssets();
+            AssetDatabase.DeleteAsset(TEMP_ASSET_PATH);
+            FileUtil.DeleteFileOrDirectory(TEMP_ASSET_PATH);
         }
 
         protected nadena.dev.ndmf.BuildContext CreateContext(GameObject root)