Skip to content

re-enable matching non-local assets by name #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jamiras merged 1 commit into from
Dec 19, 2025
Merged

re-enable matching non-local assets by name #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions Source/Data/Achievement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,18 @@ public static Achievement FindMergeAchievement(IEnumerable<Achievement> achievem
return match;
}

// ignore achievements with non-local IDs. they're only eligible for matching by ID.
var localAchievements = achievements.Where(a => a.Id == 0 || a.Id >= FirstLocalId);

// second pass - look for title match
if (!String.IsNullOrEmpty(achievement.Title))
{
match = localAchievements.FirstOrDefault(a => String.Compare(a.Title, achievement.Title, StringComparison.InvariantCultureIgnoreCase) == 0);
match = achievements.FirstOrDefault(a => String.Compare(a.Title, achievement.Title, StringComparison.InvariantCultureIgnoreCase) == 0);
if (match != null)
return match;
}

// third pass - look for description match
if (!String.IsNullOrEmpty(achievement.Description))
{
match = localAchievements.FirstOrDefault(a => String.Compare(a.Description, achievement.Description, StringComparison.InvariantCultureIgnoreCase) == 0);
match = achievements.FirstOrDefault(a => String.Compare(a.Description, achievement.Description, StringComparison.InvariantCultureIgnoreCase) == 0);
if (match != null)
return match;
}
Expand Down
7 changes: 2 additions & 5 deletions Source/Data/Leaderboard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,21 +200,18 @@ public static Leaderboard FindMergeLeaderboard(IEnumerable<Leaderboard> leaderbo
return match;
}

// ignore leaderboards with non-local IDs. they're only eligible for matching by ID.
var localLeaderboards = leaderboards.Where(a => a.Id == 0 || a.Id >= FirstLocalId);

// second pass - look for title match
if (!String.IsNullOrEmpty(leaderboard.Title))
{
match = localLeaderboards.FirstOrDefault(l => String.Compare(l.Title, leaderboard.Title, StringComparison.InvariantCultureIgnoreCase) == 0);
match = leaderboards.FirstOrDefault(l => String.Compare(l.Title, leaderboard.Title, StringComparison.InvariantCultureIgnoreCase) == 0);
if (match != null)
return match;
}

// third pass - look for description match
if (!String.IsNullOrEmpty(leaderboard.Description))
{
match = localLeaderboards.FirstOrDefault(l => String.Compare(l.Description, leaderboard.Description, StringComparison.InvariantCultureIgnoreCase) == 0);
match = leaderboards.FirstOrDefault(l => String.Compare(l.Description, leaderboard.Description, StringComparison.InvariantCultureIgnoreCase) == 0);
if (match != null)
return match;
}
Expand Down
Loading