Merge branch 'master' into feature/202403-mac-arm64-try2

# Conflicts:
#	starskydesktop/package-lock.json
#	starskydesktop/package.json

.github/workflows/release-on-tag-netcore-desktop-electron.yml

@@ -292,7 +292,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/v')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/storybook-clientapp-netlify.yml

@@ -45,7 +45,7 @@ jobs:
           path: ./starsky/starsky/clientapp/storybook-static
 
       - name: Deploy to Netlify
-        uses: nwtgck/actions-netlify@v2.1
+        uses: nwtgck/actions-netlify@v3.0
         if: github.event_name != 'pull_request'
         with:
           publish-dir: './starsky/starsky/clientapp/storybook-static'

history.md

@@ -54,6 +54,8 @@ Semantic Versioning 2.0.0 is from version 0.1.6+
 - [x] (Fixed) _Back-end_ Longer regex timeout for GetFileName (PR #1444)
 - [x] (Fixed) _Back-end_ Warnings for Sonarcloud (PR #1445)
 - [x] (Fixed) _Front-end_ Fix list item status OkAndSame is not red anymore (PR #1445)
+- [x] (Removed) _Back-end_ Unused .NET cultures (PR #1453)
+- [x] (Changed) _Back-end_ Change GetParentPath() to avoid regex due timeout (PR #1461)
 
 ## version 0.6.0-beta.2 - 2024-03-05 {#v0.6.0-beta.2}
 

starsky-tools/thumbnail/package.json

@@ -27,7 +27,7 @@
     "p-iteration": "^1.1.8"
   },
   "devDependencies": {
-    "@types/node": "^20.11.18",
+    "@types/node": "^20.11.19",
     "concurrently": "^8.2.2",
     "typescript": "^5.3.3"
   }

starsky/starsky.foundation.platform/Helpers/FilenamesHelper.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace starsky.foundation.platform.Helpers
@@ -15,7 +16,7 @@ public static partial class FilenamesHelper
 		/// <returns>Regex object</returns>
 		[GeneratedRegex(
 			"^[a-zA-Z0-9_](?:[a-zA-Z0-9 ._-]*[a-zA-Z0-9])?\\.[a-zA-Z0-9_-]+$",
-			RegexOptions.CultureInvariant,
+			RegexOptions.CultureInvariant | RegexOptions.Singleline,
 			matchTimeoutMilliseconds: 300)]
 		private static partial Regex ValidFileNameRegex();
 
@@ -63,7 +64,7 @@ public static string GetFileName(string filePath,
 		/// <returns>Regex object</returns>
 		[GeneratedRegex(
 			"\\.[a-zA-Z0-9]{1,4}$",
-			RegexOptions.CultureInvariant,
+			RegexOptions.NonBacktracking | RegexOptions.CultureInvariant,
 			matchTimeoutMilliseconds: 100)]
 		private static partial Regex FileNameWithoutExtensionRegex();
 
@@ -87,7 +88,7 @@ public static string GetFileNameWithoutExtension(string filePath)
 		/// <returns>Regex object</returns>
 		[GeneratedRegex(
 			"[^.][a-zA-Z0-9]{1,4}$",
-			RegexOptions.CultureInvariant,
+			RegexOptions.NonBacktracking | RegexOptions.CultureInvariant,
 			matchTimeoutMilliseconds: 100)]
 		private static partial Regex FileExtensionWithoutDotRegex();
 
@@ -108,20 +109,9 @@ public static string GetFileExtensionWithoutDot(string filename)
 		}
 
 		/// <summary>
+		/// Return UNIX style parent paths back
 		/// Get Parent Regex
 		/// unescaped regex: /.+(?=\/[^/]+$)/
-		/// pre compiled regex
-		/// Regex.Match
-		/// </summary>
-		/// <returns>Regex object</returns>
-		[GeneratedRegex(
-			".+(?=\\/[^/]+$)",
-			RegexOptions.CultureInvariant,
-			matchTimeoutMilliseconds: 200)]
-		private static partial Regex ParentPathRegex();
-
-		/// <summary>
-		/// Return UNIX style parent paths back
 		/// </summary>
 		/// <param name="filePath">unix style subPath</param>
 		/// <returns>parent folder path</returns>
@@ -131,8 +121,21 @@ public static string GetParentPath(string? filePath)
 			{
 				return "/";
 			}
+
+			var parts = filePath.TrimEnd('/').Split('/');
+			if (parts.Length <= 2)
+			{
+				return "/";
+			}
+
+			var stringBuilder = new StringBuilder();
+			for (var i = 0; i < parts.Length - 1; i++)
+			{
+				stringBuilder.Append(parts[i] + "/");
+			}
+
+			var result = stringBuilder.ToString().TrimEnd('/');
 
-			var result = ParentPathRegex().Match(filePath).Value;
 			return string.IsNullOrEmpty(result) ? "/" : PathHelper.RemoveLatestSlash(result);
 		}
 	}

starsky/starsky.foundation.sync/Metrics/DiskWatcherBackgroundTaskQueueMetrics.cs

@@ -13,7 +13,7 @@ public class DiskWatcherBackgroundTaskQueueMetrics
 	public DiskWatcherBackgroundTaskQueueMetrics(IMeterFactory meterFactory)
 	{
 		var meter = meterFactory.Create(ActivitySourceMeter.SyncNameSpace);
-		const string name = "_s." + nameof(DiskWatcherBackgroundTaskQueueMetrics);
+		const string name = "App." + nameof(DiskWatcherBackgroundTaskQueueMetrics);
 		meter.CreateObservableGauge(name, ObserveValue);
 	}
 

starsky/starsky.foundation.worker/Metrics/ThumbnailBackgroundQueuedMetrics.cs

@@ -13,7 +13,7 @@ public class ThumbnailBackgroundQueuedMetrics
 	public ThumbnailBackgroundQueuedMetrics(IMeterFactory meterFactory)
 	{
 		var meter = meterFactory.Create(ActivitySourceMeter.WorkerNameSpace);
-		const string name = "_s." + nameof(ThumbnailBackgroundQueuedMetrics);
+		const string name = "App." + nameof(ThumbnailBackgroundQueuedMetrics);
 		meter.CreateObservableGauge(name, ObserveValue);
 	}
 

starsky/starsky.foundation.worker/Metrics/UpdateBackgroundQueuedMetrics.cs

@@ -13,7 +13,7 @@ public class UpdateBackgroundQueuedMetrics
 	public UpdateBackgroundQueuedMetrics(IMeterFactory meterFactory)
 	{
 		var meter = meterFactory.Create(ActivitySourceMeter.WorkerNameSpace);
-		const string name = "_s." + nameof(UpdateBackgroundQueuedMetrics);
+		const string name = "App." + nameof(UpdateBackgroundQueuedMetrics);
 		meter.CreateObservableGauge(name, ObserveValue);
 	}
 

starsky/starsky/starsky.csproj

@@ -217,4 +217,25 @@
     <PropertyGroup Condition=" '$(noSonar)' == 'true' ">
         <SonarQubeExclude>true</SonarQubeExclude>
     </PropertyGroup>
+
+    <!-- remove cultures (https://stackoverflow.com/a/34362524)-->
+
+    <Target Name="AfterPackage" AfterTargets="CopyAllFilesToSingleFolderForPackage"/>
+
+    <ItemGroup>
+        <ThisAppExcludedCultures Include="cs;da;de;es;fa;fi;fr;it;ko;mk;nl;pl;pt;ru;sv;tr;zh-CN;pt-BR;ja;zh-Hans;zh-Hant">
+            <InProject>false</InProject>
+        </ThisAppExcludedCultures>
+    </ItemGroup>
+
+    <Target Name="RemoveTranslationsAfterBuild" AfterTargets="AfterBuild">
+        <RemoveDir Directories="@(ThisAppExcludedCultures->'$(OutputPath)%(Filename)')"/>
+    </Target>
+
+    <Target Name="RemoveTranslationsAfterPackage" AfterTargets="AfterPackage">
+        <RemoveDir Directories="@(ThisAppExcludedCultures->'$(_PackageTempDir)\$(OutputPath)%(Filename)')"/>
+    </Target>
+
+    <!-- end remove cultures -->
+
 </Project>

starsky/starskytest/FakeCreateAn/CreateAnImage.cs

@@ -37,6 +37,7 @@ public class CreateAnImage
 			 Path.DirectorySeparatorChar).Replace("./",string.Empty);
 
 		/// <summary>
+		/// Split line
 		/// @see: https://superuser.com/a/1467266 and 80 chars
 		/// </summary>
 		[SuppressMessage("ReSharper", "StringLiteralTypo")] 

starsky/starskytest/starsky.foundation.native/OpenApplicationNative/Helpers/WindowsOpenDesktopAppTests.cs

@@ -6,6 +6,7 @@
 using starskytest.FakeCreateAn.CreateFakeStarskyExe;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Medallion.Shell;
@@ -16,7 +17,7 @@ namespace starskytest.starsky.foundation.native.OpenApplicationNative.Helpers;
 public class WindowsOpenDesktopAppTests
 {
 	private const string Extension = ".starsky";
-	private const string ProgId = "starskytest";
+	private const string ProgramId = "starskytest";
 	private const string FileTypeDescription = "Starsky Test File";
 
 	[TestInitialize]
@@ -41,8 +42,15 @@ private static void CleanSetup()
 		}
 
 		// Ensure no keys exist before the test starts
-		Registry.CurrentUser.DeleteSubKeyTree($"Software\\Classes\\{Extension}", false);
-		Registry.CurrentUser.DeleteSubKeyTree($"Software\\Classes\\{ProgId}", false);
+		try
+		{
+			Registry.CurrentUser.DeleteSubKeyTree($@"Software\Classes\{Extension}", false);
+			Registry.CurrentUser.DeleteSubKeyTree($@"Software\Classes\{ProgramId}", false);
+		}
+		catch ( IOException )
+		{
+			// do nothing
+		}
 	}
 
 	private static CreateFakeStarskyWindowsExe SetupEnsureAssociationsSet()
@@ -58,7 +66,7 @@ private static CreateFakeStarskyWindowsExe SetupEnsureAssociationsSet()
 			new FileAssociation
 			{
 				Extension = Extension,
-				ProgId = ProgId,
+				ProgId = ProgramId,
 				FileTypeDescription = FileTypeDescription,
 				ExecutableFilePath = filePath
 			});
@@ -72,7 +80,7 @@ public void W_OpenDefault_NonWindows()
 		var result = WindowsOpenDesktopApp.OpenDefault(["any value"], OSPlatform.Linux);
 		Assert.IsNull(result);
 	}
-	
+
 	[TestMethod]
 	public void W_OpenDefault2_NonWindows()
 	{
@@ -117,7 +125,7 @@ public async Task W_OpenDefault_HappyFlow__WindowsOnly()
 			WindowsOpenDesktopApp.OpenDefault([mock.StarskyDotStarskyPath], OSPlatform.Windows);
 
 		// Retry if failed due to multi-threading
-		for (var i = 0; i < 2 && result != true; i++)
+		for ( var i = 0; i < 2 && result != true; i++ )
 		{
 			Console.WriteLine($"Retry due to multi-threading {i + 1}");
 			await Task.Delay(1000);
@@ -135,7 +143,7 @@ public void W_OpenApplicationAtUrl_NonWindows()
 			"app", OSPlatform.Linux);
 		Assert.IsNull(result);
 	}
-	
+
 	[TestMethod]
 	[ExpectedException(typeof(Win32Exception))]
 	public void W_OpenApplicationAtUrl2_NonWindows()
@@ -147,7 +155,7 @@ public void W_OpenApplicationAtUrl2_NonWindows()
 		}
 
 		// ExpectedException = Win32Exception
-		WindowsOpenDesktopApp.OpenApplicationAtUrl(["any value"], 
+		WindowsOpenDesktopApp.OpenApplicationAtUrl(["any value"],
 			"/not_found_849539453", OSPlatform.Windows);
 	}
 

starsky/starskytest/starsky.foundation.platform/Helpers/FilenamesHelperTest.cs

@@ -209,6 +209,22 @@ public void GetFileExtensionWithoutDot_Should_Not_Return_Extension_With_Invalid_
 		// Assert
 		Assert.AreEqual("txt", extension);
 	}
+
+	[TestMethod]
+	public void GetParentPath_AddSlash()
+	{
+		const string filePath = "/folder_no_content/";
+		var result = FilenamesHelper.GetParentPath(filePath);
+		Assert.AreEqual("/", result);
+	}
+
+	[TestMethod]
+	public void GetParentPath_AddSlash2()
+	{
+		const string filePath = "/folder_no_content/test.jpg/";
+		var result = FilenamesHelper.GetParentPath(filePath);
+		Assert.AreEqual("/folder_no_content", result);
+	}
 
 	[TestMethod]
 	public void GetParentPath_ReturnsCorrectPath_WhenFilePathIsValid()
@@ -240,11 +256,11 @@ public void GetParentPath_ReturnsSlash_WhenFilePathIsRoot()
 	public void GetParentPath_ReturnsSlash_WhenFilePathIsNullOrEmpty()
 	{
 		// Arrange
-		string filePath2 = "";
+		const string filePath2 = "";
 
 		// Act
-		string result1 = FilenamesHelper.GetParentPath(null);
-		string result2 = FilenamesHelper.GetParentPath(filePath2);
+		var result1 = FilenamesHelper.GetParentPath(null);
+		var result2 = FilenamesHelper.GetParentPath(filePath2);
 
 		// Assert
 		Assert.AreEqual("/", result1);