mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Graceful fallback to readonly mode if RDB can't be opened readwrite (#15569)

Browse Source 
* Graceful fallback to readonly mode if RDB can't be opened readwrite
* let RA open db readonly
This commit is contained in:
Joe Osborn 2023-08-10 11:04:47 -07:00 committed by GitHub
parent d0d1321ac1
commit 679083a08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database_info.c
View File

@ -717,7 +717,7 @@ static int database_cursor_open(libretrodb_t *db,
const char *error = NULL; const char *error = NULL;
libretrodb_query_t *q = NULL; libretrodb_query_t *q = NULL;
if ((libretrodb_open(path, db)) != 0) if ((libretrodb_open(path, db, false)) != 0)
return -1; return -1;
if (query) if (query)

50
libretro-db/libretrodb.c
View File

@ -46,45 +46,46 @@
struct node_iter_ctx struct node_iter_ctx
{ {
libretrodb_t *db; libretrodb_t *db;
libretrodb_index_t *idx; libretrodb_index_t *idx;
}; };
struct libretrodb struct libretrodb
{ {
RFILE *fd; RFILE *fd;
char *path; char *path;
uint64_t root; bool can_write;
uint64_t count; uint64_t root;
uint64_t first_index_offset; uint64_t count;
uint64_t first_index_offset;
}; };
struct libretrodb_index struct libretrodb_index
{ {
char name[50]; char name[50];
uint64_t key_size; uint64_t key_size;
uint64_t next; uint64_t next;
uint64_t count; uint64_t count;
}; };
typedef struct libretrodb_metadata typedef struct libretrodb_metadata
{ {
uint64_t count; uint64_t count;
} libretrodb_metadata_t; } libretrodb_metadata_t;
typedef struct libretrodb_header typedef struct libretrodb_header
{ {
char magic_number[sizeof(MAGIC_NUMBER)]; char magic_number[sizeof(MAGIC_NUMBER)];
uint64_t metadata_offset; uint64_t metadata_offset;
} libretrodb_header_t; } libretrodb_header_t;
struct libretrodb_cursor struct libretrodb_cursor
{ {
RFILE *fd; RFILE *fd;
libretrodb_query_t *query; libretrodb_query_t *query;
libretrodb_t *db; libretrodb_t *db;
int is_valid; int is_valid;
int eof; int eof;
}; };
static int libretrodb_validate_document(const struct rmsgpack_dom_value *doc) static int libretrodb_validate_document(const struct rmsgpack_dom_value *doc)
@ -180,16 +181,16 @@ void libretrodb_close(libretrodb_t *db)
db->fd = NULL; db->fd = NULL;
} }
int libretrodb_open(const char *path, libretrodb_t *db) int libretrodb_open(const char *path, libretrodb_t *db, bool write)
{ {
libretrodb_header_t header; libretrodb_header_t header;
libretrodb_metadata_t md; libretrodb_metadata_t md;
RFILE *fd = filestream_open(path, RFILE *fd = filestream_open(path,
RETRO_VFS_FILE_ACCESS_READ_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING, write ? RETRO_VFS_FILE_ACCESS_READ_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING : RETRO_VFS_FILE_ACCESS_READ,
RETRO_VFS_FILE_ACCESS_HINT_NONE); RETRO_VFS_FILE_ACCESS_HINT_NONE);
db->can_write = write;
if (!fd) if (!fd)
return -1; return -1;
if (!string_is_empty(db->path)) if (!string_is_empty(db->path))
free(db->path); free(db->path);
@ -456,9 +457,14 @@ int libretrodb_create_index(libretrodb_t *db,
uint64_t item_count = 0; uint64_t item_count = 0;
int rval = -1; int rval = -1;
if (libretrodb_find_index(db, name, &idx) >= 0) { if (libretrodb_find_index(db, name, &idx) >= 0)
{
return 1; return 1;
} }
if (!db->can_write)
{
return -1;
}
tree = bintree_new(node_compare, &field_size); tree = bintree_new(node_compare, &field_size);

2
libretro-db/libretrodb.h
View File

@ -49,7 +49,7 @@ int libretrodb_create(RFILE *fd, libretrodb_value_provider value_provider, void
void libretrodb_close(libretrodb_t *db); void libretrodb_close(libretrodb_t *db);
int libretrodb_open(const char *path, libretrodb_t *db); int libretrodb_open(const char *path, libretrodb_t *db, bool write);
int libretrodb_create_index(libretrodb_t *db, const char *name, int libretrodb_create_index(libretrodb_t *db, const char *name,
const char *field_name); const char *field_name);

2
libretro-db/libretrodb_tool.c
View File

@ -60,7 +60,7 @@ int main(int argc, char ** argv)
if (!db || !cur) if (!db || !cur)
goto error; goto error;
if ((rv = libretrodb_open(path, db)) != 0) if ((rv = libretrodb_open(path, db, true)) != 0)
{ {
printf("Could not open db file '%s'\n", path); printf("Could not open db file '%s'\n", path);
goto error; goto error;

2
menu/menu_explore.c
View File

@ -583,7 +583,7 @@ explore_state_t *menu_explore_build_list(const char *directory_playlist,
ext_path[3] = 'b'; ext_path[3] = 'b';
} }
if (libretrodb_open(tmp, newrdb.handle) != 0) if (libretrodb_open(tmp, newrdb.handle, false) != 0)
{ {
/* Invalid RDB file */ /* Invalid RDB file */
libretrodb_free(newrdb.handle); libretrodb_free(newrdb.handle);