ModTextDump: dump more studio mods, KSS_TextResourseRedirector: fix s…

…alon subs
IllusionMods · Sep 29, 2021 · 0922d17 · 0922d17
1 parent 6bcf162
commit 0922d17
Show file tree

Hide file tree

Showing 12 changed files with 291 additions and 101 deletions.
diff --git a/src/Core_ModTextDump/Core.ModTextDump.cs b/src/Core_ModTextDump/Core.ModTextDump.cs
diff --git a/src/Core_ModTextDump/Core_ModTextDump.projitems b/src/Core_ModTextDump/Core_ModTextDump.projitems
@@ -12,5 +12,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core.ModTextDump.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Enums.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WaitUntilStable.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/Core_ModTextDump/WaitUntilStable.cs b/src/Core_ModTextDump/WaitUntilStable.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Linq;
+using UnityEngine;
+
+namespace IllusionMods
+{
+    internal class WaitUntilStable : CustomYieldInstruction
+
+    {
+        private readonly int _framesUntilStable;
+        private readonly ICollection _target;
+        private int _lastCount = -1;
+        private int _stableCount;
+
+        internal WaitUntilStable(ICollection target, int framesUntilStable = 3)
+        {
+            _framesUntilStable = framesUntilStable;
+            _target = target;
+        }
+
+        public override bool keepWaiting => !IsDone();
+
+        private bool IsDone()
+        {
+            var lastCount = _lastCount;
+            _lastCount = _target.Count;
+            if (_lastCount != lastCount)
+            {
+                _stableCount = 0;
+                return false;
+            }
+
+            _stableCount++;
+            return _stableCount > _framesUntilStable;
+        }
+    }
+}
diff --git a/src/Core_TextDump/Core.AssetLoader.cs b/src/Core_TextDump/Core.AssetLoader.cs
@@ -4,6 +4,7 @@
 using ADV.Commands.Base;
 using BepInEx.Logging;
 using UnityEngine;
+using static IllusionMods.AssetLoader;
 using Logger = UnityEngine.Logger;
 using Object = UnityEngine.Object;
 
@@ -184,7 +185,8 @@ internal static T AssetBundleManagerLoader(string assetBundleName, string assetN
                     }
                     catch (Exception err)
                     {
-                        Logger.LogFatal(err);
+                        Logger.LogWarning($"{nameof(AssetBundleManagerLoader)}: {err.Message}");
+                        UnityEngine.Debug.LogException(err);
                     }
                 }
                 return bundle.LoadAsset<T>(assetName);

diff --git a/src/Core_TextResourceHelper/Core.IPathListBoundHandler.cs b/src/Core_TextResourceHelper/Core.IPathListBoundHandler.cs
@@ -14,6 +14,7 @@ public interface IPathListBoundHandler
     public static partial class PathListBoundHandlerExtensions
     {
         private static ManualLogSource Logger => TextResourceHelper.Logger;
+
         public static bool IsPathWhitelisted(this IPathListBoundHandler handler, string path,
             bool isPathNormalized = false)
         {
@@ -29,14 +30,23 @@ public static bool IsPathBlacklisted(this IPathListBoundHandler handler, string
         public static bool IsPathAllowed(this IPathListBoundHandler handler, string path, bool isPathNormalized = false)
         {
             var search = isPathNormalized ? path : PathList.Normalize(path);
-            Logger.DebugLogDebug($"IsPathAllowed: {search}");
-            // run shorter test first
-            if (handler.WhiteListPaths.Count < handler.BlackListPaths.Count)
+            var result = true;
+            try
             {
-                return IsPathWhitelisted(handler, search, true) && !IsPathBlacklisted(handler, search, true);
-            }
+                // run shorter test first
+                if (handler.WhiteListPaths.Count < handler.BlackListPaths.Count)
+                {
+                    return result = IsPathWhitelisted(handler, search, true) &&
+                                    !IsPathBlacklisted(handler, search, true);
+                }
 
-            return !IsPathBlacklisted(handler, search, true) && IsPathWhitelisted(handler, search, true);
+                return result = !IsPathBlacklisted(handler, search, true) &&
+                                IsPathWhitelisted(handler, search, true);
+            }
+            finally
+            {
+                Logger.DebugLogDebug("{0}.{1}: {2} => {3}", handler.GetType(), nameof(IsPathAllowed), search, result);
+            }
         }
 
         public static bool IsPathBlocked(this IPathListBoundHandler handler, string path, bool isPathNormalized = false)

diff --git a/src/Core_TextResourceHelper/Core.ResourceMappingHelper.cs b/src/Core_TextResourceHelper/Core.ResourceMappingHelper.cs
@@ -109,14 +109,14 @@ public IEnumerable<ResourceMappingPath> GetMappingForPath(ResourceMappingPath pa
 
             if (IsPathUnmapped(path, mode))
             {
-                Logger.LogFatal($"{nameof(GetMappingForPath)}: {path}: unmapped");
+                Logger.DebugLogDebug($"{nameof(GetMappingForPath)}: {path}: unmapped");
                 yield break;
             }
 
             if (TryGetCachedMappingPaths(path, mode, out var cachedMappedPaths))
             {
                 foreach (var mappedPath in cachedMappedPaths) yield return mappedPath;
-                Logger.LogFatal($"{nameof(GetMappingForPath)}: {path}: used cached");
+                Logger.DebugLogDebug($"{nameof(GetMappingForPath)}: {path}: used cached");
                 yield break;
             }
 

diff --git a/src/Core_TextResourceHelper/Core.ResourceMappingPath.cs b/src/Core_TextResourceHelper/Core.ResourceMappingPath.cs
@@ -41,7 +41,7 @@ private ResourceMappingPath(string resourcePath = null, string calculatedModific
             if (_calculatedModificationPath != null && _calculatedModificationPath[1] == ':' &&
                 _calculatedModificationPath[2] != '\\')
             {
-                TextResourceHelper.Logger.LogFatal($"_calculatedModificationPath is corrupted {_calculatedModificationPath}");
+                TextResourceHelper.Logger.LogWarning($"{this}.{nameof(_calculatedModificationPath)} is corrupted {_calculatedModificationPath}");
             }
         }
 
@@ -87,7 +87,7 @@ private string BaseModificationPath
                     if (_baseModificationPath != null && _baseModificationPath[1] == ':' &&
                         _baseModificationPath[2] != '\\')
                     {
-                        TextResourceHelper.Logger.LogFatal($"_baseModificationPath is corrupted {_baseModificationPath}");
+                        TextResourceHelper.Logger.LogFatal($"{this}.{nameof(_baseModificationPath)} is corrupted {_baseModificationPath}");
                     }
 
                 }

diff --git a/src/Core_TextResourceRedirector/Core.TextResourceRedirector.cs b/src/Core_TextResourceRedirector/Core.TextResourceRedirector.cs
@@ -30,7 +30,7 @@ public partial class TextResourceRedirector : BaseUnityPlugin
 
         public const string PluginName = "Text Resource Redirector";
         public const string GUID = "com.deathweasel.bepinex.textresourceredirector";
-        public const string Version = "1.4.5.2";
+        public const string Version = "1.4.5.5";
         internal new static ManualLogSource Logger;
 #if !HS
         internal ChaListDataHandler ChaListDataHandler;

diff --git a/src/KKS_TextDump/KKS_AssetDumpHelper.cs b/src/KKS_TextDump/KKS_AssetDumpHelper.cs
@@ -528,7 +528,7 @@ IDictionary<string, string> Dumper()
 
 
                     // CUSTOM_LIST2 = 3
-                    Logger.LogFatal($"{nameof(GetCustomListDumpers)}: {assetBundleName} {asset.name}: ");
+                    //Logger.LogFatal($"{nameof(GetCustomListDumpers)}: {assetBundleName} {asset.name}: ");
                     var processors = colsToDump.Select(col => GetTranslateManagerRowProcessor(3, mapIdx, col)).ToList();
                     var items = GetExcelEntries(asset, assetName).ToList();
                     for (var i = firstRow; i < items.Count; i++)

diff --git a/src/KKS_TextResourceRedirector/KKS.TextResourceRedirector.cs b/src/KKS_TextResourceRedirector/KKS.TextResourceRedirector.cs
@@ -140,7 +140,7 @@ private void ConfigureHandlersForKKS(TextResourceRedirector sender, EventArgs ev
 
             if (sender.EstheticVoiceInfoHandler is IPathListBoundHandler estheticVoiceInfoHandler)
             {
-                estheticVoiceInfoHandler.WhiteListPaths.Add("esthetic/list/voice");
+                estheticVoiceInfoHandler.WhiteListPaths.Add("abdata/esthetic/list/voice");
             }
 
             Harmony.CreateAndPatchAll(typeof(Hooks));

diff --git a/src/Shared.TextDumpBase/BaseTextDumpPlugin.cs b/src/Shared.TextDumpBase/BaseTextDumpPlugin.cs
@@ -222,8 +222,24 @@ protected IEnumerator WriteTranslations()
 
             if (moveSuccess)
             {
-                LogWithMessage(BepInExLogLevel.Info,
-                    $"Dump can be found in {DumpDestination}");
+                LogWithMessage(BepInExLogLevel.Info, $"Dump can be found in {DumpDestination}");
+                if (_dumpRoot != null)
+                {
+                    var oldDumpRoot = _dumpRoot;
+                    _dumpRoot = null;
+                    if (Directory.Exists(oldDumpRoot))
+
+                    {
+                        try
+                        {
+                            Directory.Delete(DumpRoot);
+                        }
+                        catch
+                        {
+                            // leave it
+                        }
+                    }
+                }
             }
             else
             {

diff --git a/src/Shared/Shared.Constants.cs b/src/Shared/Shared.Constants.cs
@@ -37,7 +37,7 @@ internal static class Constants
         internal const RegexOptions DefaultRegexOptions = RegexOptions.Compiled;
 #elif KKS
         internal const string GameName = "Koikatsu Sunshine";
-        internal const string StudioProcessName = "CharaStudioV2";
+        internal const string StudioProcessName = "CharaStudio";
         internal const string MainGameProcessName = "Koikatsu Sunshine";
         internal const RegexOptions DefaultRegexOptions = RegexOptions.Compiled;
 #else