Skip to content

Fix/calibre msi readonly cleanup #1122

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

Closed
mohamedelghazali wants to merge 4 commits into from
Closed

Fix/calibre msi readonly cleanup #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f53ccd
Fix cleanup of read-only MSI staging files
mohamedelghazali Nov 4, 2026
cae3f7c
Test cleanup of read-only MSI staging files
mohamedelghazali Nov 4, 2026
af58471
Avoid unused local in MSI cleanup test
mohamedelghazali Nov 4, 2026
2164bf1
Fix path in read-only MSI cleanup test
mohamedelghazali Nov 4, 2026
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
21 changes: 20 additions & 1 deletion src/Filee.Engines/Infrastructure/EngineInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,29 @@ private async Task UnpackAsync(EngineComponent component, string file, Cancellat
finally
{
if (Directory.Exists(staging))
Directory.Delete(staging, recursive: true);
DeleteStagingDirectory(staging);
}
}

/// <summary>
/// Removes read-only attributes before deleting an unpacking folder. Administrative MSI extraction preserves
/// Windows file attributes; Calibre includes read-only DLLs (e.g. amatch.dll), which make recursive deletion fail.
/// </summary>
internal static void DeleteStagingDirectory(string folder)
{
if (OperatingSystem.IsWindows())
{
foreach (var file in Directory.EnumerateFiles(folder, "*", SearchOption.AllDirectories))
{
var attributes = File.GetAttributes(file);
if ((attributes & FileAttributes.ReadOnly) != 0)
File.SetAttributes(file, attributes & ~FileAttributes.ReadOnly);
}
}

Directory.Delete(folder, recursive: true);
}

internal static async Task UnpackTarAsync(string file, string target, string kind, CancellationToken cancellationToken)
{
Directory.CreateDirectory(target);
Expand Down
16 changes: 16 additions & 0 deletions tests/Filee.Engines.Tests/EngineInstallerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,22 @@ public async Task LibreOffice_extensions_go_into_the_installed_LibreOffice_and_n
Assert.True(installer.IsInstalled(package));
}

[Fact]
public void Staging_cleanup_removes_read_only_MSI_files_on_Windows()
{
Assert.SkipUnless(OperatingSystem.IsWindows(), "Windows MSI packages preserve read-only file attributes.");

var staging = Path.Combine(_root, "~staging");
Directory.CreateDirectory(Path.Combine(staging, "Program", "bin"));
var dll = Path.Combine(staging, "Program", "bin", "amatch.dll");
File.WriteAllText(dll, "MSI payload");
File.SetAttributes(dll, File.GetAttributes(dll) | FileAttributes.ReadOnly);

EngineInstaller.DeleteStagingDirectory(staging);

Assert.False(Directory.Exists(staging));
}

[Fact]
public void LibreOffice_is_trimmed_to_what_headless_conversion_needs()
{
Expand Down