Merge pull request #84 from senko-forks/pr-slotfail

Avoid import failure due to filenames with invalid 3 letter slot codes

Author: Squall-Leonhart

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -680,7 +680,12 @@ public static XivDependencyRootInfo ExtractRootInfo(string internalFilePath)
                 match = _slotRegex.Match(internalFilePath);
                 if (match.Success)
                 {
-                    info.Slot = match.Groups[1].Value;
+                    // Validate the slot name to avoid matching on arbitrary three letter strings that may be present
+                    if (XivItemTypes.GetAvailableSlots(info.PrimaryType).Contains(match.Groups[1].Value)
+                        || (info.SecondaryType.HasValue && XivItemTypes.GetAvailableSlots(info.SecondaryType.Value).Contains(match.Groups[1].Value)))
+                    {
+                        info.Slot = match.Groups[1].Value;
+                    }
                 }
             }
             else

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -508,7 +508,7 @@ public string GetMaterialIdentifier()
         public string GetItemTypeIdentifier()
         {
             // This regex feels a little janky, but it's good enough for now.
-            var match = Regex.Match(MTRLPath, "_([a-z]{3})_[a-z0-9]\\.mtrl");
+            var match = Regex.Match(MTRLPath, "_([a-z]{3})_[a-z0-9]+\\.mtrl");
             if (match.Success)
             {
                 return "_" + match.Groups[1].Value;