Refactors and fixes from sonarcloud analysis

nanoframework · Jun 7, 2024 · f3635e0 · f3635e0
1 parent ff143af
commit f3635e0
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/System.IO.FileSystem/DirectoryInfo.cs b/System.IO.FileSystem/DirectoryInfo.cs
@@ -177,6 +177,14 @@ public void Delete(bool recursive)
                 recursive);
         }
 
+        /// <inheritdoc/>
+        protected override void HandleRefreshError()
+        {
+            throw new IOException(
+                string.Empty,
+                (int)IOException.IOExceptionErrorCode.DirectoryNotFound);
+        }
+
         /// <summary>
         /// Returns the original path that was passed to the <see cref="DirectoryInfo"/> constructor. Use the <see cref="FileSystemInfo.FullName"/> or <see cref="Name"/> properties for the full path or file/directory name instead of this method.
         /// </summary>

diff --git a/System.IO.FileSystem/File.cs b/System.IO.FileSystem/File.cs
@@ -536,7 +536,7 @@ internal static void Copy(
 
                 byte[] buffer = new byte[ChunkSize];
 
-                for (; ; )
+                while (true)
                 {
                     int readSize = reader.Read(buffer, 0, ChunkSize);
 

diff --git a/System.IO.FileSystem/FileInfo.cs b/System.IO.FileSystem/FileInfo.cs
@@ -39,7 +39,7 @@ public long Length
             {
                 RefreshIfNull();
 
-                return (long)_nativeFileInfo.Size;
+                return _nativeFileInfo.Size;
             }
         }
 
@@ -91,6 +91,14 @@ public override bool Exists
             }
         }
 
+        /// <inheritdoc/>
+        protected override void HandleRefreshError()
+        {
+            throw new IOException(
+                string.Empty,
+                (int)IOException.IOExceptionErrorCode.FileNotFound);
+        }
+
         /// <summary>
         /// Returns the original path that was passed to the FileInfo constructor. Use the <see cref="FileSystemInfo.FullName"/> or <see cref="Name"/> property for the full path or file name.
         /// </summary>

diff --git a/System.IO.FileSystem/FileSystemInfo.cs b/System.IO.FileSystem/FileSystemInfo.cs
@@ -80,7 +80,7 @@ public abstract string Name
         /// Refreshes the state of the object.
         /// </summary>
         /// <exception cref="IOException">A device such as a disk drive is not ready.</exception>
-        public void Refresh()
+        public virtual void Refresh()
         {
             object record = FileSystemManager.AddToOpenListForRead(_fullPath);
 
@@ -90,11 +90,7 @@ public void Refresh()
 
                 if (_nativeFileInfo == null)
                 {
-                    IOException.IOExceptionErrorCode errorCode = (this is FileInfo) ? IOException.IOExceptionErrorCode.FileNotFound : IOException.IOExceptionErrorCode.DirectoryNotFound;
-
-                    throw new IOException(
-                        string.Empty,
-                        (int)errorCode);
+                    HandleRefreshError();
                 }
             }
             finally
@@ -103,6 +99,11 @@ public void Refresh()
             }
         }
 
+        /// <summary>
+        /// Handler for the case when the file or directory does not exist.
+        /// </summary>
+        protected abstract void HandleRefreshError();
+
         internal void RefreshIfNull()
         {
             if (_nativeFileInfo == null)

diff --git a/System.IO.FileSystem/FileSystemManager.cs b/System.IO.FileSystem/FileSystemManager.cs
@@ -30,20 +30,20 @@ public FileRecord(
             }
         }
 
-        public static object AddToOpenList(string fullName)
+        public static object AddToOpenListForRead(string fullName)
         {
             return AddToOpenList(
                 fullName,
-                FileAccess.ReadWrite,
-                FileShare.None);
+                FileAccess.Read,
+                FileShare.ReadWrite);
         }
 
-        public static object AddToOpenListForRead(string fullName)
+        public static object AddToOpenList(string fullName)
         {
             return AddToOpenList(
                 fullName,
-                FileAccess.Read,
-                FileShare.ReadWrite);
+                FileAccess.ReadWrite,
+                FileShare.None);
         }
 
         public static FileRecord AddToOpenList(

diff --git a/System.IO.FileSystem/NativeFileStream.cs b/System.IO.FileSystem/NativeFileStream.cs
@@ -12,7 +12,9 @@ internal class NativeFileStream
         // field is required for native interop
 #pragma warning disable IDE0051
 #pragma warning disable CS0169
+#pragma warning disable S1144
         object _fs;
+#pragma warning restore S1144
 #pragma warning restore CS0169
 #pragma warning restore IDE0051