LocalFile fixes

Author: KSemenenko

Directory.Build.props

@@ -14,8 +14,8 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Product>Managed Code - Storage</Product>
-        <Version>2.1.6</Version>
-        <PackageVersion>2.1.6</PackageVersion>
+        <Version>2.1.7</Version>
+        <PackageVersion>2.1.7</PackageVersion>
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

ManagedCode.Storage.AspNetExtensions/StorageExtensions.cs

@@ -21,7 +21,7 @@ public static async Task<Result<FileResult>> DownloadAsFileResult(this IStorage
 
         var fileStream = new FileStreamResult(result.Value!.FileStream, MimeHelper.GetMimeType(result.Value.FileInfo.Extension))
         {
-            FileDownloadName = result.Value.FileName
+            FileDownloadName = result.Value.Name
         };
 
         return Result<FileResult>.Succeed(fileStream);
@@ -40,7 +40,7 @@ public static async Task<Result<FileResult>> DownloadAsFileResult(this IStorage
 
         var fileStream = new FileStreamResult(result.Value!.FileStream, MimeHelper.GetMimeType(result.Value.FileInfo.Extension))
         {
-            FileDownloadName = result.Value.FileName
+            FileDownloadName = result.Value.Name
         };
 
         return Result<FileResult>.Succeed(fileStream);

ManagedCode.Storage.Core/BaseStorage.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCode.Communication;

ManagedCode.Storage.Core/Models/LocalFile.cs

@@ -43,12 +43,12 @@ public LocalFile(string? path = null, bool keepAlive = false)
             fs.Close();
         }
 
-        FileName = FileInfo.Name;
+        Name = FileInfo.Name;
     }
 
     public string FilePath { get; }
 
-    public string FileName { get; }
+    public string Name { get; }
 
     public bool KeepAlive { get; set; }
 
@@ -115,6 +115,42 @@ public void Dispose()
         }
     }
 
+    public string ReadAllText()
+    {
+        lock (_lockObject)
+        {
+            CloseFileStream();
+            return File.ReadAllText(FilePath);
+        }
+    }
+
+    public Task<string> ReadAllTextAsync()
+    {
+        lock (_lockObject)
+        {
+            CloseFileStream();
+            return File.ReadAllTextAsync(FilePath);
+        }
+    }
+
+    public string[] ReadAllLines()
+    {
+        lock (_lockObject)
+        {
+            CloseFileStream();
+            return File.ReadAllLines(FilePath);
+        }
+    }
+
+    public Task<string[]> ReadAllLinesAsync()
+    {
+        lock (_lockObject)
+        {
+            CloseFileStream();
+            return File.ReadAllLinesAsync(FilePath);
+        }
+    }
+
     ~LocalFile()
     {
         Dispose();

ManagedCode.Storage.FileSystem/FileSystemStorage.cs

@@ -114,9 +114,9 @@ private string GetPathFromOptions(BaseOptions options)
         {
             filePath = Path.Combine(StorageClient, options.FileName);
         }
-        
+
         EnsureDirectoryExist(Path.GetDirectoryName(filePath));
-        
+
         return filePath;
     }
 

ManagedCode.Storage.Tests/AspNetExtensions/FormFileExtensionsTests.cs

@@ -23,7 +23,7 @@ public async Task ToLocalFileAsync_SmallFile()
 
         // Assert
         localFile.FileStream.Length.Should().Be(formFile.Length);
-        localFile.FileName.Should().Be(formFile.FileName);
+        localFile.Name.Should().Be(formFile.FileName);
     }
 
     [Fact]
@@ -39,7 +39,7 @@ public async Task ToLocalFileAsync_LargeFile()
 
         // Assert
         localFile.FileStream.Length.Should().Be(formFile.Length);
-        localFile.FileName.Should().Be(formFile.FileName);
+        localFile.Name.Should().Be(formFile.FileName);
     }
 
     [Fact]
@@ -66,7 +66,7 @@ public async Task ToLocalFilesAsync_SmallFiles()
         for (var i = 0; i < filesCount; i++)
         {
             localFiles[i].FileStream.Length.Should().Be(collection[i].Length);
-            localFiles[i].FileName.Should().Be(collection[i].FileName);
+            localFiles[i].Name.Should().Be(collection[i].FileName);
         }
     }
 }

ManagedCode.Storage.Tests/AspNetExtensions/StorageExtensionsTests.cs

@@ -46,7 +46,7 @@ public async Task UploadToStorageAsync_SmallFile()
 
         // Assert
         localFile!.Value.FileInfo.Length.Should().Be(formFile.Length);
-        localFile.Value.FileName.Should().Be(formFile.FileName);
+        localFile.Value.Name.Should().Be(formFile.FileName);
 
         await Storage.DeleteAsync(fileName);
     }
@@ -64,7 +64,7 @@ public async Task UploadToStorageAsync_LargeFile()
         var result = await Storage.DownloadAsync(fileName);
 
         // Assert
-        result.Value.FileName.Should().Be(formFile.FileName);
+        result.Value.Name.Should().Be(formFile.FileName);
 
         await Storage.DeleteAsync(fileName);
     }
@@ -84,7 +84,7 @@ public async Task UploadToStorageAsync_WithRandomName()
         // Assert
         result.IsSuccess.Should().BeTrue();
         localFile.Value.FileInfo.Length.Should().Be(formFile.Length);
-        localFile.Value.FileName.Should().Be(fileName);
+        localFile.Value.Name.Should().Be(fileName);
 
         await Storage.DeleteAsync(fileName);
     }
@@ -104,7 +104,7 @@ public async Task DownloadAsFileResult_WithFileName()
         // Assert
         result.IsSuccess.Should().BeTrue();
         result.Value!.ContentType.Should().Be(MimeHelper.GetMimeType(localFile.FileInfo.Extension));
-        result.Value.FileDownloadName.Should().Be(localFile.FileName);
+        result.Value.FileDownloadName.Should().Be(localFile.Name);
 
         await Storage.DeleteAsync(fileName);
     }
@@ -126,7 +126,7 @@ public async Task DownloadAsFileResult_WithBlobMetadata()
         // Assert
         result.IsSuccess.Should().Be(true);
         result.Value!.ContentType.Should().Be(MimeHelper.GetMimeType(localFile.FileInfo.Extension));
-        result.Value.FileDownloadName.Should().Be(localFile.FileName);
+        result.Value.FileDownloadName.Should().Be(localFile.Name);
 
         await Storage.DeleteAsync(fileName);
     }

ManagedCode.Storage.Tests/StorageBaseTests.cs

@@ -198,7 +198,7 @@ protected async Task<FileInfo> GetTestFileAsync()
 //
 //     foreach (var localFile in bigFiles)
 //     {
-//         await Storage.UploadStreamAsync(localFile.FileName, localFile.FileStream);
+//         await Storage.UploadStreamAsync(localFile.Name, localFile.FileStream);
 //         await localFile.DisposeAsync();
 //     }
 //
@@ -209,7 +209,7 @@ protected async Task<FileInfo> GetTestFileAsync()
 //
 //     foreach (var localFile in bigFiles)
 //     {
-//         await Storage.DeleteAsync(localFile.FileName);
+//         await Storage.DeleteAsync(localFile.Name);
 //     }
 // }