From 3638ecd71adf97deca37898c5a2c156949d355df Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Thu, 16 May 2019 23:23:29 -0500
Subject: [PATCH] backup cores to download dir before updating

---
 intl/msg_hash_us.h     |  8 ++++++++
 menu/cbs/menu_cbs_ok.c | 23 ++++++++++++++++++++---
 msg_hash.h             |  2 ++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 04472da7d6..983b03625f 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -697,6 +697,14 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_SUCCESS,
     "Core installation succesful"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BACKUP_CORE_ERROR,
+    "Core backup failed"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BACKUP_CORE_SUCCESS,
+    "Core backup succesful"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CORE_OPTIONS,
     "Options"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index cf89417358..a3be8d4903 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1304,7 +1304,7 @@ static bool file_copy(const char *src_path, const char *dst_path, char *msg, siz
    if (!src)
    {
       strlcpy(msg, "unable to open source file", size);
-      ret = false;
+      return false;
    }
 
    dst = filestream_open(dst_path,
@@ -1314,7 +1314,7 @@ static bool file_copy(const char *src_path, const char *dst_path, char *msg, siz
    if (!dst)
    {
       strlcpy(msg, "unable to open destination file", size);
-      ret = false;
+      return false;
    }
 
    while (!filestream_eof(src))
@@ -1430,7 +1430,6 @@ static int generic_action_ok(const char *path,
                   MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_ERROR), 1, 100, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
                RARCH_LOG("[sideload] %s: %s\n", msg_hash_to_str(
                   MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_ERROR), message);
-               RARCH_LOG(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SIDELOAD_CORE_ERROR));
             }
             else
             {
@@ -3511,8 +3510,26 @@ void cb_generic_download(retro_task_t *task,
          dir_path = settings->paths.directory_thumbnails;
          break;
       case MENU_ENUM_LABEL_CB_CORE_UPDATER_DOWNLOAD:
+      {
+         char core_name[256], core_path[PATH_MAX_LENGTH], backup_core_path[PATH_MAX_LENGTH];
+         char message[PATH_MAX_LENGTH];
+
+         fill_pathname_base_noext(core_name, transf->path, sizeof(core_name));
+         fill_pathname_join(core_path, settings->paths.directory_libretro, core_name, sizeof(core_path));
+         fill_pathname_join(backup_core_path, settings->paths.directory_core_assets, core_name, sizeof(backup_core_path));
+         if(!file_copy(core_path, backup_core_path, message, sizeof(message)))
+         {
+            RARCH_LOG("[backup] %s: %s\n", msg_hash_to_str(
+               MENU_ENUM_LABEL_VALUE_BACKUP_CORE_ERROR), message);
+         }
+         else
+         {
+            RARCH_LOG("[backup] %s\n", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BACKUP_CORE_SUCCESS));
+         }
+
          dir_path = settings->paths.directory_libretro;
          break;
+      }
       case MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD:
          dir_path = settings->paths.directory_core_assets;
 #if defined(HAVE_COMPRESSION) && defined(HAVE_ZLIB)
diff --git a/msg_hash.h b/msg_hash.h
index bcfc62065d..89fdc6ef80 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1692,6 +1692,8 @@ enum msg_hash_enums
    MENU_LABEL(SIDELOAD_CORE_LIST),
    MENU_LABEL(SIDELOAD_CORE_ERROR),
    MENU_LABEL(SIDELOAD_CORE_SUCCESS),
+   MENU_LABEL(BACKUP_CORE_ERROR),
+   MENU_LABEL(BACKUP_CORE_SUCCESS),
    MENU_LABEL(MANAGEMENT),
    MENU_LABEL(ONLINE),
    MENU_LABEL(ONLINE_UPDATER),