Fix BatchMap execution

ethanmoffat · Jan 23, 2021 · 741d035 · 741d035
1 parent 26d58b3
commit 741d035
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/BatchMap/Program.cs b/BatchMap/Program.cs
@@ -136,6 +136,7 @@ private static void Main(string[] args)
         private static void SetupDependencies()
         {
             _typeRegistry = new UnityRegistry("EOLib.IO");
+            _typeRegistry.RegisterDiscoveredTypes();
 
             _pubProvider = _typeRegistry.Resolve<IPubFileProvider>();
             _mapFileProvider = _typeRegistry.Resolve<IMapFileProvider>();

diff --git a/EOLib.IO/Map/MapPathToIDConverter.cs b/EOLib.IO/Map/MapPathToIDConverter.cs
@@ -6,11 +6,11 @@ public class MapPathToIDConverter
     {
         public int ConvertFromPathToID(string pathToMapFile)
         {
-            var lastSlash = pathToMapFile.LastIndexOf('\\') < 0 ? pathToMapFile.LastIndexOf('/') : -1;
-            if (lastSlash < 0)
+            var lastDot = pathToMapFile.LastIndexOf('.');
+            if (lastDot < 5)
                 throw new IOException();
 
-            var strID = pathToMapFile.Substring(lastSlash + 1, 5);
+            var strID = pathToMapFile.Substring(lastDot - 5, 5);
             return int.Parse(strID);
         }
     }