Simplify regular expression code

skrovina · Nov 24, 2014 · d0bab52 · d0bab52
1 parent 450c89a
commit d0bab52
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/XCDYouTubeKit/XCDYouTubePlayerScript.m b/XCDYouTubeKit/XCDYouTubePlayerScript.m
@@ -31,13 +31,9 @@ - (instancetype) initWithString:(NSString *)string
 	if ([script hasPrefix:jsPrologue] && [script hasSuffix:jsEpilogue])
 		script = [script substringWithRange:NSMakeRange(jsPrologue.length, script.length - (jsPrologue.length + jsEpilogue.length))];
 
-	__block NSString *signatureFunctionName = nil;
 	NSRegularExpression *signatureRegularExpression = [NSRegularExpression regularExpressionWithPattern:@"[\"']signature[\"']\\s*,\\s*([^\\(]+)" options:NSRegularExpressionCaseInsensitive error:NULL];
-	[signatureRegularExpression enumerateMatchesInString:script options:(NSMatchingOptions)0 range:NSMakeRange(0, script.length) usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop)
-	{
-		signatureFunctionName = [script substringWithRange:[result rangeAtIndex:1]];
-		*stop = YES;
-	}];
+	NSTextCheckingResult *result = [signatureRegularExpression firstMatchInString:script options:(NSMatchingOptions)0 range:NSMakeRange(0, script.length)];
+	NSString *signatureFunctionName = result.numberOfRanges > 1 ? [script substringWithRange:[result rangeAtIndex:1]] : nil;
 
 	if (!signatureFunctionName)
 		return nil;