• HTML output window

- a BASH script called via window.system.run() inherits the current shell vars and the associated SP_PROCESS_ID if set to make it easier to run sequelpro URL scheme commands from JavaScript via BASH
- improved error handling

5 files changed, 81 insertions, 25 deletions

diff --git a/Source/SPAppController.h b/Source/SPAppController.h
index 0d68b26c..569ef2b8 100644
--- a/Source/SPAppController.h
+++ b/Source/SPAppController.h
@@ -113,7 +113,7 @@
 - (void)handleEventWithURL:(NSURL*)url;
 
 - (IBAction)executeBundleItemForApp:(id)sender;
-- (NSDictionary*)shellEnvironment;
+- (NSDictionary*)shellEnvironmentForDocument:(NSString*)docUUID;
 
 - (void)addHTMLOutputController:(id)controller;
 
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index cf36d161..043ea9bf 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -663,10 +663,10 @@
 
 	while(1) {
 		NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-                                   untilDate:[NSDate distantPast]
-                                      inMode:NSDefaultRunLoopMode
-                                     dequeue:YES];
-
+	                                   untilDate:[NSDate distantPast]
+	                                      inMode:NSDefaultRunLoopMode
+	                                     dequeue:YES];
+	
 		if ([event type] == NSKeyDown) {
 			unichar key = [[event characters] length] == 1 ? [[event characters] characterAtIndex:0] : 0;
 			if (([event modifierFlags] & NSCommandKeyMask) && key == '.') {
@@ -684,33 +684,50 @@
 		return;
 	}
 
-	if(processDocument && command && [command isEqualToString:@"passToDoc"]) {
-		NSMutableDictionary *cmdDict = [NSMutableDictionary dictionary];
-		[cmdDict setObject:parameter forKey:@"parameter"];
-		[cmdDict setObject:passedProcessID forKey:@"id"];
-		[processDocument handleSchemeCommand:cmdDict];
-		return;
+	if(processDocument && command) {
+		if([command isEqualToString:@"passToDoc"]) {
+			NSMutableDictionary *cmdDict = [NSMutableDictionary dictionary];
+			[cmdDict setObject:parameter forKey:@"parameter"];
+			[cmdDict setObject:passedProcessID forKey:@"id"];
+			[processDocument handleSchemeCommand:cmdDict];
+			return;
+		}
+		else {
+			SPBeginAlertSheet(NSLocalizedString(@"sequelpro URL Scheme Error", @"sequelpro url Scheme Error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [NSApp mainWindow], self, nil, nil,
+							  [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [command description], NSLocalizedString(@"sequelpro URL scheme command not supported.", @"sequelpro URL scheme command not supported.")]);
+			
+			return;
+		}
 	}
 
-	if(processDocument != nil) {
+	if(passedProcessID && [passedProcessID length]) {
 		// If command failed notify the file handle hand shake mechanism
 		NSString *out = @"1";
 		[out writeToFile:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultStatusPathHeader, passedProcessID]
 			atomically:YES
 			encoding:NSUTF8StringEncoding
 			   error:nil];
-		out = @"Scheme Error";
+		out = NSLocalizedString(@"An error for sequelpro URL scheme command occurred. Probably no corresponding connection window found.", @"An error for sequelpro URL scheme command occurred. Probably no corresponding connection window found.");
 		[out writeToFile:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultPathHeader, passedProcessID]
 			atomically:YES
 			encoding:NSUTF8StringEncoding
 			   error:nil];
-	}
+		
+		SPBeginAlertSheet(NSLocalizedString(@"sequelpro URL Scheme Error", @"sequelpro url Scheme Error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [NSApp mainWindow], self, nil, nil,
+						  [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [command description], NSLocalizedString(@"An error for sequelpro URL scheme command occurred. Probably no corresponding connection window found.", @"An error for sequelpro URL scheme command occurred. Probably no corresponding connection window found.")]);
+
+
+		usleep(5000);
+		[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultStatusPathHeader, passedProcessID] error:nil];
+		[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultPathHeader, passedProcessID] error:nil];
+		[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultMetaPathHeader, passedProcessID] error:nil];
+		[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryInputPathHeader, passedProcessID] error:nil];
 
-	if(passedProcessID == nil || ![passedProcessID length]) {
+
+
+	} else {
 		SPBeginAlertSheet(NSLocalizedString(@"sequelpro URL Scheme Error", @"sequelpro url Scheme Error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [NSApp mainWindow], self, nil, nil,
 						  [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [command description], NSLocalizedString(@"An error occur while executing a scheme command. If the scheme command was invoked by a Bundle command, it could be that the command still runs. You can try to terminate it by pressing ⌘+. or via the Activities pane.", @"an error occur while executing a scheme command. if the scheme command was invoked by a bundle command, it could be that the command still runs. you can try to terminate it by pressing ⌘+. or via the activities pane.")]);
-	} else {
-		NSBeep();
 	}
 
 	if(processDocument)
@@ -720,6 +737,7 @@
 	NSLog(@"param: %@", parameter);
 	NSLog(@"command: %@", command);
 	NSLog(@"command id: %@", passedProcessID);
+
 }
 
 - (IBAction)executeBundleItemForApp:(id)sender
@@ -858,6 +876,7 @@
 							if([[win delegate] isKindOfClass:[SPBundleHTMLOutputController class]]) {
 								if([[[win delegate] windowUUID] isEqualToString:[cmdData objectForKey:SPBundleFileUUIDKey]]) {
 									correspondingWindowFound = YES;
+									[[win delegate] setDocUUID:uuid];
 									[[win delegate] displayHTMLContent:output withOptions:nil];
 									break;
 								}
@@ -866,6 +885,7 @@
 						if(!correspondingWindowFound) {
 							SPBundleHTMLOutputController *c = [[SPBundleHTMLOutputController alloc] init];
 							[c setWindowUUID:[cmdData objectForKey:SPBundleFileUUIDKey]];
+							[c setDocUUID:uuid];
 							[c displayHTMLContent:output withOptions:nil];
 							[[NSApp delegate] addHTMLOutputController:c];
 						}
@@ -889,11 +909,30 @@
  * Return of certain shell variables mainly for usage in JavaScript support inside the 
  * HTML output window to allow to ask on run-time 
  */
-- (NSDictionary*)shellEnvironment
+- (NSDictionary*)shellEnvironmentForDocument:(NSString*)docUUID
 {
 	NSMutableDictionary *env = [NSMutableDictionary dictionary];
-	SPDatabaseDocument *doc = [self frontDocument];
-	if(doc) [env addEntriesFromDictionary:[doc shellVariables]];
+	SPDatabaseDocument *doc;
+	if(docUUID == nil)
+		doc = [self frontDocument];
+	else {
+		BOOL found = NO;
+		for (NSWindow *aWindow in [NSApp orderedWindows]) {
+			if([[aWindow windowController] isMemberOfClass:[SPWindowController class]]) {
+				for(SPDatabaseDocument *d in [[aWindow windowController] documents]) {
+					if([d processID] && [[d processID] isEqualToString:docUUID]) {
+						[env addEntriesFromDictionary:[d shellVariables]];
+						found = YES;
+						break;
+					}
+				}
+			}
+			if(found) break;
+		}
+	}
+
+	// if(doc && [doc shellVariables]) [env addEntriesFromDictionary:[doc shellVariables]];
+	// if(doc) [doc release];
 	id firstResponder = [[NSApp keyWindow] firstResponder];
 	if([firstResponder respondsToSelector:@selector(executeBundleItemForInputField:)]) {
 		BOOL selfIsQueryEditor = ([[[firstResponder class] description] isEqualToString:@"SPTextView"]) ;
diff --git a/Source/SPBundleHTMLOutputController.h b/Source/SPBundleHTMLOutputController.h
index 0ad38241..ea0b96da 100644
--- a/Source/SPBundleHTMLOutputController.h
+++ b/Source/SPBundleHTMLOutputController.h
@@ -32,6 +32,7 @@
 	NSString       *docTitle;
 	NSString       *initHTMLSourceString;
 	NSString       *windowUUID;
+	NSString       *docUUID;
 	WebPreferences *webPreferences;
 
 }
@@ -39,6 +40,7 @@
 @property(readwrite,retain) NSString *docTitle;
 @property(readwrite,retain) NSString *initHTMLSourceString;
 @property(readwrite,retain) NSString *windowUUID;
+@property(readwrite,retain) NSString *docUUID;
 
 - (IBAction)printDocument:(id)sender;
 
diff --git a/Source/SPBundleHTMLOutputController.m b/Source/SPBundleHTMLOutputController.m
index a632a51a..8a5b66e6 100644
--- a/Source/SPBundleHTMLOutputController.m
+++ b/Source/SPBundleHTMLOutputController.m
@@ -30,6 +30,7 @@
 @synthesize docTitle;
 @synthesize initHTMLSourceString;
 @synthesize windowUUID;
+@synthesize docUUID;
 
 /**
  * Initialisation
@@ -63,7 +64,6 @@
 {
 
 	[[self window] orderFront:nil];
-
 	[self setInitHTMLSourceString:content];
 	[[webView mainFrame] loadHTMLString:content baseURL:nil];
 
@@ -208,6 +208,7 @@
 	[webView close];
 	[self setInitHTMLSourceString:@""];
 	windowUUID = @"";
+	docUUID = @"";
 	[self release];
 }
 
@@ -330,6 +331,7 @@
 
 - (void)webView:(WebView *)sender windowScriptObjectAvailable: (WebScriptObject *)windowScriptObject
 {
+
 	[windowScriptObject setValue:self forKey:@"system"];
 }
 
@@ -380,7 +382,7 @@
  */
 - (NSString *)getShellEnvironmentForName:(NSString*)keyName
 {
-	return [[[NSApp delegate] shellEnvironment] objectForKey:keyName];
+	return [[[NSApp delegate] shellEnvironmentForDocument:nil] objectForKey:keyName];
 }
 
 /**
@@ -403,6 +405,9 @@
 	NSString *command = nil;
 	NSString *uuid = nil;
 
+	if([self docUUID] && [[self docUUID] length])
+		uuid = [self docUUID];
+
 	if([call isKindOfClass:[NSString class]])
 		command = [NSString stringWithString:call];
 	else if([[[call class] description] isEqualToString:@"WebScriptObject"]){
@@ -426,8 +431,15 @@
 	NSString *output = nil;
 	if(uuid == nil)
 		output = [command runBashCommandWithEnvironment:nil atCurrentDirectoryPath:nil error:&err];
-	else
-		output = [command runBashCommandWithEnvironment:nil 
+	else {
+		NSMutableDictionary *theEnv = [NSMutableDictionary dictionary];
+		[theEnv addEntriesFromDictionary:[[NSApp delegate] shellEnvironmentForDocument:nil]];
+		[theEnv setObject:uuid forKey:SPBundleShellVariableProcessID];
+		[theEnv setObject:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryInputPathHeader, uuid] forKey:SPBundleShellVariableQueryFile];
+		[theEnv setObject:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultPathHeader, uuid] forKey:SPBundleShellVariableQueryResultFile];
+		[theEnv setObject:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultStatusPathHeader, uuid] forKey:SPBundleShellVariableQueryResultStatusFile];
+		[theEnv setObject:[NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultMetaPathHeader, uuid] forKey:SPBundleShellVariableQueryResultMetaFile];
+		output = [command runBashCommandWithEnvironment:theEnv 
 								atCurrentDirectoryPath:nil 
 								callerInstance:[NSApp delegate] 
 								contextInfo:[NSDictionary dictionaryWithObjectsAndKeys:
@@ -436,7 +448,7 @@
 										uuid, SPBundleFileInternalexecutionUUID,
 										nil]
 								error:&err];
-
+	}
 
 	if(err != nil) {
 		NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error while executing JavaScript BASH command", @"error while executing javascript bash command")
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 144f0710..7cea8eab 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -4816,6 +4816,9 @@
 
 - (NSDictionary*)shellVariables
 {
+
+	if(!_isConnected) return [NSDictionary dictionary];
+
 	NSMutableDictionary *env = [NSMutableDictionary dictionary];
 
 	if (tablesListInstance) {