Removes Zio

QutEcoacoustics · Mar 17, 2020 · a29aad1 · a29aad1
1 parent b0a9473
commit a29aad1
Show file tree

Hide file tree

Showing 31 changed files with 130 additions and 322 deletions.
diff --git a/src/Acoustics.Shared/Acoustics.Shared.csproj b/src/Acoustics.Shared/Acoustics.Shared.csproj
@@ -38,7 +38,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.IO.Abstractions" Version="9.0.5" />
     <PackageReference Include="YamlDotNet" Version="8.1.0" />
-    <PackageReference Include="Zio" Version="0.7.6" />
   </ItemGroup>
 </Project>
diff --git a/src/Acoustics.Shared/AnalysisIo.cs b/src/Acoustics.Shared/AnalysisIo.cs
@@ -5,14 +5,13 @@
 namespace Acoustics.Shared
 {
     using System;
+    using System.IO;
+    using System.IO.Abstractions;
     using Acoustics.Shared.Contracts;
 
-    using Zio;
-    using FileSystemEntry = Zio.FileSystemEntry;
-
     public class AnalysisIo
     {
-        public AnalysisIo((IFileSystem FileSystem, FileSystemEntry Base) input, (IFileSystem FileSystem, DirectoryEntry Base) output, (IFileSystem FileSystem, DirectoryEntry Base)? temp)
+        public AnalysisIo((IFileSystem FileSystem, IDirectoryInfo Base) input, (IFileSystem FileSystem, IDirectoryInfo Base) output, (IFileSystem FileSystem, IDirectoryInfo Base)? temp)
         {
             this.Input = input.FileSystem;
             this.InputBase = input.Base;
@@ -21,14 +20,14 @@ public AnalysisIo((IFileSystem FileSystem, FileSystemEntry Base) input, (IFileSy
             this.OutputBase = output.Base;
 
             this.Temp = (temp ?? input).FileSystem;
-            this.TempBase = (DirectoryEntry)(temp ?? input).Base;
+            this.TempBase = (temp ?? input).Base;
         }
 
-        public FileSystemEntry InputBase { get; }
+        public IDirectoryInfo InputBase { get; }
 
-        public DirectoryEntry OutputBase { get; }
+        public IDirectoryInfo OutputBase { get; }
 
-        public DirectoryEntry TempBase { get; }
+        public IDirectoryInfo TempBase { get; }
 
         public IFileSystem Input { get; }
 
@@ -40,7 +39,7 @@ public AnalysisIoInputDirectory EnsureInputIsDirectory()
         {
             Contract.Requires(this.InputBase != null, $"{nameof(this.InputBase)} must not be null");
 
-            if (this.Input.DirectoryExists(this.InputBase.Path))
+            if (this.Input.Directory.Exists(this.InputBase.FullName))
             {
                 return new AnalysisIoInputDirectory((this.Input, this.InputBase), (this.Output, this.OutputBase), (this.Temp, this.TempBase));
             }
@@ -52,11 +51,11 @@ public AnalysisIoInputDirectory EnsureInputIsDirectory()
     public class AnalysisIoInputDirectory
         : AnalysisIo
     {
-        internal AnalysisIoInputDirectory((IFileSystem FileSystem, FileSystemEntry Base) input, (IFileSystem FileSystem, DirectoryEntry Base) output, (IFileSystem FileSystem, DirectoryEntry Base)? temp)
+        internal AnalysisIoInputDirectory((IFileSystem FileSystem, IDirectoryInfo Base) input, (IFileSystem FileSystem, IDirectoryInfo Base) output, (IFileSystem FileSystem, IDirectoryInfo Base)? temp)
             : base(input, output, temp)
         {
         }
 
-        public new DirectoryEntry InputBase => (DirectoryEntry)base.InputBase;
+        public new DirectoryInfo InputBase => new DirectoryInfo(base.InputBase.FullName);
     }
 }
diff --git a/src/Acoustics.Shared/ConfigFile/ConfigFile.cs b/src/Acoustics.Shared/ConfigFile/ConfigFile.cs
@@ -19,8 +19,6 @@ namespace Acoustics.Shared.ConfigFile
 
     using log4net;
 
-    using Zio;
-
     public static partial class ConfigFile
     {
         public const string ProfilesKey = nameof(IProfiles<object>.Profiles);
@@ -55,11 +53,11 @@ public static FileInfo ResolveOrDefault<T>(string path, params DirectoryInfo[] s
         {
             if (!path.IsNullOrEmpty())
             {
-                var success = TryResolve(path, searchPaths.Select(x => x.ToDirectoryEntry()), out FileEntry configFile);
+                var success = TryResolve(path, searchPaths, out FileInfo configFile);
 
                 if (success)
                 {
-                    return configFile.ToFileInfo();
+                    return configFile;
                 }
             }
 
@@ -98,18 +96,18 @@ public static FileInfo Resolve(string file, params DirectoryInfo[] searchPaths)
                 throw new ArgumentException("Try to resolve config failed, because supplied file argument was null or empty.", nameof(file));
             }
 
-            var success = TryResolve(file, searchPaths.Select(x => x.ToDirectoryEntry()), out FileEntry configFile);
+            var success = TryResolve(file, searchPaths, out FileInfo configFile);
 
             if (success)
             {
-                return configFile.ToFileInfo();
+                return configFile;
             }
 
             var message = NotFoundMessage(file, searchPaths);
             throw new ConfigFileException(message, file);
         }
 
-        public static bool TryResolve(string file, IEnumerable<DirectoryEntry> searchPaths, out FileEntry configFile)
+        public static bool TryResolve(string file, IEnumerable<DirectoryInfo> searchPaths, out FileInfo configFile)
         {
             configFile = null;
             if (string.IsNullOrWhiteSpace(file))
@@ -123,7 +121,7 @@ public static bool TryResolve(string file, IEnumerable<DirectoryEntry> searchPat
             var fullPath = Path.GetFullPath(file);
             if (File.Exists(fullPath))
             {
-                configFile = fullPath.ToFileEntry();
+                configFile = fullPath.ToFileInfo();
                 return true;
             }
 
@@ -183,10 +181,10 @@ private static bool TryDefault<T>(out string errorMessage, out FileInfo fileInfo
 
             if (found)
             {
-                FileEntry defaultConfig = null;
+                FileInfo defaultConfig = null;
                 if (TryResolveInConfigFolder(defaultName, ref defaultConfig))
                 {
-                    var file = defaultConfig.ToFileInfo();
+                    var file = defaultConfig;
                     Log.Info($"Supplied config file not found, but a default was found and returned (`{file}`)");
                     {
                         fileInfo = file;
@@ -204,13 +202,13 @@ private static bool TryDefault<T>(out string errorMessage, out FileInfo fileInfo
             return false;
         }
 
-        private static bool TryResolveInConfigFolder(string file, ref FileEntry configFile)
+        private static bool TryResolveInConfigFolder(string file, ref FileInfo configFile)
         {
             // config files are always packaged with the app so use a physical file system
             var defaultConfigFile = Path.GetFullPath(Path.Combine(ConfigFolder, file));
             if (File.Exists(defaultConfigFile))
             {
-                configFile = defaultConfigFile.ToFileEntry();
+                configFile = defaultConfigFile.ToFileInfo();
                 return true;
             }
 
@@ -220,7 +218,7 @@ private static bool TryResolveInConfigFolder(string file, ref FileEntry configFi
                 var nestedDefaultConfigFile = Path.Combine(directory, file);
                 if (File.Exists(nestedDefaultConfigFile))
                 {
-                    configFile = nestedDefaultConfigFile.ToFileEntry();
+                    configFile = nestedDefaultConfigFile.ToFileInfo();
                     return true;
                 }
             }

diff --git a/src/Acoustics.Shared/Csv/Csv.cs b/src/Acoustics.Shared/Csv/Csv.cs
@@ -12,17 +12,16 @@ namespace Acoustics.Shared.Csv
 {
     using System;
     using System.Collections.Generic;
-    using SixLabors.ImageSharp;
     using System.Globalization;
     using System.IO;
     using System.Linq;
     using System.Reflection;
-    using Contracts;
+    using Acoustics.Shared.Contracts;
     using CsvHelper;
     using CsvHelper.Configuration;
     using CsvHelper.TypeConversion;
     using log4net;
-    using Zio;
+    using SixLabors.ImageSharp;
 
     /// <summary>
     /// Generic methods for reading and writing Csv file.
@@ -316,11 +315,6 @@ public static void WriteMatrixToCsv<T>(FileInfo destination, T[,] matrix, TwoDim
         }
 
         public static T[,] ReadMatrixFromCsv<T>(FileInfo source, TwoDimensionalArray transform = TwoDimensionalArray.None)
-        {
-            return ReadMatrixFromCsv<T>(source.ToFileEntry(), transform);
-        }
-
-        public static T[,] ReadMatrixFromCsv<T>(FileEntry source, TwoDimensionalArray transform = TwoDimensionalArray.None)
         {
             Contract.Requires(source != null);
 

diff --git a/src/Acoustics.Shared/Extensions/ZioExtensions.cs b/src/Acoustics.Shared/Extensions/ZioExtensions.cs
diff --git a/src/Acoustics.Shared/FileNameHelpers.cs b/src/Acoustics.Shared/FileNameHelpers.cs
@@ -9,7 +9,7 @@ namespace Acoustics.Shared
     using System.Linq;
     using System.Text.RegularExpressions;
 
-    using Zio;
+    using Acoustics.Shared.Contracts;
 
     /// <summary>
     /// A set of helper methods used to create/read consistently encoded filenames
@@ -110,15 +110,6 @@ public static void ParseAnalysisFileName(
             ParseAnalysisFileName(file.Name, out originalBaseName, out analysisTag, out otherSegments);
         }
 
-        public static void ParseAnalysisFileName(
-            FileEntry file,
-            out string originalBaseName,
-            out string analysisTag,
-            out string[] otherSegments)
-        {
-            ParseAnalysisFileName(file.Name, out originalBaseName, out analysisTag, out otherSegments);
-        }
-
         public static void ParseAnalysisFileName(string fileName, out string originalBaseName, out string analysisTag, out string[] otherSegments)
         {
             if (!TryParseAnalysisFileName(fileName, out originalBaseName, out analysisTag, out otherSegments))