Fix: enable transfer continuation if the failed content exists. (#40)

SenseNet · Jun 13, 2023 · 4b10345 · 4b10345
1 parent ed3e0f2
commit 4b10345
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/src/SenseNet.IO/Implementations/RepositoryWriter.cs b/src/SenseNet.IO/Implementations/RepositoryWriter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -244,7 +243,7 @@ await Retrier.RetryAsync(50, 3000, async () =>
 
                         resultString = await RESTCaller.GetResponseStringAsync(request, HttpMethod.Post, body, _repository.Server);
                     },
-                    (i, exception) => exception.CheckRetryConditionOrThrow(i));
+                    (i, exception) => exception.CheckRetryConditionOrThrow(i), cancel);
 
             }
             catch (ClientException e)
@@ -258,6 +257,16 @@ await Retrier.RetryAsync(50, 3000, async () =>
                     Messages = new[] {e.Message}
                 };
             }
+            catch (Exception e)
+            {
+                _logger.LogError(e, $"Error during importing {repositoryPath}: {e.Message}.");
+                return new WriterState
+                {
+                    WriterPath = repositoryPath,
+                    Action = IsParentNotFoundException(repositoryPath, e) ? WriterAction.MissingParent : WriterAction.Failed,
+                    Messages = new[] { e.Message }
+                };
+            }
 
             // Upload binaries if there are.
             var parentPath = ContentPath.GetParentPath(repositoryPath);
@@ -285,6 +294,18 @@ await _repository.UploadAsync(new UploadRequest
                         Messages = new[] { ex.Message }
                     };
                 }
+                catch (Exception e)
+                {
+                    _logger.LogError(e, $"Error during {attachment.FieldName} attachment upload for {repositoryPath}: " +
+                                        $"{e.Message}.");
+
+                    return new WriterState
+                    {
+                        WriterPath = repositoryPath,
+                        Action = WriterAction.Failed,
+                        Messages = new[] { e.Message }
+                    };
+                }
             }
 
             // Process result