feat(WIP): edit projects from app

not working completly
constraint error???

Author: DefinitelyNotSimon13

Cargo.lock

@@ -17,6 +17,7 @@ tauri-build = { version = "2.0.1", features = [] }
 
 [dependencies]
 tauri = { version = "2", features = [] }
+chrono = { workspace = true, features = ["serde"] }
 tauri-plugin-shell = "2"
 serde_json = "1"
 serde = { version = "1", features = ["derive"] }

episko_gui_backend/Cargo.toml

@@ -1,21 +1,25 @@
-use std::path::Path;
+use std::{ops::Deref, path::Path};
 use tokio::sync::Mutex;
 use uuid::Uuid;
 
 use episko_lib::{
+    ApplyIf,
     files::File,
-    metadata::{metadata_handler::MetadataHandler, Metadata},
+    metadata::{Metadata, MetadataBuilder, metadata_handler::MetadataHandler},
 };
 
-use crate::AppState;
+use crate::{AppState, MetadataDco, MetadataDto};
 
 #[tauri::command]
-pub async fn get_all(state: tauri::State<'_, Mutex<AppState>>) -> Result<Vec<Metadata>, String> {
+pub async fn get_all(state: tauri::State<'_, Mutex<AppState>>) -> Result<Vec<MetadataDto>, String> {
     let state = state.lock().await;
 
     let projects = Metadata::all_from_db(&state.db)
         .await
-        .map_err(|err| err.to_string())?;
+        .map_err(|err| err.to_string())?
+        .into_iter()
+        .map(Into::into)
+        .collect();
 
     Ok(projects)
 }
@@ -24,12 +28,52 @@ pub async fn get_all(state: tauri::State<'_, Mutex<AppState>>) -> Result<Vec<Met
 pub async fn get_with_id(
     id: Uuid,
     state: tauri::State<'_, Mutex<AppState>>,
-) -> Result<Metadata, String> {
+) -> Result<MetadataDto, String> {
     let state = state.lock().await;
 
     Metadata::from_db(&state.db, id)
         .await
         .map_err(|err| err.to_string())
+        .map(Into::into)
+}
+
+#[tauri::command]
+pub async fn update_metadata(
+    id: Uuid,
+    updated: MetadataDco,
+    state: tauri::State<'_, Mutex<AppState>>,
+) -> Result<MetadataDto, String> {
+    let state = state.lock().await;
+
+    let metadata = Metadata::from_db(&state.db, id)
+        .await
+        .map_err(|err| err.to_string())?;
+
+    let metadata = metadata
+        .update()
+        .directory_path(&updated.directory)
+        .title(&updated.title)
+        .categories(updated.categories)
+        .languages(updated.languages)
+        .build_systems(updated.build_systems)
+        .apply_if(updated.preffered_ide, MetadataBuilder::preffered_ide)
+        .apply_if(updated.description.as_deref(), MetadataBuilder::description)
+        .apply_if(
+            updated.repository_url.as_deref(),
+            MetadataBuilder::repository_url,
+        )
+        .build()
+        .map_err(|err| err.to_string())?;
+
+    metadata
+        .write_to_db(&state.db)
+        .await
+        .map_err(|err| err.to_string())?;
+    metadata
+        .write_file(&metadata.directory)
+        .map_err(|err| err.to_string())?;
+
+    Ok(metadata.into())
 }
 
 #[tauri::command]

episko_gui_backend/src/commands.rs

@@ -1,16 +1,20 @@
 #![deny(clippy::pedantic)]
 #![allow(clippy::used_underscore_binding)]
+use chrono::{DateTime, Utc};
 use episko_lib::{
     config::ConfigHandler,
     database::DatabaseHandler,
     files::File as _,
-    metadata::{metadata_handler::MetadataHandler, Metadata},
+    metadata::{BuildSystem, Category, Ide, Language, Metadata, metadata_handler::MetadataHandler},
 };
+use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use tauri::Manager;
 
 mod commands;
-use commands::{get_all, get_with_id, load_from_directory, load_from_file};
+use commands::{get_all, get_with_id, load_from_directory, load_from_file, update_metadata};
+use std::path::PathBuf;
 use tokio::sync::Mutex;
+use uuid::Uuid;
 
 struct AppState {
     pub db: DatabaseHandler,
@@ -22,6 +26,59 @@ impl AppState {
     }
 }
 
+/// Dto data transfer object
+#[derive(Serialize, Deserialize, Debug)]
+struct MetadataDto {
+    id: Uuid,
+    directory: PathBuf,
+    title: String,
+    description: Option<String>,
+    categories: Vec<Category>,
+    languages: Vec<Language>,
+    build_systems: Vec<BuildSystem>,
+    preffered_ide: Option<Ide>,
+    repository_url: Option<String>,
+    created: DateTime<Utc>,
+    updated: DateTime<Utc>,
+}
+
+/// Dco data creation object
+#[derive(Serialize, Deserialize, Debug)]
+struct MetadataDco {
+    directory: PathBuf,
+    title: String,
+    description: Option<String>,
+    categories: Vec<Category>,
+    languages: Vec<Language>,
+    build_systems: Vec<BuildSystem>,
+    preffered_ide: Option<Ide>,
+    repository_url: Option<String>,
+}
+
+impl MetadataDco {
+    fn create() -> Result<Metadata, String> {
+        todo!()
+    }
+}
+
+impl From<Metadata> for MetadataDto {
+    fn from(metadata: Metadata) -> MetadataDto {
+        MetadataDto {
+            id: metadata.id,
+            directory: metadata.directory,
+            title: metadata.title,
+            description: metadata.description,
+            categories: metadata.categories,
+            languages: metadata.languages,
+            build_systems: metadata.build_systems,
+            preffered_ide: metadata.preffered_ide,
+            repository_url: metadata.repository_url,
+            created: metadata.created,
+            updated: metadata.updated,
+        }
+    }
+}
+
 /// !TODO!
 ///
 /// # Errors
@@ -61,6 +118,7 @@ pub async fn run() -> Result<(), Box<dyn std::error::Error>> {
         .invoke_handler(tauri::generate_handler![
             get_all,
             get_with_id,
+            update_metadata,
             load_from_file,
             load_from_directory,
         ])

episko_gui_backend/src/lib.rs

@@ -80,21 +80,21 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// Metadata structure containing information about a project.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Metadata {
-    pub(crate) id: Uuid,
+    pub id: Uuid,
     #[serde(skip)]
-    pub(crate) directory: PathBuf,
-    pub(crate) title: String,
-    pub(crate) description: Option<String>,
+    pub directory: PathBuf,
+    pub title: String,
+    pub description: Option<String>,
     #[serde(rename = "category")]
-    pub(crate) categories: Vec<Category>,
+    pub categories: Vec<Category>,
     #[serde(rename = "language")]
-    pub(crate) languages: Vec<Language>,
+    pub languages: Vec<Language>,
     #[serde(rename = "build_system")]
-    pub(crate) build_systems: Vec<BuildSystem>,
-    pub(crate) preffered_ide: Option<Ide>,
-    pub(crate) repository_url: Option<String>,
-    pub(crate) created: DateTime<Utc>,
-    pub(crate) updated: DateTime<Utc>,
+    pub build_systems: Vec<BuildSystem>,
+    pub preffered_ide: Option<Ide>,
+    pub repository_url: Option<String>,
+    pub created: DateTime<Utc>,
+    pub updated: DateTime<Utc>,
 }
 
 impl Metadata {
@@ -189,7 +189,7 @@ mod tests {
     fn test_metadata_checksum_is_consistent() {
         let metadata = get_simple_metadata();
         let checksum1 = metadata.get_hash().unwrap();
-        for i in 0..100 {
+        for _ in 0..100 {
             let checksum2 = metadata.get_hash().unwrap();
             assert_eq!(checksum1, checksum2)
         }

episko_lib/src/metadata.rs

@@ -17,7 +17,6 @@
       {
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
-            rustfmt
             bacon
           ];
           nativeBuildInputs = with pkgs; [
@@ -29,7 +28,6 @@
             cargo-tauri
             cargo-update
             cargo-watch
-            rustc
             gobject-introspection
             gtk3
             gtk4

flake.nix

@@ -1,6 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
-import type { Metadata, Uuid } from './types';
-import { parseMetadata, parseMetadataArray } from './schemas/metadata';
+import type { FormMetadata, Metadata, Uuid } from './types';
+import { parseMetadata, parseMetadataArray, parseMetadataDco } from './schemas/metadata';
 
 export default {
 	async get_all(): Promise<Metadata[]> {
@@ -11,6 +11,10 @@ export default {
 		return invoke('get_with_id', { id: id }).then((data) => parseMetadata(data));
 	},
 
+	async update_metadata(id: Uuid, updated: FormMetadata): Promise<Metadata> {
+		return invoke('update_metadata', { id: id, updated: parseMetadataDco(updated) }).then((data) => parseMetadata(data));
+	},
+
 	async load_from_file(path: string): Promise<Uuid> {
 		return invoke('load_from_file', { path: path });
 	},

src/lib/commands.ts

@@ -3,11 +3,14 @@
 	import FormLanguages from './form-languages.svelte';
 	import { Input } from '$lib/components/ui/input';
 	import type { FormMetadata, Metadata } from '$lib/types';
-	import { type SuperValidated, superForm } from 'sveltekit-superforms';
+	import { type SuperValidated, setError, setMessage, superForm } from 'sveltekit-superforms';
 	import { zodClient } from 'sveltekit-superforms/adapters';
 	import { MetadataFormSchema } from '$lib/schemas/metadata';
 	import Badge from '../ui/badge/badge.svelte';
 	import { Button } from '../ui/button';
+	import { goto } from '$app/navigation';
+	import Commands from '$lib/commands';
+	import { upsertMetadata } from '../../../routes/metadata-state.svelte';
 
 	interface Props {
 		metadata?: Metadata;
@@ -20,7 +23,29 @@
 	const form = superForm(formProp, {
 		SPA: true,
 		validators: zodClient(MetadataFormSchema),
-		dataType: 'json'
+		dataType: 'json',
+		onUpdate: async ({ form }) => {
+			console.log('FormValid:', form.valid);
+			if (form.valid) {
+				if (metadata) {
+					console.log('Metadata found');
+					await Commands.update_metadata(metadata.id, form.data)
+						.then((metadata) => {
+							console.log('Promise resolved');
+							upsertMetadata(metadata);
+							history.back();
+						})
+						.catch((err) => {
+							console.error('Promise failed:', err);
+							setError(form, err);
+						});
+				} else {
+					setMessage(form, 'TODO: Create');
+				}
+			} else {
+				console.log('Helloo I am under the water');
+			}
+		}
 	});
 
 	const { form: formData, enhance } = form;
@@ -39,21 +64,33 @@
 </script>
 
 <h1>{formTitle}</h1>
-<form use:enhance>
+<form method="POST" use:enhance>
+	<Form.Field {form} name="directory">
+		<Form.Control>
+			{#snippet children({ props })}
+				<Form.Label>Directory</Form.Label>
+				<Input {...props} bind:value={$formData.directory} />
+			{/snippet}
+		</Form.Control>
+		<Form.FieldErrors />
+		<Form.Description>Todo: Use tauri file chooser</Form.Description>
+	</Form.Field>
+
 	<Form.Field {form} name="title">
 		<Form.Control>
 			{#snippet children({ props })}
 				<Form.Label>Title</Form.Label>
 				<Input {...props} bind:value={$formData.title} />
 			{/snippet}
 		</Form.Control>
-		<Form.Description>TBC: Title of the Project</Form.Description>
 		<Form.FieldErrors />
+		<Form.Description>TBC: Title of the Project</Form.Description>
 	</Form.Field>
 
 	<FormLanguages {form} />
 
 	<!-- similiar like languages probably also seperate component-->
+	Categories
 	{#each $formData.categories as _, i}
 		<Badge
 			>{$formData.categories[i].name}