ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up core_info.c/core_info.h

This commit is contained in:
meancoot 2013-06-25 20:57:19 -04:00
parent 9e359cc527
commit 081232132f
4 changed files with 76 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
core_info.c
View File

@ -15,86 +15,66 @@
#include "core_info.h"
#include "general.h"
#include <math.h>
#ifdef _WIN32
#include "compat/dirent_win32.h"
#else
#include <dirent.h>
#endif
#include "file.h"
#include "config.def.h"
core_info_list_t *get_core_info_list(const char *modules_path)
{
DIR *dirp;
struct dirent* direntp;
int count=0, i=0;
struct string_list *contents = dir_list_new(modules_path, EXT_EXECUTABLES, false);
core_info_t *core_info;
core_info_list_t *core_info_list;
int i;
if (!*g_settings.libretro)
if (!contents)
return NULL;
dirp = opendir(g_settings.libretro);
if (dirp == NULL)
return NULL;
core_info = (core_info_t*)malloc(contents->size * sizeof(core_info_t));
memset(core_info, 0, contents->size * sizeof(core_info_t));
//Count number of cores
for (;;)
{
direntp = readdir(dirp);
if (direntp == NULL)
break;
count++;
}
rewinddir(dirp);
if (count == 2)
{
//Only . and ..
closedir(dirp);
return NULL;
}
core_info = (core_info_t*)malloc(count*sizeof(core_info_t));
core_info_list = malloc(sizeof(core_info_list_t));
memset(core_info_list, 0, sizeof(core_info_list_t));
core_info_list->list = core_info;
count = 0;
core_info_list->count = contents->size;
for (;;)
for (i = 0; i < contents->size; i ++)
{
direntp = readdir(dirp);
if (direntp == NULL)
break;
if (strcmp((char*)direntp->d_name, ".") == 0 || strcmp((char*)direntp->d_name, "..") == 0)
continue;
core_info[count++].path = strdup((char*)direntp->d_name);
}
core_info_list->count = count;
for (i = 0; i < count; i++)
{
char info_path[255];
snprintf(info_path, sizeof(info_path), modules_path);
strncat(info_path, core_info[i].path, sizeof(info_path)-strlen(info_path)-1);
char *substr = strrchr(info_path, '_');
char buffer[PATH_MAX];
char info_path[PATH_MAX];
char *substr;
core_info[i].path = strdup(contents->elems[i].data);
// NOTE: This assumes all modules are named module_name_{tag}.ext
// {tag} must not contain an underscore. (This isn't true for PC versions)
snprintf(buffer, PATH_MAX, "%s", contents->elems[i].data);
substr = strrchr(buffer, '_');
if (substr)
{
info_path[strlen(info_path) - strlen(substr)] = '\0';
strncat(info_path, ".info", sizeof(info_path)-strlen(info_path)-1);
core_info[i].data = config_file_new(info_path);
*substr = 0;
if (core_info[i].data)
{
config_get_string(core_info[i].data, "display_name", &core_info[i].displayName);
config_get_string(core_info[i].data, "supported_extensions", &core_info[i].supportedExtensions);
}
else
core_info[i].displayName = "Not Supported";
// NOTE: Can't just use fill_pathname on iOS as it will cut at RetroArch.app;
// perhaps fill_pathname shouldn't cut before the last path element.
if (substr)
snprintf(info_path, PATH_MAX, "%s.info", buffer);
else
fill_pathname(info_path, buffer, ".info", PATH_MAX);
core_info[i].data = config_file_new(info_path);
if (core_info[i].data)
{
config_get_string(core_info[i].data, "display_name", &core_info[i].display_name);
char* extensions;
if (config_get_string(core_info[i].data, "supported_extensions", &extensions) && extensions)
core_info[i].supported_extensions = string_split(extensions, "|");
}
if (!core_info[i].display_name)
core_info[i].display_name = strdup(path_basename(core_info[i].path));
}
closedir(dirp);
dir_list_free(contents);
return core_info_list;
}
@ -103,14 +83,26 @@ void free_core_info_list(core_info_list_t *core_info_list)
{
int i;
if (!core_info_list)
return;
for (i = 0; i < core_info_list->count; i++)
{
free(core_info_list->list[i].path);
free(core_info_list->list[i].displayName);
free(core_info_list->list[i].supportedExtensions);
free(core_info_list->list[i].display_name);
string_list_free(core_info_list->list[i].supported_extensions);
config_file_free(core_info_list->list[i].data);
}
free(core_info_list->list);
free(core_info_list);
}
bool does_core_support_file(core_info_t* core, const char *path)
{
if (!path || !core || !core->supported_extensions)
return false;
return string_list_find_elem_prefix(core->supported_extensions, ".", path_get_extension(path));
}

7
core_info.h
View File

@ -25,9 +25,8 @@ extern "C" {
typedef struct {
char * path;
config_file_t* data;
char * configPath;
char * displayName;
char * supportedExtensions;
char * display_name;
struct string_list * supported_extensions;
} core_info_t;
typedef struct {
@ -38,6 +37,8 @@ typedef struct {
core_info_list_t *get_core_info_list(const char *modules_path);
void free_core_info_list(core_info_list_t * core_info_list);
bool does_core_support_file(core_info_t* core, const char *path);
#ifdef __cplusplus
}
#endif

3
ios/RetroArch/RAModuleInfo.h
View File

@ -14,12 +14,13 @@
*/
#include "conf/config_file.h"
#include "core_info.h"
@interface RAModuleInfo : NSObject
@property (strong) NSString* path;
@property core_info_t* info;
@property config_file_t* data;
@property (strong) NSString* displayName;
@property (strong) NSArray* supportedExtensions;
+ (NSArray*)getModules;
- (bool)supportsFileAtPath:(NSString*)path;

39
ios/RetroArch/RAModuleInfo.m
View File

@ -13,15 +13,15 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <glob.h>
#import "RetroArch_iOS.h"
#import "RAModuleInfo.h"
#import "views.h"
#include "file.h"
#include "core_info.h"
static NSMutableArray* moduleList;
static core_info_list_t* coreList;
@implementation RAModuleInfo
+ (NSArray*)getModules
@ -29,35 +29,27 @@ static NSMutableArray* moduleList;
if (!moduleList)
{
char pattern[PATH_MAX];
snprintf(pattern, PATH_MAX, "%s/modules/*.dylib", [[NSBundle mainBundle].bundlePath UTF8String]);
snprintf(pattern, PATH_MAX, "%s/modules", [[NSBundle mainBundle].bundlePath UTF8String]);
glob_t files = {0};
glob(pattern, 0, 0, &files);
moduleList = [NSMutableArray arrayWithCapacity:files.gl_pathc];
for (int i = 0; i != files.gl_pathc; i ++)
coreList = get_core_info_list(pattern);
moduleList = [NSMutableArray arrayWithCapacity:coreList->count];
for (int i = 0; coreList && i < coreList->count; i ++)
{
core_info_t* core = &coreList->list[i];
RAModuleInfo* newInfo = [RAModuleInfo new];
newInfo.path = [NSString stringWithUTF8String:files.gl_pathv[i]];
newInfo.path = [NSString stringWithUTF8String:core->path];
newInfo.info = core;
newInfo.data = core->data;
newInfo.displayName = [NSString stringWithUTF8String:core->display_name];
NSString* baseName = newInfo.path.lastPathComponent.stringByDeletingPathExtension;
NSString* infoPath = [newInfo.path stringByReplacingOccurrencesOfString:@"_ios.dylib" withString:@".dylib"];
infoPath = [infoPath stringByReplacingOccurrencesOfString:@".dylib" withString:@".info"];
newInfo.data = config_file_new([infoPath UTF8String]);
newInfo.displayName = ios_get_value_from_config(newInfo.data, @"display_name", newInfo.path.lastPathComponent.stringByDeletingPathExtension);
newInfo.supportedExtensions = [ios_get_value_from_config(newInfo.data, @"supported_extensions", @"") componentsSeparatedByString:@"|"];
newInfo.customConfigPath = [NSString stringWithFormat:@"%@/%@.cfg", RetroArch_iOS.get.systemDirectory, baseName];
[moduleList addObject:newInfo];
}
globfree(&files);
[moduleList sortUsingComparator:^(RAModuleInfo* left, RAModuleInfo* right)
{
return [left.displayName caseInsensitiveCompare:right.displayName];
@ -69,12 +61,11 @@ static NSMutableArray* moduleList;
- (void)dealloc
{
config_file_free(self.data);
}
- (bool)supportsFileAtPath:(NSString*)path
{
return [self.supportedExtensions containsObject:[[path pathExtension] lowercaseString]];
return does_core_support_file(self.info, path.UTF8String);
}
- (void)createCustomConfig