Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/ResXManager.Model/ResourceEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@ public bool Update(ProjectFile file, [NotNullWhen(true)] out ResourceLanguage? u

private void UpdateResourceTableEntries()
{
var unmatchedTableEntries = _resourceTableEntries.ToList();
var entriesByKey = _resourceTableEntries.ToDictionary(entry => entry.Key);

var keys = _languages.Values
.SelectMany(language => language.ResourceKeys)
.Distinct()
.ToArray();

var matchedKeys = new HashSet<string>();
var index = 0;

foreach (var key in keys)
{
var existingEntry = _resourceTableEntries.FirstOrDefault(entry => entry.Key == key);
if (existingEntry != null)
if (entriesByKey.TryGetValue(key, out var existingEntry))
{
existingEntry.Update(index);
unmatchedTableEntries.Remove(existingEntry);
matchedKeys.Add(key);
}
else
{
Expand All @@ -107,6 +107,9 @@ private void UpdateResourceTableEntries()
index += 1;
}

var unmatchedTableEntries = _resourceTableEntries
.Where(entry => !matchedKeys.Contains(entry.Key))
.ToList();
_resourceTableEntries.RemoveRange(unmatchedTableEntries);
}

Expand Down
18 changes: 16 additions & 2 deletions src/ResXManager.Model/Snapshot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,27 @@ private static void UnloadSnapshot(IEnumerable<ResourceEntity> resourceEntities)

private static void Load(this IEnumerable<ResourceEntity> resourceEntities, IEnumerable<EntitySnapshot> entitySnapshots)
{
var entitySnapshotMap = entitySnapshots
.GroupBy(snapshot => (snapshot.ProjectName?.ToUpperInvariant(), snapshot.UniqueName?.ToUpperInvariant()))
.ToDictionary(g => g.Key, g => g.First());

resourceEntities.ForEach(entity =>
{
var entrySnapshots = entitySnapshots.Where(snapshot => Equals(entity, snapshot)).Select(s => s.Entries).FirstOrDefault() ?? Array.Empty<EntrySnapshot>();
var entityKey = (entity.ProjectName?.ToUpperInvariant(), entity.UniqueName?.ToUpperInvariant());
var entrySnapshots = entitySnapshotMap.TryGetValue(entityKey, out var entitySnapshot)
? entitySnapshot.Entries ?? Array.Empty<EntrySnapshot>()
: Array.Empty<EntrySnapshot>();

var entrySnapshotMap = entrySnapshots
.Where(s => s.Key != null)
.GroupBy(s => s.Key ?? string.Empty, StringComparer.Ordinal)
.ToDictionary(g => g.Key, g => g.First().Data ?? Array.Empty<DataSnapshot>(), StringComparer.Ordinal);

entity.Entries.ForEach(entry =>
{
var data = entrySnapshots.Where(s => string.Equals(entry.Key, s.Key, StringComparison.Ordinal)).Select(s => s.Data).FirstOrDefault() ?? Array.Empty<DataSnapshot>();
var data = entrySnapshotMap.TryGetValue(entry.Key, out var snapData)
? snapData
: Array.Empty<DataSnapshot>();

entry.Snapshot = data.ToDictionary(item => new CultureKey(item.Language), item => new ResourceData { Text = item.Text, Comment = item.Comment });
});
Expand Down