Allow combining saves in content dir with save sorting (#16369)

BryanJacobs · web-flow · commit 338c9a4fe441 · 2024-03-19T04:53:32.000-07:00
* Allow combining saves in content dir with save sorting

* Formatting

* Realign var assignments
diff --git a/runloop.c b/runloop.c
@@ -1976,14 +1976,14 @@ bool runloop_environment_cb(unsigned cmd, void *data)
 
                   if (string_is_empty(dir_system))
                      RARCH_WARN("[Environ]: SYSTEM DIR is empty, assume CONTENT DIR %s\n",
-                           fullpath);
+                                fullpath);
 
                   strlcpy(tmp_path, fullpath, sizeof(tmp_path));
                   path_basedir(tmp_path);
 
                   /* Removes trailing slash (unless root dir) */
                   len = strlen(tmp_path);
-                  if (     string_count_occurrences_single_character(tmp_path, PATH_DEFAULT_SLASH_C()) > 1
+                  if (string_count_occurrences_single_character(tmp_path, PATH_DEFAULT_SLASH_C()) > 1
                         && tmp_path[len - 1] == PATH_DEFAULT_SLASH_C())
                      tmp_path[len - 1] = '\0';
 
@@ -2000,7 +2000,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
             {
                *(const char**)data = dir_system;
                RARCH_LOG("[Environ]: SYSTEM_DIRECTORY: \"%s\".\n",
-                     dir_system);
+                         dir_system);
             }
          }
          break;
@@ -7925,144 +7925,144 @@ void runloop_path_set_names(void)
 }
 
 void runloop_path_set_redirect(settings_t *settings,
-      const char *old_savefile_dir,
-      const char *old_savestate_dir)
+                               const char *old_savefile_dir,
+                               const char *old_savestate_dir)
 {
    char content_dir_name[PATH_MAX_LENGTH];
    char new_savefile_dir[PATH_MAX_LENGTH];
    char new_savestate_dir[PATH_MAX_LENGTH];
-   runloop_state_t *runloop_st                 = &runloop_state;
-   struct retro_system_info *sysinfo           = &runloop_st->system.info;
-   bool sort_savefiles_enable                  = settings->bools.sort_savefiles_enable;
-   bool sort_savefiles_by_content_enable       = settings->bools.sort_savefiles_by_content_enable;
-   bool sort_savestates_enable                 = settings->bools.sort_savestates_enable;
-   bool sort_savestates_by_content_enable      = settings->bools.sort_savestates_by_content_enable;
-   bool savefiles_in_content_dir               = settings->bools.savefiles_in_content_dir;
-   bool savestates_in_content_dir              = settings->bools.savestates_in_content_dir;
+   char intermediate_savefile_dir[PATH_MAX_LENGTH];
+   char intermediate_savestate_dir[PATH_MAX_LENGTH];
+   runloop_state_t *runloop_st            = &runloop_state;
+   struct retro_system_info *sysinfo      = &runloop_st->system.info;
+   bool sort_savefiles_enable             = settings->bools.sort_savefiles_enable;
+   bool sort_savefiles_by_content_enable  = settings->bools.sort_savefiles_by_content_enable;
+   bool sort_savestates_enable            = settings->bools.sort_savestates_enable;
+   bool sort_savestates_by_content_enable = settings->bools.sort_savestates_by_content_enable;
+   bool savefiles_in_content_dir          = settings->bools.savefiles_in_content_dir;
+   bool savestates_in_content_dir         = settings->bools.savestates_in_content_dir;
 
-   content_dir_name[0]  = '\0';
+   content_dir_name[0] = '\0';
 
    /* Initialize current save directories
     * with the values from the config. */
-   strlcpy(new_savefile_dir,  old_savefile_dir,  sizeof(new_savefile_dir));
-   strlcpy(new_savestate_dir, old_savestate_dir, sizeof(new_savestate_dir));
+   strlcpy(intermediate_savefile_dir, old_savefile_dir, sizeof(intermediate_savefile_dir));
+   strlcpy(intermediate_savestate_dir, old_savestate_dir, sizeof(intermediate_savestate_dir));
 
    /* Get content directory name, if per-content-directory
     * saves/states are enabled */
-   if (    (sort_savefiles_by_content_enable
-         || sort_savestates_by_content_enable)
-         && !string_is_empty(runloop_st->runtime_content_path_basename))
+   if ((sort_savefiles_by_content_enable
+        || sort_savestates_by_content_enable)
+       && !string_is_empty(runloop_st->runtime_content_path_basename))
       fill_pathname_parent_dir_name(content_dir_name,
-            runloop_st->runtime_content_path_basename,
-            sizeof(content_dir_name));
+                                    runloop_st->runtime_content_path_basename,
+                                    sizeof(content_dir_name));
+
+   /* Set savefile directory if empty to content directory */
+   if (string_is_empty(intermediate_savefile_dir) || savefiles_in_content_dir)
+   {
+      strlcpy(intermediate_savefile_dir,
+              runloop_st->runtime_content_path_basename,
+              sizeof(intermediate_savefile_dir));
+      path_basedir(intermediate_savefile_dir);
+
+      if (string_is_empty(intermediate_savefile_dir))
+         RARCH_LOG("Cannot resolve save file path.\n");
+   }
+
+   /* Set savestate directory if empty based on content directory */
+   if (string_is_empty(intermediate_savestate_dir)
+       || savestates_in_content_dir)
+   {
+      strlcpy(intermediate_savestate_dir,
+              runloop_st->runtime_content_path_basename,
+              sizeof(intermediate_savestate_dir));
+      path_basedir(intermediate_savestate_dir);
+
+      if (string_is_empty(intermediate_savestate_dir))
+         RARCH_LOG("Cannot resolve save state file path.\n");
+   }
+
+   strlcpy(new_savefile_dir, intermediate_savefile_dir, sizeof(new_savefile_dir));
+   strlcpy(new_savestate_dir, intermediate_savestate_dir, sizeof(new_savestate_dir));
 
    if (sysinfo && !string_is_empty(sysinfo->library_name))
    {
 #ifdef HAVE_MENU
       if (!string_is_equal(sysinfo->library_name,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
+                           msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
 #endif
       {
          /* Per-core and/or per-content-directory saves */
-         if ((       sort_savefiles_enable
-                  || sort_savefiles_by_content_enable)
-                 && !string_is_empty(old_savefile_dir))
+         if ((sort_savefiles_enable
+              || sort_savefiles_by_content_enable)
+             && !string_is_empty(new_savefile_dir))
          {
             /* Append content directory name to save location */
             if (sort_savefiles_by_content_enable)
                fill_pathname_join_special(
-                     new_savefile_dir,
-                     old_savefile_dir,
-                     content_dir_name,
-                     sizeof(new_savefile_dir));
+                  new_savefile_dir,
+                  new_savefile_dir,
+                  content_dir_name,
+                  sizeof(new_savefile_dir));
 
             /* Append library_name to the save location */
             if (sort_savefiles_enable)
                fill_pathname_join(
-                     new_savefile_dir,
-                     new_savefile_dir,
-                     sysinfo->library_name,
-                     sizeof(new_savefile_dir));
+                  new_savefile_dir,
+                  new_savefile_dir,
+                  sysinfo->library_name,
+                  sizeof(new_savefile_dir));
 
             /* If path doesn't exist, try to create it,
              * if everything fails revert to the original path. */
             if (!path_is_directory(new_savefile_dir))
                if (!path_mkdir(new_savefile_dir))
                {
                   RARCH_LOG("%s %s\n",
-                        msg_hash_to_str(MSG_REVERTING_SAVEFILE_DIRECTORY_TO),
-                        old_savefile_dir);
+                            msg_hash_to_str(MSG_REVERTING_SAVEFILE_DIRECTORY_TO),
+                            intermediate_savefile_dir);
 
-                  strlcpy(new_savefile_dir, old_savefile_dir, sizeof(new_savefile_dir));
+                  strlcpy(new_savefile_dir, intermediate_savefile_dir, sizeof(new_savefile_dir));
                }
          }
 
          /* Per-core and/or per-content-directory savestates */
          if ((sort_savestates_enable || sort_savestates_by_content_enable)
-               && !string_is_empty(old_savestate_dir))
+             && !string_is_empty(new_savestate_dir))
          {
             /* Append content directory name to savestate location */
             if (sort_savestates_by_content_enable)
                fill_pathname_join_special(
-                     new_savestate_dir,
-                     old_savestate_dir,
-                     content_dir_name,
-                     sizeof(new_savestate_dir));
+                  new_savestate_dir,
+                  new_savestate_dir,
+                  content_dir_name,
+                  sizeof(new_savestate_dir));
 
             /* Append library_name to the savestate location */
             if (sort_savestates_enable)
                fill_pathname_join(
-                     new_savestate_dir,
-                     new_savestate_dir,
-                     sysinfo->library_name,
-                     sizeof(new_savestate_dir));
+                  new_savestate_dir,
+                  new_savestate_dir,
+                  sysinfo->library_name,
+                  sizeof(new_savestate_dir));
 
             /* If path doesn't exist, try to create it.
              * If everything fails, revert to the original path. */
             if (!path_is_directory(new_savestate_dir))
                if (!path_mkdir(new_savestate_dir))
                {
                   RARCH_LOG("%s %s\n",
-                        msg_hash_to_str(MSG_REVERTING_SAVESTATE_DIRECTORY_TO),
-                        old_savestate_dir);
+                            msg_hash_to_str(MSG_REVERTING_SAVESTATE_DIRECTORY_TO),
+                            intermediate_savestate_dir);
                   strlcpy(new_savestate_dir,
-                        old_savestate_dir,
-                        sizeof(new_savestate_dir));
+                          intermediate_savestate_dir,
+                          sizeof(new_savestate_dir));
                }
          }
       }
    }
 
-   /* Set savefile directory if empty to content directory */
-   if (string_is_empty(new_savefile_dir) || savefiles_in_content_dir)
-   {
-      strlcpy(new_savefile_dir,
-            runloop_st->runtime_content_path_basename,
-            sizeof(new_savefile_dir));
-      path_basedir(new_savefile_dir);
-
-      if (string_is_empty(new_savefile_dir))
-         RARCH_LOG("Cannot resolve save file path.\n");
-      else if (sort_savefiles_enable
-            || sort_savefiles_by_content_enable)
-         RARCH_LOG("Saving files in content directory is set. This overrides other save file directory settings.\n");
-   }
-
-   /* Set savestate directory if empty based on content directory */
-   if (     string_is_empty(new_savestate_dir)
-         || savestates_in_content_dir)
-   {
-      strlcpy(new_savestate_dir,
-            runloop_st->runtime_content_path_basename,
-            sizeof(new_savestate_dir));
-      path_basedir(new_savestate_dir);
-
-      if (string_is_empty(new_savestate_dir))
-         RARCH_LOG("Cannot resolve save state file path.\n");
-      else if (sort_savestates_enable
-            || sort_savestates_by_content_enable)
-         RARCH_LOG("Saving save states in content directory is set. This overrides other save state file directory settings.\n");
-   }
 
 #ifdef HAVE_NETWORKING
    /* Special save directory for netplay clients. */
@@ -8085,50 +8085,49 @@ void runloop_path_set_redirect(settings_t *settings,
       bool savestate_is_dir = path_is_directory(new_savestate_dir);
       if (savefile_is_dir)
          strlcpy(runloop_st->name.savefile, new_savefile_dir,
-               sizeof(runloop_st->name.savefile));
+                 sizeof(runloop_st->name.savefile));
       else
-         savefile_is_dir    = path_is_directory(runloop_st->name.savefile);
+         savefile_is_dir = path_is_directory(runloop_st->name.savefile);
 
       if (savestate_is_dir)
       {
          strlcpy(runloop_st->name.savestate, new_savestate_dir,
                  sizeof(runloop_st->name.savestate));
          strlcpy(runloop_st->name.replay, new_savestate_dir,
                  sizeof(runloop_st->name.replay));
-      }
-      else
-         savestate_is_dir   = path_is_directory(runloop_st->name.savestate);
+      } else
+         savestate_is_dir = path_is_directory(runloop_st->name.savestate);
 
       if (savefile_is_dir)
       {
          fill_pathname_dir(runloop_st->name.savefile,
-               !string_is_empty(runloop_st->runtime_content_path_basename)
-               ? runloop_st->runtime_content_path_basename
-               : sysinfo->library_name,
-               FILE_PATH_SRM_EXTENSION,
-               sizeof(runloop_st->name.savefile));
+                           !string_is_empty(runloop_st->runtime_content_path_basename)
+                           ? runloop_st->runtime_content_path_basename
+                           : sysinfo->library_name,
+                           FILE_PATH_SRM_EXTENSION,
+                           sizeof(runloop_st->name.savefile));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
-               msg_hash_to_str(MSG_REDIRECTING_SAVEFILE_TO),
-               runloop_st->name.savefile);
+                   msg_hash_to_str(MSG_REDIRECTING_SAVEFILE_TO),
+                   runloop_st->name.savefile);
       }
 
       if (savestate_is_dir)
       {
          fill_pathname_dir(runloop_st->name.savestate,
-               !string_is_empty(runloop_st->runtime_content_path_basename)
-               ? runloop_st->runtime_content_path_basename
-               : sysinfo->library_name,
-               FILE_PATH_STATE_EXTENSION,
-               sizeof(runloop_st->name.savestate));
+                           !string_is_empty(runloop_st->runtime_content_path_basename)
+                           ? runloop_st->runtime_content_path_basename
+                           : sysinfo->library_name,
+                           FILE_PATH_STATE_EXTENSION,
+                           sizeof(runloop_st->name.savestate));
          fill_pathname_dir(runloop_st->name.replay,
-               !string_is_empty(runloop_st->runtime_content_path_basename)
-               ? runloop_st->runtime_content_path_basename
-               : sysinfo->library_name,
-               FILE_PATH_BSV_EXTENSION,
-               sizeof(runloop_st->name.replay));
+                           !string_is_empty(runloop_st->runtime_content_path_basename)
+                           ? runloop_st->runtime_content_path_basename
+                           : sysinfo->library_name,
+                           FILE_PATH_BSV_EXTENSION,
+                           sizeof(runloop_st->name.replay));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
-               msg_hash_to_str(MSG_REDIRECTING_SAVESTATE_TO),
-               runloop_st->name.savestate);
+                   msg_hash_to_str(MSG_REDIRECTING_SAVESTATE_TO),
+                   runloop_st->name.savestate);
       }
 
 #ifdef HAVE_CHEATS
@@ -8147,7 +8146,7 @@ void runloop_path_set_redirect(settings_t *settings,
 #endif
    }
 
-   dir_set(RARCH_DIR_CURRENT_SAVEFILE,  new_savefile_dir);
+   dir_set(RARCH_DIR_CURRENT_SAVEFILE, new_savefile_dir);
    dir_set(RARCH_DIR_CURRENT_SAVESTATE, new_savestate_dir);
 }
 
