From 4407d24f5d533d61657610ce3ccd487d0a64150a Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Fri, 2 Aug 2019 13:48:50 -0400 Subject: codacy fixes applied --- .../Main/Operation/Backup/FileEnumerationProcess.cs | 15 ++++++++++++--- .../Library/Main/Operation/Backup/MetadataPreProcess.cs | 7 +++++-- Duplicati/Library/Snapshots/UsnJournalService.cs | 5 ++++- 3 files changed, 21 insertions(+), 6 deletions(-) (limited to 'Duplicati') diff --git a/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs b/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs index f094fa2a1..e816fbbab 100644 --- a/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs +++ b/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs @@ -83,7 +83,10 @@ namespace Duplicati.Library.Main.Operation.Backup { } - if (token.IsCancellationRequested) return false; + if (token.IsCancellationRequested) + { + return false; + } return AttributeFilter(x, fa, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, fileAttributes, enumeratefilter, ignorenames, mixinqueue); }); @@ -105,7 +108,10 @@ namespace Duplicati.Library.Main.Operation.Backup }); } - if (token.IsCancellationRequested) return; + if (token.IsCancellationRequested) + { + return; + } var source = ExpandWorkList(worklist, mixinqueue, emitfilter, enumeratefilter); if (excludeemptyfolders) @@ -114,7 +120,10 @@ namespace Duplicati.Library.Main.Operation.Backup // Process each path, and dequeue the mixins with symlinks as we go foreach (var s in source) { - if (token.IsCancellationRequested) break; + if (token.IsCancellationRequested) + { + break; + } if (!await taskreader.ProgressAsync) { diff --git a/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs b/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs index 46675dce6..fd11e11b9 100644 --- a/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs +++ b/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs @@ -137,7 +137,7 @@ namespace Duplicati.Library.Main.Operation.Backup else { var res = await database.GetFileEntryAsync(prefixid, split.Value, lastfilesetid); - await self.Output.WriteAsync(new FileEntry() + await self.Output.WriteAsync(new FileEntry { OldId = res == null ? -1 : res.id, Path = path, @@ -154,7 +154,10 @@ namespace Duplicati.Library.Main.Operation.Backup } catch (Exception ex) { - if (ex.IsRetiredException() || token.IsCancellationRequested) continue; + if (ex.IsRetiredException() || token.IsCancellationRequested) + { + continue; + } Logging.Log.WriteWarningMessage(FILELOGTAG, "ProcessingMetadataFailed", ex, "Failed to process entry, path: {0}", path); } diff --git a/Duplicati/Library/Snapshots/UsnJournalService.cs b/Duplicati/Library/Snapshots/UsnJournalService.cs index da4a4adfe..3fc44ac00 100644 --- a/Duplicati/Library/Snapshots/UsnJournalService.cs +++ b/Duplicati/Library/Snapshots/UsnJournalService.cs @@ -416,7 +416,10 @@ namespace Duplicati.Library.Snapshots foreach (var folder in volumeData.Folders) { - if (m_token.IsCancellationRequested) break; + if (m_token.IsCancellationRequested) + { + break; + } if (path.Equals(folder, Utility.Utility.ClientFilenameStringComparison)) return true; // do not append from previous set, already scanned -- cgit v1.2.3