hotfix: fnis parsing issues

Monitor221hz · Jul 21, 2024 · 4a1b94a · 4a1b94a
1 parent ab8b0db
commit 4a1b94a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/PandoraPlus/MVVM/Model/Patch/Patchers/Skyrim/FNIS/FNISParser.cs b/PandoraPlus/MVVM/Model/Patch/Patchers/Skyrim/FNIS/FNISParser.cs
@@ -86,7 +86,7 @@ public class FNISParser
 
  private HashSet<string> parsedFolders = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
- public HashSet<FNISModInfo> ModInfos { get; private set; } = new HashSet<FNISModInfo>();
+ public HashSet<IModInfo> ModInfos { get; private set; } = new HashSet<IModInfo>();
 
  public FNISParser(ProjectManager manager)
  {
@@ -112,7 +112,14 @@ public void ScanProjectAnimlist(Project project)
 
  foreach (var modFile in modFiles)
  {
- InjectGraphReference(modFile, project.BehaviorFile);
+ try
+ {
+ InjectGraphReference(modFile, project.BehaviorFile);
+ }
+ catch 
+ {
+ logger.Warn($"FNIS Parser > Inject > Behavior > {modFile.Name} > FAILED");
+ }
  }
  if (!animationsFolder.Exists) { return; }
  var modAnimationFolders = animationsFolder.GetDirectories();
@@ -178,10 +185,17 @@ private void ParseAnimlistFolder(DirectoryInfo folder, Project project, ProjectM
  List<FNISAnimationList> animLists = new(); 
  foreach (var animlistFile in animlistFiles)
  {
- animLists.Add(FNISAnimationList.FromFile(animlistFile));
+ try
+ {
+ FNISAnimationList animList = FNISAnimationList.FromFile(animlistFile);
+ ModInfos.Add(animList.ModInfo);
+ animLists.Add(animList);
+ }
+ catch
+ {
+ logger.Warn($"FNIS Parser > Serialize > Animlist > {animlistFile.Name} > FAILED");
+ }
  }
  Parallel.ForEach(animLists, animlist => { animlist.BuildPatches(project, projectManager, patchNodeCreator); }); 
  }
-
-
 }
diff --git a/PandoraPlus/MVVM/Model/Patch/Patchers/Skyrim/ProjectManager.cs b/PandoraPlus/MVVM/Model/Patch/Patchers/Skyrim/ProjectManager.cs
@@ -84,8 +84,8 @@ public void GetFNISInfo(StringBuilder builder)
  foreach(IModInfo modInfo in fnisParser.ModInfos)
  {
  fnisModCount++;
- builder.AppendLine($"FNIS Mod {fnisModCount} : {modInfo.Name}");
- Logger.Info($"FNIS Mod {fnisModCount} : {modInfo.Name}");
+ builder.AppendLine($"FNIS Mod {fnisModCount} : {modInfo.Code}");
+ Logger.Info($"FNIS Mod {fnisModCount} : {modInfo.Code}");
  }
  }
 
@@ -368,8 +368,6 @@ public bool ApplyPatches()
  {
  packFileCache.DeletePackFileOutput();
 
-
-
  Parallel.ForEach(ActivePackFiles, packFile =>
  {
  packFile.ApplyChanges();