maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed restrictions for image-resizer file format (#3377)

Browse source
This commit is contained in:
Lavius Motileng 2020-06-04 11:05:28 -07:00 committed by GitHub
parent 7c7ccc3a07
commit 30cb7e62fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ImageResizerViewModel.cs
View file

@ -178,10 +178,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
set
{
var regex = @"[%]{1}[1-6]{1} [(]{1}[%]{1}[1-6]{1}[)]{1}";
Match match = Regex.Match(value.Trim(), regex);
if (!string.IsNullOrWhiteSpace(value) && match.Success)
if (!string.IsNullOrWhiteSpace(value))
{
_fileName = value;
Settings.Properties.ImageresizerFileName.Value = value;

32
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/ImageResizer.cs
View file

@ -124,38 +124,6 @@ namespace ViewModelTests
Assert.AreEqual(expectedValue, viewModel.FileName);
}
[TestMethod]
public void FileName_ShouldNOTUpdateValue_WhenNameIsInValid ()
{
// arrange
ImageResizerViewModel viewModel = new ImageResizerViewModel();
string[] invalidNames =
{
string.Empty,
" ", // no name.
"%1", // single name value.
"%7 (%5)", // name max index exceeded.
"%8 (%8)", // name max index exceeded.
"%5 (%3 )", // name contains extra spaces.
"%5 (%3)", // name contains extra spaces.
"%5 ( %3)", // name contains extra spaces.
"% 5 ( %3)", // name contains extra spaces.
"%5 (% 3)", // name contains extra spaces.
"%5 ( %3 )", // name contains extra spaces.
};
// act and Assert
foreach (string invalidName in invalidNames)
{
viewModel = new ImageResizerViewModel();
viewModel.FileName = invalidName;
Assert.AreNotEqual(invalidName, viewModel.FileName);
ImageResizerSettings settings = SettingsUtils.GetSettings<ImageResizerSettings>(Module);
Assert.AreNotEqual(invalidName, settings.Properties.ImageresizerFileName.Value);
}
}
[TestMethod]
public void KeepDateModified_ShouldUpdateValue_WhenSuccessful()
{