label for foo.app is foo

Revert "Remove failing test for Safari label" This reverts commit 55abc88. Restores code from 9245f0a
quicksilver · Mar 19, 2023 · 260eee3 · 260eee3
1 parent 55abc88
commit 260eee3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m b/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m
@@ -897,8 +897,12 @@ - (void)getNameFromFiles {
 	[self setName:newName];
 
 	// generally: name = what you see in Terminal, label = what you see in Finder
-
 	NSString *newLabel = [[self infoRecord] objectForKey:NSURLLocalizedNameKey];
+	if ([[newLabel pathExtension] isEqualToString:@"app"]) {
+		// most apps just remove the extension
+		newLabel = [newLabel stringByDeletingPathExtension];
+	}
+
 	if (UTTypeConformsTo((__bridge CFStringRef)[self fileUTI], (CFStringRef)@"com.apple.systempreference.prefpane")) {
 		// get the CFBundleName for preference panes
 		newLabel = [[NSBundle bundleWithPath:path] localizedInfoDictionary][@"CFBundleName"];

diff --git a/Quicksilver/Tests/Tests-QSCore/QSFileObjectTests.m b/Quicksilver/Tests/Tests-QSCore/QSFileObjectTests.m
@@ -39,7 +39,8 @@ - (void)testFileNaming
     // label is localized, so this test might only work for a specific locale
     path = @"/Applications/Safari.app";
     object = [QSObject fileObjectWithPath:path];
-    XCTAssertEqualObjects([object name], @"Safari.app");
+    XCTAssertEqualObjects([object name], @"Safari.app", @"");
+    XCTAssertEqualObjects([object label], @"Safari", @"");
 
     path = @"/System/Library/PreferencePanes/Accounts.prefPane";
     object = [QSObject fileObjectWithPath:path];