Merge branch 'dev'

Author: nomnomab

README.md

@@ -36,6 +36,12 @@ pnpm tauri build
 
 Then find the exe in `\src-tauri\target\release\`
 
+## FAQ
+
+### Why does my local package.json file keeps failing to be read?
+
+Makes sure the file is set to UTF8 encoding.
+
 ## Screenshots
 
 #### Projects

package.json

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

src-tauri/src/cache.rs

@@ -82,7 +82,7 @@ pub fn cmd_add_local_package_to_cache(app_handle: tauri::AppHandle, app_state: t
 pub fn cmd_remove_git_package_from_cache(app_handle: tauri::AppHandle, app_state: tauri::State<AppState>, package: package::MinimalPackage) -> Result<(), errors::AnyError> {
   let mut user_cache = app_state.user_cache.lock()
     .map_err(|_| errors::str_error("Failed to get user_cache. Is it locked?"))?;
-  user_cache.git_packages.retain(|p| p.name != package.name && p.version != package.version);
+  user_cache.git_packages.retain(|p| !(p.name == package.name && (p.version == package.version || (p.version.is_empty() && package.version.is_empty()))));
   app::save_user_cache_to_disk(&user_cache, &app_handle)?;
   Ok(())
 }
@@ -91,7 +91,7 @@ pub fn cmd_remove_git_package_from_cache(app_handle: tauri::AppHandle, app_state
 pub fn cmd_remove_local_package_from_cache(app_handle: tauri::AppHandle, app_state: tauri::State<AppState>, package: package::MinimalPackage) -> Result<(), errors::AnyError> {
   let mut user_cache = app_state.user_cache.lock()
     .map_err(|_| errors::str_error("Failed to get user_cache. Is it locked?"))?;
-  user_cache.local_packages.retain(|p| p.name != package.name);
+  user_cache.local_packages.retain(|p| !(p.name == package.name && (p.version == package.version || (p.version.is_empty() && package.version.is_empty()))));
   app::save_user_cache_to_disk(&user_cache, &app_handle)?;
   Ok(())
 }

src-tauri/src/generate.rs

@@ -57,12 +57,6 @@ pub fn generate_project(app: &tauri::AppHandle, app_state: &tauri::State<'_, App
       .to_str()
       .ok_or(errors::str_error("Failed to convert path to string"))?
       .to_string();
-    // let tmp_path = package_cache_dir
-    //   .join("project")
-    //   .join("ProjectData~")
-    //   .to_str()
-    //   .ok_or(errors::str_error("Failed to convert path to string"))?
-    //   .to_string();
     let args = vec!["-createProject".to_string(), package_cache_dir_out_str, "-quit".to_string()];
     editor::open(editor_version.clone(), args, &app_state, true)?;
 
@@ -465,17 +459,17 @@ fn modify_package_json(json_root: &PathBuf, packages: &Vec<MinimalPackage>, outp
       None => package_json_path.clone()
     };
 
+    #[derive(serde::Deserialize)]
+    #[serde(rename_all = "camelCase")]
+    struct JsonData {
+      name: String,
+    }
+
     let json = std::fs::read_to_string(&package_json_path)?;
-    let json: serde_json::Value = serde_json::from_str(&json)?;
-    let name = json.as_object()
-      .ok_or(errors::str_error(&format!("Failed to get json object from {}", package_json_path.display())))?
-      .get("name")
-      .ok_or(errors::str_error(&format!("Failed to get name from {}", package_json_path.display())))?
-      .as_str()
-      .ok_or(errors::str_error(&format!("Failed to get name from {}", package_json_path.display())))?
-      .to_string();
+    let json: JsonData = serde_json::from_str(&json)
+      .map_err(|err| errors::str_error(&format!("Failed to parse json from {}, error: {:?}", package_json_path.display(), err)))?;
 
-    let name = name.clone();
+    let name = json.name.clone();
     let version = format!("file:{}", relative_path
       .to_str()
       .ok_or(errors::str_error("Failed to get str"))?

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Nomnoms Unity Hub",
-    "version": "1.0.4"
+    "version": "1.0.5"
   },
   "tauri": {
     "allowlist": {

src/context/new-project-context.tsx

@@ -376,9 +376,7 @@ export namespace NewProjectContext {
           packageInfo: {
             ...state.packageInfo,
             gitPackages: state.packageInfo.gitPackages.filter(
-              (x) =>
-                x.name !== action.package.name &&
-                x.version !== action.package.version
+              (x) => x !== action.package
             ),
           },
         };
@@ -388,9 +386,7 @@ export namespace NewProjectContext {
           packageInfo: {
             ...state.packageInfo,
             localPackages: state.packageInfo.localPackages.filter(
-              (x) =>
-                x.name !== action.package.name &&
-                x.version !== action.package.version
+              (x) => x !== action.package
             ),
           },
         };
@@ -400,14 +396,10 @@ export namespace NewProjectContext {
           packageInfo: {
             ...state.packageInfo,
             templatePackages: state.packageInfo.templatePackages.filter(
-              (x) =>
-                x.name !== action.package.name &&
-                x.version !== action.package.version
+              (x) => x !== action.package
             ),
             selectedPackages: state.packageInfo.selectedPackages.filter(
-              (x) =>
-                x.name !== action.package.name &&
-                x.version !== action.package.version
+              (x) => x !== action.package
             ),
           },
         };

src/views/new-project/package-view.tsx

@@ -161,12 +161,16 @@ export default function PackageView() {
     });
   }
 
-  function removePackage(package_: CategoryPackage, version: string) {
+  function removePackage(package_: CategoryPackage, version?: string) {
     const packages = packageInfo.selectedPackages;
     newProjectContext.dispatch({
       type: "set_selected_packages",
       packages: packages.filter(
-        (x) => !(x.name === package_.package_.name && x.version === version)
+        (x) =>
+          !(
+            x.name === package_.package_.name &&
+            (x.version === version || (x.version ?? "") === version)
+          )
       ),
     });
   }
@@ -199,7 +203,7 @@ export default function PackageView() {
     });
   }
 
-  function togglePackage(package_: CategoryPackage, version: string) {
+  function togglePackage(package_: CategoryPackage, version?: string) {
     if (isSelected(package_, version)) {
       removePackage(package_, version);
     } else {
@@ -344,7 +348,9 @@ export default function PackageView() {
                   onClick={() =>
                     togglePackage(
                       x,
-                      existingPackage?.version ?? x.package_.version
+                      existingPackage?.version ??
+                        x.package_.version ??
+                        undefined
                     )
                   }
                   destroyPackage={destroyPackage}