Skip to content

Commit

Permalink
Added quiet and unattended cases in QueryApps (Klocman#354)
Browse files Browse the repository at this point in the history
  • Loading branch information
zbalkan committed May 9, 2022
1 parent 67f9caa commit b9eee94
Showing 1 changed file with 26 additions and 15 deletions.
41 changes: 26 additions & 15 deletions source/BCU-console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,10 @@ private static int RunUninstall(UninstallList list, bool isQuiet, bool isUnatten

foreach (var error in task.AllUninstallersList.Where(x =>
x.CurrentStatus != UninstallStatus.Completed && x.CurrentError != null))
{
Console.WriteLine("Error: {0} - {1}", error.UninstallerEntry.DisplayName,
error.CurrentError.Message);
}
}
};
task.Start();
Expand Down Expand Up @@ -224,22 +226,31 @@ private static IList<ApplicationUninstallerEntry> QueryApps(bool isQuiet, bool i

Console.WriteLine("Looking for applications...");
string previousMain = null;
var result = ApplicationUninstallerFactory.GetUninstallerEntries(report =>

IList<ApplicationUninstallerEntry> result;
if (isQuiet || isUnattended)
{
if (previousMain != report.Message)
{
previousMain = report.Message;
Console.WriteLine(report.Message);
}
if (isVerbose)
{
if (!string.IsNullOrEmpty(report.Inner?.Message))
{
Console.Write("-> ");
Console.WriteLine(report.Inner.Message);
}
}
});
result = ApplicationUninstallerFactory.GetUninstallerEntries(_ => { });
}
else
{
result = ApplicationUninstallerFactory.GetUninstallerEntries(report =>
{
if (previousMain != report.Message)
{
previousMain = report.Message;
Console.WriteLine(report.Message);
}
if (isVerbose)
{
if (!string.IsNullOrEmpty(report.Inner?.Message))
{
Console.Write("-> ");
Console.WriteLine(report.Inner.Message);
}
}
});
}

Console.WriteLine("Found {0} applications.", result.Count);
return result;
Expand Down

0 comments on commit b9eee94

Please sign in to comment.