Merge branch 'dev'

Author: nomnomab

README.md

@@ -36,6 +36,11 @@ pnpm tauri build
 
 Then find the exe in `\src-tauri\target\release\`
 
+## Notes
+
+If you know how to get the package versions for a specific unity template, please let me know. Things like the built-in package somehow
+have updated package versions that aren't the recommended version, but aren't the versions in their template file anywhere.
+
 ## FAQ
 
 ### Why does my local package.json file keeps failing to be read?

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nomnom-unity-hub",
   "private": true,
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/src/assets/PackageClientTest.cs

@@ -0,0 +1,36 @@
+using System.Linq;
+using UnityEditor;
+using UnityEditor.PackageManager;
+using UnityEngine;
+using UnityEngine.Pool;
+
+public class PackageClientTest {
+    [MenuItem("PackageClientTest/PerformCheck")]
+    static void PerformCheck() {
+        var installed = Client.List();
+        while (!installed.IsCompleted) { }
+        
+        if (installed.Error != null) {
+            Debug.LogError(installed.Error);
+            return;
+        }
+        
+        var packages = Client.SearchAll(false);
+        while (!packages.IsCompleted) { }
+        
+        if (packages.Error != null) {
+            Debug.LogError(packages.Error);
+        }
+        else {
+            using var _ = ListPool<string>.Get(out var toAdd);
+            foreach (var package in packages.Result) {
+                if (installed.Result.All(x => x.name != package.name)) continue;
+                
+                Debug.Log($"{package.name}: {package.version} | latest: {package.versions.latest} | recommended: {package.versions.recommended}");
+                toAdd.Add(package.name);
+            }
+            
+            var request = Client.AddAndRemove(toAdd.ToArray());
+        }
+    }
+}

src-tauri/src/editor.rs

@@ -264,6 +264,9 @@ pub fn open(
     .clone();
 
   let exe_path = get_real_exe_path(&editor)?;
+
+  println!("Opening editor: {}", exe_path.display());
+  println!("Arguments: {:?}", arguments);
 
   if wait {
     std::process::Command::new(&exe_path)

src-tauri/src/generate.rs

@@ -150,6 +150,52 @@ pub fn generate_project(app: &tauri::AppHandle, app_state: &tauri::State<'_, App
     std::fs::write(&package_lock_path, serde_json::to_string_pretty(&json_str)?)?;
   }
 
+  let project_settings_path = package_cache_dir_out
+    .join("ProjectSettings")
+    .join("ProjectSettings.asset");
+
+  if project_settings_path.is_file() {
+    let project_settings = std::fs::read_to_string(&project_settings_path)?;
+    let mut lines = project_settings.lines().map(|x| x.to_string()).collect::<Vec<_>>();
+
+    for line in lines.iter_mut() {
+      let trimmed_line = line.trim();
+      if trimmed_line.starts_with("companyName: ") {
+        *line = "  companyName: DefaultCompany".to_string();
+        continue;
+      }
+
+      if trimmed_line.starts_with("productName: ") {
+        *line = format!("  productName: {}", project_info.name.clone());
+        break;
+      }
+    }
+
+    let project_settings = lines.join("\n");
+    std::fs::write(&project_settings_path, project_settings)?;
+  }
+
+  // let out_path = package_cache_dir_out
+  //   .to_str()
+  //   .ok_or(errors::str_error("Failed to convert path to string"))?
+  //   .to_string();
+  // println!("out path: {}", out_path);
+  
+  // let embedded_cs_script = include_str!("assets/PackageClientTest.cs");
+  // let embedded_cs_script_path = package_cache_dir_out
+  //   .join("Assets")
+  //   .join("PackageClientTest.cs");
+
+  // println!("writing script: {}", embedded_cs_script_path.display());
+  // std::fs::write(&embedded_cs_script_path, embedded_cs_script)?;
+
+  // println!("running script: {}", embedded_cs_script_path.display());
+  // crate::editor::open(template_info.editor_version.version.clone(), vec!["-quit".to_string(), "-batchmode".to_string(), "-projectPath".to_string(), format!("{}", out_path).to_string(), "-executeMethod".to_string(), "PackageClientTest.PerformCheck".to_string()], app_state, true)?;
+
+  // // delete script
+  // println!("deleting script: {}", embedded_cs_script_path.display());
+  // std::fs::remove_file(&embedded_cs_script_path)?;
+  
   // crate::project::update_project_open_time(app_state, package_cache_dir_out.clone(), app)?;
   // crate::project::cmd_open_project_in_editor(app.clone(), app_state.clone(), package_cache_dir_out.clone(), editor_version.clone())?;
 

src-tauri/src/project.rs

@@ -365,6 +365,8 @@ pub fn cmd_is_open_in_editor(project_path: PathBuf, editor_version: String, app_
     .ok_or(errors::str_error("Invalid project path"))?
     .to_string();
 
+  let project_name = format!("{} - ", project_name);
+
   // needs to start with project_name and contain Unity editor_version near the end
   // todo: make sure this works fine on other platforms
   let contains_title = titles

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Nomnoms Unity Hub",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   "tauri": {
     "allowlist": {
@@ -33,9 +33,7 @@
       "http": {
         "all": true,
         "request": true,
-        "scope": [
-          "https://raw.githubusercontent.com/*"
-        ]
+        "scope": ["https://raw.githubusercontent.com/*"]
       }
     },
     "windows": [