Skip to content

Commit d13cf29

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Refactoring & Cleanup & Docs
1 parent 0580c22 commit d13cf29

37 files changed

+652
-484
lines changed

‎Source/NETworkManager.Localization/Resources/StaticStrings.Designer.cs‎

Lines changed: 93 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/StaticStrings.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<data name="ExampleSNMPCommunity" xml:space="preserve">
235235
<value>public</value>
236236
</data>
237-
<data name="ExampleSNMPOID" xml:space="preserve">
237+
<data name="ExampleSnmpOid" xml:space="preserve">
238238
<value>1.3.6.1.2.1.1</value>
239239
</data>
240240
<data name="ExampleSNMPUsername" xml:space="preserve">
@@ -339,7 +339,7 @@
339339
<data name="ExampleSNMPMIB" xml:space="preserve">
340340
<value>system</value>
341341
</data>
342-
<data name="ExampleSNMPOIDS" xml:space="preserve">
342+
<data name="ExampleSnmpOids" xml:space="preserve">
343343
<value>1.3.6.1.2.1.1; 1.3.6.1.2.1.2</value>
344344
</data>
345345
<data name="ExamplePassword" xml:space="preserve">

‎Source/NETworkManager.Utilities/RegexHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ public static class RegexHelper
8484
// Match a number (like 12, 12.4, 12,3)
8585
public const string NumberRegex = @"^\d+((\.|,)\d+)?$";
8686

87-
// Match an SNMP OID (like 1.3.6.1)
88-
public const string SNMOIODRegex = @"^[012]\.(?:[0-9]|[1-3][0-9])(\.\d+)*$";
87+
// Match an SNMP OID (like 1.3.6.1 or .1.3.6.2)
88+
public const string SnmpOidRegex = @"^\.?[012]\.(?:[0-9]|[1-3][0-9])(\.\d+)*$";
8989
}

‎Source/NETworkManager.Validators/SNMPOIDValidator.cs‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
using NETworkManager.Utilities;
22
using System.Globalization;
3+
using System.Linq;
34
using System.Text.RegularExpressions;
45
using System.Windows.Controls;
56

67
namespace NETworkManager.Validators;
78

8-
public class SNMPOIDValidator : ValidationRule
9+
public class SnmpOidValidator : ValidationRule
910
{
1011
public SNMPOIDDependencyObjectWrapper Wrapper { get; set; }
1112

1213
public override ValidationResult Validate(object value, CultureInfo cultureInfo)
1314
{
14-
var oidValue = (value as string).Replace(" ", "");
15+
var oidValue = (value as string)!.Replace(" ", "");
1516

16-
if (Wrapper.Mode == Models.Network.SNMPMode.Get && oidValue.Contains(';'))
17-
{
18-
foreach (var oid in oidValue.Split(';'))
19-
{
20-
if (!Regex.IsMatch(oid, RegexHelper.SNMOIODRegex))
21-
return new ValidationResult(false, Localization.Resources.Strings.EnterValidOID);
22-
}
23-
24-
return ValidationResult.ValidResult;
25-
}
26-
27-
return Regex.IsMatch(oidValue, RegexHelper.SNMOIODRegex) ? ValidationResult.ValidResult : new ValidationResult(false, Localization.Resources.Strings.EnterValidOID);
17+
if (Wrapper.Mode != Models.Network.SNMPMode.Get || !oidValue.Contains(';'))
18+
return Regex.IsMatch(oidValue, RegexHelper.SnmpOidRegex)
19+
? ValidationResult.ValidResult
20+
: new ValidationResult(false, Localization.Resources.Strings.EnterValidOID);
21+
22+
return oidValue.Split(';').Any(oid => !Regex.IsMatch(oid, RegexHelper.SnmpOidRegex)) ?
23+
new ValidationResult(false, Localization.Resources.Strings.EnterValidOID) :
24+
ValidationResult.ValidResult;
2825
}
2926
}

‎Source/NETworkManager.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<s:Boolean x:Key="/Default/UserDictionary/Words/=Rlogin/@EntryIndexedValue">True</s:Boolean>
5959
<s:Boolean x:Key="/Default/UserDictionary/Words/=Rsna/@EntryIndexedValue">True</s:Boolean>
6060
<s:Boolean x:Key="/Default/UserDictionary/Words/=slovenski/@EntryIndexedValue">True</s:Boolean>
61+
6162
<s:Boolean x:Key="/Default/UserDictionary/Words/=sntp/@EntryIndexedValue">True</s:Boolean>
6263
<s:Boolean x:Key="/Default/UserDictionary/Words/=Subnetmask/@EntryIndexedValue">True</s:Boolean>
6364
<s:Boolean x:Key="/Default/UserDictionary/Words/=Subnetting/@EntryIndexedValue">True</s:Boolean>

‎Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
4-
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization">
4+
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
5+
>
56
<ContextMenu x:Key="CutCopyPasteContextMenu" MinWidth="150">
67
<MenuItem Header="{x:Static localization:Strings.Cut}" Command="Cut">
78
<MenuItem.Icon>

‎Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using NETworkManager.Settings;
2-
using MahApps.Metro.Controls.Dialogs;
32
using System;
43
using NETworkManager.Models.Network;
54
using System.ComponentModel;
@@ -18,10 +17,8 @@ public class BitCalculatorViewModel : ViewModelBase
1817
{
1918
#region Variables
2019
private static readonly ILog Log = LogManager.GetLogger(typeof(BitCalculatorViewModel));
21-
private readonly IDialogCoordinator _dialogCoordinator;
22-
23-
private readonly bool _isLoading = true;
24-
private bool _isViewActive = true;
20+
21+
private readonly bool _isLoading;
2522

2623
private string _input;
2724
public string Input
@@ -39,11 +36,11 @@ public string Input
3936

4037
public ICollectionView InputHistoryView { get; }
4138

42-
private List<BitCaluclatorUnit> _units = new();
39+
private readonly List<BitCaluclatorUnit> _units = new();
4340
public List<BitCaluclatorUnit> Units
4441
{
4542
get => _units;
46-
set
43+
private init
4744
{
4845
if (value == _units)
4946
return;
@@ -70,16 +67,16 @@ public BitCaluclatorUnit Unit
7067
}
7168
}
7269

73-
private bool _isCalculationRunning;
74-
public bool IsCalculationRunning
70+
private bool _isRunning;
71+
public bool IsRunning
7572
{
76-
get => _isCalculationRunning;
73+
get => _isRunning;
7774
set
7875
{
79-
if (value == _isCalculationRunning)
76+
if (value == _isRunning)
8077
return;
8178

82-
_isCalculationRunning = value;
79+
_isRunning = value;
8380
OnPropertyChanged();
8481
}
8582
}
@@ -103,7 +100,7 @@ public bool IsResultVisible
103100
public BitCaluclatorInfo Result
104101
{
105102
get => _result;
106-
set
103+
private set
107104
{
108105
if (value == _result)
109106
return;
@@ -115,9 +112,9 @@ public BitCaluclatorInfo Result
115112
#endregion
116113

117114
#region Constructor, load settings
118-
public BitCalculatorViewModel(IDialogCoordinator instance)
115+
public BitCalculatorViewModel()
119116
{
120-
_dialogCoordinator = instance;
117+
_isLoading = true;
121118

122119
InputHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.BitCalculator_InputHistory);
123120

@@ -137,11 +134,11 @@ private void LoadSettings()
137134
#endregion
138135

139136
#region ICommands & Actions
140-
public ICommand CalculateCommand => new RelayCommand(p => CalcualateAction(), Calculate_CanExecute);
137+
public ICommand CalculateCommand => new RelayCommand(_ => CalculateAction(), Calculate_CanExecute);
141138

142-
private bool Calculate_CanExecute(object paramter) => Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
139+
private bool Calculate_CanExecute(object parameter) => Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
143140

144-
private void CalcualateAction()
141+
private void CalculateAction()
145142
{
146143
Calculate();
147144
}
@@ -151,9 +148,9 @@ private void CalcualateAction()
151148
private async void Calculate()
152149
{
153150
IsResultVisible = false;
154-
IsCalculationRunning = true;
151+
IsRunning = true;
155152

156-
if (double.TryParse(Input.Replace('.', ','), out double input))
153+
if (double.TryParse(Input.Replace('.', ','), out var input))
157154
{
158155
Result = await BitCaluclator.CalculateAsync(input, Unit, SettingsManager.Current.BitCalculator_Notation);
159156
}
@@ -166,7 +163,7 @@ private async void Calculate()
166163

167164
AddInputToHistory(Input);
168165

169-
IsCalculationRunning = false;
166+
IsRunning = false;
170167
}
171168

172169
private void AddInputToHistory(string input)
@@ -184,18 +181,14 @@ private void AddInputToHistory(string input)
184181

185182
public void OnViewVisible()
186183
{
187-
_isViewActive = true;
184+
188185
}
189186

190187
public void OnViewHide()
191188
{
192-
_isViewActive = false;
189+
193190
}
194191

195192

196-
#endregion
197-
198-
#region Event
199-
200193
#endregion
201194
}

0 commit comments

Comments
 (0)