Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
15 changes: 15 additions & 0 deletions src/Files.App/Data/Contracts/IGeneralSettingsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,21 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
/// </summary>
FileNameConflictResolveOptionType ConflictsResolveOption { get; set; }

/// <summary>
/// Gets or sets a value indicating the default archive format.
/// </summary>
ArchiveFormats ArchiveFormatsOption { get; set; }

/// <summary>
/// Gets or sets a value indicating the default archive compression level.
/// </summary>
ArchiveCompressionLevels ArchiveCompressionLevelsOption { get; set; }

/// <summary>
/// Gets or sets a value indicating the default archive splitting size.
/// </summary>
ArchiveSplittingSizes ArchiveSplittingSizesOption { get; set; }

/// <summary>
/// A dictionary to determine which hashes should be shown.
/// </summary>
Expand Down
35 changes: 21 additions & 14 deletions src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public ArchiveSplittingSizes SplittingSize
get => ViewModel.SplittingSize.Key;
set => ViewModel.SplittingSize = ViewModel.SplittingSizes.First(size => size.Key == value);
}

public int CPUThreads
{
get => ViewModel.CPUThreads;
Expand Down Expand Up @@ -107,6 +107,7 @@ private void ViewModel_PropertyChanged(object? _, PropertyChangedEventArgs e)

private sealed class DialogViewModel : ObservableObject
{
private readonly IGeneralSettingsService GeneralSettingsService = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
public bool IsNameValid => FilesystemHelpers.IsValidForFilename(fileName);

public bool ShowNameWarning => !string.IsNullOrEmpty(fileName) && !IsNameValid;
Expand All @@ -125,33 +126,41 @@ public string FileName
}
}

private FileFormatItem fileFormat;
public FileFormatItem FileFormat
{
get => fileFormat;
get => FileFormats.First(format => format.Key == GeneralSettingsService.ArchiveFormatsOption);
set
{
if (SetProperty(ref fileFormat, value))
if (value.Key != GeneralSettingsService.ArchiveFormatsOption)
{
GeneralSettingsService.ArchiveFormatsOption = value.Key;
OnPropertyChanged(nameof(CanSplit));
}
}
}

private CompressionLevelItem compressionLevel;
public CompressionLevelItem CompressionLevel
{
get => compressionLevel;
set => SetProperty(ref compressionLevel, value);
get => CompressionLevels.First(level => level.Key == GeneralSettingsService.ArchiveCompressionLevelsOption);
set
{
if (value.Key != GeneralSettingsService.ArchiveCompressionLevelsOption)
GeneralSettingsService.ArchiveCompressionLevelsOption = value.Key;
}
}

public bool CanSplit => FileFormat.Key is ArchiveFormats.SevenZip;

private SplittingSizeItem splittingSize;
public SplittingSizeItem SplittingSize
{
get => splittingSize;
set => SetProperty(ref splittingSize, value);
get => SplittingSizes.First(size => size.Key == GeneralSettingsService.ArchiveSplittingSizesOption);
set
{
if (value.Key != GeneralSettingsService.ArchiveSplittingSizesOption)
GeneralSettingsService.ArchiveSplittingSizesOption = value.Key;
}
}

private int cpuThreads = Environment.ProcessorCount;
public int CPUThreads
{
Expand Down Expand Up @@ -215,9 +224,7 @@ public string Password

public DialogViewModel()
{
fileFormat = FileFormats.First(format => format.Key is ArchiveFormats.Zip);
compressionLevel = CompressionLevels.First(level => level.Key is ArchiveCompressionLevels.Normal);
splittingSize = SplittingSizes.First(size => size.Key is ArchiveSplittingSizes.None);

}

private static string ToSizeText(ulong megaBytes) => ByteSize.FromMebiBytes(megaBytes).ShortString;
Expand Down
18 changes: 18 additions & 0 deletions src/Files.App/Services/Settings/GeneralSettingsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,24 @@ public FileNameConflictResolveOptionType ConflictsResolveOption
set => Set((long)value);
}

public ArchiveFormats ArchiveFormatsOption
{
get => (ArchiveFormats)Get((long)ArchiveFormats.Zip);
set => Set((long)value);
}

public ArchiveCompressionLevels ArchiveCompressionLevelsOption
{
get => (ArchiveCompressionLevels)Get((long)ArchiveCompressionLevels.Normal);
set => Set((long)value);
}

public ArchiveSplittingSizes ArchiveSplittingSizesOption
{
get => (ArchiveSplittingSizes)Get((long)ArchiveSplittingSizes.None);
set => Set((long)value);
}

public Dictionary<string, bool> ShowHashesDictionary
{
get => Get<Dictionary<string, bool>>(null);
Expand Down
Loading