Merge branch 'master' of github.com:duplicati/duplicati

6 files changed, 23 insertions, 21 deletions

diff --git a/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs b/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs
index 745adccb2..6799c716f 100644
--- a/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs
+++ b/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs
@@ -38,7 +38,7 @@ namespace Duplicati.Library.Main.Operation.Backup
         /// </summary>

         private static readonly string FILTER_LOGTAG = Logging.Log.LogTagFromType(typeof(FileEnumerationProcess));

 

-        public static Task Run(IEnumerable<string> sources, Snapshots.ISnapshotService snapshot, UsnJournalService journalService, FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter sourcefilter, Duplicati.Library.Utility.IFilter emitfilter, Options.SymlinkStrategy symlinkPolicy, Options.HardlinkStrategy hardlinkPolicy, bool excludeemptyfolders, string[] ignorenames, string[] changedfilelist, ITaskReader taskreader)

+        public static Task Run(IEnumerable<string> sources, Snapshots.ISnapshotService snapshot, UsnJournalService journalService, FileAttributes fileAttributes, Duplicati.Library.Utility.IFilter sourcefilter, Duplicati.Library.Utility.IFilter emitfilter, Options.SymlinkStrategy symlinkPolicy, Options.HardlinkStrategy hardlinkPolicy, bool excludeemptyfolders, string[] ignorenames, string[] changedfilelist, ITaskReader taskreader)

         {

             return AutomationExtensions.RunTask(

             new

@@ -77,21 +77,21 @@ namespace Duplicati.Library.Main.Operation.Backup
                         {

                         }

 

-                        return AttributeFilterAsync(null, x, fa, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, attributeFilter, enumeratefilter, ignorenames, mixinqueue).WaitForTask().Result;

+                        return AttributeFilter(null, x, fa, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, fileAttributes, enumeratefilter, ignorenames, mixinqueue);

                     });

                 }

                 else

                 {

-					Library.Utility.Utility.EnumerationFilterDelegate AttributeFilter = (root, path, attr) =>

-					    AttributeFilterAsync(root, path, attr, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, attributeFilter, enumeratefilter, ignorenames, mixinqueue).WaitForTask().Result;

+                    Library.Utility.Utility.EnumerationFilterDelegate attributeFilter = (root, path, attr) =>

+                        AttributeFilter(root, path, attr, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, fileAttributes, enumeratefilter, ignorenames, mixinqueue);

 

                     if (journalService != null)

                     {

                         // filter sources using USN journal, to obtain a sub-set of files / folders that may have been modified

-                        sources = journalService.GetModifiedSources(AttributeFilter);

+                        sources = journalService.GetModifiedSources(attributeFilter);

                     }

 

-                    worklist = snapshot.EnumerateFilesAndFolders(sources, AttributeFilter, (rootpath, errorpath, ex) =>

+                    worklist = snapshot.EnumerateFilesAndFolders(sources, attributeFilter, (rootpath, errorpath, ex) =>

                     {

                         Logging.Log.WriteWarningMessage(FILTER_LOGTAG, "FileAccessError", ex, "Error reported while accessing file: {0}", errorpath);

                     });

@@ -222,7 +222,7 @@ namespace Duplicati.Library.Main.Operation.Backup
         /// <param name="rootpath">The root path that initiated this enumeration.</param>

         /// <param name="path">The current path.</param>

         /// <param name="attributes">The file or folder attributes.</param>

-        private static async Task<bool> AttributeFilterAsync(string rootpath, string path, FileAttributes attributes, Snapshots.ISnapshotService snapshot, Library.Utility.IFilter sourcefilter, Options.HardlinkStrategy hardlinkPolicy, Options.SymlinkStrategy symlinkPolicy, Dictionary<string, string> hardlinkmap, FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter enumeratefilter, string[] ignorenames, Queue<string> mixinqueue)

+        private static bool AttributeFilter(string rootpath, string path, FileAttributes attributes, Snapshots.ISnapshotService snapshot, Library.Utility.IFilter sourcefilter, Options.HardlinkStrategy hardlinkPolicy, Options.SymlinkStrategy symlinkPolicy, Dictionary<string, string> hardlinkmap, FileAttributes fileAttributes, Duplicati.Library.Utility.IFilter enumeratefilter, string[] ignorenames, Queue<string> mixinqueue)

         {

 			// Step 1, exclude block devices

 			try

@@ -304,7 +304,7 @@ namespace Duplicati.Library.Main.Operation.Backup
             }

 

             // If we exclude files based on attributes, filter that

-            if ((attributeFilter & attributes) != 0)

+            if ((fileAttributes & attributes) != 0)

             {

                 Logging.Log.WriteVerboseMessage(FILTER_LOGTAG, "ExcludingPathFromAttributes", "Excluding path due to attribute filter: {0}", path);

                 return false;

diff --git a/Duplicati/Library/Main/Operation/Backup/FilePreFilterProcess.cs b/Duplicati/Library/Main/Operation/Backup/FilePreFilterProcess.cs
index 34b458d8a..304b0c859 100644
--- a/Duplicati/Library/Main/Operation/Backup/FilePreFilterProcess.cs
+++ b/Duplicati/Library/Main/Operation/Backup/FilePreFilterProcess.cs
@@ -124,7 +124,7 @@ namespace Duplicati.Library.Main.Operation.Backup
                     }

 

                     // Compute current metadata

-                    e.MetaHashAndSize = SKIPMETADATA ? EMPTY_METADATA : Utility.WrapMetadata(await MetadataGenerator.GenerateMetadataAsync(e.Path, e.Attributes, options, snapshot), options);

+                    e.MetaHashAndSize = SKIPMETADATA ? EMPTY_METADATA : Utility.WrapMetadata(MetadataGenerator.GenerateMetadata(e.Path, e.Attributes, options, snapshot), options);

                     e.MetadataChanged = !SKIPMETADATA && (e.MetaHashAndSize.Blob.Length != e.OldMetaSize || e.MetaHashAndSize.FileHash != e.OldMetaHash);

 

                     // Check if the file is new, or something indicates a change

diff --git a/Duplicati/Library/Main/Operation/Backup/MetadataGenerator.cs b/Duplicati/Library/Main/Operation/Backup/MetadataGenerator.cs
index bd982751c..a6b5a16fc 100644
--- a/Duplicati/Library/Main/Operation/Backup/MetadataGenerator.cs
+++ b/Duplicati/Library/Main/Operation/Backup/MetadataGenerator.cs
@@ -30,7 +30,7 @@ namespace Duplicati.Library.Main.Operation.Backup
     {

         private static readonly string METALOGTAG = Logging.Log.LogTagFromType(typeof(MetadataGenerator)) + ".Metadata";

 

-        public static async Task<Dictionary<string, string>> GenerateMetadataAsync(string path, System.IO.FileAttributes attributes, Options options, Snapshots.ISnapshotService snapshot)

+        public static Dictionary<string, string> GenerateMetadata(string path, System.IO.FileAttributes attributes, Options options, Snapshots.ISnapshotService snapshot)

         {

             try

             {

diff --git a/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs b/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs
index 335a1996c..53e09905c 100644
--- a/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs
+++ b/Duplicati/Library/Main/Operation/Backup/MetadataPreProcess.cs
@@ -162,7 +162,7 @@ namespace Duplicati.Library.Main.Operation.Backup
 

                     if (options.SymlinkPolicy == Options.SymlinkStrategy.Store)

                     {

-                        var metadata = await MetadataGenerator.GenerateMetadataAsync(path, attributes, options, snapshot);

+                        var metadata = MetadataGenerator.GenerateMetadata(path, attributes, options, snapshot);

 

                         if (!metadata.ContainsKey("CoreSymlinkTarget"))

                             metadata["CoreSymlinkTarget"] = symlinkTarget;

@@ -187,7 +187,7 @@ namespace Duplicati.Library.Main.Operation.Backup
 

                 if (!options.SkipMetadata)

                 {

-                    metahash = Utility.WrapMetadata(await MetadataGenerator.GenerateMetadataAsync(path, attributes, options, snapshot), options);

+                    metahash = Utility.WrapMetadata(MetadataGenerator.GenerateMetadata(path, attributes, options, snapshot), options);

                 }

                 else

                 {

diff --git a/Duplicati/Library/Main/Operation/Common/BackendHandler.cs b/Duplicati/Library/Main/Operation/Common/BackendHandler.cs
index b028c5e1c..88dae4cce 100644
--- a/Duplicati/Library/Main/Operation/Common/BackendHandler.cs
+++ b/Duplicati/Library/Main/Operation/Common/BackendHandler.cs
@@ -109,7 +109,7 @@ namespace Duplicati.Library.Main.Operation.Common
                 this.LocalTempfile.Protected = true;

             }

                 

-            public async Task Encrypt(Options options)

+            public void Encrypt(Options options)

             {

                 if (!this.Encrypted && !options.NoEncryption)

                 {

@@ -221,9 +221,9 @@ namespace Duplicati.Library.Main.Operation.Common
 

             var tcs = new TaskCompletionSource<bool>();

 

-            var backgroundhashAndEncrypt = Task.Run(async () =>

+            var backgroundhashAndEncrypt = Task.Run(() =>

             {

-                await fe.Encrypt(m_options).ConfigureAwait(false);

+                fe.Encrypt(m_options);

                 return fe.UpdateHashAndSize(m_options);

             });

 

@@ -331,7 +331,7 @@ namespace Duplicati.Library.Main.Operation.Common
             return RunRetryOnMain(fe, () => DoGet(fe));

         }

 

-        private async Task ResetBackendAsync(Exception ex)

+        private void ResetBackend(Exception ex)

         {

             try

             {

@@ -343,7 +343,6 @@ namespace Duplicati.Library.Main.Operation.Common
                 Logging.Log.WriteWarningMessage(LOGTAG, "BackendDisposeError", dex, "Failed to dispose backend instance: {0}", ex.Message); 

             }

             m_backend = null;

-

         }

 

         private async Task<T> DoWithRetry<T>(FileEntryItem item, Func<Task<T>> method)

@@ -405,12 +404,12 @@ namespace Duplicati.Library.Main.Operation.Common
                     }

 

                     if (!recovered)

-                        await ResetBackendAsync(ex).ConfigureAwait(false);

+                        ResetBackend(ex);

                 }

                 finally

                 {

                     if (m_options.NoConnectionReuse)

-                        await ResetBackendAsync(null).ConfigureAwait(false);

+                        ResetBackend(null);

                 }

             }

 

@@ -435,7 +434,7 @@ namespace Duplicati.Library.Main.Operation.Common
         private async Task<bool> DoPut(FileEntryItem item, bool updatedHash = false)

         {

             // If this is not already encrypted, do it now

-            await item.Encrypt(m_options).ConfigureAwait(false);

+            item.Encrypt(m_options);

 

             updatedHash |= item.UpdateHashAndSize(m_options);

 

diff --git a/Duplicati/Library/Main/default_compressed_extensions.txt b/Duplicati/Library/Main/default_compressed_extensions.txt
index 7b189bf7a..87c9e3c5d 100644
--- a/Duplicati/Library/Main/default_compressed_extensions.txt
+++ b/Duplicati/Library/Main/default_compressed_extensions.txt
@@ -97,8 +97,11 @@
 .pspimage #PaintShopPro Image
 .tif #TIFF image
 .dng #Adobe Digital Negative
-.cr2 #Canon RAW Image Format
+.cr2 #Canon RAW Image Format (already compressed despite being "RAW")
 .webp #WebP Image
+.nef #Nikon RAW format
+.arw #Sony RAW format
+.heic #High Efficiency Image File Format
 
 
 # Compressed Font files