code smells

qdraw · Aug 1, 2023 · f400d42 · f400d42
1 parent d3c6989
commit f400d42
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 18 deletions.
diff --git a/starsky/starsky.foundation.database/Helpers/FileIndexCompareHelper.cs b/starsky/starsky.foundation.database/Helpers/FileIndexCompareHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using starsky.foundation.database.Models;
@@ -141,6 +142,8 @@ public static FileIndexItem Set(FileIndexItem? sourceIndexItem, string fieldName
 		/// </summary>
 		/// <param name="fieldName">name e.g. Tags</param>
 		/// <returns>bool, true=exist</returns>
+		[SuppressMessage("Usage", "Collection-specific Exists " +
+		                          "method should be used instead of the Any extension.")]
 		public static bool CheckIfPropertyExist(string fieldName)
 		{
 			PropertyInfo[] propertiesA = new FileIndexItem().GetType().GetProperties(

diff --git a/starsky/starsky.foundation.sync/SyncServices/SyncFolder.cs b/starsky/starsky.foundation.sync/SyncServices/SyncFolder.cs
@@ -137,7 +137,7 @@ internal async Task CompareFolderListAndFixMissingFolders(List<string> subPaths,
 		{
 			if ( subPaths.Count == folderList.Count ) return;
 
-			foreach ( var path in subPaths.Where(path => folderList.All(p => p.FilePath != path) &&
+			foreach ( var path in subPaths.Where(path => folderList.TrueForAll(p => p.FilePath != path) &&
 				_subPathStorage.ExistFolder(path) && !_syncIgnoreCheck.Filter(path) ) )
 			{
 				await _query.AddItemAsync(new FileIndexItem(path)
@@ -155,7 +155,7 @@ internal async Task<List<FileIndexItem>> AddParentFolder(string subPath, List<Fi
 			// used to check later if the item already exists, to avoid duplicates
 			var filePathsAllResults = allResults.Select(p => p.FilePath).ToList();
 
-			if ( allResults.All(p => p.FilePath != subPath))
+			if ( allResults.TrueForAll(p => p.FilePath != subPath))
 			{
 				var subPathStatus = _subPathStorage.IsFolderOrFile(subPath);
 				var exifStatus = subPathStatus ==
@@ -301,7 +301,7 @@ internal static List<FileIndexItem> PathsToUpdateInDatabase(
 			var resultDatabaseItems = new List<FileIndexItem>(databaseItems);
 			foreach ( var path in pathsOnDisk )
 			{
-				var item = databaseItems.FirstOrDefault(p => string.Equals(p.FilePath, path, StringComparison.InvariantCultureIgnoreCase));
+				var item = databaseItems.Find(p => string.Equals(p.FilePath, path, StringComparison.InvariantCultureIgnoreCase));
 				if (item == null ) // when the file should be added to the index
 				{
 					// Status is used by MultiFile

diff --git a/starsky/starsky.foundation.sync/SyncServices/SyncMultiFile.cs b/starsky/starsky.foundation.sync/SyncServices/SyncMultiFile.cs
@@ -50,7 +50,7 @@ internal async Task<List<FileIndexItem>> MultiFile(List<string> subPathInFiles,
 			var resultDatabaseItems = new List<FileIndexItem>();
 			foreach ( var path in subPathInFiles )
 			{
-				var item = databaseItems.FirstOrDefault(p => 
+				var item = databaseItems.Find(p => 
 					string.Equals(p.FilePath, path, StringComparison.InvariantCultureIgnoreCase));
 				if (item == null ) // when the file should be added to the index
 				{

diff --git a/starsky/starsky.foundation.sync/SyncServices/SyncSingleFile.cs b/starsky/starsky.foundation.sync/SyncServices/SyncSingleFile.cs
@@ -44,7 +44,7 @@ internal async Task<List<FileIndexItem>> SingleFile(string subPath,
 			ISynchronize.SocketUpdateDelegate? updateDelegate = null)
 		{
 			// when item does not exist in db
-			if ( dbItems?.FirstOrDefault(p => p.FilePath == subPath) == null )
+			if ( dbItems?.Find(p => p.FilePath == subPath) == null )
 			{
 				return await SingleFile(subPath);
 			}
@@ -91,7 +91,7 @@ internal async Task<List<FileIndexItem>> SingleFile(string subPath,
 				scanItems.Add(item);
 			}
 
-			foreach ( var item in dbItems.Where(item => scanItems.All(p => p.FilePath != item.FilePath)) )
+			foreach ( var item in dbItems.Where(item => scanItems.TrueForAll(p => p.FilePath != item.FilePath)) )
 			{
 				scanItems.Add(item);
 			}

diff --git a/starsky/starsky/Program.cs b/starsky/starsky/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,6 +14,8 @@ namespace starsky
 {
 	public static class Program
 	{
+		[SuppressMessage("Usage", "S6603: The collection-specific TrueForAll " +
+		                          "method should be used instead of the All extension")]
 		public static async Task Main(string[] args)
 		{
 			var appSettingsPath = Path.Join(

diff --git a/starsky/starsky/clientapp/src/components/atoms/list-image/list-image.tsx b/starsky/starsky/clientapp/src/components/atoms/list-image/list-image.tsx
@@ -98,11 +98,12 @@ const ListImage: React.FunctionComponent<IListImageProps> = memo((props) => {
     );
   }
 
-  const className = error
-    ? `img-box--error img-box--${props.imageFormat}`
-    : isLoading
-    ? "img-box img-box--loading"
-    : "img-box";
+  let className = "img-box";
+  if (error) {
+    className += ` img-box--error img-box--${props.imageFormat}`;
+  } else if (isLoading) {
+    className += " img-box--loading";
+  }
 
   return (
     <div ref={target} className={className}>

diff --git a/...rsky/clientapp/src/components/molecules/force-sync-wait-button/force-sync-wait-button.tsx b/...rsky/clientapp/src/components/molecules/force-sync-wait-button/force-sync-wait-button.tsx
@@ -55,7 +55,7 @@ const ForceSyncWaitButton: React.FunctionComponent<
   ForceSyncWaitButtonPropTypes
 > = ({ propsParentFolder, historyLocationSearch, callback, dispatch }) => {
   function forceSync(): Promise<IConnectionDefault> {
-    const parentFolder = propsParentFolder ? propsParentFolder : "/";
+    const parentFolder = propsParentFolder ?? "/";
     setIsLoading(true);
     new FileListCache().CacheCleanEverything();
 

diff --git a/...nents/organisms/modal-archive-synchronize-manually/modal-archive-synchronize-manually.tsx b/...nents/organisms/modal-archive-synchronize-manually/modal-archive-synchronize-manually.tsx
@@ -79,7 +79,7 @@ const ModalArchiveSynchronizeManually: React.FunctionComponent<
   function removeCache() {
     setIsLoading(true);
     new FileListCache().CacheCleanEverything();
-    const parentFolder = props.parentFolder ? props.parentFolder : "/";
+    const parentFolder = props.parentFolder ?? "/";
     FetchGet(
       new UrlQuery().UrlRemoveCache(new URLPath().encodeURI(parentFolder))
     ).then((_) => {
@@ -106,7 +106,7 @@ const ModalArchiveSynchronizeManually: React.FunctionComponent<
   const [geoSyncPercentage, setGeoSyncPercentage] = useState(0);
 
   function geoSync() {
-    const parentFolder = props.parentFolder ? props.parentFolder : "/";
+    const parentFolder = props.parentFolder ?? "/";
 
     const bodyParams = new URLSearchParams();
     bodyParams.set("f", parentFolder);
@@ -116,7 +116,7 @@ const ModalArchiveSynchronizeManually: React.FunctionComponent<
   }
 
   function fetchGeoSyncStatus() {
-    const parentFolder = props.parentFolder ? props.parentFolder : "/";
+    const parentFolder = props.parentFolder ?? "/";
     FetchGet(
       new UrlQuery().UrlGeoStatus(new URLPath().encodeURI(parentFolder))
     ).then((anyData) => {
@@ -136,15 +136,15 @@ const ModalArchiveSynchronizeManually: React.FunctionComponent<
   useInterval(() => fetchGeoSyncStatus(), 10000);
 
   function manualThumbnailSync() {
-    const parentFolder = props.parentFolder ? props.parentFolder : "/";
+    const parentFolder = props.parentFolder ?? "/";
     const bodyParams = new URLSearchParams();
     bodyParams.set("f", parentFolder);
     setIsLoading(true);
 
     FetchPost(
       new UrlQuery().UrlThumbnailGeneration(),
       bodyParams.toString()
-    ).then((anyData) => {
+    ).then((_) => {
       setTimeout(() => {
         setIsLoading(false);
         props.handleExit();

diff --git a/.../clientapp/src/components/organisms/preferences-app-settings/preferences-app-settings.tsx b/.../clientapp/src/components/organisms/preferences-app-settings/preferences-app-settings.tsx
@@ -45,7 +45,7 @@ export const PreferencesAppSettings: React.FunctionComponent<any> = (_) => {
 
   async function changeSetting(value: string, name?: string): Promise<number> {
     const bodyParams = new URLSearchParams();
-    bodyParams.set(name ? name : "", value);
+    bodyParams.set(name ?? "", value);
     const result = await FetchPost(
       new UrlQuery().UrlApiAppSettings(),
       bodyParams.toString()