Ellpeck/Contentless
1
0
Fork 0
mirror of https://github.com/Ellpeck/Contentless.git synced 2024-11-27 17:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Change error logic - no return

Browse source
This commit is contained in:
Gandifil 2023-12-21 16:50:03 +03:00
parent bfe6849171
commit d3130c77e3
1 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Contentless/Program.cs
View file

@ -47,30 +47,10 @@ public static class Program {
var referencesVersions = config.References.ToDictionary(x => x, x => (string)null, StringComparer.OrdinalIgnoreCase); var referencesVersions = config.References.ToDictionary(x => x, x => (string)null, StringComparer.OrdinalIgnoreCase);
if (config.References.Length > 0) if (config.References.Length > 0)
{ {
if (args.Length < 2) { if (args.Length > 1)
Console.WriteLine("You supplied references but there is no project file, this isn't compatible. Please specify the full path of project file, if you want to sync references"); ExtractVersions(args[1], referencesVersions);
return; else
} Console.Error.WriteLine("You supplied references but there is no project file, this isn't compatible. Please specify the full path of project file, if you want to sync references");
var csprojPath = args[1];
Console.WriteLine($"Using project file {csprojPath}");
var projectRootElement = ProjectRootElement.Open(csprojPath);
foreach (var property in projectRootElement.AllChildren.Where(x => x.ElementName == "PackageReference").Select(x => x as ProjectItemElement))
{
var libraryName = property.Include;
var version = (property.Children.First() as ProjectMetadataElement).Value;
if (referencesVersions.Keys.Contains(libraryName))
{
referencesVersions[libraryName] = version;
Console.WriteLine($"Found library version for sync: {libraryName}, {version}");
}
}
foreach (var library in referencesVersions)
if (library.Value is null)
{
Console.WriteLine($"Unable to find library {library.Key}");
return;
}
} }
var changed = false; var changed = false;
@ -86,9 +66,9 @@ public static class Program {
var reference = line.Substring(ReferenceHeader.Length); var reference = line.Substring(ReferenceHeader.Length);
var libraryName = Path.GetFileName(reference)[..^4]; var libraryName = Path.GetFileName(reference)[..^4];
if (referencesVersions.Keys.Contains(libraryName)) if (referencesVersions.TryGetValue(libraryName, out var version) && version is not null)
{ {
var fullLibraryPath = CalculateFullPathToLibrary(libraryName, referencesVersions[libraryName]); var fullLibraryPath = CalculateFullPathToLibrary(libraryName, version);
if (reference != fullLibraryPath) if (reference != fullLibraryPath)
{ {
Console.WriteLine($"Changing library reference from {reference} to {fullLibraryPath}"); Console.WriteLine($"Changing library reference from {reference} to {fullLibraryPath}");
@ -114,10 +94,7 @@ public static class Program {
// check references not in .mgcb now // check references not in .mgcb now
foreach (var reference in referencesVersions) foreach (var reference in referencesVersions)
if (!referencesSyncs.Contains(reference.Key)) if (!referencesSyncs.Contains(reference.Key))
{ Console.Error.WriteLine($"Please, add reference for {reference.Key} in .mgcb file or remove it from Contentless! Reference was skipped!");
Console.WriteLine($"Please, add reference for {reference.Key} in .mgcb file or remove it from Contentless! Reference was skipped!");
return;
}
// load content importers // load content importers
@ -204,6 +181,26 @@ public static class Program {
Console.Write("Done"); Console.Write("Done");
} }
private static void ExtractVersions(string csprojPath, Dictionary<string, string> referencesVersions)
{
Console.WriteLine($"Using project file {csprojPath}");
var projectRootElement = ProjectRootElement.Open(csprojPath);
foreach (var property in projectRootElement.AllChildren.Where(x => x.ElementName == "PackageReference").Select(x => x as ProjectItemElement))
{
var libraryName = property.Include;
var version = (property.Children.First() as ProjectMetadataElement).Value;
if (referencesVersions.Keys.Contains(libraryName))
{
referencesVersions[libraryName] = version;
Console.WriteLine($"Found library version for sync: {libraryName}, {version}");
}
}
foreach (var library in referencesVersions)
if (library.Value is null)
Console.Error.WriteLine($"Unable to find library {library.Key} in .csproj");
}
private static string CalculateFullPathToLibrary(string libraryName, string referencesVersion) private static string CalculateFullPathToLibrary(string libraryName, string referencesVersion)
{ {
var settings = Settings.LoadDefaultSettings(null); var settings = Settings.LoadDefaultSettings(null);