Skip to content

Commit 7b433a1

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Refactoring & Cleanup & Docs
1 parent acde850 commit 7b433a1

18 files changed

+68
-130
lines changed

‎Source/NETworkManager.Settings/SettingsManager.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static class SettingsManager
3636
/// <summary>
3737
/// Settings that are currently loaded.
3838
/// </summary>
39-
public static SettingsInfo Current { get; set; }
39+
public static SettingsInfo Current { get; private set; }
4040

4141
/// <summary>
4242
/// Indicates if the HotKeys have changed. May need to be reworked if we add more HotKeys.
@@ -154,7 +154,6 @@ private static void SerializeToFile(string filePath)
154154
}
155155
#endregion
156156

157-
158157
#region Upgrade
159158
/// <summary>
160159
/// Method to upgrade the settings.

‎Source/NETworkManager.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<s:Boolean x:Key="/Default/UserDictionary/Words/=Controlz/@EntryIndexedValue">True</s:Boolean>
3636
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dccp/@EntryIndexedValue">True</s:Boolean>
3737
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dragablz/@EntryIndexedValue">True</s:Boolean>
38+
<s:Boolean x:Key="/Default/UserDictionary/Words/=EDNS/@EntryIndexedValue">True</s:Boolean>
3839
<s:Boolean x:Key="/Default/UserDictionary/Words/=Espa_00F1ol/@EntryIndexedValue">True</s:Boolean>
3940
<s:Boolean x:Key="/Default/UserDictionary/Words/=FFFFFF/@EntryIndexedValue">True</s:Boolean>
4041
<s:Boolean x:Key="/Default/UserDictionary/Words/=Fran_00E7ais/@EntryIndexedValue">True</s:Boolean>

‎Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ public DragablzTabHostWindow(ApplicationName applicationName)
7171
InterTabController.Partition = applicationName.ToString();
7272

7373
Title = $"NETworkManager {AssemblyManager.Current.Version} - {ResourceTranslator.Translate(ResourceIdentifier.ApplicationName, applicationName)}";
74-
75-
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
7674
}
7775
#endregion
7876

@@ -374,11 +372,7 @@ private async void FocusEmbeddedWindow()
374372
#endregion
375373

376374
#region Events
377-
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
378-
{
379-
380-
}
381-
375+
382376
private void MetroWindow_Activated(object sender, EventArgs e)
383377
{
384378
FocusEmbeddedWindow();

‎Source/NETworkManager/ViewModels/AWSSessionManagerHostViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public AWSSessionManagerHostViewModel(IDialogCoordinator instance)
312312

313313
LoadSettings();
314314

315-
SettingsManager.Current.PropertyChanged += Current_PropertyChanged;
315+
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
316316
SettingsManager.Current.AWSSessionManager_AWSProfiles.CollectionChanged += AWSSessionManager_AWSProfiles_CollectionChanged;
317317

318318
SyncAllInstanceIDsFromAWS();
@@ -938,7 +938,7 @@ public void OnProfileManagerDialogClose()
938938
#endregion
939939

940940
#region Event
941-
private void Current_PropertyChanged(object sender, PropertyChangedEventArgs e)
941+
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
942942
{
943943
if (e.PropertyName == nameof(SettingsInfo.AWSSessionManager_EnableSyncInstanceIDsFromAWS))
944944
{

‎Source/NETworkManager/ViewModels/IPApiDNSResolverViewModel.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ public DNSResolverResult Result
3939
OnPropertyChanged();
4040
}
4141
}
42-
43-
public bool CheckIPDNSApiEnabled => SettingsManager.Current.Dashboard_CheckIPApiDNSResolver;
4442
#endregion
4543

4644
#region Constructor, load settings
@@ -81,7 +79,7 @@ public void Check()
8179
private async Task CheckAsync()
8280
{
8381
// Check is disabled via settings
84-
if (!CheckIPDNSApiEnabled)
82+
if (!SettingsManager.Current.Dashboard_CheckIPApiDNSResolver)
8583
return;
8684

8785
// Don't check multiple times if already running
@@ -108,10 +106,8 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
108106
switch (e.PropertyName)
109107
{
110108
case nameof(SettingsInfo.Dashboard_CheckIPApiDNSResolver):
111-
OnPropertyChanged(nameof(CheckIPDNSApiEnabled));
112-
113109
// Check if enabled via settings
114-
if (CheckIPDNSApiEnabled)
110+
if (SettingsManager.Current.Dashboard_CheckIPApiDNSResolver)
115111
Check();
116112

117113
break;

‎Source/NETworkManager/ViewModels/IPApiIPGeolocationViewModel.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ public IPGeolocationResult Result
3838
OnPropertyChanged();
3939
}
4040
}
41-
42-
public bool CheckIPGeoApiEnabled => SettingsManager.Current.Dashboard_CheckIPApiIPGeolocation;
43-
#endregion
41+
#endregion
4442

4543
#region Constructor, load settings
4644
public IPApiIPGeolocationViewModel()
@@ -79,7 +77,7 @@ public void Check()
7977
private async Task CheckAsync()
8078
{
8179
// Check is disabled via settings
82-
if (!CheckIPGeoApiEnabled)
80+
if (!SettingsManager.Current.Dashboard_CheckIPApiIPGeolocation)
8381
return;
8482

8583
// Don't check multiple times if already running
@@ -104,10 +102,8 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
104102
switch (e.PropertyName)
105103
{
106104
case nameof(SettingsInfo.Dashboard_CheckIPApiIPGeolocation):
107-
OnPropertyChanged(nameof(CheckIPGeoApiEnabled));
108-
109105
// Check if enabled via settings
110-
if (CheckIPGeoApiEnabled)
106+
if (SettingsManager.Current.Dashboard_CheckIPApiIPGeolocation)
111107
Check();
112108

113109
break;

‎Source/NETworkManager/ViewModels/NetworkConnectionViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ public ConnectionState InternetDNSState
426426
public NetworkConnectionViewModel()
427427
{
428428
// Detect if network address or status changed...
429-
NetworkChange.NetworkAvailabilityChanged += (sender, args) => CheckConnection();
430-
NetworkChange.NetworkAddressChanged += (sender, args) => CheckConnection();
429+
NetworkChange.NetworkAvailabilityChanged += (_, _) => CheckConnection();
430+
NetworkChange.NetworkAddressChanged += (_, _) => CheckConnection();
431431

432432
LoadSettings();
433433

‎Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,7 @@ public NetworkInterfaceViewModel(IDialogCoordinator instance)
540540
NetworkChange.NetworkAddressChanged += (sender, args) => ReloadNetworkInterfaces();
541541

542542
LoadSettings();
543-
544-
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
545-
543+
546544
_isLoading = false;
547545
}
548546

@@ -1262,10 +1260,5 @@ private void NetworkInterface_UserHasCanceled(object sender, EventArgs e)
12621260
StatusMessage = Localization.Resources.Strings.CanceledByUserMessage;
12631261
IsStatusMessageDisplayed = true;
12641262
}
1265-
1266-
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
1267-
{
1268-
1269-
}
12701263
#endregion
12711264
}

‎Source/NETworkManager/ViewModels/PortScannerViewModel.cs‎

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public class PortScannerViewModel : ViewModelBase
3636

3737
private string _lastSortDescriptionAscending = string.Empty;
3838

39-
private bool _isLoading;
40-
4139
private string _hosts;
4240
public string Hosts
4341
{
@@ -70,16 +68,16 @@ public string Ports
7068

7169
public ICollectionView PortsHistoryView { get; }
7270

73-
private bool _isScanRunning;
74-
public bool IsScanRunning
71+
private bool _isRunning;
72+
public bool IsRunning
7573
{
76-
get => _isScanRunning;
74+
get => _isRunning;
7775
set
7876
{
79-
if (value == _isScanRunning)
77+
if (value == _isRunning)
8078
return;
8179

82-
_isScanRunning = value;
80+
_isRunning = value;
8381

8482
OnPropertyChanged();
8583
}
@@ -141,9 +139,7 @@ public IList SelectedResults
141139
OnPropertyChanged();
142140
}
143141
}
144-
145-
public bool ResolveHostname => SettingsManager.Current.PortScanner_ResolveHostname;
146-
142+
147143
private int _portsToScan;
148144
public int PortsToScan
149145
{
@@ -204,7 +200,7 @@ public bool IsStatusMessageDisplayed
204200
public string StatusMessage
205201
{
206202
get => _statusMessage;
207-
set
203+
private set
208204
{
209205
if (value == _statusMessage)
210206
return;
@@ -218,8 +214,6 @@ public string StatusMessage
218214
#region Constructor, load settings, shutdown
219215
public PortScannerViewModel(IDialogCoordinator instance, int tabId, string host, string port)
220216
{
221-
_isLoading = true;
222-
223217
_dialogCoordinator = instance;
224218

225219
_tabId = tabId;
@@ -236,11 +230,6 @@ public PortScannerViewModel(IDialogCoordinator instance, int tabId, string host,
236230
ResultsView.SortDescriptions.Add(new SortDescription(nameof(PortScannerPortInfo.IPAddressInt32), ListSortDirection.Descending));
237231

238232
LoadSettings();
239-
240-
// Detect if settings have changed...
241-
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
242-
243-
_isLoading = false;
244233
}
245234

246235
private void LoadSettings()
@@ -254,27 +243,27 @@ public void OnLoaded()
254243
return;
255244

256245
if (!string.IsNullOrEmpty(Hosts) && !string.IsNullOrEmpty(Ports))
257-
StartScan();
246+
StartScan().ConfigureAwait(false);
258247

259248
_firstLoad = false;
260249
}
261250

262251
public void OnClose()
263252
{
264253
// Stop scan
265-
if (IsScanRunning)
254+
if (IsRunning)
266255
StopScan();
267256
}
268257
#endregion
269258

270259
#region ICommands & Actions
271-
public ICommand OpenPortProfileSelectionCommand => new RelayCommand(p => OpenPortProfileSelectionAction(), OpenPortProfileSelection_CanExecute);
260+
public ICommand OpenPortProfileSelectionCommand => new RelayCommand(_ => OpenPortProfileSelectionAction(), OpenPortProfileSelection_CanExecute);
272261

273262
private bool OpenPortProfileSelection_CanExecute(object parameter) => Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
274263

275264
private void OpenPortProfileSelectionAction()
276265
{
277-
OpenPortProfileSelection();
266+
OpenPortProfileSelection().ConfigureAwait(false);
278267
}
279268

280269
public ICommand ScanCommand => new RelayCommand(_ => ScanAction(), Scan_CanExecute);
@@ -283,10 +272,10 @@ private void OpenPortProfileSelectionAction()
283272

284273
private void ScanAction()
285274
{
286-
if (IsScanRunning)
275+
if (IsRunning)
287276
StopScan();
288277
else
289-
StartScan();
278+
StartScan().ConfigureAwait(false);
290279
}
291280

292281
public ICommand CopySelectedIPAddressCommand => new RelayCommand(_ => CopySelectedIPAddressAction());
@@ -342,7 +331,7 @@ private void CopySelectedDescriptionAction()
342331

343332
private void ExportAction()
344333
{
345-
Export();
334+
Export().ConfigureAwait(false);
346335
}
347336
#endregion
348337

@@ -359,7 +348,7 @@ private async Task OpenPortProfileSelection()
359348
await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
360349

361350
Ports = string.Join("; ", instance.GetSelectedPortProfiles().Select(x => x.Ports));
362-
}, async instance =>
351+
}, async _ =>
363352
{
364353
await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
365354
});
@@ -374,12 +363,10 @@ private async Task OpenPortProfileSelection()
374363

375364
private async Task StartScan()
376365
{
377-
_isLoading = true;
378-
379366
IsStatusMessageDisplayed = false;
380367
StatusMessage = string.Empty;
381368

382-
IsScanRunning = true;
369+
IsRunning = true;
383370
PreparingScan = true;
384371

385372
Results.Clear();
@@ -465,7 +452,7 @@ private void StopScan()
465452
private void ScanFinished()
466453
{
467454
CancelScan = false;
468-
IsScanRunning = false;
455+
IsRunning = false;
469456
}
470457

471458
private async Task Export()
@@ -493,7 +480,7 @@ private async Task Export()
493480

494481
SettingsManager.Current.PortScanner_ExportFileType = instance.FileType;
495482
SettingsManager.Current.PortScanner_ExportFilePath = instance.FilePath;
496-
}, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, new ExportFileType[] { ExportFileType.Csv, ExportFileType.Xml, ExportFileType.Json }, true, SettingsManager.Current.PortScanner_ExportFileType, SettingsManager.Current.PortScanner_ExportFilePath);
483+
}, _ => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, new[] { ExportFileType.Csv, ExportFileType.Xml, ExportFileType.Json }, true, SettingsManager.Current.PortScanner_ExportFileType, SettingsManager.Current.PortScanner_ExportFilePath);
497484

498485
customDialog.Content = new ExportDialog
499486
{
@@ -581,15 +568,6 @@ private void PortScanned(object sender, PortScannerPortScannedArgs e)
581568
Results.Add(e.Args);
582569
}));
583570
}
584-
585-
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
586-
{
587-
switch (e.PropertyName)
588-
{
589-
case nameof(SettingsInfo.PortScanner_ResolveHostname):
590-
OnPropertyChanged(nameof(ResolveHostname));
591-
break;
592-
}
593-
}
571+
594572
#endregion
595573
}

‎Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public PowerShellHostViewModel(IDialogCoordinator instance)
246246

247247
LoadSettings();
248248

249-
SettingsManager.Current.PropertyChanged += Current_PropertyChanged;
249+
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
250250

251251
_isLoading = false;
252252
}
@@ -614,7 +614,7 @@ private void TabItems_CollectionChanged(object sender, NotifyCollectionChangedEv
614614
ConfigurationManager.Current.PowerShellHasTabs = TabItems.Count > 0;
615615
}
616616

617-
private void Current_PropertyChanged(object sender, PropertyChangedEventArgs e)
617+
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
618618
{
619619
if (e.PropertyName == nameof(SettingsInfo.PowerShell_ApplicationFilePath))
620620
CheckSettings();

0 commit comments

Comments
 (0)