Skip to content

Commit bc1ff90

Browse files
akesselerakesseler
authored
Merge pull request #3 from akesseler/logging
Composite logging and resolving links.
2 parents 0451328 + 549cd97 commit bc1ff90

14 files changed

Lines changed: 406 additions & 925 deletions

File tree

‎code/src/HISTORY.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11

2+
**1.0.3**
3+
- Update of used Nuget packages.
4+
- All loggers replaced by composite logger.
5+
- Resolving reparse points to their originals.
6+
- Bugfix, prevention of target file deletion under some circumstances.
7+
- Version number increased.
8+
- Releasing and publishing all changes on GitHub.
9+
210
**1.0.2**
311
- Bugfix, support of final backslash in path arguments.
412
- Version number increased.

‎code/src/QuickCopy/Builders/PlaylistBuilder.cs‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@
2323
*/
2424

2525
using Plexdata.LogWriter.Abstraction;
26+
using Plexdata.LogWriter.Extensions;
2627
using Plexdata.QuickCopy.Handlers;
2728
using Plexdata.QuickCopy.Helpers;
2829
using Plexdata.QuickCopy.Models;
30+
using Plexdata.QuickCopy.Native;
2931
using Plexdata.QuickCopy.Timers;
3032
using System;
3133
using System.Collections.Generic;
3234
using System.IO;
3335
using System.Linq;
36+
using System.Reflection;
3437
using System.Threading;
3538

3639
namespace Plexdata.QuickCopy.Builders
@@ -73,10 +76,18 @@ public List<PlaylistEntryHandler> Build(Arguments arguments)
7376
{
7477
foreach (String file in arguments.Files)
7578
{
79+
String source = Path.GetFullPath(file);
80+
String origin = source;
81+
82+
source = this.Resolve(source, out Boolean resolved);
83+
84+
String target = Path.Combine(arguments.Target, Path.GetFileName(source));
85+
7686
result.Add(new PlaylistEntry()
7787
{
78-
Source = Path.GetFullPath(file),
79-
Target = Path.Combine(arguments.Target, Path.GetFileName(file)),
88+
Source = source,
89+
Origin = resolved ? origin : String.Empty,
90+
Target = target,
8091
IsMove = arguments.IsMove,
8192
IsVerify = arguments.IsVerify,
8293
IsOverwrite = arguments.IsOverwrite,
@@ -85,18 +96,23 @@ public List<PlaylistEntryHandler> Build(Arguments arguments)
8596
}
8697
else
8798
{
88-
DirectoryInfo folder = new DirectoryInfo(FilePathAdjuster.ToLongPath(arguments.Source));
99+
DirectoryInfo folder = new DirectoryInfo(FilePathAdjuster.ToLongPath(this.Resolve(arguments.Source)));
89100
SearchOption option = arguments.IsRecursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
90101

91102
foreach (FileInfo file in folder.EnumerateFiles(arguments.Pattern, option))
92103
{
93104
// The new target filename must include the sub-path of the source folder.
94105
String source = file.FullName;
106+
String origin = source;
107+
108+
source = this.Resolve(source, out Boolean resolved);
109+
95110
String target = source.Replace(folder.FullName, String.Empty).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
96111

97112
result.Add(new PlaylistEntry()
98113
{
99114
Source = source,
115+
Origin = resolved ? origin : String.Empty,
100116
Target = Path.Combine(arguments.Target, target),
101117
IsMove = arguments.IsMove,
102118
IsVerify = arguments.IsVerify,
@@ -110,5 +126,42 @@ public List<PlaylistEntryHandler> Build(Arguments arguments)
110126
}
111127

112128
#endregion
129+
130+
#region Private methods
131+
132+
private String Resolve(String filename)
133+
{
134+
return this.Resolve(filename, out Boolean resolved);
135+
}
136+
137+
private String Resolve(String filename, out Boolean resolved)
138+
{
139+
resolved = false;
140+
141+
try
142+
{
143+
String result = ReparseResolver.Resolve(filename, out resolved);
144+
145+
if (resolved)
146+
{
147+
this.logger.Verbose(
148+
MethodBase.GetCurrentMethod(),
149+
$"Reparse point \"{filename}\" resolved to \"{result}\".");
150+
}
151+
152+
return result;
153+
}
154+
catch (Exception exception)
155+
{
156+
this.logger.Warning(
157+
MethodBase.GetCurrentMethod(),
158+
$"Resolving reparse point \"{filename}\" has failed. Use original name instead.",
159+
exception);
160+
161+
return filename;
162+
}
163+
}
164+
165+
#endregion
113166
}
114167
}

‎code/src/QuickCopy/Handlers/PlaylistEntryHandler.cs‎

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -78,34 +78,34 @@ public Boolean IsCancel
7878

7979
public void Execute()
8080
{
81-
try
82-
{
83-
if (this.IsAbort) { return; }
81+
if (this.IsAbort) { return; }
8482

85-
// Check file name equality.
86-
if (!this.CheckDiffer(this.Entry.Source, this.Entry.Target))
87-
{
88-
return;
89-
}
83+
// Check file name equality.
84+
if (!this.CheckDiffer(this.Entry.Source, this.Entry.Target))
85+
{
86+
return;
87+
}
9088

91-
if (this.IsAbort) { return; }
89+
if (this.IsAbort) { return; }
9290

93-
// Check and validate source file.
94-
if (!this.CheckSource(this.Entry.Source))
95-
{
96-
return;
97-
}
91+
// Check and validate source file.
92+
if (!this.CheckSource(this.Entry.Source))
93+
{
94+
return;
95+
}
9896

99-
if (this.IsAbort) { return; }
97+
if (this.IsAbort) { return; }
10098

101-
// Check and validate target file.
102-
if (!this.CheckTarget(this.Entry.Target))
103-
{
104-
return;
105-
}
99+
// Check and validate target file.
100+
if (!this.CheckTarget(this.Entry.Target, this.Entry.IsOverwrite))
101+
{
102+
return;
103+
}
106104

107-
if (this.IsAbort) { return; }
105+
if (this.IsAbort) { return; }
108106

107+
try
108+
{
109109
using (new PlaylistEntryExecutionTimer(this.logger, this.GetExecutionDetails()))
110110
using (IncrementalHash sourceHash = IncrementalHash.CreateHash(HashAlgorithmName.MD5))
111111
using (IncrementalHash targetHash = IncrementalHash.CreateHash(HashAlgorithmName.MD5))
@@ -146,6 +146,10 @@ public void Execute()
146146
// case of an unsuccessful termination (!error && !cancel).
147147
this.DeleteSource(this.Entry.Source);
148148

149+
// Remove origin file in case of moving is enabled but not in
150+
// case of an unsuccessful termination (!error && !cancel).
151+
this.DeleteSource(this.Entry.Origin);
152+
149153
// Remove target file but only in case of an unsuccessful
150154
// termination (error || cancel).
151155
this.DeleteTarget(this.Entry.Target);
@@ -156,7 +160,7 @@ public void Execute()
156160

157161
#region Private properties
158162

159-
public Boolean IsAbort
163+
private Boolean IsAbort
160164
{
161165
get
162166
{
@@ -278,14 +282,18 @@ private Boolean CheckSource(String sourceFile)
278282
/// <summary>
279283
/// Validates the target file (not empty) and creates the folder structure
280284
/// if necessary. Additionally, all existing file attributes are released.
285+
/// But only if target file already exists and overwrite mode is enabled.
281286
/// </summary>
282287
/// <param name="targetFile">
283288
/// The target file to check.
284289
/// </param>
290+
/// <param name="overwrite">
291+
/// Current overwrite mode.
292+
/// </param>
285293
/// <returns>
286294
/// True, if successful and false otherwise.
287295
/// </returns>
288-
private Boolean CheckTarget(String targetFile)
296+
private Boolean CheckTarget(String targetFile, Boolean overwrite)
289297
{
290298
if (String.IsNullOrWhiteSpace(targetFile))
291299
{
@@ -309,6 +317,17 @@ private Boolean CheckTarget(String targetFile)
309317

310318
if (nominee.Exists)
311319
{
320+
if (!overwrite)
321+
{
322+
// Do not set error flag!
323+
this.logger.Warning(
324+
MethodBase.GetCurrentMethod(),
325+
"Target file exists and overwrite is disabled.",
326+
this.GetTargetFileDetail(targetFile));
327+
328+
return false;
329+
}
330+
312331
nominee.Attributes = FileAttributes.Normal; // Release all attributes.
313332
}
314333

@@ -461,6 +480,8 @@ private void DeleteSource(String source)
461480
{
462481
try
463482
{
483+
if (String.IsNullOrWhiteSpace(source)) { return; }
484+
464485
// Don't do anything in case of abort state.
465486
if (this.IsAbort) { return; }
466487

@@ -497,6 +518,8 @@ private void DeleteTarget(String target)
497518
{
498519
try
499520
{
521+
if (String.IsNullOrWhiteSpace(target)) { return; }
522+
500523
// Don't do anything in case of success state.
501524
if (!this.IsAbort) { return; }
502525

‎code/src/QuickCopy/Models/PlaylistEntry.cs‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ internal class PlaylistEntry
3636

3737
private String source = String.Empty;
3838

39+
private String origin = String.Empty;
40+
3941
private String target = String.Empty;
4042

4143
#endregion
@@ -63,6 +65,25 @@ public String Source
6365
}
6466
}
6567

68+
public String Origin
69+
{
70+
get
71+
{
72+
return this.origin;
73+
}
74+
set
75+
{
76+
if (String.IsNullOrWhiteSpace(value))
77+
{
78+
this.origin = String.Empty;
79+
}
80+
else
81+
{
82+
this.origin = FilePathAdjuster.ToLongPath(Path.GetFullPath(value));
83+
}
84+
}
85+
}
86+
6687
public String Target
6788
{
6889
get
@@ -93,7 +114,8 @@ public override String ToString()
93114
builder.Append($"{nameof(this.IsVerify)}=[{this.IsVerify.ToSafeString()}], ");
94115
builder.Append($"{nameof(this.IsOverwrite)}=[{this.IsOverwrite.ToSafeString()}], ");
95116
builder.Append($"{nameof(this.Target)}=[{this.Target.ToSafeString()}], ");
96-
builder.Append($"{nameof(this.Source)}=[{this.Source.ToSafeString()}]");
117+
builder.Append($"{nameof(this.Source)}=[{this.Source.ToSafeString()}], ");
118+
builder.Append($"{nameof(this.Origin)}=[{this.Origin.ToSafeString()}]");
97119

98120
return builder.ToString();
99121
}

0 commit comments

Comments
 (0)