update libcosmic and make test more usefull

Cargo.toml

@@ -43,5 +43,5 @@ log = "0.4"
 # kdl = "4.6.0"
 # knuffel = "3.2.0"
 indexmap = "2"
-bon = "2"
+bon = "3"
 pretty_assertions = "1"

configurator/Cargo.toml

@@ -59,3 +59,4 @@ features = [
 configurator_schema = { workspace = true }
 serial_test = "3"
 pretty_assertions.workspace = true
+dir-assert = "0.2"

configurator/src/app.rs

@@ -182,7 +182,8 @@ impl cosmic::Application for App {
                 name,
                 data_path,
                 page_id,
-            } => widget::dialog("Create")
+            } => widget::dialog()
+                .title("Create")
                 .control(text_input("name", name).on_input(AppMsg::DialogInput))
                 .primary_action(button::text("create").on_press(AppMsg::PageMsg(
                     *page_id,
@@ -198,7 +199,8 @@ impl cosmic::Application for App {
                 name,
                 data_path,
                 page_id,
-            } => widget::dialog("Rename")
+            } => widget::dialog()
+                .title("Rename")
                 .control(text_input("name", name).on_input(AppMsg::DialogInput))
                 .primary_action(button::text("rename").on_press(AppMsg::PageMsg(
                     *page_id,

configurator/src/providers/tests.rs

@@ -1,6 +1,8 @@
 use std::{collections::HashMap, fs, marker::PhantomData, path::Path, sync::LazyLock};
 
 use configurator_utils::ConfigFormat;
+use cosmic::cosmic_config::CosmicConfigEntry;
+use dir_assert::assert_paths;
 use figment::{
     value::{Tag, Value},
     Profile, Provider,
@@ -14,12 +16,28 @@ use pretty_assertions::assert_eq;
 
 /// 1. write the value
 /// 2. read the value and assert equal
-fn write_and_read<P: AsRef<Path>>(path: P, format: &ConfigFormat, initial_value: &Value) {
-    let _ = fs::remove_dir_all(path.as_ref());
+fn write_and_read<P: AsRef<Path>, S>(path: P, format: &ConfigFormat)
+where
+    S: Default + Serialize + CosmicConfigEntry,
+{
+    let _ = fs::remove_dir_all("tests");
+    let default_config = S::default();
+    let path = path.as_ref();
 
-    super::write(path.as_ref(), format, initial_value).unwrap();
+    {
+        let config_handler =
+            cosmic::cosmic_config::Config::with_custom_path("expected", 1, "tests".into()).unwrap();
+        default_config.write_entry(&config_handler).unwrap();
+    }
 
-    let value = super::read_from_format(path.as_ref(), format);
+
+    let initial_value = &Value::serialize(default_config).unwrap();
+
+    super::write(path, format, initial_value).unwrap();
+
+    assert_paths(path, "tests/cosmic/expected/v1").unwrap();
+
+    let value = super::read_from_format(path, format);
 
     let value = value.data().unwrap().remove(&Profile::Default).unwrap();
 
@@ -28,12 +46,8 @@ fn write_and_read<P: AsRef<Path>>(path: P, format: &ConfigFormat, initial_value:
     assert_eq!(initial_value, &value);
 }
 
-fn write_and_read_common<S: Default + Serialize>(format: &ConfigFormat) {
-    write_and_read(
-        "tests/cosmic_ron/config1",
-        format,
-        &Value::serialize(S::default()).unwrap(),
-    );
+fn write_and_read_common<S: Default + Serialize + CosmicConfigEntry>(format: &ConfigFormat) {
+    write_and_read::<_, S>("tests/cosmic/actual/v1", format);
 }
 
 #[test]

configurator/src/test_common.rs

@@ -1,9 +1,12 @@
-use std::collections::HashMap;
-
+use cosmic::{
+    cosmic_config::{self, cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry},
+    iced::Subscription,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, PartialEq)]
 #[serde(default)]
 pub struct Complex {
     x: String,
@@ -41,7 +44,7 @@ impl Default for Rec {
     }
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, PartialEq)]
 pub enum EnumComplex {
     A,
     B(i32),
@@ -86,81 +89,81 @@ impl Default for TestVeryComplex {
     }
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestBool {
     x: bool,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestString {
     x: String,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestNumber {
     x: i32,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestFloat {
     x: f32,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, PartialEq)]
 pub enum EnumSimple {
     #[default]
     A,
     B,
     C,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestEnumSimple {
     x: EnumSimple,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestEnumComplex {
     x: EnumComplex,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestOption {
     x: Option<String>,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestOptionComplex {
     x: Option<Complex>,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestTuple {
     x: (Option<Complex>, i32, String),
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestVec {
     x: Vec<Complex>,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, Default, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestHashMap {
     x: HashMap<String, Complex>,
 }
 
-#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize)]
+#[derive(Clone, Debug, JsonSchema, Serialize, Deserialize, CosmicConfigEntry)]
 #[serde(default)]
 pub struct TestVeryComplex {
     x: HashMap<String, Complex>,

cosmic_compat/schemas/com.system76.CosmicPanel.Dock.json

@@ -3,7 +3,7 @@
   "X_CONFIGURATOR_FORMAT": "cosmic_ron",
   "X_CONFIGURATOR_SOURCE_HOME_PATH": ".config/cosmic/com.system76.CosmicPanel.Dock/v1",
   "X_CONFIGURATOR_SOURCE_PATHS": "/usr/share/cosmic/com.system76.CosmicPanel.Dock/v1",
-  "X_CONFIGURATOR_WRITE_PATH": "/home/fedasus/Documents/configurator/configurator/test_configs/com.system76.CosmicPanel.Dock",
+  "X_CONFIGURATOR_WRITE_PATH": "/home/fedasus/SSD/Documents/configurator/configurator/test_configs/com.system76.CosmicPanel.Dock",
   "additionalProperties": false,
   "definitions": {
     "AutoHide": {

cosmic_compat/schemas/com.system76.CosmicPanel.Panel.json

@@ -3,7 +3,7 @@
   "X_CONFIGURATOR_FORMAT": "cosmic_ron",
   "X_CONFIGURATOR_SOURCE_HOME_PATH": ".config/cosmic/com.system76.CosmicPanel.Panel/v1",
   "X_CONFIGURATOR_SOURCE_PATHS": "/usr/share/cosmic/com.system76.CosmicPanel.Panel/v1",
-  "X_CONFIGURATOR_WRITE_PATH": "/home/fedasus/Documents/configurator/configurator/test_configs/com.system76.CosmicPanel.Panel",
+  "X_CONFIGURATOR_WRITE_PATH": "/home/fedasus/SSD/Documents/configurator/configurator/test_configs/com.system76.CosmicPanel.Panel",
   "additionalProperties": false,
   "definitions": {
     "AutoHide": {

dev/TODO.md

@@ -10,4 +10,15 @@
   - https://github.com/ron-rs/ron/issues/189
   - https://github.com/ron-rs/ron/issues/122
 - créer un nouveau type struct ValueDeserializer(NodeContainer)
-et implementer Deserializer dessu.
+  et implementer Deserializer dessu.
+
+ce qui ne marche pas
+
+- les enums ne sont pas bien serializées
+- figment::Value ne se serialize pas correctement en ron. Notament les key des Dict qui ne sont mis entre guillement, meme pour les noms des fields.
+
+comment tester ?
+
+1. implementer CosmicConfigEntry sur les struct de Test.
+2. Les écrires dans un repertoire
+3. assert que le contenu est égual a la generation du provider.