diff --git a/Assets/QuickSheet/Editor/BaseMachineEditor.cs b/Assets/QuickSheet/Editor/BaseMachineEditor.cs index 1838c9b..ad36b61 100644 --- a/Assets/QuickSheet/Editor/BaseMachineEditor.cs +++ b/Assets/QuickSheet/Editor/BaseMachineEditor.cs @@ -42,7 +42,7 @@ public override void OnInspectorGUI() /// /// It should be overried and implemented in the derived class /// - protected virtual void Import(bool reimport = false) + public virtual void Import(bool reimport = false) { throw new NotImplementedException(); } @@ -66,7 +66,7 @@ protected bool IsValidHeader(string s) /// Generate script files with the given templates. /// Total four files are generated, two for runtime and others for editor. /// - protected virtual ScriptPrescription Generate(BaseMachine m) + public virtual ScriptPrescription Generate(BaseMachine m) { if (m == null) return null; @@ -395,5 +395,11 @@ protected ColumnHeader ParseColumnHeader(string columnheader, int order) return new ColumnHeader { name = cHeader, type = CellType.Undefined, OrderNO = order }; } + + public static void CreateGenerateDirectory(BaseMachine machine) + { + Directory.CreateDirectory(Application.dataPath + Path.DirectorySeparatorChar + machine.RuntimeClassPath); + Directory.CreateDirectory(Application.dataPath + Path.DirectorySeparatorChar + machine.EditorClassPath); + } } } \ No newline at end of file diff --git a/Assets/QuickSheet/Editor/QuickSheetMenu.cs b/Assets/QuickSheet/Editor/QuickSheetMenu.cs new file mode 100644 index 0000000..003264f --- /dev/null +++ b/Assets/QuickSheet/Editor/QuickSheetMenu.cs @@ -0,0 +1,156 @@ +using System.Collections.Generic; +using System.IO; +using System.Text; +using UnityEditor; +using UnityEngine; + +namespace UnityQuickSheet +{ + public static class QuickSheetMenu + { + /// + /// Select currently exist account setting asset file. + /// + [MenuItem("QuickSheet/Excel Setting")] + public static void SelectExcelSetting() + { + Selection.activeObject = ExcelSettings.Instance; + if (Selection.activeObject == null) + { + Debug.LogError(@"No ExcelSetting.asset file is found. Create setting file first. See the menu at 'Create/QuickSheet/Setting/Excel Setting'."); + } + } + + /// + /// Select currently exist account setting asset file. + /// + [MenuItem("QuickSheet/Google Data Setting")] + public static void SelectGoogleDataSetting() + { + Selection.activeObject = GoogleDataSettings.Instance; + if (Selection.activeObject == null) + { + Debug.LogError("No GoogleDataSettings.asset file is found. Create setting file first."); + } + } + + /// + /// Setup selected excel files + /// 1.Create Machine Asset + /// 2.Reimport Machine + /// 3.Generate Class + /// 4.Reimport Excel file + /// + [MenuItem("QuickSheet/Setup Select Excels")] + public static void SetupSelectExcels() + { + if (Selection.assetGUIDs.Length == 0) + { + EditorUtility.DisplayDialog("Error", "Select excel files to setup!", "OK"); + return; + } + + var selectObjs = new List(); + foreach (var guid in Selection.assetGUIDs) + { + var path = AssetDatabase.GUIDToAssetPath(guid); + if (!IsExcel(path)) continue; + + ExcelSettings.Instance._waitImportPath.Add(path); + + var excelQuery = new ExcelQuery(path); + var sheets = excelQuery.GetSheetNames(); + for (int i = 0; i < sheets.Length; i++) + { + var machine = ExcelMachine.CreateScriptMachineAsset(); + machine.excelFilePath = path; + machine.SheetNames = sheets; + machine.WorkSheetName = sheets[i]; + machine.CurrentSheetIndex = i; + machine.SpreadSheetName = Path.GetFileName(path); + + ReimportMachine(machine, true); + BaseMachineEditor.CreateGenerateDirectory(machine); + GenerateMachine(machine, false); + RenameMachineAsset(machine); + + selectObjs.Add(machine); + Debug.LogFormat("Setup finished! file:{0}, Sheet:{1}", machine.SpreadSheetName, sheets[i]); + } + } + + Selection.objects = selectObjs.ToArray(); + AssetDatabase.Refresh(); + } + + /// + /// After generate script reload, reimport excel file to generate data asset and update it + /// + [UnityEditor.Callbacks.DidReloadScripts] + private static void OnScriptsReloaded() + { + foreach (var path in ExcelSettings.Instance._waitImportPath) + { + AssetDatabase.ImportAsset(path); + } + ExcelSettings.Instance._waitImportPath.Clear(); + } + + /// + /// Refresh all excel files in project + /// refresh when change excel header column + /// + [MenuItem("QuickSheet/Refresh All")] + public static void RefreshAll() + { + foreach (var machine in Util.FindAssetsByType()) + { + ReimportMachine(machine, true); + GenerateMachine(machine, true); + } + + var files = Directory.GetFiles(Application.dataPath, "*.xls?", SearchOption.AllDirectories); + foreach (var file in files) + { + if (!IsExcel(file) || Path.GetFileName(file).StartsWith("~$")) continue; + var relativePath = "Assets" + file.Replace(Application.dataPath, ""); + Debug.Log(relativePath); + AssetDatabase.ImportAsset(relativePath); + } + AssetDatabase.Refresh(); + } + + private static void GenerateMachine(BaseMachine machine, bool onlyDataClass) + { + var editor = Editor.CreateEditor(machine) as BaseMachineEditor; + if (editor == null) return; + machine.onlyCreateDataClass = onlyDataClass; + editor.Generate(machine); + } + + private static void ReimportMachine(BaseMachine machine, bool reimport) + { + var editor = Editor.CreateEditor(machine) as BaseMachineEditor; + if (editor == null) return; + editor.Import(reimport); + } + + private static void RenameMachineAsset(ExcelMachine machine) + { + var name = new StringBuilder(); + name.Append(machine.SpreadSheetName.Split('.')[0]) + .Append("-") + .Append(machine.WorkSheetName) + .Append("-") + .Append("Importer"); + var err = AssetDatabase.RenameAsset(AssetDatabase.GetAssetPath(machine), name.ToString()); + if (!string.IsNullOrEmpty(err)) Debug.LogWarning("Rename failed " + err); + } + + private static bool IsExcel(string path) + { + var ext = Path.GetExtension(path); + return ext == ".xls" || ext == ".xlsx"; + } + } +} \ No newline at end of file diff --git a/Assets/QuickSheet/Editor/QuickSheetMenu.cs.meta b/Assets/QuickSheet/Editor/QuickSheetMenu.cs.meta new file mode 100644 index 0000000..8196dcc --- /dev/null +++ b/Assets/QuickSheet/Editor/QuickSheetMenu.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cb3e33668eef4724bf74729e7322004a +timeCreated: 1567843872 \ No newline at end of file diff --git a/Assets/QuickSheet/Editor/Util/SingletonScriptableObject.cs b/Assets/QuickSheet/Editor/Util/SingletonScriptableObject.cs index eeb3b9e..5e6c016 100644 --- a/Assets/QuickSheet/Editor/Util/SingletonScriptableObject.cs +++ b/Assets/QuickSheet/Editor/Util/SingletonScriptableObject.cs @@ -27,16 +27,14 @@ public static T Instance _instance = Resources.FindObjectsOfTypeAll().FirstOrDefault(); if (!_instance) { - string filter = "t:" + typeof(T); - var guids = AssetDatabase.FindAssets(filter); - if (guids.Length > 0) + var assets = Util.FindAssetsByType(); + if (assets.Length > 0) { - if (guids.Length > 1) + if (assets.Length > 1) Debug.LogWarningFormat("Multiple {0} assets are found.", typeof(T)); - string assetPath = AssetDatabase.GUIDToAssetPath(guids[0]); - Debug.LogFormat("Using {0}.", assetPath); - _instance = AssetDatabase.LoadAssetAtPath(assetPath); + _instance = assets[0]; + Debug.LogFormat("Using {0}.", AssetDatabase.GetAssetPath(_instance)); } // no found any setting file. else diff --git a/Assets/QuickSheet/Editor/Util/Util.cs b/Assets/QuickSheet/Editor/Util/Util.cs index cfac57d..010faa5 100644 --- a/Assets/QuickSheet/Editor/Util/Util.cs +++ b/Assets/QuickSheet/Editor/Util/Util.cs @@ -8,6 +8,7 @@ using System; using System.Collections; using System.Linq; +using UnityEditor; namespace UnityQuickSheet { @@ -25,5 +26,18 @@ public static class Util "ushort", "using", "virtual", "void", "volatile", "while", }; + public static T[] FindAssetsByType() where T : UnityEngine.Object + { + string filter = "t:" + typeof(T); + var guids = AssetDatabase.FindAssets(filter); + var results = new T[guids.Length]; + for (int i = 0; i < guids.Length; i++) + { + string assetPath = AssetDatabase.GUIDToAssetPath(guids[i]); + results[i] = AssetDatabase.LoadAssetAtPath(assetPath); + } + + return results; + } } } \ No newline at end of file diff --git a/Assets/QuickSheet/ExcelPlugin/Editor/Excel Settings.asset b/Assets/QuickSheet/ExcelPlugin/Editor/Excel Settings.asset index 2fb8150..9fce7af 100644 Binary files a/Assets/QuickSheet/ExcelPlugin/Editor/Excel Settings.asset and b/Assets/QuickSheet/ExcelPlugin/Editor/Excel Settings.asset differ diff --git a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachine.cs b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachine.cs index 6c994a7..3123a43 100644 --- a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachine.cs +++ b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachine.cs @@ -50,13 +50,14 @@ private void Awake() { /// A menu item which create a 'ExcelMachine' asset file. /// [MenuItem("Assets/Create/QuickSheet/Tools/Excel")] - public static void CreateScriptMachineAsset() + public static ExcelMachine CreateScriptMachineAsset() { ExcelMachine inst = ScriptableObject.CreateInstance(); string path = CustomAssetUtility.GetUniqueAssetPathNameOrFallback(ImportSettingFilename); AssetDatabase.CreateAsset(inst, path); AssetDatabase.SaveAssets(); Selection.activeObject = inst; + return inst; } } } \ No newline at end of file diff --git a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachineEditor.cs b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachineEditor.cs index 42d4084..b495258 100644 --- a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachineEditor.cs +++ b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachineEditor.cs @@ -168,8 +168,7 @@ Set a folder under the 'Assets' folder! \n return; } - Directory.CreateDirectory(Application.dataPath + Path.DirectorySeparatorChar + machine.RuntimeClassPath); - Directory.CreateDirectory(Application.dataPath + Path.DirectorySeparatorChar + machine.EditorClassPath); + CreateGenerateDirectory(machine); ScriptPrescription sp = Generate(machine); if (sp != null) @@ -189,7 +188,7 @@ Set a folder under the 'Assets' folder! \n /// /// Import the specified excel file and prepare to set type of each cell. /// - protected override void Import(bool reimport = false) + public override void Import(bool reimport = false) { ExcelMachine machine = target as ExcelMachine; @@ -291,7 +290,7 @@ protected override void CreateAssetCreationScript(BaseMachine m, ScriptPrescript // path where the .asset file will be created. string path = Path.GetDirectoryName(machine.excelFilePath); path += "/" + machine.WorkSheetName + ".asset"; - sp.assetFilepath = path; + sp.assetFilepath = path.Replace('\\', '/'); sp.assetPostprocessorClass = machine.WorkSheetName + "AssetPostprocessor"; sp.template = GetTemplate("PostProcessor"); diff --git a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelSettings.cs b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelSettings.cs index 6b427bd..6284070 100644 --- a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelSettings.cs +++ b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelSettings.cs @@ -8,6 +8,7 @@ using UnityEngine; using UnityEditor; using System.Collections; +using System.Collections.Generic; using System.IO; namespace UnityQuickSheet @@ -32,18 +33,10 @@ public class ExcelSettings : SingletonScriptableObject /// A path where generated editor script files are to be put. /// public string EditorPath = string.Empty; - + /// - /// Select currently exist account setting asset file. + /// record import path for QuickSheetMenu /// - [MenuItem("Edit/Project Settings/QuickSheet/Select Excel Setting")] - public static void Edit() - { - Selection.activeObject = Instance; - if (Selection.activeObject == null) - { - Debug.LogError(@"No ExcelSetting.asset file is found. Create setting file first. See the menu at 'Create/QuickSheet/Setting/Excel Setting'."); - } - } + internal List _waitImportPath = new List(); } } diff --git a/Assets/QuickSheet/GDataPlugin/Editor/GoogleDataSettings.cs b/Assets/QuickSheet/GDataPlugin/Editor/GoogleDataSettings.cs index 2946362..20e3b49 100644 --- a/Assets/QuickSheet/GDataPlugin/Editor/GoogleDataSettings.cs +++ b/Assets/QuickSheet/GDataPlugin/Editor/GoogleDataSettings.cs @@ -68,18 +68,5 @@ public struct OAuth2JsonData public string _RefreshToken = ""; public string _AccessToken = ""; - - /// - /// Select currently exist account setting asset file. - /// - [MenuItem("Edit/Project Settings/QuickSheet/Select Google Data Setting")] - public static void Edit() - { - Selection.activeObject = Instance; - if (Selection.activeObject == null) - { - Debug.LogError("No GoogleDataSettings.asset file is found. Create setting file first."); - } - } } } \ No newline at end of file diff --git a/Assets/QuickSheet/GDataPlugin/Editor/GoogleMachineEditor.cs b/Assets/QuickSheet/GDataPlugin/Editor/GoogleMachineEditor.cs index f94546e..70592af 100644 --- a/Assets/QuickSheet/GDataPlugin/Editor/GoogleMachineEditor.cs +++ b/Assets/QuickSheet/GDataPlugin/Editor/GoogleMachineEditor.cs @@ -190,7 +190,7 @@ private void DoCellQuery(OnEachCell onCell) /// /// Connect to the google spreadsheet and retrieves its header columns. /// - protected override void Import(bool reimport = false) + public override void Import(bool reimport = false) { Regex re = new Regex(@"\d+");