Merge pull request #1199 from qdraw/feature/202307_code_smells_24

Feature/202307 code smells 24

starsky/starsky.feature.health/HealthCheck/DiskStorageHealthCheck.cs

@@ -59,8 +59,9 @@ private static (bool Exists, long ActualFreeMegabytes) GetSystemDriveInfo(string
 				return ( false, 0L );
 			}
 
-			var driveInfo = drivesList.FirstOrDefault(
-				drive => string.Equals(drive.Name, driveName, StringComparison.InvariantCultureIgnoreCase));
+			var driveInfo = Array.Find(drivesList,
+				drive => string.Equals(drive.Name, driveName,
+					StringComparison.InvariantCultureIgnoreCase));
 			return driveInfo?.AvailableFreeSpace != null ? (true, driveInfo.AvailableFreeSpace / 1024L / 1024L) : (false, 0L);
 		}
 	}

starsky/starsky.feature.health/HealthCheck/PathExistHealthCheck.cs

@@ -33,7 +33,7 @@ public Task<HealthCheckResult> CheckHealthAsync(
 					$"Not configured"));
 
 			return Task.FromResult(
-				resultsList.Any(p => p == FolderOrFileModel.FolderOrFileTypeList.Deleted) ? 
+				resultsList.Exists(p => p == FolderOrFileModel.FolderOrFileTypeList.Deleted) ? 
 				new HealthCheckResult(context.Registration.FailureStatus, $"Configured path is not present on system") : 
 				HealthCheckResult.Healthy("Configured path is present"));
 		}

starsky/starsky.feature.health/UpdateCheck/Models/ReleaseModel.cs

@@ -29,7 +29,7 @@ public string TagName {
 			set
 			{
 				if ( string.IsNullOrWhiteSpace(value)) return;
-				if ( !value.StartsWith("v") ) Console.WriteLine($"{_tagName} Should start with v");
+				if ( !value.StartsWith('v') ) Console.WriteLine($"{_tagName} Should start with v");
 				_tagName = value;
 			} 
 		}

starsky/starsky.feature.health/UpdateCheck/Services/CheckForUpdates.cs

@@ -72,8 +72,11 @@ internal static KeyValuePair<UpdateStatus, string> Parse(IEnumerable<ReleaseMode
 		{
 			var orderedReleaseModelList = releaseModelList.OrderByDescending(p => p.TagName);
 			var tagName = orderedReleaseModelList.FirstOrDefault(p => !p.Draft && !p.PreRelease)?.TagName;
-			if ( string.IsNullOrWhiteSpace(tagName) || !tagName.StartsWith("v") )
+			if ( string.IsNullOrWhiteSpace(tagName) ||
+			     !tagName.StartsWith('v') )
+			{
 				return new KeyValuePair<UpdateStatus, string>(UpdateStatus.NoReleasesFound,string.Empty);
+			}
 
 			try
 			{

starsky/starsky.feature.import/Services/Import.cs

@@ -142,7 +142,7 @@ public async Task<List<ImportIndexItem>> Preflight(List<string> fullFilePathsLis
 				var parentFolder = Directory.GetParent(itemSourceFullFilePath)
 					?.FullName;
 
-				if ( parentFolders.All(p => p.Item1 != parentFolder) )
+				if ( parentFolders.TrueForAll(p => p.Item1 != parentFolder) )
 				{
 					parentFolders.Add(new Tuple<string?, List<string>>(parentFolder, new List<string>{itemSourceFullFilePath}));
 					continue;
@@ -157,10 +157,16 @@ public async Task<List<ImportIndexItem>> Preflight(List<string> fullFilePathsLis
 				var fileStorageInfo = _filesystemStorage.Info(parentFolder.Item1!);
 				if ( fileStorageInfo.IsFolderOrFile !=
 				     FolderOrFileModel.FolderOrFileTypeList.Folder ||
-				     fileStorageInfo.IsFileSystemReadOnly != true ) continue;
+				     fileStorageInfo.IsFileSystemReadOnly != true )
+				{
+					continue;
+				}
+
+				var items = parentFolder.Item2.Select(parentItem => 
+						Array.Find(importIndexItemsList.ToArray(), 
+							p => p.SourceFullFilePath == parentItem)).Cast<ImportIndexItem>();
 
-				foreach ( var item in parentFolder.Item2.Select(parentItem => importIndexItemsList.FirstOrDefault(p =>
-					         p.SourceFullFilePath == parentItem)).Where(item => item != null).Cast<ImportIndexItem>() )
+				foreach ( var item in items )
 				{
 					importIndexItemsList[importIndexItemsList.IndexOf(item)]
 						.Status = ImportStatus.ReadOnlyFileSystem;
@@ -229,7 +235,7 @@ internal List<ImportIndexItem> CheckForDuplicateNaming(List<ImportIndexItem> imp
 					var currentDirectoryContent =
 						directoriesContent[importIndexItem.FileIndexItem.ParentDirectory!];
 
-					if ( currentDirectoryContent.Any(p => p == updatedFilePath)  )
+					if ( currentDirectoryContent.Contains(updatedFilePath)  )
 					{
 						indexer++;
 						continue;
@@ -291,7 +297,7 @@ private List<KeyValuePair<string,bool>> AppendDirectoryFilePaths(List<string> fu
 		internal async Task<ImportIndexItem> PreflightPerFile(KeyValuePair<string,bool> inputFileFullPath, 
 			ImportSettingsModel importSettings)
 		{
-			if ( _appSettings.ImportIgnore.Any(p => inputFileFullPath.Key.Contains(p)) )
+			if ( _appSettings.ImportIgnore.Exists(p => inputFileFullPath.Key.Contains(p)) )
 			{
 				ConsoleIfVerbose($"❌ skip due rules: {inputFileFullPath.Key} ");
 				return new ImportIndexItem{ 

starsky/starsky.feature.metaupdate/Helpers/AddNotFoundInIndexStatus.cs

@@ -13,7 +13,7 @@ internal static void Update(IEnumerable<string> inputFilePaths, List<FileIndexIt
 			foreach (var subPath in inputFilePaths)
 			{
 				// when item is not in the database
-				if ( fileIndexResultsList.Any(p => p.FilePath == subPath) )
+				if ( fileIndexResultsList.Exists(p => p.FilePath == subPath) )
 				{
 					continue;
 				}

starsky/starsky.feature.metaupdate/Services/MetaReplaceService.cs

@@ -135,8 +135,10 @@ public static List<FileIndexItem> SearchAndReplace(List<FileIndexItem> fileIndex
 
 				var propertiesA = new FileIndexItem().GetType().GetProperties(
 					BindingFlags.Public | BindingFlags.Instance);
-				var property = propertiesA.FirstOrDefault(p => string.Equals(
-					p.Name, fieldName, StringComparison.InvariantCultureIgnoreCase));
+
+				var property = Array.Find(propertiesA, p => string.Equals(
+					p.Name, fieldName,
+					StringComparison.InvariantCultureIgnoreCase));
 
 				if ( property?.PropertyType == typeof(string))
 				{

starsky/starsky.feature.packagetelemetry/Services/PackageTelemetry.cs

@@ -127,7 +127,7 @@ internal List<KeyValuePair<string, string>> AddAppSettingsData( List<KeyValuePai
 			// ReSharper disable once LoopCanBeConvertedToQuery
 			foreach (var property in properties)
 			{
-				var someAttribute = Attribute.GetCustomAttributes(property).FirstOrDefault(x => x is PackageTelemetryAttribute);
+				var someAttribute = Array.Find(Attribute.GetCustomAttributes(property), x => x is PackageTelemetryAttribute);
 				if ( someAttribute == null )
 				{
 					continue;

starsky/starsky.feature.search/ViewModels/SearchViewModel.cs

@@ -503,9 +503,14 @@ public static SearchViewModel NarrowSearch(SearchViewModel model)
 
 			for ( var i = 0; i < model.SearchIn.Count; i++ )
 			{
-				var propertyStringName = FileIndexItem.FileIndexPropList().FirstOrDefault(p =>
-					string.Equals(p, model.SearchIn[i], StringComparison.InvariantCultureIgnoreCase));
-				if ( string.IsNullOrEmpty(propertyStringName) ) continue;
+				var propertyStringName =  FileIndexItem.FileIndexPropList().Find( p =>
+						string.Equals(p, model.SearchIn[i],
+							StringComparison.InvariantCultureIgnoreCase));
+
+				if ( string.IsNullOrEmpty(propertyStringName) )
+				{
+					continue;
+				}
 
 				var property = new FileIndexItem().GetType().GetProperty(propertyStringName)!;
 
@@ -518,7 +523,7 @@ public static SearchViewModel NarrowSearch(SearchViewModel model)
 			}
 
 			// hide xmp files in default view
-			if ( model.SearchIn.All(p => !string.Equals(p, nameof(SearchInTypes.imageformat), 
+			if ( model.SearchIn.TrueForAll(p => !string.Equals(p, nameof(SearchInTypes.imageformat), 
 				    StringComparison.InvariantCultureIgnoreCase)))
 			{
 				model.FileIndexItems = model.FileIndexItems!

starsky/starsky.feature.thumbnail/Services/DatabaseThumbnailGenerationService.cs

@@ -81,7 +81,7 @@ internal async Task<IEnumerable<ThumbnailItem>> WorkThumbnailGeneration(
 
 		foreach ( var item in chuckedItems )
 		{
-			var fileIndexItem = fileIndexItems.FirstOrDefault(p => p.FileHash == item.FileHash);
+			var fileIndexItem = fileIndexItems.Find(p => p.FileHash == item.FileHash);
 			if ( fileIndexItem?.FilePath == null || 
 			     fileIndexItem.Status != FileIndexItem.ExifStatus.Ok )
 			{

starsky/starsky.feature.webhtmlpublish/Services/WebHtmlPublishService.cs

@@ -97,7 +97,7 @@ internal List<FileIndexItem> AddFileHashIfNotExist(List<FileIndexItem> fileIndex
 	    internal bool ShouldSkipExtraLarge(string publishProfileName)
 	    {
 		    var skipExtraLarge = _publishPreflight?.GetPublishProfileName(publishProfileName)?
-			    .All(p => p.SourceMaxWidth <= 1999);
+			    .TrueForAll(p => p.SourceMaxWidth <= 1999);
 		    return skipExtraLarge == true;
 
 	    }
@@ -156,9 +156,10 @@ private async Task<Dictionary<string,bool>> Render(List<FileIndexItem> fileIndex
 
 		    // Order alphabetically
 		    // Ignore Items with Errors
-		    fileIndexItemsList = fileIndexItemsList.OrderBy(p => p.FileName)
+		    fileIndexItemsList = fileIndexItemsList
 			    .Where(p=> p.Status == FileIndexItem.ExifStatus.Ok || 
-			               p.Status == FileIndexItem.ExifStatus.ReadOnly).ToList();
+			               p.Status == FileIndexItem.ExifStatus.ReadOnly)
+			    .OrderBy(p => p.FileName).ToList();
 
 		    var copyResult = new Dictionary<string,bool>();
 

starsky/starsky.foundation.accountmanagement/Services/UserManager.cs

@@ -164,7 +164,7 @@ internal async Task AddUserToCache(User user)
 			if ( !IsCacheEnabled() ) return;
 			var allUsers = (await AllUsersAsync()).Users;
 			var index = allUsers.Find(p => p.Id == user.Id);
-			if ( allUsers.Any(p => p.Id == user.Id) && index != null )
+			if ( allUsers.Exists(p => p.Id == user.Id) && index != null )
 			{
 				var indexOf = allUsers.IndexOf(index);
 				allUsers[indexOf] = user;
@@ -211,7 +211,7 @@ private async Task RemoveUserFromCacheAsync(User user)
 			}
 
 			var users = (await AllUsersAsync()).Users;
-			return users.FirstOrDefault(p => p.Id == userTableId);
+			return users.Find(p => p.Id == userTableId);
 		}
 
 		/// <summary>
@@ -284,7 +284,7 @@ public async Task<SignUpResult> SignUpAsync(string name,
 			}
 
 			// Add a user role based on a user id
-			var roleToAdd = roles.FirstOrDefault(p => p.Code == GetRoleAddToUser(identifier,user));
+			var roleToAdd = roles.Find(p => p.Code == GetRoleAddToUser(identifier,user));
 			AddToRole(user, roleToAdd);
 
 			if (credentialType == null)
@@ -555,7 +555,7 @@ public async Task<ValidateResult> ValidateAsync(string credentialTypeCode,
 				return new ValidateResult(success: false, error: ValidateResultError.SecretNotValid);
 			}
 
-			var userData = (await AllUsersAsync()).Users.FirstOrDefault(p => p.Id == credential.UserId);
+			var userData = (await AllUsersAsync()).Users.Find(p => p.Id == credential.UserId);
 			if ( userData == null )
 			{
 				return new ValidateResult(success: false, error: ValidateResultError.UserNotFound);

starsky/starsky.foundation.database/Helpers/FileIndexCompareHelper.cs

@@ -102,13 +102,13 @@ public static List<string> Compare(FileIndexItem sourceIndexItem, FileIndexItem?
             }
 
 	        // Last Edited is not needed
-	        if ( differenceList.Any(p => p == nameof(FileIndexItem.LastEdited).ToLowerInvariant()) )
+	        if ( differenceList.Exists(p => p == nameof(FileIndexItem.LastEdited).ToLowerInvariant()) )
 	        {
 		        differenceList.Remove(nameof(FileIndexItem.LastEdited).ToLowerInvariant());
 	        }
 
 	        // Last Changed is a generated list
-	        if ( differenceList.Any(p => p == nameof(FileIndexItem.LastChanged).ToLowerInvariant()) )
+	        if ( differenceList.Exists(p => p == nameof(FileIndexItem.LastChanged).ToLowerInvariant()) )
 	        {
 		        differenceList.Remove(nameof(FileIndexItem.LastChanged).ToLowerInvariant());
 	        }
@@ -134,7 +134,7 @@ public static FileIndexItem Set(FileIndexItem? sourceIndexItem, string fieldName
 
 		    PropertyInfo[] propertiesA = new FileIndexItem().GetType().GetProperties(
 			    BindingFlags.Public | BindingFlags.Instance);
-		    var property = propertiesA.FirstOrDefault(p =>
+		    var property = Array.Find(propertiesA,p =>
 			    string.Equals(p.Name, fieldName, StringComparison.InvariantCultureIgnoreCase));
 
 		    var fieldType = fieldContent.GetType();
@@ -158,7 +158,7 @@ public static FileIndexItem Set(FileIndexItem? sourceIndexItem, string fieldName
 		    {
 			    PropertyInfo[] propertiesA = new FileIndexItem().GetType()
 				    .GetProperties(BindingFlags.Public | BindingFlags.Instance);
-			    return propertiesA.FirstOrDefault(p => 
+			    return Array.Find(propertiesA,p => 
 				    string.Equals(p.Name, fieldName, StringComparison.InvariantCultureIgnoreCase))?
 				    .GetValue(sourceIndexItem, null);
 		    }

starsky/starsky.foundation.database/Models/ImportIndexItem.cs

@@ -118,7 +118,10 @@ public DateTime ParseDateTimeFromFileName()
         {
             // Depends on 'AppSettingsProvider.Structure'
             // depends on SourceFullFilePath
-            if(string.IsNullOrEmpty(SourceFullFilePath)) {return new DateTime();}
+            if ( string.IsNullOrEmpty(SourceFullFilePath) )
+            {
+	            return new DateTime(0, DateTimeKind.Utc);
+            }
 
             var fileName = Path.GetFileNameWithoutExtension(SourceFullFilePath);
 

starsky/starsky.foundation.database/Query/Query.cs

@@ -93,7 +93,6 @@ internal static string GetObjectByFilePathAsyncCacheName(string subPath)
 			     _cache.TryGetValue(
 				     GetObjectByFilePathAsyncCacheName(filePath), out var data) )
 			{
-				_logger.LogInformation("Get from cache " + GetObjectByFilePathAsyncCacheName(filePath));
 				if ( !(data is FileIndexItem fileIndexItem) ) return null;
 				fileIndexItem.Status = FileIndexItem.ExifStatus.OkAndSame;
 				return fileIndexItem;
@@ -478,7 +477,7 @@ public void CacheUpdateItem(List<FileIndexItem> updateStatusContent)
 			    // make it a list to avoid enum errors
 			    displayFileFolders = displayFileFolders.ToList();
 
-			    var obj = displayFileFolders.FirstOrDefault(p => p.FilePath == item.FilePath);
+			    var obj = displayFileFolders.Find(p => p.FilePath == item.FilePath);
 			    if ( obj != null )
 			    {
 				    // remove add again

starsky/starsky.foundation.database/Query/QueryGetObjectsByFileHashAsync.cs

@@ -27,7 +27,7 @@ async Task<List<FileIndexItem>> LocalQuery(ApplicationDbContext context)
 						fileHashesList.Contains(p.FileHash!)).ToListAsync();
 				foreach ( var fileHash in fileHashesList )
 				{
-					if ( result.FirstOrDefault(p => p.FileHash == fileHash) == null )
+					if ( result.Find(p => p.FileHash == fileHash) == null )
 					{
 						result.Add(new FileIndexItem(){FileHash = fileHash, 
 							Status = FileIndexItem.ExifStatus.NotFoundNotInIndex});

starsky/starsky.foundation.database/Query/QuerySingleItem.cs

@@ -88,7 +88,7 @@ public partial class Query
 	            };
             }
 
-            var currentFileIndexItem = fileIndexItemsList.FirstOrDefault(p => p.FileName == fileName);
+            var currentFileIndexItem = fileIndexItemsList.Find(p => p.FileName == fileName);
 
             // Could be not found or not in directory cache
             if ( currentFileIndexItem == null )

starsky/starsky.foundation.database/Thumbnails/ThumbnailQuery.cs

@@ -32,7 +32,7 @@ public ThumbnailQuery(ApplicationDbContext context, IServiceScopeFactory? scopeF
 
 	public Task<List<ThumbnailItem>?> AddThumbnailRangeAsync(List<ThumbnailResultDataTransferModel> thumbnailItems)
 	{
-		if ( thumbnailItems.Any(p => string.IsNullOrEmpty(p.FileHash) ) )
+		if ( thumbnailItems.Exists(p => string.IsNullOrEmpty(p.FileHash) ) )
 		{
 			throw new ArgumentNullException(nameof(thumbnailItems), "[AddThumbnailRangeAsync] FileHash is null or empty");
 		}
@@ -208,8 +208,8 @@ private static async Task<bool> RenameInternalAsync(ApplicationDbContext dbConte
 		var beforeOrNewItems = await dbContext.Thumbnails.Where(p =>
 			p.FileHash == beforeFileHash || p.FileHash == newFileHash).ToListAsync();
 
-		var beforeItem = beforeOrNewItems.FirstOrDefault(p => p.FileHash == beforeFileHash);
-		var newItem = beforeOrNewItems.FirstOrDefault(p => p.FileHash == newFileHash);
+		var beforeItem = beforeOrNewItems.Find(p => p.FileHash == beforeFileHash);
+		var newItem = beforeOrNewItems.Find(p => p.FileHash == newFileHash);
 
 		if ( beforeItem == null) return false;
 

starsky/starsky.foundation.injection/ServiceCollectionExtensions.cs

@@ -138,7 +138,7 @@ private static List<Assembly> GetEntryAssemblyReferencedAssemblies(List<Assembly
 		        // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
 		        foreach ( var assemblyFilter in assemblyFilters )
 		        {
-			        var isThere = assemblies.Any(p => p.FullName == assemblyName.FullName);
+			        var isThere = assemblies.Exists(p => p.FullName == assemblyName.FullName);
 			        if (IsWildcardMatch(assemblyName.Name!, assemblyFilter) && !isThere )
 			        {
 				        assemblies.Add(AppDomain.CurrentDomain.Load(assemblyName));
@@ -165,7 +165,7 @@ private static Assembly[] GetReferencedAssemblies(List<Assembly> assemblies, IEn
 			        foreach ( var referencedAssembly in assembly.GetReferencedAssemblies() )
 			        {
 				        if ( IsWildcardMatch(referencedAssembly.Name!, assemblyFilter) 
-				             && assemblies.All(p => p.FullName != referencedAssembly.FullName) )
+				             && assemblies.TrueForAll(p => p.FullName != referencedAssembly.FullName) )
 				        {
 					        assemblies.Add(Assembly.Load(referencedAssembly));
 				        }

starsky/starsky.foundation.platform/Helpers/AppSettingsCompareHelper.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -28,7 +29,7 @@ public static List<string> Compare(AppSettings sourceIndexItem, object? updateOb
             foreach ( var propertyB in propertiesB )
             {
 	            // only for when TransferObject is Nullable<bool> and AppSettings is bool
-	            var propertyInfoFromA = propertiesA.FirstOrDefault(p => p.Name == propertyB.Name);
+	            var propertyInfoFromA = Array.Find(propertiesA, p => p.Name == propertyB.Name);
 	            if ( propertyInfoFromA == null ) continue;
 	            if (propertyInfoFromA.PropertyType == typeof(bool?) && propertyB.PropertyType == typeof(bool?))
 	            {
@@ -277,8 +278,7 @@ internal static void CompareInt(string propertyName, AppSettings sourceIndexItem
 	    /// <returns></returns>
 	    private static object? GetPropertyValue(object car, string propertyName)
 	    {
-		    return car.GetType().GetProperties()
-			    .FirstOrDefault(pi => pi.Name == propertyName)?
+		    return Array.Find(car.GetType().GetProperties(), pi => pi.Name == propertyName)?
 			    .GetValue(car, null);
 	    }
 

starsky/starsky.foundation.platform/Helpers/DateAssembly.cs

@@ -20,7 +20,11 @@ public static DateTime GetBuildDate(Assembly assembly)
 			// <SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss"))</SourceRevisionId>
 			// </PropertyGroup>
 			var attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
-			if ( attribute?.InformationalVersion == null ) return new DateTime();
+			if ( attribute?.InformationalVersion == null )
+			{
+				return new DateTime(0, DateTimeKind.Utc);
+			}
+
 			var value = attribute.InformationalVersion;
 			return ParseBuildTime(value);
 		}
@@ -29,7 +33,10 @@ internal static DateTime ParseBuildTime(string value)
 		{
 			const string buildVersionMetadataPrefix = "+build";
 			var index = value.IndexOf(buildVersionMetadataPrefix, StringComparison.Ordinal);
-			if ( index <= 0 ) return new DateTime();
+			if ( index <= 0 )
+			{
+				return new DateTime(0, DateTimeKind.Utc);
+			}
 			value = value.Substring(index + buildVersionMetadataPrefix.Length);
 			return DateTime.TryParseExact(value, "yyyyMMddHHmmss", CultureInfo.InvariantCulture, 
 				DateTimeStyles.AssumeUniversal, out var result) ? result : new DateTime();