Begin trying to deal with external mac installs

Author: Ravbug

source/Info.plist

@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.55</string>
+	<string>1.56</string>
 	<key>CFBundleSignature</key>
 	<string>UNHn</string>
 	<key>CFBundleVersion</key>

source/add_install_dlg_derived.cpp

@@ -107,7 +107,7 @@ void AddNewInstallDlg::GetAllVersions(){
 							if (strncmp(r.text.data() + i, match.data(), match.size()) == 0){
 								// we have found a version, extract its data
 								auto begin = i + match.size();
-								auto end = r.text.find_first_of("\"", i + match.size());
+								auto end = std::min(r.text.find_first_of("\"", i + match.size()), r.text.find_first_of("\\", i + match.size()));
 								std::string_view versiondata(r.text.data() + begin,end-begin);
 
 								// get the version and hashcode
@@ -118,7 +118,8 @@ void AddNewInstallDlg::GetAllVersions(){
 
 								auto version = string(string_view(versiondata.data(),slashpos));
 								if (versionDates.find(version) != versionDates.end()){
-									versions.emplace_back(version,string(string_view(versiondata.data() + slashpos + 1, versiondata.size() - slashpos - 1)), versionDates.at(version));
+                                    auto hashcode = string(string_view(versiondata.data() + slashpos + 1, versiondata.size() - slashpos - 1));
+									versions.emplace_back(version,hashcode, versionDates.at(version));
 								}
 							}
 						}

source/create_dialog_derived.cpp

@@ -168,7 +168,12 @@ void CreateProjectDialogD::loadTemplates(const editor& e){
 	templateCtrl->ClearAll();
 
 	//open the folder
+#if __APPLE__
+    auto templatesFolder = e.path / templatesDir;
+
+#else
 	auto templatesFolder = e.path /e.name / templatesDir;
+#endif
 
     for(const auto& entry : std::filesystem::directory_iterator{templatesFolder}){
         //does the file start with the correct prefix?

source/globals.h

@@ -14,7 +14,7 @@
 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.55";
+static constexpr std::string_view AppVersion = "v1.56";
 
 struct wxListCtrl;
 struct wxWindow;
@@ -117,7 +117,11 @@ struct editor {
 	std::string name;
 	std::filesystem::path path;
 	decltype(path) executablePath() const {
+#if __APPLE__
+        return path / executable;
+#else
 		return path / name / executable;
+#endif
 	}
 
 	bool operator==(const editor& other) {

source/interface_derived.cpp

@@ -395,23 +395,6 @@ void MainFrameDerived::OpenProject(const long& index){
             return;
         }
     }
-#if __APPLE__
-    for (const auto& path : installPaths) {
-        if (filesystem::exists(path / executable)) {
-            // mac unlabeled version
-            auto unlabeledPath = path / executable;
-            char buffer[16];
-            auto unlabeledPathInfo = path / "Unity.app" / "Contents" / "Info.plist";
-            getCFBundleVersionFromPlist(unlabeledPathInfo.string().c_str(), buffer, sizeof(buffer));
-            if (p.version == buffer) {
-                string cmd = "\"" + unlabeledPath.string() + "\" -projectpath \"" + p.path.string() + "\"";
-                launch_process(cmd);
-                return;
-            }
-        }
-    }
-#endif
-    
 
     // prompt the user to choose a new editor because we couldn't locate one
     wxCommandEvent evt;
@@ -445,7 +428,7 @@ const char* const PlatToStr(TargetPlatform plat) {
  @param e the editor version to use when opening the project
  */
 void MainFrameDerived::OpenProject(const project& p, const editor& e, TargetPlatform plat){
-	string cmd = "\"" + (e.path / e.name / executable).string() + "\" -projectpath \"" + p.path.string() + "\"";
+	string cmd = "\"" + e.executablePath().string() + "\" -projectpath \"" + p.path.string() + "\"";
     if (plat != TargetPlatform::CurrentPlatform) {
         auto str = PlatToStr(plat);
         cmd += fmt::format(" -buildTarget {}", str);
@@ -595,8 +578,6 @@ void MainFrameDerived::LoadEditorVersions(){
     wxCommandEvent e;
     OnSelectEditor(e);
 	editors.clear();
-    
-
 
 	//iterate over the search paths
 	for (auto& path : installPaths){
@@ -630,38 +611,35 @@ void MainFrameDerived::LoadEditorVersions(){
             //is this a folder?
             if (dir_entry.is_directory()){
                 //does this folder have a valid executable inside?
-                auto p = path / entry.filename() / executable;
-                if (filesystem::exists(p)){
-                    //add it to the list
+                
+                //add it to the list
 #if __APPLE__
-                    // the Unity Download Assistant on Mac does not allow multiple
-                    // unity versions at once, which sucks. To get the version,
-                    // we need to parse the info.plist inside of Unity.app
-                    auto pathstr = entry.filename().string();
-                    if (pathstr == "."){
-                        auto infopath = path / entry.filename() / "Unity.app" / "Contents" / "Info.plist";
-                        if (filesystem::exists(infopath)){
-                            // read the file and look for CFBundleVersion
-                            char buffer[16]{0};
-                            getCFBundleVersionFromPlist(infopath.string().c_str(), buffer, sizeof(buffer));
-                            
-                            //add it to the backing datastructure
-                            editor e = {buffer, path};
-                            addInstall(e);
-                        }
-                    }
-                    else
-#endif
-                    {
-                        //add it to the backing datastructure
-                        editor e = {entry.filename(), path};
-                        addInstall(e);
-                    }
+                // the Unity Download Assistant on Mac does not allow multiple
+                // unity versions at once, which sucks. To get the version,
+                // we need to parse the info.plist inside of Unity.app
+                auto infopath = entry / "Unity.app" / "Contents" / "Info.plist";
+                if (filesystem::exists(infopath)){
+                    // read the file and look for CFBundleVersion
+                    char buffer[16]{0};
+                    getCFBundleVersionFromPlist(infopath.string().c_str(), buffer, sizeof(buffer));
+                    
+                    //add it to the backing datastructure
+                    editor e = {buffer, entry};
+                    addInstall(e);
                 }
+#else
+                auto p = entry / executable;
+                if (filesystem::exists(p)){
+                    //add it to the backing datastructure
+                    editor e = {entry.filename(), p};
+                    addInstall(e);
+                }
+#endif
             }
 
             installsList->Append(a);
         }
+        
 	}
 }