Cleanup double callback

minio · Jan 25, 2024 · b76231b · b76231b
1 parent 230c72f
commit b76231b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/Minio/DataModel/Args/GetObjectArgs.cs b/Minio/DataModel/Args/GetObjectArgs.cs
@@ -28,8 +28,7 @@ public GetObjectArgs()
         OffsetLengthSet = false;
     }
 
-    internal Action<Stream> CallBack { get; private set; }
-    internal Func<Stream, CancellationToken, Task> FuncCallBack { get; private set; }
+    internal Func<Stream, CancellationToken, Task> CallBack { get; private set; }
     internal long ObjectOffset { get; private set; }
     internal long ObjectLength { get; private set; }
     internal string FileName { get; private set; }
@@ -38,7 +37,7 @@ public GetObjectArgs()
     internal override void Validate()
     {
         base.Validate();
-        if (CallBack is null && FuncCallBack is null && string.IsNullOrEmpty(FileName))
+        if (CallBack is null && string.IsNullOrEmpty(FileName))
             throw new MinioException("Atleast one of " + nameof(CallBack) + ", CallBack method or " + nameof(FileName) +
                                      " file path to save need to be set for GetObject operation.");
 
@@ -76,8 +75,7 @@ internal override HttpRequestMessageBuilder BuildRequest(HttpRequestMessageBuild
     {
         if (!string.IsNullOrEmpty(VersionId)) requestMessageBuilder.AddQueryParameter("versionId", $"{VersionId}");
 
-        if (CallBack is not null) requestMessageBuilder.ResponseWriter = CallBack;
-        else requestMessageBuilder.FunctionResponseWriter = FuncCallBack;
+        requestMessageBuilder.ResponseWriter = CallBack;
 
         if (Headers.TryGetValue(S3ZipExtractKey, out var value))
             requestMessageBuilder.AddQueryParameter(S3ZipExtractKey, value);
@@ -87,13 +85,35 @@ internal override HttpRequestMessageBuilder BuildRequest(HttpRequestMessageBuild
 
     public GetObjectArgs WithCallbackStream(Action<Stream> cb)
     {
-        CallBack = cb;
+        CallBack = (stream, cancellationToken) =>
+        {
+            var taskCompletionSource = new TaskCompletionSource<bool>();
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                taskCompletionSource.SetCanceled();
+            }
+            else
+            {
+                try
+                {
+                    cb(stream);
+                    taskCompletionSource.SetResult(true);
+                }
+                catch (Exception ex)
+                {
+                    taskCompletionSource.SetException(ex);
+                }
+            }
+
+            return taskCompletionSource.Task;
+        };
         return this;
     }
 
     public GetObjectArgs WithCallbackStream(Func<Stream, CancellationToken, Task> cb)
     {
-        FuncCallBack = cb;
+        CallBack = cb;
         return this;
     }
 

diff --git a/Minio/DataModel/Args/ListenBucketNotificationsArgs.cs b/Minio/DataModel/Args/ListenBucketNotificationsArgs.cs
@@ -71,7 +71,7 @@ internal override HttpRequestMessageBuilder BuildRequest(HttpRequestMessageBuild
         requestMessageBuilder.AddQueryParameter("prefix", Prefix);
         requestMessageBuilder.AddQueryParameter("suffix", Suffix);
 
-        requestMessageBuilder.FunctionResponseWriter = async (responseStream, cancellationToken) =>
+        requestMessageBuilder.ResponseWriter = async (responseStream, cancellationToken) =>
         {
             using var sr = new StreamReader(responseStream);
             while (!sr.EndOfStream)

diff --git a/Minio/HttpRequestMessageBuilder.cs b/Minio/HttpRequestMessageBuilder.cs
@@ -51,8 +51,7 @@ public HttpRequestMessageBuilder(HttpMethod method, Uri requestUri)
     }
 
     public Uri RequestUri { get; set; }
-    public Action<Stream> ResponseWriter { get; set; }
-    public Func<Stream, CancellationToken, Task> FunctionResponseWriter { get; set; }
+    public Func<Stream, CancellationToken, Task> ResponseWriter { get; set; }
     public HttpMethod Method { get; }
 
     public HttpRequestMessage Request

diff --git a/Minio/RequestExtensions.cs b/Minio/RequestExtensions.cs
@@ -98,9 +98,7 @@ private static async Task<ResponseResult> ExecuteTaskCoreAsync(this IMinioClient
                 .ConfigureAwait(false);
             responseResult = new ResponseResult(request, response);
             if (requestMessageBuilder.ResponseWriter is not null)
-                requestMessageBuilder.ResponseWriter(responseResult.ContentStream);
-            if (requestMessageBuilder.FunctionResponseWriter is not null)
-                await requestMessageBuilder.FunctionResponseWriter(responseResult.ContentStream, cancellationToken)
+                await requestMessageBuilder.ResponseWriter(responseResult.ContentStream, cancellationToken)
                     .ConfigureAwait(false);
 
             var path = request.RequestUri.LocalPath.TrimStart('/').TrimEnd('/').Split('/');