Merge pull request #33 from LaughingLeader/master

Quick regex exception fix, TypeCoercionsWhitelist typo fix
Norbyte · Jan 3, 2020 · 11968f1 · 11968f1
2 parents 81d0b0f + 9d4b6c3
commit 11968f1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/Divine/CLI/CommandLineActions.cs b/Divine/CLI/CommandLineActions.cs
@@ -120,23 +120,35 @@ private static void SetUpAndValidate(CommandLineArguments args)
 
         private static void Process(CommandLineArguments args)
         {
-	        var expression = new Regex("^" + Regex.Escape(args.Expression).Replace(@"\*", ".*").Replace(@"\?", ".") + "$", RegexOptions.Singleline | RegexOptions.Compiled);
-
-	        if (args.UseRegex)
-	        {
-		        try
-		        {
-			        expression = new Regex(args.Expression, RegexOptions.Singleline | RegexOptions.Compiled);
-		        }
-		        catch (ArgumentException)
-		        {
-			        CommandLineLogger.LogFatal($"Cannot parse RegEx expression: {args.Expression}", -1);
-		        }
-	        }
-
-	        Func<AbstractFileInfo, bool> filter = obj => obj.Name.Like(expression);
-
-	        switch (args.Action)
+            Func<AbstractFileInfo, bool> filter;
+
+            if (args.Expression != null)
+            {
+                Regex expression = null;
+                if (args.UseRegex)
+                {
+                    try
+                    {
+                        expression = new Regex(args.Expression, RegexOptions.Singleline | RegexOptions.Compiled);
+                    }
+                    catch (ArgumentException)
+                    {
+                        CommandLineLogger.LogFatal($"Cannot parse RegEx expression: {args.Expression}", -1);
+                    }
+                }
+                else
+                {
+                    expression = new Regex("^" + Regex.Escape(args.Expression).Replace(@"\*", ".*").Replace(@"\?", ".") + "$", RegexOptions.Singleline | RegexOptions.Compiled);
+                }
+
+                filter = obj => obj.Name.Like(expression);
+            }
+            else
+            {
+                filter = obj => true;
+            }
+
+            switch (args.Action)
             {
                 case "create-package":
                 {

diff --git a/LSLib/LS/Mods/ModResources.cs b/LSLib/LS/Mods/ModResources.cs
@@ -400,7 +400,7 @@ public void DiscoverModDirectory(string modName, string modPath, string publicPa
                 }
 
                 var typeCoercionWhitelistPath = modPath + @"\Story\RawFiles\TypeCoercionWhitelist.txt";
-                if (File.Exists(headerPath))
+                if (File.Exists(typeCoercionWhitelistPath))
                 {
                     var fileInfo = new FilesystemFileInfo
                     {