Fix mac compile errors, implement uninstall on mac

Author: Ravbug

source/form.fbp

@@ -1228,8 +1228,8 @@
                                                     <property name="font"></property>
                                                     <property name="gripper">0</property>
                                                     <property name="hidden">0</property>
-                                                    <property name="id">wxID_ANY</property>
-                                                    <property name="label">Remove</property>
+                                                    <property name="id">wxID_NO</property>
+                                                    <property name="label">Uninstall</property>
                                                     <property name="margins"></property>
                                                     <property name="markup">0</property>
                                                     <property name="max_size"></property>

source/globals.h

@@ -25,10 +25,10 @@ struct editor{
 #if defined __APPLE__
 	#include <pwd.h>
 	//the location to store application data
-	static const std::string datapath = getpwuid(getuid())->pw_dir + string("/Library/Application Support/UnityHubNative");
+	static const std::string datapath = getpwuid(getuid())->pw_dir + std::string("/Library/Application Support/UnityHubNative");
 	static const char dirsep = '/';
 
-    static const std::string cachedir = getpwuid(getuid())->pw_dir + string("/Library/Caches/com.ravbug.UnityHubNative");
+    static const std::string cachedir = getpwuid(getuid())->pw_dir + std::string("/Library/Caches/com.ravbug.UnityHubNative");
 	static const std::string installerExt = "dmg";
 
 	//where to find various Unity things on macOS
@@ -160,7 +160,7 @@ inline bool file_exists(const std::string& name){
 inline void launch_process(const std::string& command) {
 #if defined __APPLE__ || defined __linux__
 	//the '&' runs the command nonblocking, and >/dev/null 2>&1 destroys output
-	FILE* stream = popen(string(command + null_device + " &").c_str(), "r");
+	FILE* stream = popen(std::string(command + null_device + " &").c_str(), "r");
 	pclose(stream);
 
 #elif _WIN32
@@ -172,10 +172,10 @@ inline void launch_process(const std::string& command) {
 
 inline void reveal_in_explorer(const std::string& path){
 #if defined __APPLE__
-	string command = "open \"" + path + "\"";
+	std::string command = "open \"" + path + "\"";
 
 #elif defined __linux__
-	string command = "xdg-open \"" + path + "\"";
+	std::string command = "xdg-open \"" + path + "\"";
 
 #elif defined _WIN32
 	//do not surround the paths in quotes, it will not work

source/interface.cpp

@@ -108,7 +108,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	launchHubBtn = new wxButton( installs_pane, wxID_BACKWARD, wxT("Add New"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer5->Add( launchHubBtn, 0, wxALL|wxEXPAND, 5 );
 
-	removeInstallBtn = new wxButton( installs_pane, wxID_ANY, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+	removeInstallBtn = new wxButton( installs_pane, wxID_NO, wxT("Uninstall"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer5->Add( removeInstallBtn, 0, wxALL|wxEXPAND, 5 );
 
 	wxButton* reloadInstalls;

source/interface_derived.cpp

@@ -15,6 +15,8 @@
 #else
 #include <dirent.h>
 #endif
+
+#include <fmt/format.h>
 using namespace std;
 
 #define LEARN_TAB 2
@@ -38,6 +40,7 @@ EVT_BUTTON(wxID_NEW,MainFrameDerived::OnCreateProject)
 EVT_BUTTON(wxID_FIND,MainFrameDerived::OnLocateInstall)
 EVT_BUTTON(wxID_CLEAR,MainFrameDerived::OnRemoveInstallPath)
 EVT_BUTTON(wxID_DELETE,MainFrameDerived::OnRemoveProject)
+EVT_BUTTON(wxID_NO,MainFrameDerived::OnUninstall)
 EVT_BUTTON(wxID_JUMP_TO,MainFrameDerived::OnRevealProject)
 EVT_BUTTON(wxID_BACKWARD,MainFrameDerived::OnOpenHub)
 EVT_BUTTON(wxID_RELOAD,MainFrameDerived::OnReloadEditors)
@@ -505,3 +508,28 @@ void MainFrameDerived::OnOpenHub(wxCommandEvent &event){
     AddNewInstallDlg dlg(this);
     dlg.Show();
 }
+
+void MainFrameDerived::OnUninstall(wxCommandEvent &){
+    auto selected = installsList->GetSelection();
+    if (selected != -1){
+        auto name = installsList->GetString(selected);
+        
+        auto pathsep = name.find_last_of("-");
+        
+        string_view container(name.data() + pathsep + 2,name.size() - pathsep - 2);
+        string_view version(name.data(),pathsep - 2);
+        
+#ifdef __APPLE__
+        // delete the folder
+        auto path = fmt::format("{}/{}",container,version);
+        int answer = wxMessageBox(fmt::format("Will delete {}, is this ok?", path), "Confirm deletion", wxYES | wxNO | wxICON_ERROR);
+        if (answer == wxYES){
+            std::filesystem::remove_all(path);
+            ReloadData();
+        }
+#elif defined _WIN32
+        // execute the uninstaller
+#endif
+    }
+   
+}

source/interface_derived.hpp

@@ -92,6 +92,7 @@ class MainFrameDerived : public MainFrame{
 	void OnRevealProject(wxCommandEvent& event);
 	void OnOpenWith(wxCommandEvent& event);
 	void OnPageChanging(wxBookCtrlEvent& event);
+    void OnUninstall(wxCommandEvent&);
 	void OnUpdate(wxCommandEvent& event){
 		wxLaunchDefaultBrowser("https://github.com/ravbug/unityhubnative/releases/latest");
 	}