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

Remove MSIX installers after validation is done #2591

Merged
merged 6 commits into from
Oct 12, 2022
Merged

Remove MSIX installers after validation is done #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
996d682
Remove installers post validation
AmelBawa-msft Oct 12, 2022
d0b8f2b
Move push statement to download method
AmelBawa-msft Oct 12, 2022
6b03eef
Clear msix info cache
AmelBawa-msft Oct 12, 2022
d97121c
Comment typo and clear vector
AmelBawa-msft Oct 12, 2022
e24eaf5
Adddressed comments
AmelBawa-msft Oct 12, 2022
888edce
Update src/AppInstallerCommonCore/Manifest/MsixManifestValidation.cpp
AmelBawa-msft Oct 12, 2022
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
23 changes: 17 additions & 6 deletions src/AppInstallerCommonCore/Manifest/MsixManifestValidation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ namespace AppInstaller::Manifest
return errors;
}

MsixManifestValidation::~MsixManifestValidation()
{
AICLI_LOG(Core, Info, << "Removing downloaded installers");
for (const auto& installerPath : m_downloadedInstallers)
{
try
{
std::filesystem::remove(installerPath);
}
catch (...)
{
AICLI_LOG(Core, Warning, << "Failed to remove downloaded installer: " << installerPath);
}
}
}

std::optional<std::filesystem::path> MsixManifestValidation::DownloadInstaller(std::string installerUrl, int retryCount)
{
while (retryCount-- > 0)
Expand All @@ -46,6 +62,7 @@ namespace AppInstaller::Manifest
auto tempFile = Runtime::GetNewTempFilePath();
ProgressCallback callback;
Utility::Download(installerUrl, tempFile, Utility::DownloadType::Installer, callback);
m_downloadedInstallers.push_back(tempFile);
return tempFile;
}
catch (...)
Expand Down Expand Up @@ -87,12 +104,6 @@ namespace AppInstaller::Manifest
{
AICLI_LOG(Core, Error, << "Error fetching Msix info from the installer local path.");
}

AICLI_LOG(Core, Info, << "Removing downloaded installer");
if (!std::filesystem::remove(installerPath.value()))
{
AICLI_LOG(Core, Warning, << "Failed to remove downloaded installer");
}
}
else
{
Expand Down
3 changes: 3 additions & 0 deletions src/AppInstallerCommonCore/Public/winget/MsixManifestValidation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ namespace AppInstaller::Manifest
{
MsixManifestValidation(ValidationError::Level validationErrorLevel) : m_validationErrorLevel(validationErrorLevel) {}

~MsixManifestValidation();

// Validate manifest for Msix packages and Msix bundles.
std::vector<ValidationError> Validate(
const Manifest &manifest,
const ManifestInstaller &installer);
private:
std::map<std::string, std::shared_ptr<Msix::MsixInfo>> m_msixInfoCache;
std::vector<std::filesystem::path> m_downloadedInstallers;
ValidationError::Level m_validationErrorLevel;

// Get Msix info from url/local path, or load it from cache.
Expand Down