filename fix

Advance-Technologies-Foundation · Sep 13, 2024 · 3e4be5a · 3e4be5a
1 parent 83b8a3e
commit 3e4be5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/clio.tests/ComposableApplication/ComposableApplicationManagerTestCase.cs b/clio.tests/ComposableApplication/ComposableApplicationManagerTestCase.cs
@@ -57,8 +57,8 @@ const string expectedFilePath
 		string appDescriptorContent = FileSystem.File.ReadAllText(expectedFilePath);
 
 		AppDescriptorJson appDescriptor = JsonConvert.DeserializeObject<AppDescriptorJson>(appDescriptorContent);
-		string iconFileName = Path.GetFileName(IconPath);
-		string timestampPattern = @"\d{14}$"; // Matches the datetime format "yyyyMMddHHmmss"
+		string iconFileName = Path.GetFileNameWithoutExtension(IconPath);
+		string timestampPattern = @"\d{14}.svg$"; // Matches the datetime format "yyyyMMddHHmmss"
 		appDescriptor.IconName.Should().MatchRegex($"{iconFileName}_{timestampPattern}");
 		appDescriptor.Icon.Should().Be(PartnerSvgBase64);
 	}

diff --git a/clio/ComposableApplication/ComposableApplicationManager.cs b/clio/ComposableApplication/ComposableApplicationManager.cs
@@ -116,9 +116,11 @@ public void SetIcon(string packagesFolderPath, string iconPath, string appName){
 		}
 
 		var matchingFile = matchingFiles[0];
-		string iconFileName = Path.GetFileName(iconPath);
+
+		string fileExt = Path.GetExtension(iconPath);
+		string iconFileName = Path.GetFileNameWithoutExtension(iconPath);
 		string timestamp = DateTime.Now.ToString("yyyyMMddHHmmss");
-		matchingFile.AppDescriptor.IconName = $"{iconFileName}_{timestamp}";
+		matchingFile.AppDescriptor.IconName = $"{iconFileName}_{timestamp}{fileExt}";
 
 		string base64EncodedIcon = Convert.ToBase64String(_fileSystem.File.ReadAllBytes(iconPath));
 		matchingFile.AppDescriptor.Icon = base64EncodedIcon;