Merge pull request #25 from logiclrd/JDG_UploadWithoutActualFile

Add support for uploading without actually having a physical file

Author: microcompiler

src/Client/Client/Storage/IStorageFiles.cs

@@ -186,7 +186,25 @@ public interface IStorageFiles
         Task<IApiResults<UploadFileResponse>> UploadAsync(string bucketId, string fileName, string localPath, IProgress<ICopyProgress> progress, CancellationToken cancel);
 
         /// <summary>
-        /// Downloads a file by bucket and file name from Backblaze B2 Cloud Storage. 
+        /// Uploads a file by bucket id and filename to Backblaze B2 Cloud Storage, with the file content and attributes supplied explicitly by the caller.
+        /// </summary>
+        /// <param name="bucketId">The bucket id you want to upload to.</param>
+        /// <param name="fileName">The name of the file to upload.</param>
+        /// <param name="content">A stream from which the content to upload for the file can be read.</param>
+        /// <param name="lastModified">The DateTime to register as the file's last-modified date/time.</param>
+        /// <param name="isReadOnly">True if the file should be marked read-only.</param>
+        /// <param name="isHidden">True if the file should be marked hidden.</param>
+        /// <param name="isArchive">True if the file should be marked for archiving.</param>
+        /// <param name="isCompressed">True if the file should be marked compressed.</param>
+        /// <param name="progress">A progress action which fires every time the write buffer is cycled.</param>
+        /// <param name="cancel">The cancellation token to cancel operation.</param>
+        /// <returns></returns>
+        Task<IApiResults<UploadFileResponse>> UploadAsync
+            (string bucketId, string fileName, Stream content, DateTime lastModified, bool isReadOnly, bool isHidden, bool isArchive, bool isCompressed,
+            IProgress<ICopyProgress> progress, CancellationToken cancel);
+
+        /// <summary>
+        /// Downloads a file by bucket and file name from Backblaze B2 Cloud Storage.
         /// </summary>
         /// <param name="bucketName">The name of the bucket to download from.</param>
         /// <param name="fileName">The name of the file to download.</param>

src/Client/Client/Storage/Storage.Files.cs

@@ -271,45 +271,56 @@ async Task<IApiResults<ListUnfinishedLargeFilesResponse>> IStorageFiles.ListUnfi
         /// <exception cref="CapExceededExecption">Thrown when a cap is exceeded or an account in bad standing.</exception>
         /// <exception cref="InvalidHashException">Thrown when a checksum hash is not valid.</exception>
         /// <exception cref="ApiException">Thrown when an error occurs during client operation.</exception>
-        async Task<IApiResults<UploadFileResponse>> IStorageFiles.UploadAsync
+        Task<IApiResults<UploadFileResponse>> IStorageFiles.UploadAsync
             (string bucketId, string fileName, string localPath, IProgress<ICopyProgress> progress, CancellationToken cancel)
         {
             using (var content = File.OpenRead(localPath))
             {
-                var fileInfo = new Models.FileInfo();
-
-                // get last modified date
                 DateTime lastModified = File.GetLastWriteTime(localPath);
 
-                // check whether a file is read only
                 var isReadOnly = ((File.GetAttributes(localPath) & FileAttributes.ReadOnly) == FileAttributes.ReadOnly);
-                fileInfo.Add("src_file_readonly", isReadOnly.ToString().ToLower());
-
-                // check whether a file is hidden
                 var isHidden = ((File.GetAttributes(localPath) & FileAttributes.Hidden) == FileAttributes.Hidden);
-                fileInfo.Add("src_file_hidden", isHidden.ToString().ToLower());
-
-                // check whether a file has archive attribute
                 var isArchive = ((File.GetAttributes(localPath) & FileAttributes.Archive) == FileAttributes.Archive);
-                fileInfo.Add("src_file_archive", isArchive.ToString().ToLower());
-
-                // check whether a file has compressed attribute
                 var isCompressed = ((File.GetAttributes(localPath) & FileAttributes.Compressed) == FileAttributes.Compressed);
-                fileInfo.Add("src_file_compressed", isCompressed.ToString().ToLower());
 
-                var request = new UploadFileByBucketIdRequest(bucketId, fileName) { LastModified = lastModified, FileInfo = fileInfo };
-                var results = await _client.UploadAsync(request, content, progress, cancel);
-                if (results.IsSuccessStatusCode)
-                {
-                    _logger.LogInformation($"Successfully uploaded '{localPath}' file to '{bucketId}' bucket id");
-                }
-                else
-                {
-                    _logger.LogError($"Failed uploading '{localPath}' file with error: {results.Error?.Message}");
-                }
+                return ((IStorageFiles)this).UploadAsync(
+                    bucketId,
+                    fileName,
+                    content,
+                    lastModified,
+                    isReadOnly,
+                    isHidden,
+                    isArchive,
+                    isCompressed,
+                    progress,
+                    cancel);
+            }
+        }
 
-                return results;
+        async Task<IApiResults<UploadFileResponse>> IStorageFiles.UploadAsync
+            (string bucketId, string fileName, Stream content, DateTime lastModified, bool isReadOnly, bool isHidden, bool isArchive, bool isCompressed,
+            IProgress<ICopyProgress> progress, CancellationToken cancel)
+        {
+            var fileInfo = new Models.FileInfo();
+
+            fileInfo.Add("src_file_readonly", isReadOnly ? "true" : "false");
+            fileInfo.Add("src_file_hidden", isHidden ? "true" : "false");
+            fileInfo.Add("src_file_archive", isArchive ? "true" : "false");
+            fileInfo.Add("src_file_compressed", isCompressed ? "true" : "false");
+
+            var request = new UploadFileByBucketIdRequest(bucketId, fileName) { LastModified = lastModified, FileInfo = fileInfo };
+            var results = await _client.UploadAsync(request, content, progress, cancel);
+
+            if (results.IsSuccessStatusCode)
+            {
+                _logger.LogInformation($"Successfully uploaded in-memory file to '{bucketId}' bucket id with filename '{fileName}'");
             }
+            else
+            {
+                _logger.LogError($"Failed uploading in-memory file '{fileName}' with error: {results.Error?.Message}");
+            }
+
+            return results;
         }
 
         /// <summary>