Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ImageRsizer] Add support for blanks in height/width fields (#15368)

Browse Source
This commit is contained in:
CleanCodeDeveloper
2022-01-21 18:42:50 +01:00
committed by GitHub
parent a1f319afa7
commit ac4f725433
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/imageresizer/ui/Properties/Settings.cs
View File

@@ -21,6 +21,11 @@ namespace ImageResizer.Properties
public sealed partial class Settings : IDataErrorInfo, INotifyPropertyChanged public sealed partial class Settings : IDataErrorInfo, INotifyPropertyChanged
{ {
private static readonly IFileSystem _fileSystem = new FileSystem(); private static readonly IFileSystem _fileSystem = new FileSystem();
private static readonly JsonSerializerOptions _jsonSerializerOptions = new JsonSerializerOptions
{
NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
WriteIndented = true,
};
// Used to synchronize access to the settings.json file // Used to synchronize access to the settings.json file
private static Mutex _jsonMutex = new Mutex(); private static Mutex _jsonMutex = new Mutex();
@@ -409,7 +414,7 @@ namespace ImageResizer.Properties
public void Save() public void Save()
{ {
_jsonMutex.WaitOne(); _jsonMutex.WaitOne();
string jsonData = JsonSerializer.Serialize(new SettingsWrapper() { Properties = this }); string jsonData = JsonSerializer.Serialize(new SettingsWrapper() { Properties = this }, _jsonSerializerOptions);
// Create directory if it doesn't exist // Create directory if it doesn't exist
IFileInfo file = _fileSystem.FileInfo.FromFileName(SettingsPath); IFileInfo file = _fileSystem.FileInfo.FromFileName(SettingsPath);
@@ -442,7 +447,7 @@ namespace ImageResizer.Properties
var jsonSettings = new Settings(); var jsonSettings = new Settings();
try try
{ {
jsonSettings = JsonSerializer.Deserialize<SettingsWrapper>(jsonData)?.Properties; jsonSettings = JsonSerializer.Deserialize<SettingsWrapper>(jsonData, _jsonSerializerOptions)?.Properties;
} }
catch (JsonException) catch (JsonException)
{ {