Properly handle editors installed via DownloadAssistant on Mac

Author: Ravbug

CMakeLists.txt

@@ -24,7 +24,10 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/wxWidgets/build/cmake/modules"
 message("module path = ${CMAKE_MODULE_PATH}")
 
 file(GLOB source "source/*.cpp" "source/*.hpp" "source/*.h")
-add_executable("${PROJECT_NAME}" WIN32 ${source} "source/wxmac.icns" "source/windows.rc")
+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)
 
 #wxwidgets

source/AppleUtilities.h

@@ -0,0 +1,4 @@
+#pragma once
+#include <cstdint>
+
+void getCFBundleVersionFromPlist(const char* path, char* outbuf, uint8_t outbuf_size);

source/AppleUtilities.mm

@@ -0,0 +1,11 @@
+#include "AppleUtilities.h"
+#import <Cocoa/Cocoa.h>
+
+void getCFBundleVersionFromPlist(const char* path, char* outbuf, uint8_t outbuf_size){
+    NSString* pstr = [NSString stringWithUTF8String:path];
+    NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:pstr];
+    NSString* item = dict[@"CFBundleVersion"];
+    
+    memset(outbuf, 0, outbuf_size);
+    strncpy(outbuf, [item cStringUsingEncoding:NSUTF8StringEncoding], outbuf_size);
+}

source/add_install_dlg_derived.cpp

@@ -39,7 +39,6 @@ AddNewInstallDlg::AddNewInstallDlg(wxWindow* parent) : AddNewInstallDlgBase(pare
         this->GetAllVersions();
     });
     th.detach();
-    
 }
 
 void AddNewInstallDlg::PopulateTable(wxCommandEvent&){

source/globals.h

@@ -14,7 +14,7 @@
 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.41";
+static const std::string AppVersion = "v1.42";
 
 //structure for representing an editor and for locating it
 struct editor{

source/interface_derived.cpp

@@ -18,6 +18,9 @@
 
 #include <fmt/format.h>
 #include <filesystem>
+#if __APPLE__
+#include "AppleUtilities.h"
+#endif
 using namespace std;
 using namespace std::filesystem;
 
@@ -495,11 +498,33 @@ void MainFrameDerived::LoadEditorVersions(){
 					auto p = path / entry->d_name / executable;
 					if (filesystem::exists(p)){
 						//add it to the list
-						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 __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
+                        if (strcmp(entry->d_name, ".") == 0){
+                            auto infopath = path / entry->d_name / "Unity.app" / "Contents" / "Info.plist";
+                            if (filesystem::exists(infopath)){
+                                // read the file and look for CFBundleVersion
+                                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);
+                            }
+                        }
+                        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);
+                        }
 					}
 				}
 				entry = readdir(dir);

source/interface_derived.hpp

@@ -142,7 +142,12 @@ class MainFrameDerived : public MainFrame{
 		if (id != wxNOT_FOUND){
 			editor& e = editors[id];
 			std::filesystem::path path = e.path / e.name;
-			reveal_in_explorer(path.string());
+            if (!std::filesystem::exists(path)){
+                reveal_in_explorer(e.path);
+            }
+            else{
+                reveal_in_explorer(path.string());
+            }
 		}
 	}
 	/**