fix: parse project rosters with legacy-compatible semantics
This commit is contained in:
codex
@@ -7,10 +7,11 @@ public static class LauncherOperationFailures
|
||||
public static LauncherOperationFailure Classify(string code, string fallbackStage, bool processStartAttempted = false) => code switch
|
||||
{
|
||||
"LEGACY_DOWNLOAD_LIST_NOT_FOUND" => new("RosterResolutionFailed", "AUTOMATIC_DOWNLOAD_LIST_NOT_FOUND", "Для выбранного проекта не найден список плагинов", false),
|
||||
"LEGACY_DOWNLOAD_SELECTION_INVALID" => new("PluginPlanFailed", "DOWNLOAD_LIST_INVALID", "Список плагинов проекта содержит недопустимые или повторяющиеся записи", false),
|
||||
"DOWNLOAD_LIST_XML_MALFORMED" => new("PluginPlanFailed", "DOWNLOAD_LIST_XML_MALFORMED", "Некорректный download_list.xml", false),
|
||||
"DOWNLOAD_LIST_ROOT_INVALID" => new("PluginPlanFailed", "DOWNLOAD_LIST_ROOT_INVALID", "download_list.xml имеет недопустимый корневой элемент", false),
|
||||
"LEGACY_PLUGIN_ID_NOT_DEFINED" => new("PluginPlanFailed", "DOWNLOAD_LIST_ID_UNKNOWN", "В Settings.xml отсутствует описание плагина", false),
|
||||
"AMBIGUOUS_LEGACY_PLUGIN_DEFINITION" => new("PluginPlanFailed", "DOWNLOAD_LIST_PLUGIN_DEFINITION_AMBIGUOUS", "Определение плагина в Settings.xml неоднозначно", false),
|
||||
"LEGACY_PLUGIN_PRODUCT_MISMATCH" => new("PluginPlanFailed", "PLUGIN_PRODUCT_MISMATCH", "Список плагинов не совместим с выбранным продуктом", false),
|
||||
"LEGACY_PLUGIN_ID_NOT_DEFINED" => new("PluginPlanFailed", "PLUGIN_DEFINITION_NOT_FOUND", "Для одного из плагинов отсутствует определение", false),
|
||||
"AMBIGUOUS_LEGACY_PLUGIN_DEFINITION" => new("PluginPlanFailed", "PLUGIN_DEFINITION_AMBIGUOUS", "Определение плагина неоднозначно", false),
|
||||
"LEGACY_MAPPING_NOT_FOUND" => new("PackageMappingFailed", "PACKAGE_MAPPING_NOT_FOUND", "Для выбранных плагинов отсутствуют пакеты 2026", false),
|
||||
"LOCAL_PARITY_ROSTER_PROFILE_MISMATCH" => new("RosterResolutionFailed", "OWNER_REVIEW_PROFILE_ROSTER_MISMATCH", "Контролируемая конфигурация не соответствует выбранному проекту", false),
|
||||
_ when code.Contains("PROCESS", StringComparison.Ordinal) || code.Contains("PLANT3D_2026_NOT_FOUND", StringComparison.Ordinal) => new("ProcessStartFailed", "PROCESS_START_FAILED", "Не удалось запустить Autodesk", true),
|
||||
|
||||
@@ -10,7 +10,11 @@ public sealed record LegacyPluginDefinition(string Id, string Renewal, string Ca
|
||||
}
|
||||
public sealed record LegacyProductPattern(string Name, string Filter, string Roster, IReadOnlyList<LegacyPluginDefinition> Plugins, IReadOnlyList<string>? Attributes = null, IReadOnlyList<string>? Sources = null, string? Target = null, string? Loader = null, string? ObjectPath = null);
|
||||
public sealed record LegacyLauncherSettings(string Help, string CareMarker, IReadOnlyList<LegacyProductPattern> Patterns);
|
||||
public sealed record LegacyDownloadSelection(IReadOnlyList<string> PluginIds);
|
||||
public sealed record LegacyDownloadListEntry(int ElementIndex, string RawId, string NormalizedId, int? FirstOccurrenceIndex, string SourceShape);
|
||||
public sealed record LegacyDownloadSelection(IReadOnlyList<string> PluginIds, IReadOnlyList<LegacyDownloadListEntry>? Entries = null)
|
||||
{
|
||||
public IReadOnlyList<string> EffectivePluginIds => PluginIds.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
}
|
||||
public sealed record LegacyCompatibilityMapping(string LegacyId, string PackageId, string Version, string Channel);
|
||||
public sealed record LegacyCompatibilityOverlay(string MappingId, string Product, int ProductYear, string Architecture, bool AllowOfflineFallback, IReadOnlyList<LegacyCompatibilityMapping> Plugins);
|
||||
|
||||
@@ -42,18 +46,39 @@ public sealed class LegacyConfigurationAdapter
|
||||
|
||||
public LegacyDownloadSelection ParseDownloadList(string xml)
|
||||
{
|
||||
using var reader = XmlReader.Create(new StringReader(xml), XmlSettings); var root = XDocument.Load(reader).Root;
|
||||
if (root?.Name != "root") throw new InvalidOperationException("LEGACY_DOWNLOAD_LIST_INVALID");
|
||||
var ids = root.Elements("id").Select(x => x.Value.Trim()).ToArray();
|
||||
if (ids.Length == 0 || ids.Any(string.IsNullOrWhiteSpace) || ids.GroupBy(x => x, StringComparer.OrdinalIgnoreCase).Any(x => x.Count() > 1))
|
||||
throw new InvalidOperationException("LEGACY_DOWNLOAD_SELECTION_INVALID");
|
||||
return new(ids);
|
||||
try
|
||||
{
|
||||
using var reader = XmlReader.Create(new StringReader(xml), XmlSettings);
|
||||
var root = XDocument.Load(reader).Root;
|
||||
if (root?.Name != "root") throw new InvalidOperationException("DOWNLOAD_LIST_ROOT_INVALID");
|
||||
// F2_Xml serialized only root/id and removed only exact empty strings. Real project files
|
||||
// also contain source-grouped <area><id> entries; preserve their document order as the
|
||||
// modern plan while retaining raw values and duplicate evidence.
|
||||
var direct = root.Elements("id").Select(x => (Element: x, Shape: "Root"));
|
||||
var grouped = root.Elements("area").SelectMany(area => area.Elements("id").Select(x => (Element: x, Shape: "Area")));
|
||||
var entries = (direct.Any() ? direct : grouped).Select((entry, index) =>
|
||||
{
|
||||
var raw = entry.Element.Value;
|
||||
var normalized = raw; // legacy F2_Xml did not Trim or case-normalize IDs.
|
||||
return new LegacyDownloadListEntry(index, raw, normalized, null, entry.Shape);
|
||||
}).ToArray();
|
||||
var seen = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
|
||||
var annotated = entries.Select(entry =>
|
||||
{
|
||||
if (entry.RawId == "") return entry;
|
||||
if (seen.TryGetValue(entry.NormalizedId, out var first)) return entry with { FirstOccurrenceIndex = first };
|
||||
seen[entry.NormalizedId] = entry.ElementIndex;
|
||||
return entry;
|
||||
}).ToArray();
|
||||
return new(annotated.Where(x => x.RawId != "").Select(x => x.RawId).ToArray(), annotated);
|
||||
}
|
||||
catch (XmlException) { throw new InvalidOperationException("DOWNLOAD_LIST_XML_MALFORMED"); }
|
||||
}
|
||||
|
||||
public IReadOnlyList<PackageRequirement> Join(LegacyProductPattern pattern, LegacyDownloadSelection selection, LegacyCompatibilityOverlay overlay)
|
||||
{
|
||||
var result = new List<PackageRequirement>();
|
||||
foreach (var id in selection.PluginIds)
|
||||
foreach (var id in selection.EffectivePluginIds)
|
||||
{
|
||||
var definition = pattern.Plugins.Where(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase)).ToArray();
|
||||
if (definition.Length == 0) throw new InvalidOperationException("LEGACY_PLUGIN_ID_NOT_DEFINED");
|
||||
|
||||
@@ -59,3 +59,30 @@ public static class LegacyNetworkConfiguration
|
||||
private static string Hash(string path) { using var stream = File.OpenRead(path); return Convert.ToHexString(SHA256.HashData(stream)); }
|
||||
private static string Fingerprint(string endpoint, string hash) => Convert.ToHexString(SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(endpoint + "|" + hash)));
|
||||
}
|
||||
|
||||
public static class LegacyReadOnlySnapshots
|
||||
{
|
||||
public static LegacySettingsSnapshot Acquire(string source, string localRoot, string role)
|
||||
{
|
||||
if (!Path.IsPathFullyQualified(source) || !source.StartsWith(@"\\", StringComparison.Ordinal) || source.Contains('?') || source.Contains('*') || !File.Exists(source) || File.GetAttributes(source).HasFlag(FileAttributes.ReparsePoint)) throw new InvalidOperationException("READONLY_SNAPSHOT_SOURCE_INVALID");
|
||||
var before = new FileInfo(source);
|
||||
var beforeHash = Hash(source);
|
||||
var directory = Path.Combine(Path.GetFullPath(localRoot), "configuration-snapshots", role);
|
||||
Directory.CreateDirectory(directory);
|
||||
var temporary = Path.Combine(directory, Guid.NewGuid().ToString("N") + ".tmp");
|
||||
File.Copy(source, temporary, false);
|
||||
var copiedHash = Hash(temporary);
|
||||
var after = new FileInfo(source);
|
||||
var afterHash = Hash(source);
|
||||
if (before.Length != after.Length || before.LastWriteTimeUtc != after.LastWriteTimeUtc || beforeHash != afterHash || copiedHash != afterHash)
|
||||
{
|
||||
File.Delete(temporary);
|
||||
throw new InvalidOperationException("READONLY_SNAPSHOT_SOURCE_CHANGED");
|
||||
}
|
||||
var final = Path.Combine(directory, copiedHash + ".xml");
|
||||
if (File.Exists(final)) File.Delete(temporary); else File.Move(temporary, final);
|
||||
return new(source, Convert.ToHexString(SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(role + "|" + source + "|" + copiedHash))), copiedHash, before.Length, new DateTimeOffset(before.LastWriteTimeUtc), DateTimeOffset.UtcNow, final, false);
|
||||
}
|
||||
|
||||
private static string Hash(string path) { using var stream = File.OpenRead(path); return Convert.ToHexString(SHA256.HashData(stream)); }
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
namespace Launcher.Next.Application;
|
||||
|
||||
public sealed record LegacyProductSelection(string Id, string DisplayName, string Filter, string RequiredFileName, string Pattern, string[] SourceVerifiedLegacyIds, string[] UnmappedLegacyIds, bool SupportsPlantBootstrap);
|
||||
public sealed record LegacyPluginPlan(string RosterPath, string Source, IReadOnlyList<string> OrderedIds, IReadOnlyList<string> UnmappedIds);
|
||||
public sealed record LegacyPluginPlan(string RosterPath, string Source, IReadOnlyList<string> OrderedIds, IReadOnlyList<string> UnmappedIds, string? SnapshotPath = null, string? SnapshotSha256 = null);
|
||||
|
||||
public static class LegacyProductSelections
|
||||
{
|
||||
@@ -26,12 +26,13 @@ public static class LegacyProductSelections
|
||||
return Path.GetFullPath(Path.Combine(projectDirectory, "..", "_System", product.Pattern, "Applications", "download_list.xml"));
|
||||
}
|
||||
|
||||
public static LegacyPluginPlan ReadRoster(LegacyProductSelection product, string selectedFile, string? manualXml, LegacyConfigurationAdapter parser)
|
||||
public static LegacyPluginPlan ReadRoster(LegacyProductSelection product, string selectedFile, string? manualXml, LegacyConfigurationAdapter parser, string? snapshotRoot = null)
|
||||
{
|
||||
var roster = manualXml is null ? AutomaticRoster(product, selectedFile) : Path.GetFullPath(manualXml);
|
||||
if (!File.Exists(roster) || File.GetAttributes(roster).HasFlag(FileAttributes.ReparsePoint) || !string.Equals(Path.GetFileName(roster), "download_list.xml", StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("LEGACY_DOWNLOAD_LIST_NOT_FOUND");
|
||||
var ids = parser.ParseDownloadList(File.ReadAllText(roster)).PluginIds;
|
||||
var snapshot = roster.StartsWith(@"\\", StringComparison.Ordinal) && snapshotRoot is not null ? LegacyReadOnlySnapshots.Acquire(roster, snapshotRoot, "project-rosters") : null;
|
||||
var ids = parser.ParseDownloadList(File.ReadAllText(snapshot?.LocalSnapshotPath ?? roster)).PluginIds;
|
||||
if (product.SourceVerifiedLegacyIds.Length > 0 && ids.Any(id => !product.SourceVerifiedLegacyIds.Contains(id, StringComparer.OrdinalIgnoreCase))) throw new InvalidOperationException("LEGACY_PLUGIN_PRODUCT_MISMATCH");
|
||||
return new(roster, manualXml is null ? "Automatic" : "Manual", ids, product.UnmappedLegacyIds.Intersect(ids, StringComparer.OrdinalIgnoreCase).ToArray());
|
||||
return new(roster, manualXml is null ? "Automatic" : "Manual", ids, product.UnmappedLegacyIds.Intersect(ids, StringComparer.OrdinalIgnoreCase).ToArray(), snapshot?.LocalSnapshotPath, snapshot?.Sha256);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user