Revert and improve some changes

Author: XorTroll

Goldleaf/include/base.hpp

@@ -213,12 +213,19 @@ class ScopeGuard {
 
     private:
         Fn exit_fn;
+        bool call;
 
     public:
-        ScopeGuard(Fn fn) : exit_fn(fn) {}
+        ScopeGuard(Fn fn) : exit_fn(fn), call(true) {}
 
         ~ScopeGuard() {
-            this->exit_fn();
+            if(this->call) {
+                this->exit_fn();
+            }
+        }
+        
+        inline void Cancel() {
+            this->call = false;
         }
 };
 

Goldleaf/include/ui/ui_BrowserLayout.hpp

@@ -40,7 +40,7 @@ namespace ui {
             void ChangePartitionExplorer(fs::Explorer *exp, const bool update_contents = true);
             void ChangePartitionSdCard(const bool update_contents = true);
             void ChangePartitionNAND(const fs::Partition partition, const bool update_contents = true);
-            void ChangePartitionPCDrive(const std::string &mount_name, const bool update_contents = true);
+            void ChangePartitionRemotePcDrive(const std::string &mount_name, const bool update_contents = true);
             void ChangePartitionDrive(const UsbHsFsDevice &drv, const bool update_contents = true);
             void UpdateElements(const int idx = 0);
             void ResetMenuHead();

Goldleaf/include/ui/ui_ExploreMenuLayout.hpp

@@ -34,9 +34,7 @@ namespace ui {
             pu::ui::elm::Menu::Ref mounts_menu;
             pu::ui::elm::MenuItem::Ref sd_card_menu_item;
             std::vector<pu::ui::elm::MenuItem::Ref> usb_drive_menu_items;
-            std::vector<PcSpecialPath> remote_pc_special_paths;
-            std::vector<pu::ui::elm::MenuItem::Ref> remote_pc_special_menu_items;
-            pu::ui::elm::MenuItem::Ref remote_pc_select_file_menu_item;
+            pu::ui::elm::MenuItem::Ref remote_pc_explore_menu_item;
             std::unordered_map<fs::Explorer*, pu::ui::elm::MenuItem::Ref> mounted_explorer_items;
             pu::ui::elm::MenuItem::Ref nand_user_menu_item;
             pu::ui::elm::MenuItem::Ref nand_system_menu_item;
@@ -49,8 +47,7 @@ namespace ui {
             void OnSdCardSelected();
             void OnUsbDriveSelected(const UsbHsFsDevice drive);
             void OnUsbDriveSelectedX(const UsbHsFsDevice drive);
-            void OnRemotePcSpecialPathSelected(const PcSpecialPath &path);
-            void OnRemotePcSelectFileSelected();
+            void OnRemotePcExploreSelected();
             void OnNandPartitionSelected(const fs::Partition partition);
             void OnMountedExplorerSelected(fs::Explorer *exp, const std::string &name, pu::sdl2::TextureHandle::Ref icon);
             void OnMountedExplorerSelectedX(fs::Explorer *exp);

Goldleaf/include/ui/ui_MainApplication.hpp

@@ -34,6 +34,7 @@
 #include <ui/ui_MainMenuLayout.hpp>
 #include <ui/ui_MemoryLayout.hpp>
 #include <ui/ui_OwnSettingsLayout.hpp>
+#include <ui/ui_RemotePcExploreLayout.hpp>
 #include <ui/ui_BrowserLayout.hpp>
 #include <ui/ui_SettingsLayout.hpp>
 #include <ui/ui_TicketsLayout.hpp>
@@ -72,6 +73,7 @@ namespace ui {
             AmiiboDumpLayout::Ref amiibo_dump_lyt;
             SettingsLayout::Ref settings_lyt;
             OwnSettingsLayout::Ref own_settings_lyt;
+            RemotePcExploreLayout::Ref remote_pc_explore_lyt;
             MemoryLayout::Ref memory_lyt;
             UpdateLayout::Ref update_lyt;
             UpdateInstallLayout::Ref update_install_lyt;
@@ -189,6 +191,10 @@ namespace ui {
                 return this->own_settings_lyt;
             }
 
+            inline RemotePcExploreLayout::Ref &GetRemotePcExploreLayout() {
+                return this->remote_pc_explore_lyt;
+            }
+
             inline MemoryLayout::Ref &GetMemoryLayout() {
                 return this->memory_lyt;
             }

Goldleaf/include/ui/ui_RemotePcExploreLayout.hpp

@@ -0,0 +1,46 @@
+
+/*
+
+    Goldleaf - Multipurpose homebrew tool for Nintendo Switch
+    Copyright © 2018-2025 XorTroll
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+*/
+
+#pragma once
+#include <ui/ui_Includes.hpp>
+
+namespace ui {
+
+    class RemotePcExploreLayout : public pu::ui::Layout {
+        private:
+            std::vector<std::string> names;
+            std::vector<std::string> paths;
+            pu::ui::elm::Menu::Ref paths_menu;
+            std::vector<pu::ui::elm::MenuItem::Ref> path_items;
+
+            void OnInput(const u64 keys_down, const u64 keys_up, const u64 keys_held, const pu::ui::TouchPoint touch_pos);
+
+            void OnPathSelected();
+            void OnSelectFileSelected();
+
+        public:
+            RemotePcExploreLayout();
+            PU_SMART_CTOR(RemotePcExploreLayout)
+
+            Result Reload();
+    };
+
+}

Goldleaf/include/ui/ui_Utils.hpp

@@ -66,6 +66,7 @@ namespace ui {
         Update,
         USB,
         User,
+        Pc,
 
         Count
     };
@@ -80,4 +81,6 @@ namespace ui {
     void SetApplicationIcon(const u64 app_id, pu::sdl2::TextureHandle::Ref icon);
     pu::sdl2::TextureHandle::Ref GetApplicationIcon(const u64 app_id);
 
+    void SleepWhileRender(const u64 ns);
+
 }

Goldleaf/romfs/Common/Pc.png

@@ -514,5 +514,10 @@
     "This version is more recent than the last release... this surely is a debug build, right?",
     "Delta fragment",
     "Clear logs",
-    "Goldleaf logs were successfully cleared."
+    "Goldleaf logs were successfully cleared.",
+    "Browse PC drives and files via USB",
+    "Filesystem type:",
+    "Unmount drive",
+    "The selected drive was successfully unmounted. You can now safely remove it.",
+    "An error ocurred attempting to unmount the drive."
 ]

Goldleaf/romfs/Strings/de.json

@@ -514,5 +514,10 @@
     "This version is more recent than the last release... this surely is a debug build, right?",
     "Delta fragment",
     "Clear logs",
-    "Goldleaf logs were successfully cleared."
+    "Goldleaf logs were successfully cleared.",
+    "Browse PC drives and files via USB",
+    "Filesystem type:",
+    "Unmount drive",
+    "The selected drive was successfully unmounted. You can now safely remove it.",
+    "An error ocurred attempting to unmount the drive."
 ]

Goldleaf/romfs/Strings/en-US.json

@@ -514,5 +514,10 @@
     "Esta versión es más reciente que el último lanzamiento... seguro que no es una versión de desarrollo, verdad?",
     "Fragmento delta",
     "Limpiar logs",
-    "Los logs de Goldleaf fueron limpiados con éxito."
+    "Los logs de Goldleaf fueron limpiados con éxito.",
+    "Browse PC drives and files via USB",
+    "Filesystem type:",
+    "Unmount drive",
+    "The selected drive was successfully unmounted. You can now safely remove it.",
+    "An error ocurred attempting to unmount the drive."
 ]