Merge pull request #1 from dhirensham/feature/attachments-as-streams-instead-of-files

dhirensham · web-flow · commit 59bbe20a18cd · 2024-06-05T12:20:02.000+02:00
Use streams instead of files for attachments
diff --git a/src/CouchDB.Driver/Converters/AttachmentsParsedConverter.cs b/src/CouchDB.Driver/Converters/AttachmentsParsedConverter.cs
@@ -12,7 +12,7 @@ public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttach
             JsonSerializer serializer)
         {
             serializer.Serialize(writer, value
-                .Where(kvp => kvp.Value.FileInfo is null)
+                .Where(kvp => kvp.Value.Stream is null)
                 .ToDictionary(k => k.Key, v => v.Value)
             );
         }
diff --git a/src/CouchDB.Driver/CouchDatabase.cs b/src/CouchDB.Driver/CouchDatabase.cs
@@ -455,13 +455,12 @@ private async Task UpdateAttachments(TSource document, CancellationToken cancell
         {
             foreach (CouchAttachment attachment in document.Attachments.GetAddedAttachments())
             {
-                if (attachment.FileInfo == null)
+                if (attachment.Stream == null)
                 {
                     continue;
                 }
 
-                using var stream = new StreamContent(
-                    new FileStream(attachment.FileInfo.FullName, FileMode.Open));
+                using var stream = new StreamContent(attachment.Stream);
 
                 AttachmentResult response = await NewRequest()
                     .AppendPathSegment(Uri.EscapeDataString(document.Id))
@@ -475,7 +474,7 @@ private async Task UpdateAttachments(TSource document, CancellationToken cancell
                 if (response.Ok)
                 {
                     document.Rev = response.Rev;
-                    attachment.FileInfo = null;
+                    attachment.Stream.Close();
                 }
             }
 
diff --git a/src/CouchDB.Driver/Types/CouchAttachment.cs b/src/CouchDB.Driver/Types/CouchAttachment.cs
@@ -18,7 +18,7 @@ public sealed class CouchAttachment
         internal string DocumentRev { get; set; }
 
         [JsonIgnore]
-        internal FileInfo FileInfo { get; set; }
+        internal Stream Stream { get; set; }
 
         [JsonIgnore]
         internal bool Deleted { get; set; }
diff --git a/src/CouchDB.Driver/Types/CouchAttachmentsCollection.cs b/src/CouchDB.Driver/Types/CouchAttachmentsCollection.cs
@@ -28,21 +28,19 @@ internal CouchAttachmentsCollection(Dictionary<string, CouchAttachment> attachme
         public void AddOrUpdate(string path, string contentType)
         {
             FileInfo info = GetFileInfo(path);
-            AddOrUpdate(info.Name, path, contentType);
+            AddOrUpdate(info.Name, info.OpenRead(), contentType);
         }
 
-        public void AddOrUpdate(string attachmentName, string path, string contentType)
+        public void AddOrUpdate(string attachmentName, Stream stream, string contentType)
         {
-            FileInfo info = GetFileInfo(path);
-
             if (!_attachments.ContainsKey(attachmentName))
             {
                 _attachments.Add(attachmentName, new CouchAttachment());
             }
 
             CouchAttachment attachment = _attachments[attachmentName];
             attachment.Name = attachmentName;
-            attachment.FileInfo = info;
+            attachment.Stream = stream;
             attachment.ContentType = contentType;
         }
 
@@ -73,7 +71,7 @@ IEnumerator IEnumerable.GetEnumerator()
         internal CouchAttachment[] GetAddedAttachments()
         {
             return _attachments
-                .Where(kv => kv.Value.FileInfo != null)
+                .Where(kv => kv.Value.Stream != null)
                 .Select(kv => kv.Value)
                 .ToArray();
         }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public override void WriteJson(JsonWriter writer, Dictionary<string, CouchAttach`
`12`	`12`	`JsonSerializer serializer)`
`13`	`13`	`{`
`14`	`14`	`serializer.Serialize(writer, value`
`15`		`- .Where(kvp => kvp.Value.FileInfo is null)`
	`15`	`+ .Where(kvp => kvp.Value.Stream is null)`
`16`	`16`	`.ToDictionary(k => k.Key, v => v.Value)`
`17`	`17`	`);`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,13 +455,12 @@ private async Task UpdateAttachments(TSource document, CancellationToken cancell`
`455`	`455`	`{`
`456`	`456`	`foreach (CouchAttachment attachment in document.Attachments.GetAddedAttachments())`
`457`	`457`	`{`
`458`		`- if (attachment.FileInfo == null)`
	`458`	`+ if (attachment.Stream == null)`
`459`	`459`	`{`
`460`	`460`	`continue;`
`461`	`461`	`}`
`462`	`462`
`463`		`- using var stream = new StreamContent(`
`464`		`- new FileStream(attachment.FileInfo.FullName, FileMode.Open));`
	`463`	`+ using var stream = new StreamContent(attachment.Stream);`
`465`	`464`
`466`	`465`	`AttachmentResult response = await NewRequest()`
`467`	`466`	`.AppendPathSegment(Uri.EscapeDataString(document.Id))`
`@@ -475,7 +474,7 @@ private async Task UpdateAttachments(TSource document, CancellationToken cancell`
`475`	`474`	`if (response.Ok)`
`476`	`475`	`{`
`477`	`476`	`document.Rev = response.Rev;`
`478`		`- attachment.FileInfo = null;`
	`477`	`+ attachment.Stream.Close();`
`479`	`478`	`}`
`480`	`479`	`}`
`481`	`480`
Original file line number	Diff line number	Diff line change
`@@ -28,21 +28,19 @@ internal CouchAttachmentsCollection(Dictionary<string, CouchAttachment> attachme`
`28`	`28`	`public void AddOrUpdate(string path, string contentType)`
`29`	`29`	`{`
`30`	`30`	`FileInfo info = GetFileInfo(path);`
`31`		`- AddOrUpdate(info.Name, path, contentType);`
	`31`	`+ AddOrUpdate(info.Name, info.OpenRead(), contentType);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public void AddOrUpdate(string attachmentName, string path, string contentType)`
	`34`	`+ public void AddOrUpdate(string attachmentName, Stream stream, string contentType)`
`35`	`35`	`{`
`36`		`- FileInfo info = GetFileInfo(path);`
`37`		`-`
`38`	`36`	`if (!_attachments.ContainsKey(attachmentName))`
`39`	`37`	`{`
`40`	`38`	`_attachments.Add(attachmentName, new CouchAttachment());`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`CouchAttachment attachment = _attachments[attachmentName];`
`44`	`42`	`attachment.Name = attachmentName;`
`45`		`- attachment.FileInfo = info;`
	`43`	`+ attachment.Stream = stream;`
`46`	`44`	`attachment.ContentType = contentType;`
`47`	`45`	`}`
`48`	`46`
`@@ -73,7 +71,7 @@ IEnumerator IEnumerable.GetEnumerator()`
`73`	`71`	`internal CouchAttachment[] GetAddedAttachments()`
`74`	`72`	`{`
`75`	`73`	`return _attachments`
`76`		`- .Where(kv => kv.Value.FileInfo != null)`
	`74`	`+ .Where(kv => kv.Value.Stream != null)`
`77`	`75`	`.Select(kv => kv.Value)`
`78`	`76`	`.ToArray();`
`79`	`77`	`}`