CCFileUtils: Methods added to find paths of a file in all search paths.

Method added to load all filenameLookups in all search paths and merge them.

Author: NickyWeber

cocos2d/Support/CCFileUtils.h

@@ -285,7 +285,20 @@ typedef NS_ENUM(NSUInteger, CCFileUtilsSearchMode) {
  */
 -(NSString*) fullPathFromRelativePathIgnoringResolutions:(NSString*)relPath;
 
-/** 
+/**
+ *  Returns all fullpaths of a filename in all search paths without taking into account the screen resolution suffixes or directories.
+ *  It will use the "searchPath" though.
+ *  If the file can't be found, it will return an empty array.
+ *
+ *  Useful for loading the fileLookup.plist and spriteFrameFileList.plist for packages
+ *
+ *  @param relPath Relative path.
+ *
+ *  @return Array of full paths.
+ */
+- (NSArray *)fullPathsOfFileNameInAllSearchPaths:(NSString *)filename;
+
+/**
  *  Returns the fullpath for a given filename.
  *  First it will try to get a new filename from the "filenameLookup" dictionary. If a new filename can't be found on the dictionary, it will use the original filename.
  *  Then it will try obtain the full path of the filename using the CCFileUtils search rules: resolutions, and search paths
@@ -358,6 +371,15 @@ typedef NS_ENUM(NSUInteger, CCFileUtilsSearchMode) {
  */
 -(void) loadFilenameLookupDictionaryFromFile:(NSString*)filename;
 
+/**
+ *  Loads the filenameLookup dictionary from the contents of a filename in all search paths.
+ *
+ *  Used for packages to merge filenameLookups found in different search paths.
+ *
+ *  @param filename Filename to query.
+ */
+- (void)loadFileNameLookupsInAllSearchPathsWithName:(NSString *)filename;
+
 /** 
  *  Removes the suffix from a path.
  *  On iPhone RetinaDisplay it will remove the -hd suffix

cocos2d/Support/CCFileUtils.m

@@ -468,6 +468,68 @@ -(NSString*) fullPathFromRelativePathIgnoringResolutions:(NSString*)relPath
 	return ret;
 }
 
+- (NSArray *)fullPathsOfFileNameInAllSearchPaths:(NSString *)filename
+{
+    NSMutableArray *result = [NSMutableArray array];
+
+    for (NSString *path in self.searchPath)
+    {
+        NSString *aPath = [path stringByAppendingPathComponent:filename];
+        NSFileManager *fileManager = [NSFileManager defaultManager];
+
+        if ([fileManager fileExistsAtPath:aPath])
+        {
+            [result addObject:aPath];
+            continue;
+        }
+
+        NSString *file = [aPath lastPathComponent];
+        NSString *file_path = [aPath stringByDeletingLastPathComponent];
+        // Default to normal resource directory
+        NSString *foundPath = [[NSBundle mainBundle] pathForResource:file
+                                                              ofType:nil
+                                                         inDirectory:file_path];
+        if (foundPath)
+        {
+            [result addObject:aPath];
+        }
+    }
+
+    return result;
+}
+
+- (void)loadAndAddFilenameLookupDictionaryFromFile:(NSString *)filename
+{
+	NSString *fullpath = [self fullPathForFilenameIgnoringResolutions:filename];
+	if( fullpath ) {
+		NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:fullpath];
+
+		NSDictionary *metadata = dict[@"metadata"];
+		NSInteger version = [metadata[@"version"] integerValue];
+		if( version != 1) {
+			CCLOG(@"cocos2d: ERROR: Invalid filenameLookup dictionary version: %ld. Filename: %@", (long)version, filename);
+			return;
+		}
+
+		NSDictionary *filenames = dict[@"filenames"];
+        NSMutableDictionary *newFileLookup = [NSMutableDictionary dictionary];
+        [newFileLookup addEntriesFromDictionary:filenames];
+        [newFileLookup addEntriesFromDictionary:_filenameLookup];
+
+        self.filenameLookup = newFileLookup;
+	}
+}
+
+- (void)loadFileNameLookupsInAllSearchPathsWithName:(NSString *)filename
+{
+    NSArray *paths = [self fullPathsOfFileNameInAllSearchPaths:filename];
+
+    for (NSString *fileLookupFullPath in paths)
+    {
+        [self loadAndAddFilenameLookupDictionaryFromFile:fileLookupFullPath];
+    }
+}
+
 -(NSString*) fullPathForFilename:(NSString*)filename
 {
 	return [self fullPathForFilename:filename contentScale:NULL];