Another small FileDialog refactoring

Author: rds1983

src/Myra/Graphics2D/UI/File/FileDialog.PlatformDependent.cs

@@ -77,7 +77,7 @@ public static string SystemUsername
 			/// Append <see cref="Location"/> directories under the user's HOME directory.
 			/// </summary>
 			/// <param name="placeList">What folders to try to add relative to the HOME directory.</param>
-			public static void AppendUserPlacesOnSystem(List<Location> appendResult, IReadOnlyList<string> placeList)
+			public static void AppendUserPlacesOnSystem(List<Location> appendResult, IReadOnlyList<string> placeList, FileDialogMode mode, bool showHidden)
 			{
 				ThrowIfNull(appendResult);
 
@@ -97,8 +97,10 @@ public static void AppendUserPlacesOnSystem(List<Location> appendResult, IReadOn
 
 				foreach (string path in places)
 				{
-					if (!TryGetFileAttributes(path, out _))
+					if (!CheckAccess(path, mode, showHidden))
+					{
 						continue;
+					}
 
 					appendResult.Add(new Location(string.Empty, Path.GetFileName(path), path, false));
 				}

src/Myra/Graphics2D/UI/File/FileDialog.Util.cs

@@ -61,8 +61,9 @@ private static bool TryEnumerateDirectoryFiles(string path, string searchPattern
 		/// <summary>
 		/// Attempt to retreive permissions about a file or directory. Return value is indicative of success and a basic attribute filter.
 		/// </summary>
-		private static bool TryGetFileAttributes(string path, out FileAttributes attributes)
+		private static bool CheckAccess(string path, FileDialogMode mode, bool showHidden)
 		{
+			FileAttributes attributes;
 			try
 			{
 				attributes = new FileInfo(path).Attributes;
@@ -73,15 +74,6 @@ private static bool TryGetFileAttributes(string path, out FileAttributes attribu
 				return false;
 			}
 
-			bool discard =
-				attributes.HasFlag(FileAttributes.System) |
-				attributes.HasFlag(FileAttributes.Offline);
-
-			return !discard;
-		}
-
-		private static bool FileAttributeFilter(FileAttributes attributes, FileDialogMode mode, bool showHidden)
-		{
 			bool discard =
 				attributes.HasFlag(FileAttributes.System) |
 				attributes.HasFlag(FileAttributes.Offline) |
@@ -98,6 +90,7 @@ private static bool FileAttributeFilter(FileAttributes attributes, FileDialogMod
 				default:
 					break;
 			}
+
 			return !discard;
 		}
 	}

src/Myra/Graphics2D/UI/File/FileDialog.cs

@@ -194,7 +194,7 @@ protected virtual void PopulatePlacesListUI(ListView listView)
 			int index = 0;
 
 			//Add user directories
-			Platform.AppendUserPlacesOnSystem(placeList, Platform.SystemUserPlacePaths);
+			Platform.AppendUserPlacesOnSystem(placeList, Platform.SystemUserPlacePaths, _mode, ShowHiddenFiles);
 			for (; index < placeList.Count; index++)
 				listView.Widgets.Add(CreateListItem(placeList[index]));
 
@@ -241,9 +241,7 @@ protected bool TryAccessDirectory(string path)
 				return true;
 			}
 
-			if (!TryGetFileAttributes(path, out FileAttributes att))
-				return false;
-			return FileAttributeFilter(att, _mode, ShowHiddenFiles);
+			return CheckAccess(path, _mode, ShowHiddenFiles);
 		}
 
 		protected void ShowIOError(string path, string exceptionMsg)
@@ -414,11 +412,10 @@ private void UpdateFolder()
 			var gridY = 0;
 			foreach (string folder in collection)
 			{
-				success = TryGetFileAttributes(folder, out FileAttributes att);
-				if (success)
-					success &= FileAttributeFilter(att, _mode, ShowHiddenFiles);
-				if (!success)
+				if (!CheckAccess(folder, _mode, ShowHiddenFiles))
+				{
 					continue;
+				}
 
 				_gridFiles.RowsProportions.Add(new Proportion());
 
@@ -461,11 +458,10 @@ private void UpdateFolder()
 
 			foreach (string file in collection)
 			{
-				success = TryGetFileAttributes(file, out FileAttributes att);
-				if (success)
-					success &= FileAttributeFilter(att, _mode, ShowHiddenFiles);
-				if (!success)
+				if (!CheckAccess(file, _mode, ShowHiddenFiles))
+				{
 					continue;
+				}
 
 				_gridFiles.RowsProportions.Add(new Proportion());