epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore yaml files imported from other mods.

Browse Source
This commit is contained in:
Paul Chote
2018-04-29 19:27:34 +00:00
committed by reaperrr
parent 91295f9c68
commit 691c432b72
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenRA.Mods.Common/UpdateRules/UpdateUtils.cs
View File

@@ -46,11 +46,11 @@ namespace OpenRA.Mods.Common.UpdateRules
/// <summary> /// <summary>
/// Loads a YamlFileSet containing any external yaml definitions referenced by a map yaml block. /// Loads a YamlFileSet containing any external yaml definitions referenced by a map yaml block.
/// </summary> /// </summary>
static YamlFileSet LoadExternalMapYaml(ModData modData, MiniYaml yaml) static YamlFileSet LoadExternalMapYaml(ModData modData, MiniYaml yaml, HashSet<string> externalFilenames)
{ {
return FieldLoader.GetValue<string[]>("value", yaml.Value) return FieldLoader.GetValue<string[]>("value", yaml.Value)
.Where(f => f.Contains("|")) .Where(f => f.Contains("|"))
.SelectMany(f => LoadModYaml(modData, new[] { f })) .SelectMany(f => LoadModYaml(modData, FilterExternalModFiles(modData, new[] { f }, externalFilenames)))
.ToList(); .ToList();
} }
@@ -123,13 +123,28 @@ namespace OpenRA.Mods.Common.UpdateRules
return manualSteps; return manualSteps;
} }
public static List<string> UpdateMod(ModData modData, UpdateRule rule, out YamlFileSet files) static IEnumerable<string> FilterExternalModFiles(ModData modData, IEnumerable<string> files, HashSet<string> externalFilenames)
{
foreach (var f in files)
{
if (f.Contains("|") && modData.DefaultFileSystem.IsExternalModFile(f))
{
externalFilenames.Add(f);
continue;
}
yield return f;
}
}
public static List<string> UpdateMod(ModData modData, UpdateRule rule, out YamlFileSet files, HashSet<string> externalFilenames)
{ {
var manualSteps = new List<string>(); var manualSteps = new List<string>();
var modRules = LoadModYaml(modData, modData.Manifest.Rules);
var modWeapons = LoadModYaml(modData, modData.Manifest.Weapons); var modRules = LoadModYaml(modData, FilterExternalModFiles(modData, modData.Manifest.Rules, externalFilenames));
var modTilesets = LoadModYaml(modData, modData.Manifest.TileSets); var modWeapons = LoadModYaml(modData, FilterExternalModFiles(modData, modData.Manifest.Weapons, externalFilenames));
var modChromeLayout = LoadModYaml(modData, modData.Manifest.ChromeLayout); var modTilesets = LoadModYaml(modData, FilterExternalModFiles(modData, modData.Manifest.TileSets, externalFilenames));
var modChromeLayout = LoadModYaml(modData, FilterExternalModFiles(modData, modData.Manifest.ChromeLayout, externalFilenames));
// Find and add shared map includes // Find and add shared map includes
foreach (var package in modData.MapCache.EnumerateMapPackagesWithoutCaching()) foreach (var package in modData.MapCache.EnumerateMapPackagesWithoutCaching())
@@ -142,13 +157,13 @@ namespace OpenRA.Mods.Common.UpdateRules
var yaml = new MiniYaml(null, MiniYaml.FromStream(mapStream, package.Name)); var yaml = new MiniYaml(null, MiniYaml.FromStream(mapStream, package.Name));
var mapRulesNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Rules"); var mapRulesNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Rules");
if (mapRulesNode != null) if (mapRulesNode != null)
foreach (var f in LoadExternalMapYaml(modData, mapRulesNode.Value)) foreach (var f in LoadExternalMapYaml(modData, mapRulesNode.Value, externalFilenames))
if (!modRules.Any(m => m.Item1 == f.Item1 && m.Item2 == f.Item2)) if (!modRules.Any(m => m.Item1 == f.Item1 && m.Item2 == f.Item2))
modRules.Add(f); modRules.Add(f);
var mapWeaponsNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Weapons"); var mapWeaponsNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Weapons");
if (mapWeaponsNode != null) if (mapWeaponsNode != null)
foreach (var f in LoadExternalMapYaml(modData, mapWeaponsNode.Value)) foreach (var f in LoadExternalMapYaml(modData, mapWeaponsNode.Value, externalFilenames))
if (!modWeapons.Any(m => m.Item1 == f.Item1 && m.Item2 == f.Item2)) if (!modWeapons.Any(m => m.Item1 == f.Item1 && m.Item2 == f.Item2))
modWeapons.Add(f); modWeapons.Add(f);
} }

16
OpenRA.Mods.Common/UtilityCommands/UpdateModCommand.cs
View File

@@ -117,6 +117,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
static void ApplyRules(ModData modData, IEnumerable<UpdateRule> rules, bool skipMaps) static void ApplyRules(ModData modData, IEnumerable<UpdateRule> rules, bool skipMaps)
{ {
Console.WriteLine(); Console.WriteLine();
var externalFilenames = new HashSet<string>();
foreach (var rule in rules) foreach (var rule in rules)
{ {
var manualSteps = new List<string>(); var manualSteps = new List<string>();
@@ -127,7 +129,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
try try
{ {
Console.Write(" Updating mod... "); Console.Write(" Updating mod... ");
manualSteps.AddRange(UpdateUtils.UpdateMod(modData, rule, out allFiles)); manualSteps.AddRange(UpdateUtils.UpdateMod(modData, rule, out allFiles, externalFilenames));
Console.WriteLine("COMPLETE"); Console.WriteLine("COMPLETE");
} }
catch (Exception ex) catch (Exception ex)
@@ -150,13 +152,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (!skipMaps) if (!skipMaps)
{ {
var mapsFailed = false; var mapsFailed = false;
var externalFilenames = new HashSet<string>(); var mapExternalFilenames = new HashSet<string>();
foreach (var package in modData.MapCache.EnumerateMapPackagesWithoutCaching()) foreach (var package in modData.MapCache.EnumerateMapPackagesWithoutCaching())
{ {
try try
{ {
YamlFileSet mapFiles; YamlFileSet mapFiles;
var mapSteps = UpdateUtils.UpdateMap(modData, package, rule, out mapFiles, externalFilenames); var mapSteps = UpdateUtils.UpdateMap(modData, package, rule, out mapFiles, mapExternalFilenames);
allFiles.AddRange(mapFiles); allFiles.AddRange(mapFiles);
if (mapSteps.Any()) if (mapSteps.Any())
@@ -201,6 +203,14 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine(); Console.WriteLine();
} }
if (externalFilenames.Any())
{
Console.WriteLine("The following external mod files have been ignored:");
Console.WriteLine(UpdateUtils.FormatMessageList(externalFilenames));
Console.WriteLine("These files should be updated by running --update-mod on the referenced mod(s)");
Console.WriteLine();
}
Console.WriteLine("Semi-automated update complete."); Console.WriteLine("Semi-automated update complete.");
Console.WriteLine("Please review the messages above for any manual actions that must be applied."); Console.WriteLine("Please review the messages above for any manual actions that must be applied.");
} }