Skip to content
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

Jump to bottom

Better error message for Scoop export parsing crashes #638

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Better error message for Scoop export parsing crashes #638

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
4 changes: 2 additions & 2 deletions source/UninstallTools/Factory/ScoopFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public IList<ApplicationUninstallerEntry> GetUninstallerEntries(ListGenerationPr
}
}
// Fallback to plain text export format
catch (JsonException)
catch (JsonException e)
{
var appEntries = result.Split(StringTools.NewLineChars.ToArray(), StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
foreach (var str in appEntries)
Expand Down Expand Up @@ -166,7 +166,7 @@ public IList<ApplicationUninstallerEntry> GetUninstallerEntries(ListGenerationPr
// Make sure that this isn't just a corrupted json export
if (string.Equals(name, "\"apps\":", StringComparison.Ordinal) ||
string.Equals(name, "\"buckets\":", StringComparison.Ordinal))
throw;
throw new InvalidDataException("Scoop export is in unkown or invalid format! Try updating Scoop and try again.\n\nContents:\n" + result, e);

var entry = CreateUninstallerEntry(name, version, isGlobal, exeSearcher);

Expand Down
Loading