colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-03 17:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup plist and shadow files under 10.6

Browse Source
This commit is contained in:
Antoine Mercadal
2011-11-04 19:48:48 +01:00
parent 9af63ca32f
commit bc59efc3ba
3 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/xcodecapp-cocoa/FSEventCallback.m
+16 -8
View File
@@ -36,7 +36,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
for (i = 0; i < numEvents; i++)
{
NSString *path = [(NSArray *)eventPaths objectAtIndex:i];
NSString *path = [[(NSArray *)eventPaths objectAtIndex:i] stringByStandardizingPath];
if (useFileBasedListening)
{
@@ -55,27 +55,35 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
else
{
NSArray *subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:NULL];
// Uncomment to test under 10.7
// BOOL isDir;
// [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir];
// if (!isDir)
// continue;
[xcc tidyShadowedFiles:path];
for (NSString *subpath in subpaths)
{
NSString *fullPath = [NSString stringWithFormat:@"%@%@", path, subpath];
{
NSString *fullPath = [[NSString stringWithFormat:@"%@/%@", path, subpath] stringByStandardizingPath];
if ([xcc isPathMatchingIgnoredPaths:fullPath]
|| (![xcc isXIBFile:fullPath] && ![xcc isObjJFile:fullPath] && ![xcc isXCCIgnoreFile:fullPath]))
continue;
NSDate *lastModifiedDate = [xcc lastModificationDateForPath:subpath];
NSDate *lastModifiedDate = [xcc lastModificationDateForPath:fullPath];
NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:fullPath error:nil];
NSDate *fileModDate = [fileAttributes objectForKey:NSFileModificationDate];
if ([fileModDate compare:lastModifiedDate] == NSOrderedDescending)
{
[xcc updateLastModificationDate:fileModDate forPath:subpath];
[xcc updateLastModificationDate:fileModDate forPath:fullPath];
[xcc handleFileModification:fullPath notify:YES];
}
}
}
[xcc updateLastEventId:eventIds[i]];
}
}
Tools/xcodecapp-cocoa/TNXCodeCapp.h
+3
View File
@@ -75,10 +75,13 @@ extern NSString * const XCCListeningStartNotification;
@end
@interface TNXCodeCapp (SnowLeopard)
- (void)updateLastModificationDate:(NSDate *)date forPath:(NSString *)path;
- (NSDate*)lastModificationDateForPath:(NSString *)path;
- (NSString *)unshadowURLForString:(NSString *)aString;
- (void)tidyShadowedFiles:(NSString*)basePath;
@end
Tools/xcodecapp-cocoa/TNXCodeCapp.m
+42 -2
View File
@@ -56,7 +56,9 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
Gestalt(gestaltSystemVersionMinor, &versionMinor);
supportsFileBasedListening = versionMajor >= 10 && versionMinor >= 7;
// Uncomment to test under 10.7
// supportsFileBasedListening = NO;
if (supportsFileBasedListening)
DLog(@"using 10.7+ mode listening (clean)");
else
@@ -544,7 +546,11 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
pathModificationDates = [NSMutableDictionary new];
}
[pathModificationDates setObject:[date retain] forKey:path];
if (date)
[pathModificationDates setObject:[date retain] forKey:path];
else
[pathModificationDates removeObjectForKey:path];
[[NSUserDefaults standardUserDefaults] setObject:pathModificationDates forKey:@"pathModificationDates"];
}
@@ -564,4 +570,38 @@ NSString * const XCCListeningStartNotification = @"XCCListeningStartNotification
return appStartedTimestamp;
}
- (NSString *)unshadowURLForString:(NSString *)aString
{
NSMutableString * unshadowedPath = [NSMutableString stringWithString:aString];
[unshadowedPath replaceOccurrencesOfString:@"_"
withString:@"/"
options:NSCaseInsensitiveSearch
range:NSMakeRange(0, [unshadowedPath length])];
[unshadowedPath replaceOccurrencesOfString:@".h"
withString:@".j"
options:NSCaseInsensitiveSearch
range:NSMakeRange(0, [unshadowedPath length])];
return [NSString stringWithString:unshadowedPath];
}
- (void)tidyShadowedFiles:(NSString*)basePath
{
NSArray *subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[XCodeSupportProjectSources path] error:NULL];
for (NSString *subpath in subpaths)
{
NSString *unshadowed = [self unshadowURLForString:subpath];
NSString *shadowFullPath = [NSString stringWithFormat:@"%@/%@", [XCodeSupportProjectSources path], subpath];
if (![fm fileExistsAtPath:unshadowed])
{
DLog(@"cleaning shadow file: %@", subpath);
[fm removeItemAtPath:shadowFullPath error:nil];
[self updateLastModificationDate:nil forPath:unshadowed];
}
}
}
@end