Remove empty folders when deactivating mods, code cleanup

Author: rainmakerv3

modules/ModManager.cpp

@@ -142,10 +142,12 @@ void ModManager::ActivateButton_isPressed() {
                         (ModUniqueFolderPath / relative_path.parent_path()));
                 }
                 if (std::filesystem::exists(ModInstallPath / "dvdroot_ps4" / relative_path)) {
+
                     std::filesystem::copy_file(ModInstallPath / "dvdroot_ps4" / relative_path,
                                                (ModBackupFolderPath / relative_path),
                                                std::filesystem::copy_options::overwrite_existing);
                 } else {
+
                     std::filesystem::copy_file(ModSourcePath / relative_path,
                                                (ModUniqueFolderPath / relative_path),
                                                std::filesystem::copy_options::overwrite_existing);
@@ -291,6 +293,22 @@ void ModManager::DeactivateButton_isPressed() {
         }
     }
 
+    std::filesystem::path dir_path;
+    std::vector<std::filesystem::path> directories;
+    for (auto& p : std::filesystem::recursive_directory_iterator(ModInstallPath / "dvdroot_ps4")) {
+        dir_path = p.path();
+        if (std::filesystem::is_directory(p)) {
+            directories.push_back(std::filesystem::canonical(dir_path));
+        }
+    }
+
+    for (std::vector<std::filesystem::path>::reverse_iterator rit = directories.rbegin();
+         rit != directories.rend(); ++rit) {
+        if (std::filesystem::is_empty(*rit)) {
+            std::filesystem::remove(*rit);
+        }
+    }
+
     ui->progressBar->setValue(0);
     ui->FileTransferLabel->setText("Moving backup to Install Folder");
     ui->progressBar->setMaximum(getFileCount(ModBackupFolderPath));
@@ -299,6 +317,11 @@ void ModManager::DeactivateButton_isPressed() {
         auto relative_path = std::filesystem::relative(entry, ModBackupFolderPath);
         if (!entry.is_directory()) {
             try {
+                if (!std::filesystem::exists(ModInstallPath / "dvdroot_ps4" /
+                                             relative_path.parent_path())) {
+                    std::filesystem::create_directories(ModInstallPath / "dvdroot_ps4" /
+                                                        relative_path.parent_path());
+                }
                 std::filesystem::rename(ModBackupFolderPath / relative_path,
                                         ModInstallPath / "dvdroot_ps4" / relative_path);
             } catch (std::exception& ex) {

modules/ModManager.h

@@ -9,14 +9,6 @@ class ModManager;
 }
 
 const std::filesystem::path ModPath = std::filesystem::current_path() / "BBLauncher" / "Mods";
-const std::filesystem::path ModBackupPath =
-    std::filesystem::current_path() / "BBLauncher" / "Mods-BACKUP";
-const std::filesystem::path ModUniquePath =
-    std::filesystem::current_path() / "BBLauncher" / "Mods-BACKUP" / "Mods-UNIQUEFILES";
-const std::vector<std::string> BBFolders = {"dvdroot_ps4", "action", "chr",   "event",    "facegen",
-                                            "map",         "menu",   "movie", "msg",      "mtd",
-                                            "obj",         "other",  "param", "paramdef", "parts",
-                                            "remo",        "script", "sfx",   "shader",   "sound"};
 
 class ModManager : public QDialog {
     Q_OBJECT
@@ -41,4 +33,13 @@ private slots:
     void ConflictAdd(std::string ModName);
     void ConflictRemove(std::string ModName);
     std::string PathToU8(const std::filesystem::path& path);
+
+    const std::filesystem::path ModBackupPath =
+        std::filesystem::current_path() / "BBLauncher" / "Mods-BACKUP";
+    const std::filesystem::path ModUniquePath =
+        std::filesystem::current_path() / "BBLauncher" / "Mods-BACKUP" / "Mods-UNIQUEFILES";
+    const std::vector<std::string> BBFolders = {
+        "dvdroot_ps4", "action", "chr",    "event", "facegen", "map",   "menu",
+        "movie",       "msg",    "mtd",    "obj",   "other",   "param", "paramdef",
+        "parts",       "remo",   "script", "sfx",   "shader",  "sound"};
 };

modules/bblauncher.cpp

@@ -25,6 +25,7 @@ BBLauncher::BBLauncher(QWidget* parent) : QMainWindow(parent), ui(new Ui::BBLaun
     this->setFixedSize(this->width(), this->height());
     this->statusBar()->setSizeGripEnabled(false);
     QApplication::setStyle("Fusion");
+    setWindowTitle("BB Launcher Release 3.5");
 
     // this->installEventFilter(this); if needed
 
@@ -189,7 +190,7 @@ void BBLauncher::startShad() {
             [=](int exitCode, QProcess::ExitStatus exitStatus) { QApplication::quit(); });
 }
 
-void StartBackupSave() {
+void BBLauncher::StartBackupSave() {
     const std::filesystem::path BackupPath =
         std::filesystem::current_path() / "BBLauncher" / "SaveBackups";
 

modules/bblauncher.h

@@ -6,26 +6,18 @@
 #include <filesystem>
 #include <QMainWindow>
 
-void PathToQString(QString& result, const std::filesystem::path& path);
-
-QT_BEGIN_NAMESPACE
 namespace Ui {
 class BBLauncher;
 }
-QT_END_NAMESPACE
 
-const std::vector<std::string> BBSerialList = {"CUSA03173", "CUSA00900", "CUSA00208",
-                                               "CUSA00207", "CUSA01363", "CUSA03023"};
+void PathToQString(QString& result, const std::filesystem::path& path);
+std::filesystem::path GetShadUserDir();
 
-extern std::filesystem::path userPath;
 extern std::string game_serial;
 extern std::filesystem::path installPath;
 extern std::string installPathString;
 extern std::filesystem::path EbootPath;
 
-void StartBackupSave();
-std::filesystem::path GetShadUserDir();
-
 class BBLauncher : public QMainWindow {
     Q_OBJECT
 
@@ -35,17 +27,21 @@ class BBLauncher : public QMainWindow {
     // bool eventFilter(QObject* obj, QEvent* event);
 
 public slots:
-    void UpdateSettingsList();
-    void UpdateModList();
 
 private slots:
     void ExeSelectButton_isPressed();
     void WIPButton_isPressed();
     void LaunchButton_isPressed();
-    static void startShad();
     void SaveInstallLoc();
     void CheckBBInstall();
+    void UpdateSettingsList();
+    void UpdateModList();
+    static void startShad();
 
 private:
     Ui::BBLauncher* ui;
+    static void StartBackupSave();
+
+    const std::vector<std::string> BBSerialList = {"CUSA03173", "CUSA00900", "CUSA00208",
+                                                   "CUSA00207", "CUSA01363", "CUSA03023"};
 };

settings/LauncherSettings.h

@@ -12,9 +12,6 @@ void LoadLauncherSettings();
 void CreateSettingsFile();
 void SetTheme(std::string theme);
 
-const QStringList BackupNumList = {"1", "2", "3", "4", "5"};
-const QStringList BackupFreqList = {"5", "10", "15", "20", "25", "30"};
-
 extern std::filesystem::path SettingsPath;
 extern std::filesystem::path SettingsFile;
 
@@ -39,4 +36,7 @@ public slots:
 private:
     Ui::LauncherSettings* ui;
     void OnBackupStateChanged();
+
+    const QStringList BackupNumList = {"1", "2", "3", "4", "5"};
+    const QStringList BackupFreqList = {"5", "10", "15", "20", "25", "30"};
 };

settings/ShadSettings.ui

@@ -28,7 +28,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>Settings</string>
+   <string>shadPS4 Settings</string>
   </property>
   <property name="windowIcon">
    <iconset>