Tentative fix for #3

Use std::filesystem instead of manually concatenating paths and using stat to test existence

Author: Ravbug

source/add_install_dlg_derived.cpp

@@ -175,7 +175,7 @@ void AddNewInstallDlg::InstallSelected(wxCommandEvent&){
             }
             else{
                 // write the file to temp location
-                auto outpath = fmt::format("{}{}{}.{}", cachedir,"UnityDownloadAssistant",data.hashcode,installerExt);
+                auto outpath = fmt::format("{}{}{}.{}", cachedir.string(), "UnityDownloadAssistant", data.hashcode, installerExt);
                 ofstream outfile(outpath, std::ios::binary);
                 outfile.write(r.text.c_str(),r.text.size());
 

source/create_dialog_derived.cpp

@@ -70,8 +70,8 @@ void CreateProjectDialogD::OnCreate(wxCommandEvent& event){
 	if (message == ""){
 		//assemble the command that will create the project described by the dialog
 		editor& e = editors[unityVersionChoice->GetSelection()];
-		string executablePath = e.path + dirsep + e.name + dirsep + executable;
-		string executableTemplatesPath = e.path + dirsep + e.name + dirsep + templatesDir;
+		auto executablePath = e.path / e.name / executable;
+		auto executableTemplatesPath = e.path / e.name / templatesDir;
 		string projName = projNameTxt->GetValue().ToStdString();
 		string projPath = projLocTxt->GetValue().ToStdString();
 
@@ -86,9 +86,9 @@ void CreateProjectDialogD::OnCreate(wxCommandEvent& event){
 		#if defined __APPLE__
 			string command = "\"" + executablePath + "\" -createproject \"" + projPath + dirsep + projName + "\" -cloneFromTemplate \"" + executableTemplatesPath + templatePrefix + "." + templateName + "\"";
 		#elif defined _WIN32
-			string fullProj = "\"" + projPath + dirsep + projName + "\"";
-			string fullTemplate = "\"" + executableTemplatesPath + templatePrefix + "." + templateName + "\"";
-			string command = "\"" + executablePath + "\" -createproject " + fullProj + " -cloneFromTemplate " + fullTemplate;
+			auto fullProj = std::filesystem::path("\"") / projPath / projName / "\"";
+			auto fullTemplate = std::filesystem::path("\"") / executableTemplatesPath / (templatePrefix + "." + templateName + "\"");
+			string command = "\"" + executablePath.string() + "\" -createproject " + fullProj.string() + " -cloneFromTemplate " + fullTemplate.string();
 		#elif defined __linux__
 			string command = "\"" + executablePath + "\" -createproject \"" + projPath + dirsep + projName + "\" -cloneFromTemplate \"" + executableTemplatesPath + templatePrefix + "." + templateName + "\"";
 		#endif
@@ -139,8 +139,8 @@ void CreateProjectDialogD::loadTemplates(const editor& e){
 	templateCtrl->ClearAll();
 
 	//open the folder
-	string templatesFolder = e.path + dirsep + e.name + dirsep + templatesDir;
-	DIR* dir = opendir(templatesFolder.c_str());
+	auto templatesFolder = e.path /e.name / templatesDir;
+	DIR* dir = opendir(templatesFolder.string().c_str());
 	struct dirent *entry = readdir(dir);
 	//loop over the contents
 	while (entry != NULL)

source/globals.h

@@ -19,7 +19,7 @@ static const std::string AppVersion = "v1.4";
 //structure for representing an editor and for locating it
 struct editor{
 	std::string name;
-	std::string path;
+	std::filesystem::path path;
 };
 
 #if defined __APPLE__
@@ -46,19 +46,20 @@ struct editor{
 #define popen _popen
 #define pclose _pclose
 #define mkdir _mkdir
-#include <wx/wx.h>
-	static const std::string datapath = getenv("HOMEPATH") + std::string("\\AppData\\Roaming\\UnityHubNative");
+#include <wx/wx.h> 
+	static const std::string homedir = getenv("HOMEPATH");
+	static const std::filesystem::path datapath = std::filesystem::path(homedir) / std::filesystem::path("AppData\\Roaming\\UnityHubNative");
 	static const char dirsep = '\\';
 
-	static const std::string cachedir = std::filesystem::temp_directory_path().string();
+	static const std::filesystem::path cachedir = std::filesystem::temp_directory_path();
 	static const std::string installerExt = "exe";
 
 	//where to find various Unity things on windows
-	static const std::string executable = "Editor\\Unity.exe";
-    static const std::vector<std::string> defaultInstall = {"\\Program Files\\Unity\\Hub\\Editor"};
+	static const std::filesystem::path executable = "Editor\\Unity.exe";
+    static const std::vector<std::filesystem::path> defaultInstall = {"\\Program Files\\Unity\\Hub\\Editor"};
 
-	static const std::string hubDefault = "\\Program Files\\Unity Hub\\Unity Hub.exe";
-	static const std::string templatesDir = "Editor\\Data\\Resources\\PackageManager\\ProjectTemplates\\";
+	static const std::filesystem::path hubDefault = "\\Program Files\\Unity Hub\\Unity Hub.exe";
+	static const std::filesystem::path templatesDir = "Editor\\Data\\Resources\\PackageManager\\ProjectTemplates\\";
 
 	/**
 	@returns the calculated display scale factor using GDI+
@@ -137,7 +138,7 @@ struct project{
 	std::string name;
 	std::string version;
 	std::string modifiedDate;
-	std::string path;
+	std::filesystem::path path;
 };
 
 /**

source/interface_derived.cpp

@@ -17,7 +17,9 @@
 #endif
 
 #include <fmt/format.h>
+#include <filesystem>
 using namespace std;
+using namespace std::filesystem;
 
 #define LEARN_TAB 2
 #define WEBVIEW 2000
@@ -73,7 +75,7 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
 		int status = mkdir(datapath.c_str(),S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 		menuReveal->SetItemLabel("Reveal In Finder\tCtrl-F");
 	#elif defined _WIN32
-		int status = mkdir(datapath.c_str());
+		int status = mkdir(datapath.string().c_str());
 		//on windows also make the main window background white
 		this->SetBackgroundColour(*wxWHITE);
 		//high DPI scaling fixes
@@ -106,8 +108,8 @@ void MainFrameDerived::ReloadData(){
 	editors.clear();
 
 	//check that projects file exists in folder
-	string p = string(datapath + dirsep + projectsFile);
-	if (file_exists(p)){
+	path p = datapath / projectsFile;
+	if (filesystem::exists(p)){
 		ifstream in;
 		in.open(p);
 		string line;
@@ -140,8 +142,8 @@ void MainFrameDerived::ReloadData(){
 	}
 
 	//check that the installs path file exists in the folder
-	p = string(datapath + dirsep + editorPathsFile);
-	if (file_exists(p)){
+	p = datapath / editorPathsFile;
+	if (filesystem::exists(p)){
 		//load the editors
 		ifstream in; in.open(p); string line;
 		while (getline(in, line)){
@@ -232,14 +234,14 @@ void MainFrameDerived::OnPageChanging(wxBookCtrlEvent& event){
  Loads an editor search path into the app, updating the UI and the vector
  @param path the string path to laod
  */
-void MainFrameDerived::LoadEditorPath(const string& path){
+void MainFrameDerived::LoadEditorPath(const std::filesystem::path& path){
 	//add to internal structure and to file
 	installPaths.push_back(path);
 	SaveEditorVersions();
 
 	//add to the UI
 	wxArrayString a;
-	a.Add(path);
+	a.Add(path.string());
 
 	installsPathsList->Append(a);
 }
@@ -289,7 +291,7 @@ void MainFrameDerived::OnRevealProject(wxCommandEvent& event){
 	long selectedIndex = wxListCtrl_get_selected(projectsList);
 	if (selectedIndex > -1){
 		project& p = projects[selectedIndex];
-		reveal_in_explorer(p.path);
+		reveal_in_explorer(p.path.string());
 	}
 }
 
@@ -318,13 +320,13 @@ void MainFrameDerived::OpenProject(const long& index){
 	//get the project
 	project p = projects[index];
 
-	for(string path : installPaths){
-		string editorPath = path + dirsep + p.version + dirsep + executable;
+	for(auto& path : installPaths){
+		auto editorPath = path / p.version / executable;
 
 		//check that the unity editor exists at that location
-		if (file_exists(editorPath)){
+		if (filesystem::exists(editorPath)){
 
-			string cmd = "\"" + editorPath + "\" -projectpath \"" + p.path + "\"";
+			string cmd = "\"" + editorPath.string() + "\" -projectpath \"" + p.path.string() + "\"";
 
 			//start the process
 			launch_process(cmd);
@@ -343,7 +345,7 @@ void MainFrameDerived::OpenProject(const long& index){
  @param e the editor version to use when opening the project
  */
 void MainFrameDerived::OpenProject(const project& p, const editor& e){
-	string cmd = "\"" + e.path + dirsep + e.name + dirsep + executable + "\" -projectpath \"" + p.path + "\"";
+	string cmd = "\"" + (e.path / e.name / executable).string() + "\" -projectpath \"" + p.path.string() + "\"";
 	launch_process(cmd);
 }
 
@@ -408,18 +410,18 @@ project MainFrameDerived::LoadProject(const string &path){
  */
 void MainFrameDerived::SaveProjects(){
 	ofstream file;
-	file.open(datapath + dirsep + projectsFile);
+	file.open(datapath / projectsFile);
 	for (project& p : projects){
-		file << p.path << endl;
+		file << p.path.string() << endl;
 	}
 	file.close();
 }
 
 void MainFrameDerived::SaveEditorVersions(){
 	ofstream file;
-	file.open(datapath + dirsep + editorPathsFile);
-	for (string& p : installPaths){
-		file << p << endl;
+	file.open(datapath / editorPathsFile);
+	for (auto& p : installPaths){
+		file << p.string() << endl;
 	}
 	file.close();
 	LoadEditorVersions();
@@ -454,7 +456,7 @@ void MainFrameDerived::AddProject(const project& p){
 	projectsList->SetItem(i);
 
 	i.SetColumn(3);
-	i.SetText(p.path);
+	i.SetText(p.path.string());
 	projectsList->SetItem(i);
 
 	//resize columns
@@ -473,9 +475,9 @@ void MainFrameDerived::LoadEditorVersions(){
 	editors.clear();
 
 	//iterate over the search paths
-	for (string& path : installPaths){
+	for (auto& path : installPaths){
 		//open the folder
-		DIR* dir = opendir(path.c_str());
+		DIR* dir = opendir(path.string().c_str());
 		if(dir != nullptr){
 			struct dirent *entry = readdir(dir);
 			//loop over the contents
@@ -485,10 +487,10 @@ void MainFrameDerived::LoadEditorVersions(){
 				//is this a folder?
 				if (entry->d_type == DT_DIR){
 					//does this folder have a valid executable inside?
-					string p = string(path + dirsep + entry->d_name + dirsep + executable);
-					if (file_exists(p)){
+					auto p = path / entry->d_name / executable;
+					if (filesystem::exists(p)){
 						//add it to the list
-						a.Add(string(entry->d_name) + " - " + path);
+						a.Add(string(entry->d_name) + " - " + path.string());
 
 						//add it to the backing datastructure
 						editor e = {entry->d_name, path};

source/interface_derived.hpp

@@ -37,13 +37,13 @@ class MainFrameDerived : public MainFrame{
 	void OpenProject(const long& index);
 	void OpenProject(const project& p, const editor& e);
 	void SaveEditorVersions();
-	void LoadEditorPath(const std::string& path);
+	void LoadEditorPath(const std::filesystem::path& path);
 	void LoadEditorVersions();
 	void ReloadData();
 
 	//will store the list of projects
 	std::vector<project> projects;
-	std::vector<std::string> installPaths;
+	std::vector<std::filesystem::path> installPaths;
 	std::vector<editor> editors;
 	wxWebView* learnView = NULL;
 	const std::string homeurl = "https://learn.unity.com";
@@ -141,8 +141,8 @@ class MainFrameDerived : public MainFrame{
 		int id = installsList->GetSelection();
 		if (id != wxNOT_FOUND){
 			editor& e = editors[id];
-			std::string path = e.path + dirsep + e.name;
-			reveal_in_explorer(path);
+			std::filesystem::path path = e.path / e.name;
+			reveal_in_explorer(path.string());
 		}
 	}
 	/**
@@ -152,7 +152,7 @@ class MainFrameDerived : public MainFrame{
 	void OnRevealInstallLocation(wxCommandEvent& event){
 		int id = installsPathsList->GetSelection();
 		if (id != wxNOT_FOUND){
-			reveal_in_explorer(installPaths[id]);
+			reveal_in_explorer(installPaths[id].string());
 		}
 	}
     void OnOpenHub(wxCommandEvent& event);

source/open_with_dlg.cpp

@@ -19,7 +19,7 @@ OpenWithDlg::OpenWithDlg(wxWindow* parent, const project& project, const vector<
 	//populate list ctrl in reverse so ids match
 	wxArrayString a;
 	for (const editor& e : versions){
-		a.Add(e.name + " - " + e.path);
+		a.Add(e.name + " - " + e.path.string());
 	}
 	editorsListBox->InsertItems( a, 0);