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

(Database dir scanning) Can now add ZIP entry to collection

This commit is contained in:
twinaphex 2015-05-27 04:42:22 +02:00
parent d72df8492b
commit 65b8b2e0cb
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runloop_data.h
View File

@ -127,6 +127,7 @@ typedef struct database_state_handle
size_t entry_index; size_t entry_index;
uint32_t crc; uint32_t crc;
uint8_t *buf; uint8_t *buf;
char zip_name[PATH_MAX_LENGTH];
} database_state_handle_t; } database_state_handle_t;
typedef struct db_handle typedef struct db_handle

26
tasks/task_database.c
View File

@ -34,6 +34,8 @@ static int zlib_compare_crc32(const char *name, const char *valid_exts,
db_state->crc = crc32; db_state->crc = crc32;
strlcpy(db_state->zip_name, name, sizeof(db_state->zip_name));
RARCH_LOG("Going to compare CRC 0x%x for %s\n", crc32, name); RARCH_LOG("Going to compare CRC 0x%x for %s\n", crc32, name);
return 1; return 1;
@ -70,6 +72,7 @@ static int database_info_iterate_playlist(
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
db->type = DATABASE_TYPE_ITERATE_ZIP; db->type = DATABASE_TYPE_ITERATE_ZIP;
memset(&db->state, 0, sizeof(zlib_transfer_t)); memset(&db->state, 0, sizeof(zlib_transfer_t));
db_state->zip_name[0] = '\0';
db->state.type = ZLIB_TRANSFER_INIT; db->state.type = ZLIB_TRANSFER_INIT;
return 1; return 1;
@ -132,12 +135,14 @@ static int database_info_list_iterate_new(database_state_handle_t *db_state)
**/ **/
static int database_info_list_iterate_found_match( static int database_info_list_iterate_found_match(
database_state_handle_t *db_state, database_state_handle_t *db_state,
database_info_handle_t *db database_info_handle_t *db,
const char *zip_name
) )
{ {
char db_crc[PATH_MAX_LENGTH]; char db_crc[PATH_MAX_LENGTH];
char db_playlist_path[PATH_MAX_LENGTH]; char db_playlist_path[PATH_MAX_LENGTH];
char db_playlist_base_str[PATH_MAX_LENGTH]; char db_playlist_base_str[PATH_MAX_LENGTH];
char entry_path_str[PATH_MAX_LENGTH];
const char *db_playlist_base = NULL; const char *db_playlist_base = NULL;
content_playlist_t *playlist = NULL; content_playlist_t *playlist = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -164,11 +169,19 @@ static int database_info_list_iterate_found_match(
RARCH_LOG("Playlist Path: %s\n", db_playlist_path); RARCH_LOG("Playlist Path: %s\n", db_playlist_path);
RARCH_LOG("Entry Path: %s\n", entry_path); RARCH_LOG("Entry Path: %s\n", entry_path);
RARCH_LOG("Playlist not NULL: %d\n", playlist != NULL); RARCH_LOG("Playlist not NULL: %d\n", playlist != NULL);
RARCH_LOG("ZIP entry: %s\n", zip_name);
#endif #endif
snprintf(db_crc, sizeof(db_crc), "%s|crc", db_info_entry->crc32); snprintf(db_crc, sizeof(db_crc), "%s|crc", db_info_entry->crc32);
content_playlist_push(playlist, entry_path, db_info_entry->name, "DETECT", "DETECT", db_crc); strlcpy(entry_path_str, entry_path, sizeof(entry_path_str));
if (zip_name && zip_name[0] != '\0')
{
strlcat(entry_path_str, "#", sizeof(entry_path_str));
strlcat(entry_path_str, zip_name, sizeof(entry_path_str));
}
content_playlist_push(playlist, entry_path_str, db_info_entry->name, "DETECT", "DETECT", db_crc);
content_playlist_write_file(playlist); content_playlist_write_file(playlist);
content_playlist_free(playlist); content_playlist_free(playlist);
@ -190,7 +203,8 @@ static int database_info_list_iterate_next(
static int database_info_iterate_crc_lookup( static int database_info_iterate_crc_lookup(
database_state_handle_t *db_state, database_state_handle_t *db_state,
database_info_handle_t *db) database_info_handle_t *db,
const char *zip_entry)
{ {
if ((unsigned)db_state->list_index == (unsigned)db_state->list->size) if ((unsigned)db_state->list_index == (unsigned)db_state->list->size)
@ -215,7 +229,7 @@ static int database_info_iterate_crc_lookup(
#endif #endif
if (rarch_strcasestr(entry_state_crc, db_info_entry->crc32)) if (rarch_strcasestr(entry_state_crc, db_info_entry->crc32))
return database_info_list_iterate_found_match(db_state, db); return database_info_list_iterate_found_match(db_state, db, zip_entry);
} }
} }
@ -243,7 +257,7 @@ static int database_info_iterate_playlist_zip(
bool returnerr = true; bool returnerr = true;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
if (db_state->crc != 0) if (db_state->crc != 0)
return database_info_iterate_crc_lookup(db_state, db); return database_info_iterate_crc_lookup(db_state, db, db_state->zip_name);
else else
{ {
if (zlib_parse_file_iterate(&db->state, if (zlib_parse_file_iterate(&db->state,
@ -278,7 +292,7 @@ static int database_info_iterate(database_state_handle_t *state, database_info_h
case DATABASE_TYPE_ITERATE_ZIP: case DATABASE_TYPE_ITERATE_ZIP:
return database_info_iterate_playlist_zip(state, db, name); return database_info_iterate_playlist_zip(state, db, name);
case DATABASE_TYPE_CRC_LOOKUP: case DATABASE_TYPE_CRC_LOOKUP:
return database_info_iterate_crc_lookup(state, db); return database_info_iterate_crc_lookup(state, db, NULL);
} }
return 0; return 0;