Skip to content

Support for "*" wildcard in included SSH config files and creation of… #264

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

Open
zatnekitel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for "*" wildcard in included SSH config files and creation of… #264

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
32 changes: 31 additions & 1 deletion Shuttle/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,24 @@ - (void)menuWillOpen:(NSMenu *)menu {
return [self parseSSHConfig:configFile];
}

- (NSArray *)searchFiles:(NSString *)directoryPath {

NSMutableArray *filePaths = [NSMutableArray array];
NSFileManager *fileManager = [NSFileManager defaultManager];

NSArray *contents = [fileManager contentsOfDirectoryAtPath:directoryPath error:nil];
for (NSString *item in contents)
{
NSString *path = [directoryPath stringByAppendingPathComponent:item];
BOOL isDir;
if ([fileManager fileExistsAtPath:path isDirectory:&isDir] && !isDir) {
[filePaths addObject:path];
}
}

return filePaths;
}

- (NSDictionary<NSString *, NSDictionary *> *)parseSSHConfig:(NSString *)filepath {
// Get file contents into fh.
NSString *fh = [NSString stringWithContentsOfFile:filepath encoding:NSUTF8StringEncoding error:nil];
Expand Down Expand Up @@ -197,7 +215,15 @@ - (void)menuWillOpen:(NSMenu *)menu {
? [second stringByExpandingTildeInPath]
: [[filepath stringByDeletingLastPathComponent] stringByAppendingPathComponent:second];

[servers addEntriesFromDictionary:[self parseSSHConfig:includePath]];
NSString *fileName = [includePath lastPathComponent];
if ([fileName isEqualToString:@"*"]) {
NSArray *includePaths = [self searchFiles:[includePath stringByDeletingLastPathComponent]];
for (includePath in includePaths) {
[servers addEntriesFromDictionary:[self parseSSHConfig:includePath]];
}
} else {
[servers addEntriesFromDictionary:[self parseSSHConfig:includePath]];
}
}

if ([first isEqualToString:@"Host"]) {
Expand All @@ -208,6 +234,10 @@ - (void)menuWillOpen:(NSMenu *)menu {
hostAliases = [hostAliases filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF != ''"]];
key = [hostAliases firstObject];
servers[key] = [[NSMutableDictionary alloc] init];
NSString *fileName = [filepath lastPathComponent];
if (![fileName isEqualToString:@"ssh_config"] && ![fileName isEqualToString:@"config"]) {
servers[key][@"name"] = [fileName stringByAppendingPathComponent:key];
}
}
}

Expand Down