Rename UnixFileMode to UnixFileType

SharpAdb · Sep 29, 2023 · ba49fde · ba49fde
1 parent beb5033
commit ba49fde
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/AdvancedSharpAdbClient.Tests/SyncServiceTests.Async.cs b/AdvancedSharpAdbClient.Tests/SyncServiceTests.Async.cs
@@ -35,7 +35,7 @@ public async void StatAsyncTest()
                 });
 
             Assert.NotNull(value);
-            Assert.Equal(UnixFileMode.Regular, value.FileMode & UnixFileMode.TypeMask);
+            Assert.Equal(UnixFileType.Regular, value.FileType & UnixFileType.TypeMask);
             Assert.Equal(597, value.Size);
             Assert.Equal(DateTimeHelper.Epoch.ToLocalTime(), value.Time);
         }
@@ -76,25 +76,25 @@ public async void GetListingAsyncTest()
 
             FileStatistics dir = value[0];
             Assert.Equal(".", dir.Path);
-            Assert.Equal((UnixFileMode)16873, dir.FileMode);
+            Assert.Equal((UnixFileType)16873, dir.FileType);
             Assert.Equal(0, dir.Size);
             Assert.Equal(time, dir.Time);
 
             FileStatistics parentDir = value[1];
             Assert.Equal("..", parentDir.Path);
-            Assert.Equal((UnixFileMode)16877, parentDir.FileMode);
+            Assert.Equal((UnixFileType)16877, parentDir.FileType);
             Assert.Equal(0, parentDir.Size);
             Assert.Equal(time, parentDir.Time);
 
             FileStatistics sdcard0 = value[2];
             Assert.Equal("sdcard0", sdcard0.Path);
-            Assert.Equal((UnixFileMode)41471, sdcard0.FileMode);
+            Assert.Equal((UnixFileType)41471, sdcard0.FileType);
             Assert.Equal(24, sdcard0.Size);
             Assert.Equal(time, sdcard0.Time);
 
             FileStatistics emulated = value[3];
             Assert.Equal("emulated", emulated.Path);
-            Assert.Equal((UnixFileMode)16749, emulated.FileMode);
+            Assert.Equal((UnixFileType)16749, emulated.FileType);
             Assert.Equal(0, emulated.Size);
             Assert.Equal(time, emulated.Time);
         }

diff --git a/AdvancedSharpAdbClient.Tests/SyncServiceTests.cs b/AdvancedSharpAdbClient.Tests/SyncServiceTests.cs
@@ -46,7 +46,7 @@ public void StatTest()
                 });
 
             Assert.NotNull(value);
-            Assert.Equal(UnixFileMode.Regular, value.FileMode & UnixFileMode.TypeMask);
+            Assert.Equal(UnixFileType.Regular, value.FileType & UnixFileType.TypeMask);
             Assert.Equal(597, value.Size);
             Assert.Equal(DateTimeHelper.Epoch.ToLocalTime(), value.Time);
         }
@@ -87,25 +87,25 @@ public void GetListingTest()
 
             FileStatistics dir = value[0];
             Assert.Equal(".", dir.Path);
-            Assert.Equal((UnixFileMode)16873, dir.FileMode);
+            Assert.Equal((UnixFileType)16873, dir.FileType);
             Assert.Equal(0, dir.Size);
             Assert.Equal(time, dir.Time);
 
             FileStatistics parentDir = value[1];
             Assert.Equal("..", parentDir.Path);
-            Assert.Equal((UnixFileMode)16877, parentDir.FileMode);
+            Assert.Equal((UnixFileType)16877, parentDir.FileType);
             Assert.Equal(0, parentDir.Size);
             Assert.Equal(time, parentDir.Time);
 
             FileStatistics sdcard0 = value[2];
             Assert.Equal("sdcard0", sdcard0.Path);
-            Assert.Equal((UnixFileMode)41471, sdcard0.FileMode);
+            Assert.Equal((UnixFileType)41471, sdcard0.FileType);
             Assert.Equal(24, sdcard0.Size);
             Assert.Equal(time, sdcard0.Time);
 
             FileStatistics emulated = value[3];
             Assert.Equal("emulated", emulated.Path);
-            Assert.Equal((UnixFileMode)16749, emulated.FileMode);
+            Assert.Equal((UnixFileType)16749, emulated.FileType);
             Assert.Equal(0, emulated.Size);
             Assert.Equal(time, emulated.Time);
         }

diff --git a/...arpAdbClient/Models/Enums/UnixFileMode.cs → ...arpAdbClient/Models/Enums/UnixFileType.cs b/...arpAdbClient/Models/Enums/UnixFileMode.cs → ...arpAdbClient/Models/Enums/UnixFileType.cs
@@ -1,4 +1,4 @@
-// <copyright file="UnixFileMode.cs" company="The Android Open Source Project, Ryan Conrad, Quamotion, yungd1plomat, wherewhere">
+// <copyright file="UnixFileType.cs" company="The Android Open Source Project, Ryan Conrad, Quamotion, yungd1plomat, wherewhere">
 // Copyright (c) The Android Open Source Project, Ryan Conrad, Quamotion, yungd1plomat, wherewhere. All rights reserved.
 // </copyright>
 
@@ -10,10 +10,10 @@ namespace AdvancedSharpAdbClient
     /// Describes the properties of a file on an Android device.
     /// </summary>
     [Flags]
-    public enum UnixFileMode : ushort
+    public enum UnixFileType : ushort
     {
         /// <summary>
-        /// The mask that can be used to retrieve the file type from a <see cref="UnixFileMode"/>.
+        /// The mask that can be used to retrieve the file type from a <see cref="UnixFileType"/>.
         /// </summary>
         TypeMask = 0x8000,
 

diff --git a/AdvancedSharpAdbClient/Models/FileStatistics.cs b/AdvancedSharpAdbClient/Models/FileStatistics.cs
@@ -22,9 +22,9 @@ public class FileStatistics
         public string Path { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="UnixFileMode"/> attributes of the file.
+        /// Gets or sets the <see cref="UnixFileType"/> attributes of the file.
         /// </summary>
-        public UnixFileMode FileMode { get; set; }
+        public UnixFileType FileType { get; set; }
 
         /// <summary>
         /// Gets or sets the total file size, in bytes.

diff --git a/AdvancedSharpAdbClient/SyncService.Async.cs b/AdvancedSharpAdbClient/SyncService.Async.cs
@@ -309,7 +309,7 @@ private async Task ReadStatisticsAsync(FileStatistics value, CancellationToken c
                 Array.Reverse(statResult, 8, 4);
             }
 
-            value.FileMode = (UnixFileMode)BitConverter.ToInt32(statResult, 0);
+            value.FileType = (UnixFileType)BitConverter.ToInt32(statResult, 0);
             value.Size = BitConverter.ToInt32(statResult, 4);
             value.Time = Extensions.FromUnixTimeSeconds(BitConverter.ToInt32(statResult, 8));
         }

diff --git a/AdvancedSharpAdbClient/SyncService.cs b/AdvancedSharpAdbClient/SyncService.cs
@@ -374,7 +374,7 @@ private void ReadStatistics(FileStatistics value)
                 Array.Reverse(statResult, 8, 4);
             }
 
-            value.FileMode = (UnixFileMode)BitConverter.ToInt32(statResult, 0);
+            value.FileType = (UnixFileType)BitConverter.ToInt32(statResult, 0);
             value.Size = BitConverter.ToInt32(statResult, 4);
             value.Time = Extensions.FromUnixTimeSeconds(BitConverter.ToInt32(statResult, 8));
         }