Merge branch 'dev'

Author: nomnomab

src-tauri/src/cache.rs

@@ -1,29 +1,39 @@
-use crate::{app::{self, AppState}, errors};
+use crate::{app::{self, AppState}, errors, package};
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum UserCacheKey {
-  LastEditorVersion
+  LastEditorVersion,
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct UserCache {
-  pub last_editor_version: Option<String>
+  pub last_editor_version: Option<String>,
+  pub git_packages: Vec<package::MinimalPackage>,
+  pub local_packages: Vec<package::MinimalPackage>,
 }
 
 impl Default for UserCache {
   fn default() -> Self {
     Self {
-      last_editor_version: None
+      last_editor_version: None,
+      git_packages: Vec::new(),
+      local_packages: Vec::new(),
     }
   }
 }
 
 // commands
 
 #[tauri::command]
-pub fn cmd_get_user_cache(app_state: tauri::State<AppState>) -> Result<UserCache, errors::AnyError> {
-    let user_cache = app::get_user_cache(&app_state)?;
+pub fn cmd_get_user_cache(app_handle: tauri::AppHandle, app_state: tauri::State<'_, AppState>) -> Result<UserCache, errors::AnyError> {
+    //let user_cache = app::get_user_cache(&app_state)?;
+    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(|x| std::path::Path::new(&x.name).exists());
+    app::save_user_cache_to_disk(&user_cache, &app_handle)?;
+    
     Ok(user_cache.clone())
 }
 
@@ -46,6 +56,42 @@ pub fn cmd_set_user_cache_value(app_handle: tauri::AppHandle, app_state: tauri::
     _ => return Err(errors::str_error("Invalid key")),
   }
 
+  app::save_user_cache_to_disk(&user_cache, &app_handle)?;
+  Ok(())
+}
+
+#[tauri::command]
+pub fn cmd_add_git_package_to_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.push(package);
+  app::save_user_cache_to_disk(&user_cache, &app_handle)?;
+  Ok(())
+}
+
+#[tauri::command]
+pub fn cmd_add_local_package_to_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.push(package);
+  app::save_user_cache_to_disk(&user_cache, &app_handle)?;
+  Ok(())
+}
+
+#[tauri::command]
+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);
+  app::save_user_cache_to_disk(&user_cache, &app_handle)?;
+  Ok(())
+}
+
+#[tauri::command]
+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);
   app::save_user_cache_to_disk(&user_cache, &app_handle)?;
   Ok(())
 }

src-tauri/src/main.rs

@@ -34,6 +34,10 @@ fn main() {
             cache::cmd_get_user_cache,
             cache::cmd_save_user_cache,
             cache::cmd_set_user_cache_value,
+            cache::cmd_add_git_package_to_cache,
+            cache::cmd_add_local_package_to_cache,
+            cache::cmd_remove_git_package_from_cache,
+            cache::cmd_remove_local_package_from_cache,
             // project
             project::cmd_get_default_project_path,
             project::cmd_remove_missing_projects,

src/components/editor-version-select.tsx

@@ -31,7 +31,7 @@ export default function EditorVersionSelect(props: Props) {
   const className =
     (props.style ?? "link") === "link"
       ? (props.className ?? "") +
-        " text-stone-200 underline underline-offset-4 decoration-stone-600"
+        " text-stone-200 underline underline-offset-4 decoration-stone-400"
       : (props.className ?? "") + " ";
   return (
     <>

src/context/new-project-context.tsx

@@ -71,7 +71,12 @@ export namespace NewProjectContext {
   interface PackageInfo {
     gitPackages: TauriTypes.MinimalPackage[];
     localPackages: TauriTypes.MinimalPackage[];
-    selectedPackages: string[];
+    selectedPackages: SelectedPackage[];
+  }
+
+  interface SelectedPackage {
+    name: string;
+    version?: string;
   }
 
   interface FilesInfo {
@@ -142,7 +147,7 @@ export namespace NewProjectContext {
       }
     | {
         type: "set_packages";
-        packages: string[];
+        packages: SelectedPackage[];
       }
     | { type: "set_files_root"; root: TauriTypes.FileDir }
     | { type: "set_files_open_folders"; folders: string[] }
@@ -156,7 +161,9 @@ export namespace NewProjectContext {
     | { type: "set_new_template_version"; version: string }
     | { type: "set_new_template_description"; description: string }
     | { type: "add_git_package"; package: { id: string; url: string } }
-    | { type: "add_local_package"; package: { path: string } };
+    | { type: "add_local_package"; package: { path: string } }
+    | { type: "remove_git_package"; package: TauriTypes.MinimalPackage }
+    | { type: "remove_local_package"; package: TauriTypes.MinimalPackage };
 
   const reducer = (state: State, action: Action): State => {
     switch (action.type) {
@@ -323,6 +330,30 @@ export namespace NewProjectContext {
             ],
           },
         };
+      case "remove_git_package":
+        return {
+          ...state,
+          packageInfo: {
+            ...state.packageInfo,
+            gitPackages: state.packageInfo.gitPackages.filter(
+              (x) =>
+                x.name !== action.package.name &&
+                x.version !== action.package.version
+            ),
+          },
+        };
+      case "remove_local_package":
+        return {
+          ...state,
+          packageInfo: {
+            ...state.packageInfo,
+            localPackages: state.packageInfo.localPackages.filter(
+              (x) =>
+                x.name !== action.package.name &&
+                x.version !== action.package.version
+            ),
+          },
+        };
       default:
         return state;
     }

src/utils/tauri-router.ts

@@ -3,6 +3,7 @@ import { TauriTypes } from "./tauri-types";
 
 export namespace TauriRouter {
   // app
+
   export async function show_path_in_file_manager(path: string): Promise<void> {
     return invoke("cmd_show_path_in_file_manager", { path });
   }
@@ -20,6 +21,7 @@ export namespace TauriRouter {
   }
 
   // prefs
+
   export async function get_prefs(): Promise<TauriTypes.Prefs> {
     return invoke("cmd_get_prefs");
   }
@@ -60,6 +62,34 @@ export namespace TauriRouter {
     return invoke("cmd_set_user_cache_value", { key, value });
   }
 
+  export async function add_git_package_to_cache(
+    _package: TauriTypes.MinimalPackage
+  ): Promise<void> {
+    return invoke("cmd_add_git_package_to_cache", { ["package"]: _package });
+  }
+
+  export async function remove_git_package_from_cache(
+    _package: TauriTypes.MinimalPackage
+  ): Promise<void> {
+    return invoke("cmd_remove_git_package_from_cache", {
+      ["package"]: _package,
+    });
+  }
+
+  export async function add_local_package_to_cache(
+    _package: TauriTypes.MinimalPackage
+  ): Promise<void> {
+    return invoke("cmd_add_local_package_to_cache", { ["package"]: _package });
+  }
+
+  export async function remove_local_package_from_cache(
+    _package: TauriTypes.MinimalPackage
+  ): Promise<void> {
+    return invoke("cmd_remove_local_package_from_cache", {
+      ["package"]: _package,
+    });
+  }
+
   // project
 
   export async function get_default_project_path(): Promise<string> {

src/utils/tauri-types.ts

@@ -23,6 +23,8 @@ export namespace TauriTypes {
 
   export interface UserCache {
     lastEditorVersion?: string;
+    gitPackages: TauriTypes.MinimalPackage[];
+    localPackages: TauriTypes.MinimalPackage[];
   }
 
   export enum UserCacheKey {

src/views/new-project/new-project-body.tsx

@@ -69,7 +69,9 @@ export default function NewProjectBody() {
         template: initialTemplateInfo.selectedTemplate,
         editorVersion: initialTemplateInfo.editorVersion,
         packages: packages.filter((x) =>
-          pack.selectedPackages.includes(x.name)
+          pack.selectedPackages.some(
+            (y) => y.name === x.name && y.version === x.version
+          )
         ),
         selectedFiles: [
           "package/package.json",
@@ -134,7 +136,9 @@ export default function NewProjectBody() {
         template: template.selectedTemplate,
         editorVersion: template.editorVersion,
         packages: packages.filter((x) =>
-          pack.selectedPackages.includes(x.name)
+          pack.selectedPackages.some(
+            (y) => y.name === x.name && y.version === x.version
+          )
         ),
         selectedFiles: trimmedPaths,
       };