Merge branch 'feature/202312_conditionaltools' into feature/202312_co…

…nditional_tools

# Conflicts:
#	.github/workflows/starsky-docker-buildx.yml

starsky/Dockerfile

@@ -114,11 +114,16 @@ RUN if [ "$TEST" = "true" ]; then \
 # docker buildx imagetools inspect mcr.microsoft.com/dotnet/aspnet:6.0
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS release
 WORKDIR /app
-
-# for debugging
-RUN apt-get update
-RUN apt-get install -y curl
-RUN apt-get clean
+ARG TOOLS=false
+
+# # for debugging
+RUN if [ "$TOOLS" = "true" ]; then \
+    apt-get update ;\
+    apt-get install --no-install-recommends -y curl ;\
+    apt-get clean ;\
+else \
+    echo "no tools for debug" ;\
+fi
 
 # Create a group and user
 RUN groupadd --gid 1000 app \

starsky/starskytest/Controllers/DiskControllerTest.cs

@@ -89,7 +89,7 @@ public DiskControllerTest()
 			_appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			_scopeFactory = serviceProvider.GetRequiredService<IServiceScopeFactory>();
-			_query = new Query(_context, new AppSettings(), _scopeFactory, new FakeIWebLogger(), memoryCache);
+			_query = new Query(_context, _appSettings, _scopeFactory, new FakeIWebLogger(), memoryCache);
 		}
 
 		private async Task<FileIndexItem> InsertSearchData()

starsky/starskytest/FakeMocks/FakeIQuery.cs

@@ -113,7 +113,7 @@ public IEnumerable<FileIndexItem> DisplayFileFolders(List<FileIndexItem> fileInd
 			bool enableCollections = true, bool hideDeleted = true, 
 			SortType? sort = SortType.FileName)
 		{
-			if ( _content.All(p => p.FilePath != singleItemDbPath) )
+			if ( _content.TrueForAll(p => p.FilePath != singleItemDbPath) )
 			{
 				return null;
 			}
@@ -234,7 +234,7 @@ public async Task<List<FileIndexItem>> RemoveItemAsync(List<FileIndexItem> updat
 		public bool RemoveCacheParentItem(string directoryName)
 		{
 			if ( _fakeCachedContent == null ) return false;
-			var item = _fakeCachedContent.FirstOrDefault(p =>
+			var item = _fakeCachedContent.Find(p =>
 				p.ParentDirectory == directoryName);
 			if ( item == null ) return false;
 			_fakeCachedContent.Remove(item);