Skip to content

Fix up sfl file parsing + add preset for finder sidebar items #3083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjrobertson merged 1 commit into from
Oct 31, 2025
Merged

Fix up sfl file parsing + add preset for finder sidebar items #3083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion Quicksilver/PlugIns-Main/Finder/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,43 @@
<key>children</key>
<array>
<dict>
<key>icon</key>
<string>FinderIcon</string>
<key>source</key>
<string>QSFileSystemObjectSource</string>
<key>settings</key>
<dict>
<key>parser</key>
<string>QSDirectoryParser</string>
<key>folderTypes</key>
<array>
<string>com.apple.application</string>
</array>
<key>folderDepth</key>
<integer>1</integer>
<key>scanContents</key>
<integer>1</integer>
<key>kind</key>
<string>Folder</string>
<key>path</key>
<string>/System/Library/CoreServices/Finder.app/Contents/Applications/</string>
<key>skipItem</key>
<integer>1</integer>
<key>type</key>
<string></string>
</dict>
<key>ID</key>
<string>QSPresetSidebarItems</string>
<key>name</key>
<string>Finder Sidebar Items</string>
</dict>
<dict>
<key>ID</key>
<string>QSPresetSidebarFavorites</string>
<key>icon</key>
<string>FinderIcon</string>
<key>name</key>
<string>Finder Sidebar Items</string>
<string>Finder Favorites</string>
<key>settings</key>
<dict>
<key>path</key>
Expand Down
70 changes: 54 additions & 16 deletions Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSSharedFileListSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,44 @@

@implementation QSSharedFileListSource

/**
* Returns the valid path for an SFL file.
* Tries .sfl3, .sfl2, and .sfl extensions in order.
* @return NSString path, or nil if no valid file exists
*/
- (NSString *)validPathForSfl:(NSString *)sflPath
{
NSString *basePath = [sflPath stringByStandardizingPath];
// Strip any existing .sfl* extension
basePath = [basePath stringByDeletingPathExtension];

// Try extensions in order: .sfl3, .sfl2, .sfl
NSFileManager *manager = [NSFileManager defaultManager];
NSArray *extensions = @[@".sfl3", @".sfl2", @".sfl"];
for (NSString *ext in extensions) {
NSString *testPath = [basePath stringByAppendingString:ext];
BOOL isDir = NO;
if ([manager fileExistsAtPath:testPath isDirectory:&isDir] && !isDir) {
return testPath;
}
}
return nil;
}

- (BOOL)indexIsValidFromDate:(NSDate *)indexDate forEntry:(NSDictionary *)theEntry
{
NSDictionary *settings = [theEntry objectForKey:kItemSettings];
NSString *sflPath = [settings objectForKey:kItemPath];
if (!sflPath) {
return YES;
}
NSString *path = [sflPath stringByStandardizingPath];
if ([NSApplication isHighSierra]) {
path = [path stringByReplacingOccurrencesOfString:@".sfl" withString:@".sfl2"];
}
NSFileManager *manager = [NSFileManager defaultManager];
BOOL isDir = NO;
if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir] || isDir) {

NSString *path = [self validPathForSfl:sflPath];
if (!path) {
return YES;
}

NSFileManager *manager = [NSFileManager defaultManager];
NSDate *modDate = [[manager attributesOfItemAtPath:path error:NULL] fileModificationDate];
if ([modDate compare:indexDate] == NSOrderedDescending) {
return NO;
Expand All @@ -39,29 +61,45 @@ - (NSArray *)objectsForEntry:(NSDictionary *)theEntry
NSDictionary *settings = [theEntry objectForKey:kItemSettings];
NSMutableArray *sflItemArray = [NSMutableArray arrayWithCapacity:0];
NSString *sflPath = [settings objectForKey:kItemPath];
NSString *path = [sflPath stringByStandardizingPath];
if ([NSApplication isHighSierra]) {
path = [path stringByReplacingOccurrencesOfString:@".sfl" withString:@".sfl2"];
}
BOOL isDir = NO;
if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir] || isDir) {

NSString *path = [self validPathForSfl:sflPath];
if (!path) {
return nil;
}

NSString *extension = [path pathExtension];

NSDictionary *sflData = [NSKeyedUnarchiver unarchiveObjectWithFile:path];
NSString *kItems = @"items";
if (![[sflData allKeys] containsObject:kItems]) {
return nil;
}
if ([NSApplication isHighSierra]) {

// Parse based on file extension: sfl2 and sfl3 use bookmark data, sfl uses SFLListItem
if ([extension isEqualToString:@"sfl2"] || [extension isEqualToString:@"sfl3"]) {
return [sflData[kItems] arrayByEnumeratingArrayUsingBlock:^id(NSDictionary *item) {
NSData *bookmarkData = item[@"Bookmark"];
// Bookmark data might be direct NSData or wrapped in a dictionary with NS.data key
id bookmarkValue = item[@"Bookmark"];
NSData *bookmarkData = nil;

if ([bookmarkValue isKindOfClass:[NSData class]]) {
bookmarkData = bookmarkValue;
} else if ([bookmarkValue isKindOfClass:[NSDictionary class]]) {
// Try NS.data key (common in sfl3)
bookmarkData = bookmarkValue[@"NS.data"];
}

if (!bookmarkData) {
return nil;
}

NSURL *url = [NSURL URLByResolvingBookmarkData:bookmarkData options:NSURLBookmarkResolutionWithoutUI|NSURLBookmarkResolutionWithoutMounting relativeToURL:nil bookmarkDataIsStale:nil error:nil];
if ([url isFileURL]) {
return [QSObject fileObjectWithFileURL:url];
}
return [QSObject URLObjectWithURL:[url absoluteString] title:item[@"Name"]];
}];
} else {
} else if ([extension isEqualToString:@"sfl"]) {
for (SFLListItem *item in sflData[kItems]) {
// item's class is SFLListItem
if ([item URL]) {
Expand Down
5 changes: 2 additions & 3 deletions Quicksilver/PlugIns-Main/QSCorePlugIn/QSCorePlugIn-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,6 @@
<key>feature</key>
<integer>1</integer>
</dict>

</array>
<key>catalogPath</key>
<string>/</string>
Expand Down Expand Up @@ -1139,8 +1138,8 @@
</array>
<key>icon</key>
<string>QSDirectObjectIconProxy</string>
<key>runInMainThread</key>
<true/>
<key>runInMainThread</key>
<true/>
</dict>
<key>QSObjectShowChildMenu</key>
<dict>
Expand Down
2 changes: 2 additions & 0 deletions Quicksilver/PlugIns-Main/QSCorePlugIn/Resources/en.lproj/QSCatalogPreset.name.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@
<string>Shelf &amp; Clipboard</string>
<key>QSPresetSidebarItems</key>
<string>Finder Sidebar</string>
<key>QSPresetSidebarFavorites</key>
<string>Finder Favorites</string>
<key>QSPresetSogudiShortcuts</key>
<string>Sogudi Shortcuts</string>
<key>QSPresetSpeakableItems</key>
Expand Down
6 changes: 3 additions & 3 deletions Quicksilver/Quicksilver.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@
4DFE7DA10E081A30000B9AA3 /* README.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = README.rtf; sourceTree = "<group>"; };
4DFE7DAD0E081BFD000B9AA3 /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = /System/Library/Frameworks/QuickLook.framework; sourceTree = "<absolute>"; };
6008C51E2AAF433900512CB2 /* QSPathsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QSPathsTests.m; sourceTree = "<group>"; };
600950BC2ABB76AF00F67DEB /* QSCorePlugIn-Info-Testing.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "QSCorePlugIn-Info-Testing.plist"; sourceTree = "<group>"; };
600950BC2ABB76AF00F67DEB /* QSCorePlugIn-Info-Testing.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.xml; fileEncoding = 4; path = "QSCorePlugIn-Info-Testing.plist"; sourceTree = "<group>"; };
604EAB042CDE5B1E005B3451 /* QSSwiftObj.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QSSwiftObj.swift; sourceTree = "<group>"; };
60FCBED02844C9770091AB6B /* OSAKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OSAKit.framework; path = System/Library/Frameworks/OSAKit.framework; sourceTree = SDKROOT; };
6535A8DE1086EF23009D5C90 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2098,7 +2098,7 @@
D46D3C7916B33D0B00387EA9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
D46D3C7A16B33D0B00387EA9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
D48F231B1C99CCC4006504A8 /* QSSharedFileListSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSSharedFileListSource.h; sourceTree = "<group>"; };
D48F231C1C99CCC4006504A8 /* QSSharedFileListSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSSharedFileListSource.m; sourceTree = "<group>"; };
D48F231C1C99CCC4006504A8 /* QSSharedFileListSource.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = QSSharedFileListSource.m; sourceTree = "<group>"; usesTabs = 1; };
D48FC4FB1FBE89B4009600EB /* QSWebSource.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QSWebSource.xib; sourceTree = "<group>"; };
D49399091350078E00B908C6 /* QSDownloads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSDownloads.h; sourceTree = "<group>"; usesTabs = 1; };
D493990A1350078E00B908C6 /* QSDownloads.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSDownloads.m; sourceTree = "<group>"; usesTabs = 1; };
Expand Down Expand Up @@ -2198,7 +2198,7 @@
E180011607B2B48900010DB0 /* QSTextSource.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = QSTextSource.m; sourceTree = "<group>"; };
E180011707B2B48900010DB0 /* QSWebSource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSWebSource.h; sourceTree = "<group>"; };
E180011807B2B48900010DB0 /* QSWebSource.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = QSWebSource.m; sourceTree = "<group>"; };
E180011907B2B48900010DB0 /* QSCorePlugIn-Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.info; fileEncoding = 30; path = "QSCorePlugIn-Info.plist"; sourceTree = "<group>"; };
E180011907B2B48900010DB0 /* QSCorePlugIn-Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.info; fileEncoding = 4; path = "QSCorePlugIn-Info.plist"; sourceTree = "<group>"; };
E18001C507B2BBB800010DB0 /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; usesTabs = 1; };
E18001C807B2BBB800010DB0 /* QSApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSApp.h; sourceTree = "<group>"; usesTabs = 1; };
E18001C907B2BBB800010DB0 /* QSApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSApp.m; sourceTree = "<group>"; usesTabs = 1; };
Expand Down