Skip to content

Fix: Fixed issue where the extract button on the toolbar was disabled in archives #12144

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
merged 2 commits into from
Apr 21, 2023
Merged

Fix: Fixed issue where the extract button on the toolbar was disabled in archives #12144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8faf7c5
Update DecompressArchive.cs
hishitetsu Apr 21, 2023
ad0260d
Better way
hishitetsu Apr 21, 2023
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
18 changes: 14 additions & 4 deletions src/Files.App/Actions/Content/Archives/DecompressArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
using Files.App.Contexts;
using Files.App.Extensions;
using Files.App.Helpers;
using Files.Backend.Helpers;
using System.ComponentModel;
using System.IO;
using System.Threading.Tasks;

namespace Files.App.Actions
Expand All @@ -19,8 +21,9 @@ internal class DecompressArchive : BaseUIAction, IAction
public HotKey HotKey { get; } = new(Keys.E, KeyModifiers.Ctrl);

public override bool IsExecutable =>
IsContextPageTypeAdaptedToCommand() &&
ArchiveHelpers.CanDecompress(context.SelectedItems) &&
(IsContextPageTypeAdaptedToCommand() &&
ArchiveHelpers.CanDecompress(context.SelectedItems)
|| CanDecompressInsideArchive()) &&
UIHelpers.CanShowDialog;

public DecompressArchive()
Expand All @@ -40,13 +43,20 @@ and not ContentPageTypes.ZipFolder
and not ContentPageTypes.None;
}

private bool CanDecompressInsideArchive()
{
return context.PageType is ContentPageTypes.ZipFolder &&
!context.HasSelection &&
context.Folder is not null &&
FileExtensionHelpers.IsZipFile(Path.GetExtension(context.Folder.ItemPath));
}

private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
{
switch (e.PropertyName)
{
case nameof(IContentPageContext.SelectedItems):
if (IsContextPageTypeAdaptedToCommand())
OnPropertyChanged(nameof(IsExecutable));
OnPropertyChanged(nameof(IsExecutable));
break;
}
}
Expand Down