File mode progress.

include/tasks/backup.hpp

@@ -4,40 +4,37 @@
 
 #include <string>
 
-namespace tasks
+namespace tasks::backup
 {
-    namespace backup
-    {
-        /// @brief Task/thread function executed when a new backup is created.
-        void create_new_backup_local(sys::ProgressTask *task,
-                                     data::User *user,
-                                     data::TitleInfo *titleInfo,
-                                     fslib::Path target,
-                                     BackupMenuState *spawningState,
-                                     bool killTask = true);
-        void create_new_backup_remote(sys::ProgressTask *task,
-                                      data::User *user,
-                                      data::TitleInfo *titleInfo,
-                                      std::string remoteName,
-                                      BackupMenuState *spawningState,
-                                      bool killTask = true);
+    /// @brief Task/thread function executed when a new backup is created.
+    void create_new_backup_local(sys::ProgressTask *task,
+                                 data::User *user,
+                                 data::TitleInfo *titleInfo,
+                                 fslib::Path target,
+                                 BackupMenuState *spawningState,
+                                 bool killTask = true);
+    void create_new_backup_remote(sys::ProgressTask *task,
+                                  data::User *user,
+                                  data::TitleInfo *titleInfo,
+                                  std::string remoteName,
+                                  BackupMenuState *spawningState,
+                                  bool killTask = true);
 
-        /// @brief Overwrites a pre-existing backup.
-        void overwrite_backup_local(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
-        void overwrite_backup_remote(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
+    /// @brief Overwrites a pre-existing backup.
+    void overwrite_backup_local(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
+    void overwrite_backup_remote(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
 
-        /// @brief Restores a backup
-        void restore_backup_local(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
-        void restore_backup_remote(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
+    /// @brief Restores a backup
+    void restore_backup_local(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
+    void restore_backup_remote(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
 
-        /// @brief Deletes a backup
-        void delete_backup_local(sys::Task *task, BackupMenuState::TaskData taskData);
-        void delete_backup_remote(sys::Task *task, BackupMenuState::TaskData taskData);
+    /// @brief Deletes a backup
+    void delete_backup_local(sys::Task *task, BackupMenuState::TaskData taskData);
+    void delete_backup_remote(sys::Task *task, BackupMenuState::TaskData taskData);
 
-        /// @brief Uploads a backup
-        void upload_backup(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
+    /// @brief Uploads a backup
+    void upload_backup(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
 
-        /// @brief Patches a pre-existing backup on the remote storage.
-        void patch_backup(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
-    }
+    /// @brief Patches a pre-existing backup on the remote storage.
+    void patch_backup(sys::ProgressTask *task, BackupMenuState::TaskData taskData);
 }

include/tasks/fileoptions.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include "appstates/FileOptionState.hpp"
+#include "sys/sys.hpp"
+
+namespace tasks::fileoptions
+{
+    /// @brief Copies the source to destination passed through taskData.
+    void copy_source_to_destination(sys::ProgressTask *task, FileOptionState::TaskData taskData);
+
+    /// @brief Deletes the source path passed through taskData
+    void delete_target(sys::Task *task, FileOptionState::TaskData taskData);
+}

include/tasks/mainmenu.hpp

@@ -2,11 +2,8 @@
 #include "appstates/MainMenuState.hpp"
 #include "sys/sys.hpp"
 
-namespace tasks
+namespace tasks::mainmenu
 {
-    namespace mainmenu
-    {
-        void backup_all_for_all_local(sys::ProgressTask *task, MainMenuState::TaskData taskData);
-        void backup_all_for_all_remote(sys::ProgressTask *task, MainMenuState::TaskData taskData);
-    }
+    void backup_all_for_all_local(sys::ProgressTask *task, MainMenuState::TaskData taskData);
+    void backup_all_for_all_remote(sys::ProgressTask *task, MainMenuState::TaskData taskData);
 }

include/tasks/savecreate.hpp

@@ -3,13 +3,7 @@
 #include "data/data.hpp"
 #include "sys/sys.hpp"
 
-namespace tasks
+namespace tasks::savecreate
 {
-    namespace savecreate
-    {
-        void create_save_data_for(sys::Task *task,
-                                  data::User *user,
-                                  data::TitleInfo *titleInfo,
-                                  SaveCreateState *spawningState);
-    }
+    void create_save_data_for(sys::Task *task, data::User *user, data::TitleInfo *titleInfo, SaveCreateState *spawningState);
 }

include/tasks/titleoptions.hpp

@@ -3,26 +3,23 @@
 #include "appstates/TitleOptionState.hpp"
 #include "sys/sys.hpp"
 
-namespace tasks
+namespace tasks::titleoptions
 {
-    namespace titleoptions
-    {
-        /// @brief Adds a title to the blacklist. Needs to be task formatted to work with confirmations.
-        void blacklist_title(sys::Task *task, TitleOptionState::TaskData taskData);
+    /// @brief Adds a title to the blacklist. Needs to be task formatted to work with confirmations.
+    void blacklist_title(sys::Task *task, TitleOptionState::TaskData taskData);
 
-        /// @brief Wipes deletes all local backups for the current title.
-        void delete_all_local_backups_for_title(sys::Task *task, TitleOptionState::TaskData taskData);
+    /// @brief Wipes deletes all local backups for the current title.
+    void delete_all_local_backups_for_title(sys::Task *task, TitleOptionState::TaskData taskData);
 
-        /// @brief Deletes all backups found on the remote storage service.
-        void delete_all_remote_backups_for_title(sys::Task *task, TitleOptionState::TaskData taskData);
+    /// @brief Deletes all backups found on the remote storage service.
+    void delete_all_remote_backups_for_title(sys::Task *task, TitleOptionState::TaskData taskData);
 
-        /// @brief Resets save data for the current title.
-        void reset_save_data(sys::Task *task, TitleOptionState::TaskData taskData);
+    /// @brief Resets save data for the current title.
+    void reset_save_data(sys::Task *task, TitleOptionState::TaskData taskData);
 
-        /// @brief Deletes the save data from the system the same way Data Management does.
-        void delete_save_data_from_system(sys::Task *task, TitleOptionState::TaskData taskData);
+    /// @brief Deletes the save data from the system the same way Data Management does.
+    void delete_save_data_from_system(sys::Task *task, TitleOptionState::TaskData taskData);
 
-        /// @brief Extends the save container for the current save info.
-        void extend_save_data(sys::Task *task, TitleOptionState::TaskData taskData);
-    }
+    /// @brief Extends the save container for the current save info.
+    void extend_save_data(sys::Task *task, TitleOptionState::TaskData taskData);
 }

include/tasks/useroptions.hpp

@@ -2,13 +2,10 @@
 #include "appstates/UserOptionState.hpp"
 #include "sys/sys.hpp"
 
-namespace tasks
+namespace tasks::useroptions
 {
-    namespace useroptions
-    {
-        void backup_all_for_user_local(sys::ProgressTask *task, UserOptionState::TaskData taskData);
-        void backup_all_for_user_remote(sys::ProgressTask *task, UserOptionState::TaskData taskData);
-        void create_all_save_data_for_user(sys::Task *task, UserOptionState::TaskData taskData);
-        void delete_all_save_data_for_user(sys::Task *task, UserOptionState::TaskData taskData);
-    }
+    void backup_all_for_user_local(sys::ProgressTask *task, UserOptionState::TaskData taskData);
+    void backup_all_for_user_remote(sys::ProgressTask *task, UserOptionState::TaskData taskData);
+    void create_all_save_data_for_user(sys::Task *task, UserOptionState::TaskData taskData);
+    void delete_all_save_data_for_user(sys::Task *task, UserOptionState::TaskData taskData);
 }