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

Merge pull request #17678 from warmenhoven/warmenhoven/cloud-ignore

Browse Source
This commit is contained in:
LibretroAdmin 2025-03-10 04:35:37 -07:00 committed by GitHub
commit 9e64cce10f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tasks/task_cloudsync.c
View File

@ -418,7 +418,7 @@ static void task_cloud_sync_build_current_manifest(task_cloud_sync_state_t *sync
file_list_sort_on_alt(sync_state->current_manifest);
sync_state->phase = CLOUD_SYNC_PHASE_DIFF;
RARCH_LOG(CSPFX "created in-memory manifest of current disk state\n");
RARCH_LOG(CSPFX "created in-memory manifest of current disk state with %d files\n", sync_state->current_manifest->size);
}
/**
@ -869,6 +869,49 @@ static void task_cloud_sync_delete_server_file(task_cloud_sync_state_t *sync_sta
}
}
static void task_cloud_sync_maybe_ignore(task_cloud_sync_state_t *sync_state)
{
struct string_list *dirlist = task_cloud_sync_directory_map();
int i;
bool found;
if (sync_state->local_manifest)
{
for (found = false; !found && sync_state->local_idx < sync_state->local_manifest->size; )
{
struct item_file *local_file = &sync_state->local_manifest->list[sync_state->local_idx];
const char *key = CS_FILE_KEY(local_file);
for (i = 0; !found && i < dirlist->size; i++)
found = string_starts_with(key, dirlist->elems[i].data);
/* we have a record of doing a sync for this file but now no longer
* wish to sync it. keep the record? might as well, in case the option
* gets turned back on later. */
if (!found)
{
task_cloud_sync_add_to_updated_manifest(sync_state, key, CS_FILE_HASH(local_file), false);
sync_state->local_idx++;
}
}
}
if (sync_state->server_manifest)
{
for (found = false; !found && sync_state->server_idx < sync_state->server_manifest->size; )
{
struct item_file *server_file = &sync_state->server_manifest->list[sync_state->server_idx];
const char *key = CS_FILE_KEY(server_file);
for (i = 0; !found && i < dirlist->size; i++)
found = string_starts_with(key, dirlist->elems[i].data);
/* must keep the server's manifest complete */
if (!found)
{
task_cloud_sync_add_to_updated_manifest(sync_state, key, CS_FILE_HASH(server_file), true);
sync_state->server_idx++;
}
}
}
}
static void task_cloud_sync_diff_next(task_cloud_sync_state_t *sync_state)
{
int server_local_key_cmp;
@ -878,6 +921,12 @@ static void task_cloud_sync_diff_next(task_cloud_sync_state_t *sync_state)
struct item_file *local_file = NULL;
struct item_file *current_file = NULL;
/* Move past files that are deliberately not being sync'd. There would not be
* any in the current state, but there may be in the server or local state.
* If there are in the server state, make sure to leave them in the server's
* manifest. */
task_cloud_sync_maybe_ignore(sync_state);
if ( sync_state->server_manifest
&& sync_state->server_idx < sync_state->server_manifest->size)
server_file = &sync_state->server_manifest->list[sync_state->server_idx];