Use originUri.LocalPath instead of Uri.UnescapeDataString when parsin…

…g origin

Test ReturnsExpectedResponseWithSpace_OnSuccess against an URI including an escaped character

Update SftpReader to log hostname and path on exception

src/protagonist/DLCS.Repository.Tests/Strategy/SftpOriginStrategyTests.cs

@@ -123,15 +123,15 @@ public async Task LoadAssetFromOrigin_ReturnsExpectedResponseWithNonStandardPort
         result.ContentLength.Should().Be(stream.Length);
     }
 
-    [Fact]
-    public async Task LoadAssetFromOrigin_ReturnsExpectedResponseWithSpace_OnSuccess()
+    [Theory]
+    [InlineData("sftp://www.someuri.com/public_ftp/some folder/someId")]
+    [InlineData("sftp://www.someuri.com/public_ftp/some%20folder/someId")]
+    public async Task LoadAssetFromOrigin_ReturnsExpectedResponseWithSpace_OnSuccess(string originUri)
     {
         // Arrange
         var content = "this is a test";
 
         var stream = content.ToMemoryStream();
-
-        const string originUri = "sftp://www.someuri.com/public_ftp/some folder/someId";
 
         var basicCredentials = new BasicCredentials()
         {

src/protagonist/DLCS.Repository/SFTP/SftpReader.cs

@@ -40,7 +40,7 @@ public async Task<Stream> RetrieveFile(ConnectionInfo connectionInfo,
                 outputStream.Close();
             }
 
-            logger.LogError(ex, "Error downloading SFTP file");
+            logger.LogError(ex, "Error downloading SFTP file from Host: {Hostname}, Path: {Path}", connectionInfo.Host, path);
             throw;
         }
 

src/protagonist/DLCS.Repository/Strategy/SftpOriginStrategy.cs

@@ -52,8 +52,7 @@ public async Task<OriginResponse> LoadAssetFromOrigin(AssetId assetId, string or
 
         try
         {
-            var originPath = Uri.UnescapeDataString(originUri.AbsolutePath);
-            var outputStream = await sftpReader.RetrieveFile(connectionInfo, originPath, cancellationToken);
+            var outputStream = await sftpReader.RetrieveFile(connectionInfo, originUri.LocalPath, cancellationToken);
             return new OriginResponse(outputStream).WithContentLength(outputStream.Length);
         }
         catch (Exception ex)