Action config

Quicksilver/Code-QuickStepCore/QSAction.h

@@ -30,9 +30,42 @@
 - (SEL)action;
 - (void)setAction:(SEL)newAction;
 
+/**
+ * Use a predefined block as an action method. Useful for programatically creating many similar actions.
+ *
+ * @param actionBlock A block that does the action's work
+ * @param selectorName A selector name like "openThing:"
+ *
+ * @return YES if the action method was added to the provider, otherwise NO
+ *
+ * Example action block with no indirect object:
+ * QSObject *(^actionBlock)(id, QSObject *) = ^ QSObject *(id _self, QSObject *dObject) {
+ * 	   // action code
+ * 	   return nil;
+ * };
+ */
+- (BOOL)setActionUisngBlock:(QSObject *(^)(id, QSObject *))actionBlock  selectorName:(NSString *)selName;
+
+/**
+ * Use a predefined block as an action method. Useful for programatically creating many similar actions.
+ *
+ * @param actionBlock A block that does the action's work
+ * @param selectorName A selector name like "openThing:usingOtherThing:"
+ *
+ * @return YES if the action method was added to the provider, otherwise NO
+ *
+ * Example action block with an indirect object:
+ * QSObject *(^actionBlock)(id, QSObject *, QSObject *) = ^ QSObject *(id _self, QSObject *dObject, QSObject *iObject) {
+ * 	   // action code
+ * 	   return nil;
+ * };
+ */
+- (BOOL)setActionWithIndirectUisngBlock:(QSObject *(^)(id, QSObject *, QSObject *))actionBlock  selectorName:(NSString *)selName;
+
 - (NSInteger)rank;
 - (void)setRank:(NSInteger)newRank;
 - (CGFloat)precedence;
+- (void)setPrecedence:(CGFloat)precedence;
 - (BOOL)enabled;
 - (void)setEnabled:(BOOL)flag;
 - (BOOL)menuEnabled;
@@ -46,6 +79,8 @@
 - (BOOL)canThread;
 - (BOOL)indirectOptional;
 - (void)setIndirectOptional:(BOOL)flag;
+- (BOOL)validatesObjects;
+- (void)setValidatesObjects:(BOOL)flag;
 
 // resolveProxy is a BOOL set in an action's dict to specify whether an object should be resolved
 // before being sent to an action. Action's like 'assign abbreviation...' should not resolve the proxy
@@ -67,6 +102,7 @@
 - (id)objectForKey:(NSString*)key;
 
 - (NSString *)commandFormat;
+- (void)setCommandFormat:(NSString *)commandFormat;
 @end
 
 @interface QSActionHandler : NSObject

Quicksilver/Code-QuickStepCore/QSAction.m

@@ -6,6 +6,7 @@
 #import "QSResourceManager.h"
 #import "NSBundle_BLTRExtensions.h"
 #import "QSExecutor.h"
+#import <objc/objc-runtime.h>
 
 //static NSDictionary *actionPrecedence;
 
@@ -119,6 +120,12 @@ - (CGFloat)precedence {
 	return num ? [num doubleValue] : 0.0;
 }
 
+- (void)setPrecedence:(CGFloat)precedence
+{
+	NSNumber *num = [NSNumber numberWithFloat:precedence];
+	[[self actionDict] setObject:num forKey:kActionPrecedence];
+}
+
 - (NSInteger)rank { return rank;  }
 - (void)_setRank:(NSInteger)newRank {
 	[self willChangeValueForKey:@"rank"];
@@ -192,6 +199,32 @@ - (void)setAction:(SEL)newAction {
 		[[self actionDict] removeObjectForKey:kActionSelector];
 }
 
+- (BOOL)setActionUisngBlock:(QSObject *(^)(id, QSObject *))actionBlock selectorName:(NSString *)selName
+{
+	if (![self provider]) {
+		NSLog(@"define provider before setting a block as the action");
+		return NO;
+	}
+	IMP actionFunction = imp_implementationWithBlock(actionBlock);
+	SEL actionSelector = NSSelectorFromString(selName);
+	BOOL actionDefined = class_addMethod([[self provider] class], actionSelector, actionFunction, "@@:@");
+	[self setAction:actionSelector];
+	return actionDefined;
+}
+
+- (BOOL)setActionWithIndirectUisngBlock:(QSObject *(^)(id, QSObject *, QSObject *))actionBlock  selectorName:(NSString *)selName
+{
+	if (![self provider]) {
+		NSLog(@"define provider before setting a block as the action");
+		return NO;
+	}
+	IMP actionFunction = imp_implementationWithBlock(actionBlock);
+	SEL actionSelector = NSSelectorFromString(selName);
+	BOOL actionDefined = class_addMethod([[self provider] class], actionSelector, actionFunction, "@@:@@");
+	[self setAction:actionSelector];
+	return actionDefined;
+}
+
 - (NSInteger)argumentCount {
     id obj = [[self actionDict] objectForKey:kActionArgumentCount];
     if (obj)
@@ -222,6 +255,15 @@ - (void)setIndirectOptional:(BOOL)flag {
  	[[self actionDict] setObject:[NSNumber numberWithInteger:flag] forKey:kActionIndirectOptional];
 }
 
+- (BOOL)validatesObjects
+{
+	return [[[self actionDict] objectForKey:kActionValidatesObjects] boolValue];
+}
+- (void)setValidatesObjects:(BOOL)flag
+{
+	[[self actionDict] setObject:[NSNumber numberWithInteger:flag] forKey:kActionValidatesObjects];
+}
+
 - (BOOL)resolvesProxy {
     if ([[self actionDict] objectForKey:kActionResolvesProxy] == nil) {
         return YES;
@@ -364,7 +406,7 @@ - (NSString *)commandFormat {
 
 	//Check the action dictionary
 	if (!format)
-		format = [[self actionDict] objectForKey:@"commandFormat"];
+		format = [[self actionDict] objectForKey:kActionCommandFormat];
 
 	// Check the main bundle
 	if (!format)
@@ -377,6 +419,11 @@ - (NSString *)commandFormat {
     return format;
 }
 
+- (void)setCommandFormat:(NSString *)commandFormat
+{
+	[[self actionDict] setObject:commandFormat forKey:kActionCommandFormat];
+}
+
 - (CGFloat)score {
     return 0.0;
 }
@@ -426,4 +473,4 @@ - (BOOL)loadIconForObject:(QSObject *)object {
 		return NO;
 }
 
-@end
+@end

Quicksilver/Code-QuickStepCore/QSDefines.h

@@ -58,6 +58,7 @@
 #define kActionInitialize           @"initialize"
 #define kActionEnabled              @"enabled"
 #define kActionResolvesProxy        @"resolvesProxy"
+#define kActionCommandFormat        @"commandFormat"
 
 // NSNumber (float) :
 #define kActionPrecedence @"precedence"