From 7a1b273d8d4e49235de3df17836acae87d09fa7d Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@inframonde.eu>
Date: Sun, 13 Nov 2011 23:34:49 +0100
Subject: [PATCH] simplify the ignored path matching

---
 Tools/XcodeCapp/FSEventCallback.m |  2 +-
 Tools/XcodeCapp/TNXCodeCapp.m     | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/Tools/XcodeCapp/FSEventCallback.m b/Tools/XcodeCapp/FSEventCallback.m
index 6c3c87938..f457b6a85 100644
--- a/Tools/XcodeCapp/FSEventCallback.m
+++ b/Tools/XcodeCapp/FSEventCallback.m
@@ -43,7 +43,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
         NSString *path = [[(NSArray *)eventPaths objectAtIndex:i] stringByStandardizingPath];
 
         if (useFileBasedListening)
-        {            
+        {
             if (flags & kFSEventStreamEventFlagItemIsFile && 
                 flags & kFSEventStreamEventFlagItemRemoved)
             {
diff --git a/Tools/XcodeCapp/TNXCodeCapp.m b/Tools/XcodeCapp/TNXCodeCapp.m
index 971c0c67e..22d40a7dd 100644
--- a/Tools/XcodeCapp/TNXCodeCapp.m
+++ b/Tools/XcodeCapp/TNXCodeCapp.m
@@ -282,9 +282,9 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
 
     if ([self isPathMatchingIgnoredPaths:fullPath] || ![fm fileExistsAtPath:fullPath])
         return;
-    
+
     DLog(@"Parsing modified file: %@", fullPath);
-    
+
     NSArray *arguments = nil;
     NSString *successTitle = nil;
     NSString *successMsg = nil;
@@ -583,29 +583,24 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
     {
         if ([ignoredPath length] == 0)
             continue;
-        
-        NSMutableString *regexp = [NSMutableString stringWithFormat:@"%@/%@", [currentProjectURL path], ignoredPath];
 
-        [regexp replaceOccurrencesOfString:@"/*/"
-                                withString:@"/*"
-                                   options:0
-                                     range:NSMakeRange(0, [regexp length])];
+        NSMutableString *regexp = [ignoredPath mutableCopy];
 
         [regexp replaceOccurrencesOfString:@"/"
                                 withString:@"\\/"
                                    options:0
                                      range:NSMakeRange(0, [regexp length])];
-        
+
         [regexp replaceOccurrencesOfString:@"."
                                 withString:@"\\."
                                    options:0
                                      range:NSMakeRange(0, [regexp length])];
-        
+
         [regexp replaceOccurrencesOfString:@"*"
                                 withString:@".*"
                                    options:0
                                      range:NSMakeRange(0, [regexp length])];
-        
+
         [regexp replaceOccurrencesOfString:@" "
                                 withString:@"\\ "
                                    options:0
@@ -614,11 +609,9 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
         NSPredicate *regextest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regexp];
 
         if ([regextest evaluateWithObject:aPath])
-        {
             return YES;
-        }
     }
-    
+
     return NO;
 }