diff options
| author | Bibiko <bibiko@eva.mpg.de> | 2010-11-21 19:42:42 +0000 |
|---|---|---|
| committer | Bibiko <bibiko@eva.mpg.de> | 2010-11-21 19:42:42 +0000 |
| commit | 79bf97de1dc30afb75a07958ff99b6f95473383e (patch) | |
| tree | f789a43c40c6ff3f4c7868ba0115fc90926f8aea /Source/SPTextViewAdditions.m | |
| parent | ecba7ac8da8f0f2728bf23815e9103b42ec81729 (diff) | |
| download | sequelpro-79bf97de1dc30afb75a07958ff99b6f95473383e.tar.gz sequelpro-79bf97de1dc30afb75a07958ff99b6f95473383e.tar.bz2 sequelpro-79bf97de1dc30afb75a07958ff99b6f95473383e.zip | |
• added line numbering and current line highlighting to Bundle Editor's command text view
• made each Bundle in/ouptut file name unique to allow to run different Bundle commands at the same time
• fixed minor issues for Bundle Editor
Diffstat (limited to 'Source/SPTextViewAdditions.m')
| -rw-r--r-- | Source/SPTextViewAdditions.m | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m index fdf2318c..ae07d289 100644 --- a/Source/SPTextViewAdditions.m +++ b/Source/SPTextViewAdditions.m @@ -525,10 +525,11 @@ NSString *inputAction = @""; NSString *inputFallBackAction = @""; NSError *err = nil; + NSString *bundleInputFilePath = [NSString stringWithFormat:@"%@_%@", SPBundleTaskInputFilePath, [NSString stringWithNewUUID]]; NSRange currentWordRange, currentSelectionRange, currentLineRange; - [[NSFileManager defaultManager] removeItemAtPath:SPBundleTaskInputFilePath error:nil]; + [[NSFileManager defaultManager] removeItemAtPath:bundleInputFilePath error:nil]; if([cmdData objectForKey:SPBundleFileInputSourceKey]) inputAction = [[cmdData objectForKey:SPBundleFileInputSourceKey] lowercaseString]; @@ -559,7 +560,7 @@ NSMutableDictionary *env = [NSMutableDictionary dictionary]; [env setObject:[infoPath stringByDeletingLastPathComponent] forKey:@"SP_BUNDLE_PATH"]; - [env setObject:SPBundleTaskInputFilePath forKey:@"SP_BUNDLE_INPUT_FILE"]; + [env setObject:bundleInputFilePath forKey:@"SP_BUNDLE_INPUT_FILE"]; if(currentSelectionRange.length) [env setObject:[[self string] substringWithRange:currentSelectionRange] forKey:@"SP_SELECTED_TEXT"]; @@ -572,7 +573,7 @@ NSError *inputFileError = nil; NSString *input = [NSString stringWithString:[[self string] substringWithRange:replaceRange]]; - [input writeToFile:SPBundleTaskInputFilePath + [input writeToFile:bundleInputFilePath atomically:YES encoding:NSUTF8StringEncoding error:&inputFileError]; @@ -587,7 +588,7 @@ NSString *output = [cmd runBashCommandWithEnvironment:env atCurrentDirectoryPath:nil error:&err]; - [[NSFileManager defaultManager] removeItemAtPath:SPBundleTaskInputFilePath error:nil]; + [[NSFileManager defaultManager] removeItemAtPath:bundleInputFilePath error:nil]; if(err == nil && output && [cmdData objectForKey:SPBundleFileOutputActionKey]) { if([[cmdData objectForKey:SPBundleFileOutputActionKey] length] |