Fix #21, cleanup

Interface_derived
~ if an editor is findable via multiple search paths, only add the first instance found

globals.h, globals.cpp
~ make some definitions constexpr
~ move a definition to own TU (will move more here eventually)

Author: Ravbug

CMakeLists.txt

@@ -25,7 +25,7 @@ if (APPLE)
 	set(OBJCPP "source/AppleUtilities.h" "source/AppleUtilities.mm")
 endif()
 add_executable("${PROJECT_NAME}" WIN32 ${source} "source/wxmac.icns" "source/windows.rc" ${OBJCPP})
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
 
 #wxwidgets
 set(wxBUILD_SHARED OFF CACHE INTERNAL "")

source/create_dialog_derived.cpp

@@ -11,6 +11,7 @@
 #include <dirent.h>
 #endif
 #include <wx/msgdlg.h>
+#include <fmt/format.h>
 
 using namespace std;
 
@@ -85,7 +86,13 @@ void CreateProjectDialogD::OnCreate(wxCommandEvent& event){
 
 		//create the command string
 		#if defined __APPLE__
-			string command = "\"" + executablePath.string() + "\" -createproject \"" + (filesystem::path(projPath) / projName).string() + "\" -cloneFromTemplate \"" + executableTemplatesPath.string() + templatePrefix + "." + templateName + "\"";
+        string command = fmt::format("\"{}\" -createProject \"{}\" -cloneFromTemplate \"{}{}.{}\"",
+                                     executablePath.string(),
+                                     (filesystem::path(projPath) / projName).string(),
+                                     executableTemplatesPath.string(),
+                                     templatePrefix,
+                                     templateName
+                                     );
 		#elif defined _WIN32
 			auto fullProj = std::filesystem::path("\"") / projPath / projName / "\"";
 			auto fullTemplate = std::filesystem::path("\"") / executableTemplatesPath / (templatePrefix + "." + templateName + "\"");

source/globals.cpp

@@ -0,0 +1,16 @@
+#include "globals.h"
+#include <fmt/format.h>
+
+void launch_process(const std::string& command, int flags) {
+#if defined __APPLE__ || defined __linux__
+    //the '&' runs the command nonblocking, and >/dev/null 2>&1 destroys output
+    auto fullcmd = fmt::format("{}{} &", command,null_device);
+    FILE* stream = popen(fullcmd.c_str(), "r");
+    pclose(stream);
+
+#elif _WIN32
+    //call wxExecute with the Async flag
+    wxExecute(wxString(command),flags);
+
+#endif
+}

source/globals.h

@@ -11,19 +11,18 @@
 #include <filesystem>
 
 //data file names
-static const std::string projectsFile = "projects.txt";
-static const std::string editorPathsFile = "editorPaths.txt";
-static const std::string templatePrefix = "com.unity.template";
-static const std::string AppVersion = "v1.5";
+static constexpr std::string_view projectsFile = "projects.txt";
+static constexpr std::string_view editorPathsFile = "editorPaths.txt";
+static constexpr std::string_view templatePrefix = "com.unity.template";
+static constexpr std::string_view AppVersion = "v1.51";
 
 #if defined __APPLE__
 	#include <pwd.h>
 	//the location to store application data
 	static const std::filesystem::path datapath = std::filesystem::path(getpwuid(getuid())->pw_dir) / "Library/Application Support/UnityHubNative";
-	static const char dirsep = '/';
 
     static const std::filesystem::path cachedir = std::filesystem::path(getpwuid(getuid())->pw_dir) / "/Library/Caches/com.ravbug.UnityHubNative/";
-	static const std::string installerExt = "dmg";
+	static constexpr std::string_view installerExt = "dmg";
 
 	//where to find various Unity things on macOS
 	static const std::filesystem::path executable = "Unity.app/Contents/MacOS/Unity";
@@ -33,7 +32,7 @@ static const std::string AppVersion = "v1.5";
 	static const std::filesystem::path templatesDir = "Unity.app/Contents/Resources/PackageManager/ProjectTemplates/";
 
 	//for stream redirecting to dev/null
-	static const std::string null_device = ">/dev/null 2>&1";
+	static constexpr std::string_view null_device = ">/dev/null 2>&1";
 
 #elif defined _WIN32
 //naming conflicts
@@ -46,7 +45,6 @@ static const std::string AppVersion = "v1.5";
 	static const std::filesystem::path homedir = homedrive / homepath;
 
 	static const std::filesystem::path datapath = homedir / std::filesystem::path("AppData\\Roaming\\UnityHubNative");
-	static const char dirsep = '\\';
 
 	static const std::filesystem::path cachedir = std::filesystem::temp_directory_path();
 	static const std::string installerExt = "exe";
@@ -117,7 +115,6 @@ static const std::string AppVersion = "v1.5";
 	#include <pwd.h>
 	static const std::filesystem::path datapath = std::filesystem::path(getpwuid(getuid())->pw_dir) / "UnityHubNative";
 	static const std::string null_device = ">/dev/null 2>&1";
-	static const char dirsep = '/';
 
 	static const std::filesystem::path executable = "Editor/Unity";
     static const std::vector<std::filesystem::path> defaultInstall = {std::filesystem::path(getpwuid(getuid())->pw_dir) / "Unity/Hub/Editor"};
@@ -136,6 +133,9 @@ struct project{
 	std::string version;
 	std::string modifiedDate;
 	std::filesystem::path path;
+    bool operator==(const project& other) const{
+        return this->path == other.path;
+    }
 };
 
 /**
@@ -144,18 +144,7 @@ struct project{
  @param command the shell command to run on the system
  @note The command passed to this function must be correct for the system it is running on. If it is not correct, the function will appear to do nothing.
  */
-inline void launch_process(const std::string& command, int flags = 0) {
-#if defined __APPLE__ || defined __linux__
-	//the '&' runs the command nonblocking, and >/dev/null 2>&1 destroys output
-	FILE* stream = popen(std::string(command + null_device + " &").c_str(), "r");
-	pclose(stream);
-
-#elif _WIN32
-	//call wxExecute with the Async flag
-	wxExecute(wxString(command),flags);
-
-#endif
-}
+void launch_process(const std::string& command, int flags = 0);
 
 inline void reveal_in_explorer(const std::string& path){
 #if defined __APPLE__
@@ -205,4 +194,8 @@ struct editor {
 	decltype(path) executablePath() const{
 		return path / name / executable;
 	}
+    
+    bool operator==(const editor& other){
+        return this->name == other.name;    // many editors can share a root path
+    }
 };

source/interface_derived.cpp

@@ -102,7 +102,7 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
 	//if no projects to load, the interface will be blank
 
 	//show current version in titlebar
-	this->SetLabel("Unity Hub Native " + AppVersion);
+	this->SetLabel(fmt::format("Unity Hub Native {}",AppVersion));
     projSearchCtrl->Bind(wxEVT_KEY_UP, &MainFrameDerived::Filter, this);
 	projSearchCtrl->SetFocus();
 }
@@ -303,6 +303,9 @@ void MainFrameDerived::OnPageChanging(wxBookCtrlEvent& event){
  */
 void MainFrameDerived::LoadEditorPath(const std::filesystem::path& path){
 	//add to internal structure and to file
+    if (std::find(installPaths.begin(),installPaths.end(),path) != installPaths.end()){
+        return;
+    }
 	installPaths.push_back(path);
 	SaveEditorVersions();
 
@@ -517,6 +520,11 @@ void MainFrameDerived::SaveEditorVersions(){
  */
 void MainFrameDerived::AddProject(const project& p, const std::string& filter, bool select){
 	//add to the vector backing the UI
+    if (std::find_if(projects.begin(),projects.end(),[&](const auto& item){
+        return p == item;
+    }) != projects.end()){
+        return;
+    }
 	projects.insert(projects.begin(),p);
 
 	//save to file
@@ -597,21 +605,23 @@ void MainFrameDerived::LoadEditorVersions(){
                                 char buffer[16];
                                 getCFBundleVersionFromPlist(infopath.string().c_str(), buffer, sizeof(buffer));
 
-                                a.Add(string(buffer) + " - " + path.string());
                                 //add it to the backing datastructure
                                 editor e = {buffer, path};
-
-                                editors.push_back(e);
+                                if (std::find(editors.begin(), editors.end(), e) == editors.end()){
+                                    a.Add(e.name + " - " + e.path.string());
+                                    editors.push_back(e);
+                                }
                             }
                         }
                         else
 #endif
                         {
-                            a.Add(string(entry->d_name) + " - " + path.string());
                             //add it to the backing datastructure
                             editor e = {entry->d_name, path};
-
-                            editors.push_back(e);
+                            if (std::find(editors.begin(), editors.end(), e) == editors.end()){
+                                a.Add(e.name + " - " + e.path.string());
+                                editors.push_back(e);
+                            }
                         }
 					}
 				}

source/interface_derived.hpp

@@ -75,7 +75,7 @@ class MainFrameDerived : public MainFrame{
     };
 
 	//will store the list of projects
-	std::vector<project> projects;
+	std::deque<project> projects;
 	std::vector<std::filesystem::path> installPaths;
 	std::vector<editor> editors;