Change IBackend and IStreamingBackend to return Task for Put()

Duplicati/CommandLine/BackendTester/Program.cs

@@ -23,6 +23,7 @@
 using Duplicati.Library.Interface;
 using System.Linq;
 using System.Globalization;
+using System.Threading;
 
 namespace Duplicati.CommandLine.BackendTester
 {
@@ -470,10 +471,10 @@ private static void Uploadfile(string localfilename, int i, string remotefilenam
                 {
                     using (System.IO.FileStream fs = new System.IO.FileStream(localfilename, System.IO.FileMode.Open, System.IO.FileAccess.Read, System.IO.FileShare.Read))
                     using (NonSeekableStream nss = new NonSeekableStream(fs))
-                        (backend as Library.Interface.IStreamingBackend).Put(remotefilename, nss);
+                        (backend as Library.Interface.IStreamingBackend).Put(remotefilename, nss, CancellationToken.None).Wait();
                 }
                 else
-                    backend.Put(remotefilename, localfilename);
+                    backend.Put(remotefilename, localfilename, CancellationToken.None).Wait();
 
                 e = null;
             }

Duplicati/CommandLine/BackendTool/Program.cs

@@ -17,10 +17,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 #endregion
+using Duplicati.Library.Interface;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Duplicati.Library.Interface;
+using System.Threading;
 
 namespace Duplicati.CommandLine.BackendTool
 {
@@ -144,7 +145,7 @@ public static int RealMain(string[] _args)
                         if (args.Count > 3)
                             throw new UserInformationException(string.Format("too many arguments: {0}", string.Join(",", args)), "BackendToolTooManyArguments");
 
-                        backend.Put(Path.GetFileName(args[2]), args[2]);
+                        backend.Put(Path.GetFileName(args[2]), args[2], CancellationToken.None).Wait();
 
                         return 0;
                     }

Duplicati/CommandLine/RecoveryTool/Recompress.cs

@@ -1,13 +1,14 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Linq;
+using Duplicati.Library.Interface;
 using Duplicati.Library.Main;
 using Duplicati.Library.Main.Volumes;
 using Duplicati.Library.Utility;
 using Newtonsoft.Json.Linq;
-using Duplicati.Library.Interface;
-
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
 namespace Duplicati.CommandLine.RecoveryTool
 {
     public static class Recompress
@@ -253,7 +254,7 @@ public static int Run(List<string> args, Dictionary<string, string> options, Lib
                         if (reupload)
                         {
                             Console.Write(" reuploading ...");
-                            backend.Put((new FileInfo(localFileTarget)).Name, localFileTarget);
+                            backend.Put((new FileInfo(localFileTarget)).Name, localFileTarget, CancellationToken.None).Wait();
                             backend.Delete(remoteFile.File.Name);
                             File.Delete(localFileTarget);
                         }

Duplicati/Library/Backend/AlternativeFTP/AlternativeFTPBackend.cs

@@ -18,17 +18,19 @@
 //
 #endregion
 
+using Duplicati.Library.Common.IO;
+using Duplicati.Library.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.FtpClient;
 using System.Net.Security;
 using System.Security.Authentication;
-using Duplicati.Library.Interface;
-using Uri = System.Uri;
+using System.Threading;
+using System.Threading.Tasks;
 using CoreUtility = Duplicati.Library.Utility.Utility;
-using Duplicati.Library.Common.IO;
-
+using Uri = System.Uri;
+
 namespace Duplicati.Library.Backend.AlternativeFTP
 {
     // ReSharper disable once RedundantExtendsListEntry
@@ -304,7 +306,7 @@ private IEnumerable<IFileEntry> List(string filename, bool stripFile)
             return list;
         }
 
-        public void Put(string remotename, System.IO.Stream input)
+        public Task Put(string remotename, System.IO.Stream input, CancellationToken cancelToken)
         {
             string remotePath = remotename;
             long streamLen = -1;
@@ -355,7 +357,7 @@ public void Put(string remotename, System.IO.Stream input)
                         {
                             if (fileEntry.Size < 0 || streamLen < 0 || fileEntry.Size == streamLen)
                             {
-                                return;
+                                return Task.FromResult(true);
                             }
 
                             throw new UserInformationException(Strings.ListVerifySizeFailure(remotename, fileEntry.Size, streamLen), "AftpListVerifySizeFailure");
@@ -374,13 +376,15 @@ public void Put(string remotename, System.IO.Stream input)
 
                 throw;
             }
+
+            return Task.FromResult(true);
         }
 
-        public void Put(string remotename, string localname)
+        public Task Put(string remotename, string localname, CancellationToken cancelToken)
         {
             using (System.IO.FileStream fs = System.IO.File.Open(localname, System.IO.FileMode.Open, System.IO.FileAccess.Read, System.IO.FileShare.Read))
             {
-                Put(remotename, fs);
+                return Put(remotename, fs, cancelToken);
             }
         }
 
@@ -485,7 +489,7 @@ public void Test()
             {
                 try
                 {
-                    Put(TEST_FILE_NAME, testStream);
+                    Put(TEST_FILE_NAME, testStream, CancellationToken.None).Wait();
                 }
                 catch (Exception e)
                 {

Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs

@@ -14,15 +14,17 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-using System;
-using System.Linq;
-using System.Collections.Generic;
+using Duplicati.Library.Common.IO;
 using Duplicati.Library.Interface;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
-using Duplicati.Library.Common.IO;
-
+using System.Threading;
+using System.Threading.Tasks;
+
 namespace Duplicati.Library.Backend.AmazonCloudDrive
 {
     public class AmzCD : IBackend, IStreamingBackend, IRenameEnabledBackend
@@ -313,7 +315,7 @@ public static string EscapeFiltersValue(string value)
 
         #region IStreamingBackend implementation
 
-        public void Put(string remotename, System.IO.Stream stream)
+        public Task Put(string remotename, System.IO.Stream stream, CancellationToken cancelToken)
         {
             EnforceConsistencyDelay(remotename);
 
@@ -362,6 +364,8 @@ public void Put(string remotename, System.IO.Stream stream)
             {
                 SetWaitUntil(remotename, DateTime.Now + m_delayTimeSpan);
             }
+
+            return Task.FromResult(true);
         }
 
         public void Get(string remotename, System.IO.Stream stream)
@@ -428,10 +432,10 @@ public IEnumerable<IFileEntry> List()
 
         }
 
-        public void Put(string remotename, string filename)
+        public Task Put(string remotename, string filename, CancellationToken cancelToken)
         {
             using (System.IO.FileStream fs = System.IO.File.OpenRead(filename))
-                Put(remotename, fs);
+                return Put(remotename, fs, cancelToken);
         }
 
         public void Get(string remotename, string filename)

Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs

@@ -18,10 +18,11 @@
 // 
 #endregion
 
-using System;
+using Duplicati.Library.Interface;
 using System.Collections.Generic;
 using System.IO;
-using Duplicati.Library.Interface;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Duplicati.Library.Backend.AzureBlob
 {
@@ -87,18 +88,19 @@ public IEnumerable<IFileEntry> List()
             return _azureBlob.ListContainerEntries();
         }
 
-        public void Put(string remotename, string localname)
+        public Task Put(string remotename, string localname, CancellationToken cancelToken)
         {
             using (var fs = File.Open(localname,
                 FileMode.Open, FileAccess.Read, FileShare.Read))
             {
-                Put(remotename, fs);
+                return Put(remotename, fs, cancelToken);
             }
         }
 
-        public void Put(string remotename, Stream input)
+        public Task Put(string remotename, Stream input, CancellationToken cancelToken)
         {
             _azureBlob.AddFileStream(remotename, input);
+            return Task.FromResult(true);
         }
 
         public void Get(string remotename, string localname)

Duplicati/Library/Backend/Backblaze/B2.cs

@@ -14,14 +14,16 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using Duplicati.Library.Utility;
-using Duplicati.Library.Interface;
 using Duplicati.Library.Common.IO;
+using Duplicati.Library.Interface;
+using Duplicati.Library.Utility;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Duplicati.Library.Backend.Backblaze
 {
@@ -188,7 +190,7 @@ public IList<ICommandLineArgument> SupportedCommands
             }
         }
 
-        public void Put(string remotename, System.IO.Stream stream)
+        public Task Put(string remotename, System.IO.Stream stream, CancellationToken cancelToken)
         {
             TempFile tmp = null;
 
@@ -285,6 +287,8 @@ public void Put(string remotename, System.IO.Stream stream)
                 {
                 }
             }
+
+            return Task.FromResult(true);
         }
 
         public void Get(string remotename, System.IO.Stream stream)
@@ -368,10 +372,10 @@ public IEnumerable<IFileEntry> List()
                 ).ToList();
         }
 
-        public void Put(string remotename, string filename)
+        public Task Put(string remotename, string filename, CancellationToken cancelToken)
         {
             using (System.IO.FileStream fs = System.IO.File.OpenRead(filename))
-                Put(remotename, fs);
+                return Put(remotename, fs, cancelToken);
         }
 
         public void Get(string remotename, string filename)

Duplicati/Library/Backend/Box/BoxBackend.cs

@@ -14,13 +14,15 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-using System;
-using System.Linq;
-using Duplicati.Library.Interface;
 using Duplicati.Library.Common.IO;
-using System.Collections.Generic;
+using Duplicati.Library.Interface;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Duplicati.Library.Backend.Box
 {
@@ -196,7 +198,7 @@ private IEnumerable<FileEntity> PagedFileListResponse(string parentid, bool only
 
         #region IStreamingBackend implementation
 
-        public void Put(string remotename, System.IO.Stream stream)
+        public Task Put(string remotename, System.IO.Stream stream, CancellationToken cancelToken)
         {
             var createreq = new CreateItemRequest() {
                 Name = remotename,
@@ -237,6 +239,8 @@ public void Put(string remotename, System.IO.Stream stream)
                 m_filecache.Clear();
                 throw;
             }
+
+            return Task.FromResult(true);
         }
 
         public void Get(string remotename, System.IO.Stream stream)
@@ -257,10 +261,10 @@ public System.Collections.Generic.IEnumerable<IFileEntry> List()
                 select (IFileEntry)new FileEntry(n.Name, n.Size, n.ModifiedAt, n.ModifiedAt) { IsFolder = n.Type == "folder" };
         }
 
-        public void Put(string remotename, string filename)
+        public Task Put(string remotename, string filename, CancellationToken cancelToken)
         {
             using (System.IO.FileStream fs = System.IO.File.OpenRead(filename))
-                Put(remotename, fs);
+                return Put(remotename, fs, cancelToken);
         }
 
         public void Get(string remotename, string filename)

Duplicati/Library/Backend/CloudFiles/CloudFiles.cs

@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 #endregion
+using Duplicati.Library.Common.IO;
+using Duplicati.Library.Interface;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Net;
-using Duplicati.Library.Interface;
-using Duplicati.Library.Common.IO;
-
+using System.Threading;
+using System.Threading.Tasks;
+
 namespace Duplicati.Library.Backend
 {
     public class CloudFiles : IBackend, IStreamingBackend
@@ -194,10 +194,10 @@ public IEnumerable<IFileEntry> List()
             } while (repeat);
         }
 
-        public void Put(string remotename, string filename)
+        public Task Put(string remotename, string filename, CancellationToken cancelToken)
         {
             using (System.IO.FileStream fs = System.IO.File.OpenRead(filename))
-                Put(remotename, fs);
+                return Put(remotename, fs, cancelToken);
         }
 
         public void Get(string remotename, string filename)
@@ -314,7 +314,7 @@ public void Get(string remotename, System.IO.Stream stream)
             }
         }
 
-        public void Put(string remotename, System.IO.Stream stream)
+        public Task Put(string remotename, System.IO.Stream stream, CancellationToken cancelToken)
         {
             HttpWebRequest req = CreateRequest("/" + remotename, "");
             req.Method = "PUT";
@@ -394,6 +394,8 @@ public void Put(string remotename, System.IO.Stream stream)
                     throw new Exception(Strings.CloudFiles.ETagVerificationError);
                 }
             }
+
+            return Task.FromResult(true);
         }
 
         #endregion