Skip to content

Commit 370d56f

Browse files
CodeDeadCodeDead
committed
* Added scan date property to LvCheck
* Copying data to the clipboard will now use tabs as delimiter
1 parent 6ce96cd commit 370d56f

8 files changed

Lines changed: 68 additions & 62 deletions

File tree

‎Advanced PortChecker/App.config‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="Advanced_PortChecker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6-
</sectionGroup>
7-
</configSections>
8-
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
10-
</startup>
11-
<userSettings>
12-
<Advanced_PortChecker.Properties.Settings>
13-
<setting name="VisualStyle" serializeAs="String">
14-
<value>Metro</value>
15-
</setting>
16-
<setting name="MetroColor" serializeAs="String">
17-
<value>#FF07779C</value>
18-
</setting>
19-
<setting name="BorderThickness" serializeAs="String">
20-
<value>3</value>
21-
</setting>
22-
<setting name="AutoUpdate" serializeAs="String">
23-
<value>True</value>
24-
</setting>
25-
<setting name="TimeOut" serializeAs="String">
26-
<value>500</value>
27-
</setting>
28-
<setting name="WindowOpacity" serializeAs="String">
29-
<value>1</value>
30-
</setting>
31-
<setting name="WindowResizeBorder" serializeAs="String">
32-
<value>3</value>
33-
</setting>
34-
<setting name="WindowDraggable" serializeAs="String">
35-
<value>True</value>
36-
</setting>
37-
<setting name="TimeOutType" serializeAs="String">
38-
<value>0</value>
39-
</setting>
40-
<setting name="ScanThreads" serializeAs="String">
41-
<value>2</value>
42-
</setting>
43-
</Advanced_PortChecker.Properties.Settings>
44-
</userSettings>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="Advanced_PortChecker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6+
</sectionGroup>
7+
</configSections>
8+
<startup>
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
10+
</startup>
11+
<userSettings>
12+
<Advanced_PortChecker.Properties.Settings>
13+
<setting name="VisualStyle" serializeAs="String">
14+
<value>Metro</value>
15+
</setting>
16+
<setting name="MetroColor" serializeAs="String">
17+
<value>#FF07779C</value>
18+
</setting>
19+
<setting name="BorderThickness" serializeAs="String">
20+
<value>3</value>
21+
</setting>
22+
<setting name="WindowOpacity" serializeAs="String">
23+
<value>1</value>
24+
</setting>
25+
<setting name="WindowResizeBorder" serializeAs="String">
26+
<value>3</value>
27+
</setting>
28+
<setting name="WindowDraggable" serializeAs="String">
29+
<value>True</value>
30+
</setting>
31+
<setting name="AutoUpdate" serializeAs="String">
32+
<value>True</value>
33+
</setting>
34+
<setting name="TimeOut" serializeAs="String">
35+
<value>500</value>
36+
</setting>
37+
<setting name="TimeOutType" serializeAs="String">
38+
<value>0</value>
39+
</setting>
40+
<setting name="ScanThreads" serializeAs="String">
41+
<value>2</value>
42+
</setting>
43+
</Advanced_PortChecker.Properties.Settings>
44+
</userSettings>
4545
</configuration>

‎Advanced PortChecker/Classes/Export/ExportWriter.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ private static void SaveAsText(string path, ItemsControl lvPorts)
5454
LvCheck l = (LvCheck)lvPorts.Items[i];
5555
if (i == lvPorts.Items.Count - 1)
5656
{
57-
sb.Append(l.Address + "\t" + l.Port + "\t" + l.HostName + "\t" + l.Type + "\t" + l.Description);
57+
sb.Append(l.Address + "\t" + l.Port + "\t" + l.HostName + "\t" + l.Type + "\t" + l.Description + "\t" + l.ScanDate);
5858
}
5959
else
6060
{
61-
sb.AppendLine(l.Address + "\t" + l.Port + "\t" + l.HostName + "\t" + l.Type + "\t" + l.Description);
61+
sb.AppendLine(l.Address + "\t" + l.Port + "\t" + l.HostName + "\t" + l.Type + "\t" + l.Description + "\t" + l.ScanDate);
6262
}
6363
}
6464
Write(path, sb.ToString());
@@ -82,10 +82,10 @@ private static void SaveAsHTML(string path, ItemsControl lvPorts)
8282

8383
sb.AppendLine("<h1>Export list</h1>");
8484
sb.AppendLine("<table border='1'>");
85-
sb.AppendLine("<tr><th>Address</th><th>Port</th><th>Host name</th><th>Type</th><th>Description</th></tr>");
85+
sb.AppendLine("<tr><th>Address</th><th>Port</th><th>Host name</th><th>Type</th><th>Description</th><th>Scan date</th></tr>");
8686
foreach (LvCheck l in lvPorts.Items)
8787
{
88-
sb.AppendLine("<tr><td>" + l.Address + "</td><td>" + l.Port + "</td><td>" + l.HostName + "</td><td>" + l.Type + "</td><td>" + l.Description + "</td></tr>");
88+
sb.AppendLine("<tr><td>" + l.Address + "</td><td>" + l.Port + "</td><td>" + l.HostName + "</td><td>" + l.Type + "</td><td>" + l.Description +"</td><td>" + l.ScanDate + "</td></tr>");
8989
}
9090
sb.AppendLine("</table>");
9191

@@ -110,11 +110,11 @@ private static void SaveAsCSV(string path, ItemsControl lvPorts, string delimite
110110
LvCheck l = (LvCheck)lvPorts.Items[i];
111111
if (i == lvPorts.Items.Count - 1)
112112
{
113-
sb.Append(l.Address + delimiter + l.Port + delimiter + l.HostName + delimiter + l.Type + delimiter + l.Description);
113+
sb.Append(l.Address + delimiter + l.Port + delimiter + l.HostName + delimiter + l.Type + delimiter + l.Description + delimiter + l.ScanDate);
114114
}
115115
else
116116
{
117-
sb.AppendLine(l.Address + delimiter + l.Port + delimiter + l.HostName + delimiter + l.Type + delimiter + l.Description);
117+
sb.AppendLine(l.Address + delimiter + l.Port + delimiter + l.HostName + delimiter + l.Type + delimiter + l.Description + delimiter + l.ScanDate);
118118
}
119119
}
120120
Write(path, sb.ToString());

‎Advanced PortChecker/Classes/Objects/LvCheck.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ public class LvCheck
2525
/// Description of the scan result
2626
/// </summary>
2727
public string Description { get; set; }
28+
/// <summary>
29+
/// The time at which the scan was performed
30+
/// </summary>
31+
public string ScanDate { get; set; }
2832
}
2933
}

‎Advanced PortChecker/Classes/Scanner/PortScanner.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Globalization;
34
using System.Net;
45
using System.Net.Sockets;
56
using Advanced_PortChecker.Classes.Objects;
@@ -62,7 +63,8 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo
6263
Port = i,
6364
HostName = GetMachineNameFromIpAddress(address),
6465
Type = "TCP",
65-
Description = IsTcpOpen(address, i, timeout) ? "Open" : "Closed"
66+
Description = IsTcpOpen(address, i, timeout) ? "Open" : "Closed",
67+
ScanDate = DateTime.Now.ToString(CultureInfo.CurrentCulture)
6668
};
6769
lv.Add(check);
6870

@@ -105,7 +107,8 @@ internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPo
105107
Port = i,
106108
HostName = GetMachineNameFromIpAddress(address),
107109
Type = "UDP",
108-
Description = IsUdpOpen(address, i, timeout) ? "Open" : "Closed"
110+
Description = IsUdpOpen(address, i, timeout) ? "Open" : "Closed",
111+
ScanDate = DateTime.Now.ToString(CultureInfo.CurrentCulture)
109112
};
110113
lv.Add(check);
111114

‎Advanced PortChecker/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System.Reflection;
2-
using System.Resources;
3-
using System.Runtime.CompilerServices;
42
using System.Runtime.InteropServices;
53
using System.Windows;
64

‎Advanced PortChecker/Properties/Settings.settings‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@
1111
<Setting Name="BorderThickness" Type="System.Int32" Scope="User">
1212
<Value Profile="(Default)">3</Value>
1313
</Setting>
14-
<Setting Name="AutoUpdate" Type="System.Boolean" Scope="User">
15-
<Value Profile="(Default)">True</Value>
16-
</Setting>
17-
<Setting Name="TimeOut" Type="System.Int32" Scope="User">
18-
<Value Profile="(Default)">500</Value>
19-
</Setting>
20-
<Setting Name="WindowOpacity" Type="System.Double" Scope="User">
14+
<Setting Name="WindowOpacity" Type="System.Double" Scope="User">
2115
<Value Profile="(Default)">1</Value>
2216
</Setting>
2317
<Setting Name="WindowResizeBorder" Type="System.Double" Scope="User">
@@ -26,7 +20,13 @@
2620
<Setting Name="WindowDraggable" Type="System.Boolean" Scope="User">
2721
<Value Profile="(Default)">True</Value>
2822
</Setting>
29-
<Setting Name="TimeOutType" Type="System.Int32" Scope="User">
23+
<Setting Name="AutoUpdate" Type="System.Boolean" Scope="User">
24+
<Value Profile="(Default)">True</Value>
25+
</Setting>
26+
<Setting Name="TimeOut" Type="System.Int32" Scope="User">
27+
<Value Profile="(Default)">500</Value>
28+
</Setting>
29+
<Setting Name="TimeOutType" Type="System.Int32" Scope="User">
3030
<Value Profile="(Default)">0</Value>
3131
</Setting>
3232
<Setting Name="ScanThreads" Type="System.Int32" Scope="User">

‎Advanced PortChecker/Windows/MainWindow.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
<GridViewColumn Header="Host name" DisplayMemberBinding="{Binding HostName}" utils:GridViewSort.PropertyName="HostName" />
189189
<GridViewColumn Header="Type" DisplayMemberBinding="{Binding Type}" utils:GridViewSort.PropertyName="Type" />
190190
<GridViewColumn Header="Description" DisplayMemberBinding="{Binding Description}" utils:GridViewSort.PropertyName="Description" />
191+
<GridViewColumn Header="Scan date" DisplayMemberBinding="{Binding ScanDate}" utils:GridViewSort.PropertyName="ScanDate" />
191192
</GridView>
192193
</ListView.View>
193194
</ListView>

‎Advanced PortChecker/Windows/MainWindow.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,11 @@ private void BtnCopy_Click(object sender, RoutedEventArgs e)
400400
{
401401
if (i != selected.Count - 1)
402402
{
403-
sb.AppendLine(selected[i].Address + " " + selected[i].Port + " " + selected[i].HostName + " " + selected[i].Type + " " + selected[i].Description);
403+
sb.AppendLine(selected[i].Address + "\t" + selected[i].Port + "\t" + selected[i].HostName + "\t" + selected[i].Type + "\t" + selected[i].Description + "\t" + selected[i].ScanDate);
404404
}
405405
else
406406
{
407-
sb.Append(selected[i].Address + " " + selected[i].Port + " " + selected[i].HostName + " " + selected[i].Type + " " + selected[i].Description);
407+
sb.Append(selected[i].Address + "\t" + selected[i].Port + "\t" + selected[i].HostName + "\t" + selected[i].Type + "\t" + selected[i].Description + "\t" + selected[i].ScanDate);
408408
}
409409
}
410410

0 commit comments

Comments
 (0)