Replace big if with guard clause

Reduces indentation. Insert nodes shouldn't exist here anyway
sarbian · Sep 15, 2017 · 3ca1801 · 3ca1801
1 parent aa990db
commit 3ca1801
Showing 1 changed file with 69 additions and 66 deletions.
diff --git a/ModuleManager/MMPatchLoader.cs b/ModuleManager/MMPatchLoader.cs
@@ -978,84 +978,87 @@ public IEnumerator ApplyPatch(string Stage, IEnumerable<UrlDir.UrlConfig> patche
                     string name = RemoveWS(mod.type);
                     Command cmd = CommandParser.Parse(name, out string tmp);
 
-                    if (cmd != Command.Insert)
+                    if (cmd == Command.Insert)
                     {
-                        string upperName = name.ToUpper();
-                        PatchContext context = new PatchContext(mod, GameDatabase.Instance.root, logger, progress);
-                        char[] sep = { '[', ']' };
-                        string condition = "";
+                        Debug.LogWarning("Warning - Encountered insert node that should not exist at this stage: " + mod.SafeUrl());
+                        continue;
+                    }
 
-                        if (upperName.Contains(":HAS["))
-                        {
-                            int start = upperName.IndexOf(":HAS[");
-                            condition = name.Substring(start + 5, name.LastIndexOf(']') - start - 5);
-                            name = name.Substring(0, start);
-                        }
+                    string upperName = name.ToUpper();
+                    PatchContext context = new PatchContext(mod, GameDatabase.Instance.root, logger, progress);
+                    char[] sep = { '[', ']' };
+                    string condition = "";
+
+                    if (upperName.Contains(":HAS["))
+                    {
+                        int start = upperName.IndexOf(":HAS[");
+                        condition = name.Substring(start + 5, name.LastIndexOf(']') - start - 5);
+                        name = name.Substring(0, start);
+                    }
 
-                        string[] splits = name.Split(sep, 3);
-                        string[] patterns = splits.Length > 1 ? splits[1].Split(',', '|') : new string[] { null };
-                        string type = splits[0].Substring(1);
+                    string[] splits = name.Split(sep, 3);
+                    string[] patterns = splits.Length > 1 ? splits[1].Split(',', '|') : new string[] { null };
+                    string type = splits[0].Substring(1);
 
-                        foreach (UrlDir.UrlConfig url in GameDatabase.Instance.root.AllConfigs.ToArray())
+                    foreach (UrlDir.UrlConfig url in GameDatabase.Instance.root.AllConfigs.ToArray())
+                    {
+                        foreach (string pattern in patterns)
                         {
-                            foreach (string pattern in patterns)
+                            bool loop = false;
+                            do
                             {
-                                bool loop = false;
-                                do
+                                if (url.type == type && WildcardMatch(url.name, pattern)
+                                    && CheckConstraints(url.config, condition))
                                 {
-                                    if (url.type == type && WildcardMatch(url.name, pattern)
-                                        && CheckConstraints(url.config, condition))
+                                    switch (cmd)
                                     {
-                                        switch (cmd)
-                                        {
-                                            case Command.Edit:
-                                                progress.ApplyingUpdate(url, mod);
-                                                url.config = ModifyNode(new NodeStack(url.config), mod.config, context);
-                                                break;
-
-                                            case Command.Copy:
-                                                ConfigNode clone = ModifyNode(new NodeStack(url.config), mod.config, context);
-                                                if (url.config.name != mod.name)
-                                                {
-                                                    progress.ApplyingCopy(url, mod);
-                                                    url.parent.configs.Add(new UrlDir.UrlConfig(url.parent, clone));
-                                                }
-                                                else
-                                                {
-                                                    progress.Error(mod, "Error - Error while processing " + mod.config.name +
-                                                        " the copy needs to have a different name than the parent (use @name = xxx)");
-                                                }
-                                                break;
-
-                                            case Command.Delete:
-                                                progress.ApplyingDelete(url, mod);
-                                                url.parent.configs.Remove(url);
-                                                break;
-
-                                            case Command.Replace:
-
-                                                // TODO: do something sensible here.
-                                                break;
-
-                                            case Command.Create:
-
-                                                // TODO: something similar to above
-                                                break;
-                                        }
-                                        // When this special node is found then try to apply the patch once more on the same NODE
-                                        if (mod.config.HasNode("MM_PATCH_LOOP"))
-                                        {
-                                            logger.Info("Looping on " + mod.SafeUrl() + " to " + url.SafeUrl());
-                                            loop = true;
-                                        }
+                                        case Command.Edit:
+                                            progress.ApplyingUpdate(url, mod);
+                                            url.config = ModifyNode(new NodeStack(url.config), mod.config, context);
+                                            break;
+
+                                        case Command.Copy:
+                                            ConfigNode clone = ModifyNode(new NodeStack(url.config), mod.config, context);
+                                            if (url.config.name != mod.name)
+                                            {
+                                                progress.ApplyingCopy(url, mod);
+                                                url.parent.configs.Add(new UrlDir.UrlConfig(url.parent, clone));
+                                            }
+                                            else
+                                            {
+                                                progress.Error(mod, "Error - Error while processing " + mod.config.name +
+                                                    " the copy needs to have a different name than the parent (use @name = xxx)");
+                                            }
+                                            break;
+
+                                        case Command.Delete:
+                                            progress.ApplyingDelete(url, mod);
+                                            url.parent.configs.Remove(url);
+                                            break;
+
+                                        case Command.Replace:
+
+                                            // TODO: do something sensible here.
+                                            break;
+
+                                        case Command.Create:
+
+                                            // TODO: something similar to above
+                                            break;
                                     }
-                                    else
+                                    // When this special node is found then try to apply the patch once more on the same NODE
+                                    if (mod.config.HasNode("MM_PATCH_LOOP"))
                                     {
-                                        loop = false;
+                                        logger.Info("Looping on " + mod.SafeUrl() + " to " + url.SafeUrl());
+                                        loop = true;
                                     }
-                                } while (loop);
+                                }
+                                else
+                                {
+                                    loop = false;
+                                }
+                            } while (loop);
 
-                            }
                         }
                     }
                 }