Rayburn Davis
2014-09-15 fb4519e5c864e7c153b6bafcf79275ed36a9bda3
- Modernized the listview header color

- Sorting of the list broke when I started using the hash map to cache files in the search engine; this is now fixed
- Scan by filename works again
- Did a little work on network scanning
4 files added
2 files deleted
32 files modified
298 ■■■■■ changed files
DupliDelete/DCWPF/bin/Debug/DCWPF.exe patch | view | raw | blame | history
DupliDelete/DCWPF/bin/Debug/DCWPF.pdb patch | view | raw | blame | history
DupliDelete/DCWPF/bin/Debug/DCWPF.vshost.exe patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.csproj.FileListAbsolute.txt 1 ●●●● patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.csprojResolveAssemblyReference.cache patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.exe patch | view | raw | blame | history
DupliDelete/DCWPF/obj/Debug/DCWPF.pdb patch | view | raw | blame | history
DupliDelete/DupliDelete.sln 16 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete.v12.suo patch | view | raw | blame | history
DupliDelete/DupliDelete/DupliDelete.csproj 4 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Duplicate Network Server/NetworkServer.cs 10 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Duplicate Search Engine/DuplicateFinder.cs 91 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Duplicate Search Engine/Folder.cs 27 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Duplicate Search Engine/ParallelFileCache.cs 42 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/DuplicateListView/DuplicateListView.cs 16 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/DuplicateListView/ISortCriteria.cs 13 ●●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/About.cs 4 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/MainForm.Designer.cs 1 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/MainForm.cs 34 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Forms/MainForm.resx 6 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Properties/Resources.resx 11 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/Resources/header.PNG patch | view | raw | blame | history
DupliDelete/DupliDelete/Resources/sizinggrip.bmp patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.exe patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.pdb patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/dcbeta.zip patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/options.ini 17 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/bin/Debug/pinned_profiles.ini 4 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.Form1.resources patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.Properties.Resources.resources patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.FileListAbsolute.txt 1 ●●●● patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.GenerateResource.Cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csprojResolveAssemblyReference.cache patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.exe patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.pdb patch | view | raw | blame | history
DupliDelete/DupliDelete/obj/x86/Debug/TempPE/Properties.Resources1.Designer.cs.dll patch | view | raw | blame | history
DupliDelete/DCWPF/bin/Debug/DCWPF.exe
Binary files differ
DupliDelete/DCWPF/bin/Debug/DCWPF.pdb
Binary files differ
DupliDelete/DCWPF/bin/Debug/DCWPF.vshost.exe
Binary files differ
DupliDelete/DCWPF/obj/Debug/DCWPF.csproj.FileListAbsolute.txt
....@@ -21,3 +21,4 @@
2121 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\DCWPF.g.resources
2222 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\DCWPF.Properties.Resources.resources
2323 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\DCWPF.csproj.GenerateResource.Cache
24
+C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DCWPF\obj\Debug\DCWPF.csprojResolveAssemblyReference.cache
DupliDelete/DCWPF/obj/Debug/DCWPF.csprojResolveAssemblyReference.cache
Binary files differ
DupliDelete/DCWPF/obj/Debug/DCWPF.exe
Binary files differ
DupliDelete/DCWPF/obj/Debug/DCWPF.pdb
Binary files differ
DupliDelete/DupliDelete.sln
....@@ -1,9 +1,9 @@
11 
22 Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 2012
3
+# Visual Studio 2013
4
+VisualStudioVersion = 12.0.21005.1
5
+MinimumVisualStudioVersion = 10.0.40219.1
46 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DupliDelete", "DupliDelete\DupliDelete.csproj", "{A1FCD2BD-4DC3-4FFE-9A57-2EF37BD98C10}"
5
-EndProject
6
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCWPF", "DCWPF\DCWPF.csproj", "{E0AC1744-316D-4BA9-A983-BA1B37765321}"
77 EndProject
88 Global
99 GlobalSection(SolutionConfigurationPlatforms) = preSolution
....@@ -25,16 +25,6 @@
2525 {A1FCD2BD-4DC3-4FFE-9A57-2EF37BD98C10}.Release|Mixed Platforms.Build.0 = Release|x86
2626 {A1FCD2BD-4DC3-4FFE-9A57-2EF37BD98C10}.Release|x86.ActiveCfg = Release|x86
2727 {A1FCD2BD-4DC3-4FFE-9A57-2EF37BD98C10}.Release|x86.Build.0 = Release|x86
28
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Debug|Any CPU.Build.0 = Debug|Any CPU
30
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
31
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
32
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Debug|x86.ActiveCfg = Debug|Any CPU
33
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Release|Any CPU.ActiveCfg = Release|Any CPU
34
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Release|Any CPU.Build.0 = Release|Any CPU
35
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
36
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Release|Mixed Platforms.Build.0 = Release|Any CPU
37
- {E0AC1744-316D-4BA9-A983-BA1B37765321}.Release|x86.ActiveCfg = Release|Any CPU
3828 EndGlobalSection
3929 GlobalSection(SolutionProperties) = preSolution
4030 HideSolutionNode = FALSE
DupliDelete/DupliDelete.v12.suo
Binary files differ
DupliDelete/DupliDelete/DupliDelete.csproj
....@@ -71,8 +71,7 @@
7171 <Compile Include="Duplicate Network Server\NetworkScanQuery.cs" />
7272 <Compile Include="Duplicate Network Server\NetworkServer.cs" />
7373 <Compile Include="Duplicate Network Server\NetworkTestCommand.cs" />
74
- <Compile Include="Duplicate Search Engine\ParallelFileCache.cs" />
75
- <Compile Include="DuplicateListView\ISortCriteria.cs" />
74
+ <Compile Include="Duplicate Search Engine\Folder.cs" />
7675 <Compile Include="DuplicateListView\SizeSorter.cs" />
7776 <Compile Include="FileOperationAPIWrapper.cs" />
7877 <Compile Include="Forms\AdvancedSearch.cs">
....@@ -395,6 +394,7 @@
395394 </ItemGroup>
396395 <ItemGroup>
397396 <Content Include="app_ico.ico" />
397
+ <None Include="Resources\header.PNG" />
398398 <None Include="app.config" />
399399 <None Include="Resources\computer_icon.ico" />
400400 <None Include="Resources\checkbycrossreference_classic.bmp" />
DupliDelete/DupliDelete/Duplicate Network Server/NetworkServer.cs
....@@ -5,6 +5,7 @@
55 using System.Runtime.Serialization;
66 using System.Runtime.Serialization.Formatters.Binary;
77 using System.Threading;
8
+using DupliDelete.Duplicate_Search_Engine;
89
910 namespace DupliDelete
1011 {
....@@ -36,7 +37,14 @@
3637 {
3738 NetworkDuplicateScanCommand duplicateScanCommand = (NetworkDuplicateScanCommand)command;
3839
39
- DuplicateFinder networkFinder = new DuplicateFinder(duplicateScanCommand.Folders.ToArray());
40
+ List<Folder> folders = new List<Folder>();
41
+
42
+ foreach(string folder in duplicateScanCommand.Folders)
43
+ {
44
+ folders.Add(new Folder(Folder.Location.Local, "", folder));
45
+ }
46
+
47
+ DuplicateFinder networkFinder = new DuplicateFinder(folders.ToArray());
4048 networkFinder.ScanComplete += new DuplicateFinder.ScanCompleteDelegate(networkFinder_ScanComplete);
4149 networkFinder.IncludeSubfolders = true;
4250 networkFinder.IgnoreLinks = false;
....@@ -12,6 +12,7 @@
1212 using System.Threading;
1313 using System.Net.Sockets;
1414 using System.Threading.Tasks;
15
+using DupliDelete.Duplicate_Search_Engine;
1516
1617 namespace DupliDelete
1718 {
....@@ -25,7 +26,7 @@
2526 public double FileChecksumProgress;
2627 public ObjectInfo FileChecksumObject;
2728
28
- public string[] Folders;
29
+ public Folder[] Folders;
2930 public List<string> FileTypeInclusions = new List<string>();
3031 public List<string> ExcludedFolders = new List<string>();
3132 public List<string> ExcludedFiletypes = new List<string>();
....@@ -112,9 +113,83 @@
112113 [DllImport("Kernel32.dll")]
113114 static extern bool GetFileInformationByHandle(IntPtr hFile, out BY_HANDLE_FILE_INFORMATION by1);
114115
115
- public DuplicateFinder(string[] folders)
116
+ public class DuplicateSorter : System.Collections.IComparer
116117 {
117
- Folders = (string[]) folders.Clone();
118
+ DuplicateFinder Finder { get; set; }
119
+
120
+ public DuplicateSorter(DuplicateFinder finder)
121
+ {
122
+ Finder = finder;
123
+ }
124
+
125
+ public int Compare(object x, object y)
126
+ {
127
+ if (Finder.ScanMode == Mode.CompareByActualData)
128
+ {
129
+ string sizeStringX = ((DuplicateGroup)x).GroupName.Substring(0, ((DuplicateGroup)x).GroupName.IndexOf(" "));
130
+ string sizeStringY = ((DuplicateGroup)y).GroupName.Substring(0, ((DuplicateGroup)y).GroupName.IndexOf(" "));
131
+ string metricX = ((DuplicateGroup)x).GroupName.Substring(((DuplicateGroup)x).GroupName.IndexOf(" ") + 1);
132
+ string metricY = ((DuplicateGroup)y).GroupName.Substring(((DuplicateGroup)y).GroupName.IndexOf(" ") + 1);
133
+ double sizeX = Convert.ToDouble(sizeStringX);
134
+ double sizeY = Convert.ToDouble(sizeStringY);
135
+
136
+ if (metricX == "bytes")
137
+ sizeX = shortSizeToLongSize(sizeX, 1);
138
+ if (metricX == "KB")
139
+ sizeX = shortSizeToLongSize(sizeX, 2);
140
+ if (metricX == "MB")
141
+ sizeX = shortSizeToLongSize(sizeX, 3);
142
+ if (metricX == "GB")
143
+ sizeX = shortSizeToLongSize(sizeX, 4);
144
+ if (metricX == "TB")
145
+ sizeX = shortSizeToLongSize(sizeX, 5);
146
+
147
+ if (metricY == "bytes")
148
+ sizeY = shortSizeToLongSize(sizeY, 1);
149
+ if (metricY == "KB")
150
+ sizeY = shortSizeToLongSize(sizeY, 2);
151
+ if (metricY == "MB")
152
+ sizeY = shortSizeToLongSize(sizeY, 3);
153
+ if (metricY == "GB")
154
+ sizeX = shortSizeToLongSize(sizeY, 4);
155
+ if (metricY == "TB")
156
+ sizeY = shortSizeToLongSize(sizeY, 5);
157
+
158
+ if (sizeX < sizeY)
159
+ {
160
+ return -1;
161
+ }
162
+ else if (sizeX == sizeY)
163
+ return 0;
164
+ else
165
+ return 1;
166
+ }
167
+ else
168
+ {
169
+ return 0;
170
+ }
171
+ }
172
+
173
+ public long shortSizeToLongSize(double input, int metric)
174
+ {
175
+ if (metric == 1)
176
+ return (long)input;
177
+ if (metric == 2)
178
+ return (long)input * 1024;
179
+ if (metric == 3)
180
+ return (long)input * 1024 * 1024;
181
+ if (metric == 4)
182
+ return (long)input * 1024 * 1024 * 1024;
183
+ if (metric == 5)
184
+ return (long)input * 1024 * 1024 * 1024 * 1024;
185
+
186
+ return -1;
187
+ }
188
+ }
189
+
190
+ public DuplicateFinder(Folder[] folders)
191
+ {
192
+ Folders = (Folder[]) folders.Clone();
118193
119194 sha_handle = SHA1.Create();
120195 }
....@@ -624,16 +699,16 @@
624699
625700
626701 // Folders to scan
627
- List<string> scanFolders = new List<string>();
702
+ List<Folder> scanFolders = new List<Folder>();
628703 scanFolders.AddRange(Folders);
629704
630705 // Master file list that stores all files and folders that are in the folders that the user selected
631706 DirectoryList masterFolderTable = new DirectoryList();
632707
633708 // Crawl the folders that the user added to the list; add them to the master file table
634
- foreach (string folder in scanFolders)
709
+ foreach (Folder folder in scanFolders)
635710 {
636
- masterFolderTable.Add(new ObjectInfo(folder, 0, ObjectInfo.FileType.Folder));
711
+ masterFolderTable.Add(new ObjectInfo(folder.ClientPath, 0, ObjectInfo.FileType.Folder));
637712 }
638713
639714 foreach (string folder in ExcludedFolders)
....@@ -687,7 +762,7 @@
687762 {
688763 for (j = 0; j < scanFolders.Count; j++)
689764 {
690
- if (scanFolders[j].ToLower().IndexOf(objectInfo.Path.ToLower()) == 0 && scanFolders[j].ToLower() != objectInfo.Path.ToLower())
765
+ if (scanFolders[j].ClientPath.ToLower().IndexOf(objectInfo.Path.ToLower()) == 0 && scanFolders[j].ClientPath.ToLower() != objectInfo.Path.ToLower())
691766 addFolder = false;
692767 }
693768 }
....@@ -1063,6 +1138,8 @@
10631138 }
10641139 }
10651140 }
1141
+
1142
+ GlobalBuffers.Duplicates.Sort(new DuplicateSorter(this));
10661143
10671144
10681145 endTime = DateTime.Now;
....@@ -0,0 +1,27 @@
1
+using System;
2
+using System.Collections.Generic;
3
+using System.Linq;
4
+using System.Text;
5
+
6
+namespace DupliDelete.Duplicate_Search_Engine
7
+{
8
+ public class Folder
9
+ {
10
+ public enum Location
11
+ {
12
+ Local, Remote
13
+ }
14
+
15
+ public Location FolderLocation { get; set; }
16
+
17
+ public string ClientName { get; set; }
18
+ public string ClientPath { get; set; }
19
+
20
+ public Folder(Location location, string clientName, string clientPath)
21
+ {
22
+ FolderLocation = location;
23
+ ClientName = clientName;
24
+ ClientPath = clientPath;
25
+ }
26
+ }
27
+}
deleted file mode 100644
....@@ -1,42 +0,0 @@
1
-using System;
2
-using System.Collections.Generic;
3
-using System.Linq;
4
-using System.Text;
5
-
6
-namespace DupliDelete.Duplicate_Search_Engine
7
-{
8
- public class ParallelFileCache
9
- {
10
- private Action<int, int, DirectoryList> _action;
11
- public Action<int, int, DirectoryList> Action
12
- {
13
- get
14
- {
15
- return _action;
16
- }
17
- set
18
- {
19
- _action = value;
20
- }
21
- }
22
-
23
- public static ParallelFileCache Create(int startIndex, int lastIndex, DirectoryList masterFolderTable)
24
- {
25
- ParallelFileCache pfc = new ParallelFileCache();
26
-
27
- pfc.Action = new Action<int, int, DirectoryList>(ActionMethod);
28
-
29
- return pfc;
30
- }
31
-
32
- public static void ActionMethod(int startIndex, int lastIndex, DirectoryList masterFolderTable)
33
- {
34
- int i;
35
-
36
- for(i = startIndex; i < lastIndex; i++)
37
- {
38
-
39
- }
40
- }
41
- }
42
-}
DupliDelete/DupliDelete/DuplicateListView/DuplicateListView.cs
....@@ -497,7 +497,7 @@
497497 // get the item to be drawn
498498 draw_object = paint_start.ReturnDrawableItem();
499499
500
- // Select the item if it's selected
500
+ // Fil; the item if it's selected
501501 if (ItemSelected(paint_start) == true)
502502 {
503503 //SelectedItemBrush = new LinearGradientBrush(new Rectangle(0, start_y, this.Width, ItemHeight), SystemColors.Highlight, Color.DeepSkyBlue, LinearGradientMode.Vertical);
....@@ -510,23 +510,21 @@
510510 e.Graphics.FillRectangle(MouseOverBrush, new Rectangle(0, start_y, this.Width, ItemHeight));
511511 }
512512
513
- else if (draw_object.ObjectType == DuplicateObject.Type.Group)
513
+ /* else if ( draw_object.ObjectType == DuplicateObject.Type.File)
514514 {
515515 if (draw_object.DuplicateGroup.Highlighted == true)
516516 {
517517 e.Graphics.FillRectangle(Brushes.LightSteelBlue, new Rectangle(0, start_y, this.Width, ItemHeight));
518518 }
519519 }
520
- else if (draw_object.ObjectType == DuplicateObject.Type.File)
520
+
521
+ else if(draw_object.ObjectType == DuplicateObject.Type.Group)
521522 {
522
- if (draw_object.DuplicateFile.Highlighted == true)
523
- {
524
- e.Graphics.FillRectangle(Brushes.LightSteelBlue, new Rectangle(0, start_y, this.Width, ItemHeight));
525
- }
526
- }
523
+ if(draw_object.DuplicateGroup.Highlighted)
524
+ e.Graphics.FillRectangle(Brushes.LightSteelBlue, new Rectangle(0, start_y, this.Width, ItemHeight));
525
+ }*/
527526
528527 // draw the item
529
-
530528 e.Graphics.SetClip(new Rectangle(0 - horizontalScrollbar.Value, start_y, Columns[0].Width, ItemHeight));
531529
532530 // draw the checkbox
DupliDelete/DupliDelete/DuplicateListView/ISortCriteria.cs
deleted file mode 100644
....@@ -1,13 +0,0 @@
1
-using System;
2
-using System.Collections.Generic;
3
-using System.Text;
4
-
5
-namespace DupliDelete.DuplicateListView
6
-{
7
- interface ISortCriteria //: Dictionary<int, DuplicateFile>
8
- {
9
-
10
-
11
- int AddSortItem(Object sortObject);
12
- }
13
-}
DupliDelete/DupliDelete/Forms/About.cs
....@@ -31,8 +31,8 @@
3131 private void About_Load(object sender, EventArgs e)
3232 {
3333 pictureBox1.Image = imageList1.Images[0];
34
- versionLabel.Text = "Duplicate Commander " + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version.Revision;
35
-
34
+ versionLabel.Text = "Duplicate Commander 3.2.41117";/* + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version.Revision;
35
+ */
3636 }
3737
3838 private void rayburnsoftLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
DupliDelete/DupliDelete/Forms/MainForm.Designer.cs
....@@ -1427,7 +1427,6 @@
14271427 //
14281428 // startNetworkServerToolStripMenuItem
14291429 //
1430
- this.startNetworkServerToolStripMenuItem.Enabled = false;
14311430 this.startNetworkServerToolStripMenuItem.Name = "startNetworkServerToolStripMenuItem";
14321431 this.startNetworkServerToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
14331432 this.startNetworkServerToolStripMenuItem.Text = "Start Network &Server";
DupliDelete/DupliDelete/Forms/MainForm.cs
....@@ -20,6 +20,7 @@
2020 using System.Reflection;
2121 using System.Globalization;
2222 using System.Net.Sockets;
23
+using DupliDelete.Duplicate_Search_Engine;
2324
2425 //using System.Design;
2526
....@@ -370,7 +371,7 @@
370371
371372 // get this version; it's stored in the title of the window
372373 version_string = GetVersionString();
373
- Text = "Duplicate Commander " + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version.Revision;
374
+ Text = "Duplicate Commander 3.2.41117"; //+ Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version.Revision;
374375
375376 // check for updates
376377 ThreadStart ts1 = new ThreadStart(CheckForUpdates);
....@@ -2680,6 +2681,22 @@
26802681 for (i = 0; i < collection.Count; i++)
26812682 {
26822683 fileSystemTreeview.Nodes[fileSystemTreeview.Nodes.Count - 1].Nodes.Add(collection[i].Name, collection[i].Name, 3, 3);
2684
+ }
2685
+ }
2686
+
2687
+ public void LoadNetworkComputers()
2688
+ {
2689
+ int i;
2690
+
2691
+ fileSystemTreeview.Nodes.Add("Network PCs", "Network PCs", 4,4);
2692
+
2693
+ fileSystemTreeview.Nodes[fileSystemTreeview.Nodes.Count - 1].Nodes.Clear();
2694
+
2695
+ string[] clients = GlobalBuffers.SettingsManager.GetMultiple("network_clients");
2696
+
2697
+ for (i = 0; i < clients.Length; i++)
2698
+ {
2699
+ fileSystemTreeview.Nodes[fileSystemTreeview.Nodes.Count - 1].Nodes.Add(clients[i], clients[i], 4, 4);
26832700 }
26842701 }
26852702
....@@ -5256,7 +5273,7 @@
52565273 fileSystemTreeview.Nodes.Clear();
52575274 LoadDrives();
52585275 LoadPinnedList();
5259
-
5276
+ LoadNetworkComputers();
52605277
52615278 }
52625279
....@@ -6167,13 +6184,13 @@
61676184 else if (folderList.Items.Count == 0)
61686185 return;
61696186
6170
- List<string> folders = new List<string>();
6187
+ List<Folder> folders = new List<Folder>();
61716188
61726189 int i;
61736190
61746191 for (i = 0; i < folderList.Items.Count; i++)
61756192 {
6176
- folders.Add((string)folderList.Items[i]);
6193
+ folders.Add(new Folder(Folder.Location.Local, "", (string) folderList.Items[i]));
61776194 }
61786195
61796196
....@@ -6186,7 +6203,7 @@
61866203 GlobalBuffers.main_form.in_search = false;
61876204
61886205
6189
- GlobalBuffers.DuplicateFinder = new DuplicateFinder((string[])folders.ToArray());
6206
+ GlobalBuffers.DuplicateFinder = new DuplicateFinder((Folder[])folders.ToArray());
61906207
61916208
61926209 GlobalBuffers.DuplicateFinder.IncludeSubfolders = includeSubfoldersCheckbox.Checked;
....@@ -7274,7 +7291,7 @@
72747291 else if (GetTopParent(fileSystemTreeview.SelectedNode).ImageIndex == 4)
72757292 {
72767293 int i;
7277
- string folderListString = GetTopParent(fileSystemTreeview.SelectedNode).Text + ": " + fileSystemTreeview.SelectedNode.Name;
7294
+ string folderListString = "Network: " + fileSystemTreeview.SelectedNode.Name;
72787295
72797296 for (i = 0; i < folderList.Items.Count; i++)
72807297 {
....@@ -7666,9 +7683,10 @@
76667683 {
76677684 statusBarPanel6.Icon = global::DupliDelete.Properties.Resources.computer_icon_ico;
76687685
7669
- Thread networkListener = new Thread(new ThreadStart(startNetwork));
7686
+ statusBarPanel6.ToolTipText = "Network Server is running";
7687
+ // Thread networkListener = new Thread(new ThreadStart(startNetwork));
76707688
7671
- networkListener.Start();
7689
+ // networkListener.Start();
76727690 }
76737691
76747692 public void startNetwork()
DupliDelete/DupliDelete/Forms/MainForm.resx
....@@ -137,7 +137,7 @@
137137 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
138138 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
139139 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs
140
- DAAAAk1TRnQBSQFMAgEBBQEAASwBIgEsASIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
140
+ DAAAAk1TRnQBSQFMAgEBBQEAAXQBIgF0ASIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
141141 AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
142142 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
143143 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
....@@ -1290,7 +1290,7 @@
12901290 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
12911291 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
12921292 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
1293
- CAAAAk1TRnQBSQFMAwEBAAHoASEB6AEhARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
1293
+ CAAAAk1TRnQBSQFMAwEBAAEwASIBMAEiARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
12941294 AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
12951295 AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
12961296 AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
....@@ -1342,7 +1342,7 @@
13421342 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
13431343 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
13441344 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACa
1345
- HAEAAk1TRnQBSQFMAgEBIQEAASgBEgEoARIBGAEAARgBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFg
1345
+ HAEAAk1TRnQBSQFMAgEBIQEAAXABEgFwARIBGAEAARgBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFg
13461346 AwAB2AMAAQEBAAEgBgABRAEBFQAD6gH/A7IB/wOWAf8D1wH//wBxAAPXAf8BAAGZAcwB/wOGAf8DhgH/
13471347 A9cB//8AcQABmQHMAv8BAAGZAcwB/wOGAf8DhgH/A8AB/wPjAf8D4wH/A+MB/wPxAf//AGEAAZkBzAL/
13481348 AQABmQHMAf8DhgH/BAADhgH/A4YB/wOGAf8DsgH/A+MB//8AXQABzAP/AZkCzAH/A5YB/wHMApkB/wHw
DupliDelete/DupliDelete/Properties/Resources.resx
....@@ -112,10 +112,10 @@
112112 <value>2.0</value>
113113 </resheader>
114114 <resheader name="reader">
115
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116 </resheader>
117117 <resheader name="writer">
118
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120120 <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121 <data name="bytebybyte" type="System.Resources.ResXFileRef, System.Windows.Forms">
....@@ -123,9 +123,6 @@
123123 </data>
124124 <data name="sizinggrip" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125 <value>..\Resources\sizinggrip.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126
- </data>
127
- <data name="header" type="System.Resources.ResXFileRef, System.Windows.Forms">
128
- <value>..\Resources\header.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129126 </data>
130127 <data name="selectedheader" type="System.Resources.ResXFileRef, System.Windows.Forms">
131128 <value>..\Resources\selectedheader.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
....@@ -391,8 +388,10 @@
391388 <data name="checkbyregularexpression_classic" type="System.Resources.ResXFileRef, System.Windows.Forms">
392389 <value>..\Resources\checkbyregexp_classic.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
393390 </data>
394
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
395391 <data name="computer_icon_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
396392 <value>..\Resources\computer_icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
397393 </data>
394
+ <data name="header" type="System.Resources.ResXFileRef, System.Windows.Forms">
395
+ <value>..\Resources\header.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
396
+ </data>
398397 </root>
DupliDelete/DupliDelete/Resources/header.PNG
Binary files differ
DupliDelete/DupliDelete/Resources/sizinggrip.bmp
Binary files differ
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.exe
Binary files differ
DupliDelete/DupliDelete/bin/Debug/Duplicate Commander.pdb
Binary files differ
DupliDelete/DupliDelete/bin/Debug/dcbeta.zip
Binary files differ
DupliDelete/DupliDelete/bin/Debug/options.ini
....@@ -6,6 +6,9 @@
66 dont_notify="3.1 Beta 2"
77 recent1=""
88 recent2=""
9
+recent0="C:\Users\Rayburn\Documents\badlist.dcl"
10
+recent3=""
11
+recent4=""
912 multicore="0"
1013 dont_warn_ntfs="1"
1114 auto_remove_1="0"
....@@ -30,11 +33,8 @@
3033 filetype_exclusions::
3134 ::
3235 network_clients::
36
+192.168.1.128
3337 ::
34
-pos_x="140"
35
-pos_y="54"
36
-size_width="1085"
37
-size_height="619"
3838 check_extension="1"
3939 check_file_size="1"
4040 check_date_time="1"
....@@ -45,7 +45,8 @@
4545 maximum_size_metric="3"
4646 inclusions::
4747 ::
48
-recent0="C:\Users\Rayburn\Documents\badlist.dcl"
49
-recent3=""
50
-recent4=""
51
-maximized="yes"
48
+maximized="no"
49
+pos_x="26"
50
+pos_y="72"
51
+size_width="1119"
52
+size_height="615"
DupliDelete/DupliDelete/bin/Debug/pinned_profiles.ini
....@@ -6,3 +6,7 @@
66 C:\Users\Rayburn Davis\Documents
77 Documents
88 C:\Users\Rayburn\Documents
9
+Docs
10
+ C:\Users\Rayburn\Documents
11
+dctest
12
+ C:\Users\Rayburn\Desktop\dctest
DupliDelete/DupliDelete/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.Form1.resources
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.Properties.Resources.resources
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.FileListAbsolute.txt
....@@ -314,3 +314,4 @@
314314 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.Forms.ScanningForServers.resources
315315 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.NetworkScanOptions.resources
316316 C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\bin\Debug\Duplicate Commander.exe.config
317
+C:\Users\Rayburn\Dropbox\Duplicate Commander Repo\DupliDelete\DupliDelete\obj\x86\Debug\DupliDelete.csprojResolveAssemblyReference.cache
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csproj.GenerateResource.Cache
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/DupliDelete.csprojResolveAssemblyReference.cache
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.exe
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/Duplicate Commander.pdb
Binary files differ
DupliDelete/DupliDelete/obj/x86/Debug/TempPE/Properties.Resources1.Designer.cs.dll
Binary files differ