[Subs] Better handling of errors and empty names in the hook (#39)

IllusionMods · Nov 10, 2024 · d241060 · d241060
1 parent 127566b
commit d241060
Showing 1 changed file with 35 additions and 26 deletions.
diff --git a/tools/SVS_Subtitles/SubtitlesPlugin.cs b/tools/SVS_Subtitles/SubtitlesPlugin.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyProduct(SVS_Subtitles.SubtitlesPlugin.DisplayName)]
 [assembly: AssemblyVersion(SVS_Subtitles.SubtitlesPlugin.Version)]
 [assembly: AssemblyDescription("Show subtitles in H scenes.")]
-[assembly: AssemblyCompany("ekibun")]
+[assembly: AssemblyCompany("https://github.com/IllusionMods/SVS-Translation")]
 
 namespace SVS_Subtitles;
 
@@ -55,7 +55,7 @@ public override void Load()
         EnableConfig = Config.Bind("General", "Enable Subtitles", true, "Reload the game to Enable/Disable.");
         LanguageConfig = Config.Bind("General", "Subtitle Language", "auto", "Language of the subtitles.\nThe subtitles are loaded from 'BepInEx/Translation/<this setting>/SVS_Subtitles.json'.\nIf set to 'auto' or empty, AutoTranslator's Destination Language is used.");
 
-        if(!EnableConfig.Value) return;
+        if (!EnableConfig.Value) return;
 
         var languageCode = LanguageConfig.Value.Trim();
         if (languageCode == string.Empty || languageCode == "auto")
@@ -214,38 +214,47 @@ private static class Hooks
         [HarmonyPatch(typeof(BaseWords), nameof(BaseWords.Play))]
         private static void PlayVoice(BaseWords __instance, PlayData data)
         {
-            if (data.Kind == PlayData.VoiceKind.Breath) return;
+            if (data == null || data.Kind == PlayData.VoiceKind.Breath) return;
 
             if (!EnableConfig.Value) return;
 
-            var subtitle = subtitleMap.GetValueSafe(data.Voice?.AssetFile)
+            try
+            {
+                var voiceAssetFile = data.Voice?.AssetFile;
+                var subtitle = subtitleMap.GetValueSafe(voiceAssetFile)
 #if DEBUG
-                           ?? data.Voice?.AssetFile 
+                               ?? voiceAssetFile 
 #endif
-                           ?? "";
-            if (!subtitle.IsNullOrEmpty())
-            {
-                Log.LogDebug($"Play voice({data.Voice?.AssetFile}): {subtitle}");
-
-                var actorName = __instance._actor?.Name;
-
-                if(TranslationHelper.TryTranslate(actorName, out var actorNameTl))
-                    actorName = actorNameTl;
-
-                var text = $"{actorName} 「{subtitle}」";
-                var playingWord = new SubtitlesCanvas.PlayingWord
+                               ?? "";
+                if (!string.IsNullOrWhiteSpace(subtitle))
                 {
-                    baseWords = __instance,
-                    kind = data.Kind,
-                    text = text
-                };
-
-                SubtitlesCanvas.playingWords.RemoveAll(word => word.baseWords == __instance);
-                SubtitlesCanvas.playingWords.Add(playingWord);
+                    Log.LogDebug($"Play voice({voiceAssetFile}): {subtitle}");
+
+                    var actorName = __instance._actor?.Name;
+                    if (string.IsNullOrWhiteSpace(actorName))
+                        actorName = "???";
+                    else if (TranslationHelper.TryTranslate(actorName, out var actorNameTl))
+                        actorName = actorNameTl;
+
+                    var text = $"{actorName} 「{subtitle}」";
+                    var playingWord = new SubtitlesCanvas.PlayingWord
+                    {
+                        baseWords = __instance,
+                        kind = data.Kind,
+                        text = text
+                    };
+
+                    SubtitlesCanvas.playingWords.RemoveAll(word => word.baseWords == __instance);
+                    SubtitlesCanvas.playingWords.Add(playingWord);
+                }
+                else
+                {
+                    Log.LogWarning($"Play voice({voiceAssetFile}): Not in subtitleMap!");
+                }
             }
-            else
+            catch (Exception e)
             {
-                Log.LogWarning($"Play voice({data.Voice?.AssetFile}): Not in subtitleMap!");
+                Log.LogError($"{__instance} {data} {e}");
             }
         }