.gitignore

@@ -21,5 +21,3 @@ target/
 *.sln
 *.sw?
 
-# Ignore .env files
-.env

Cargo.lock

@@ -92,7 +92,6 @@ dependencies = [
  "notify 6.1.1",
  "serde",
  "systemfd",
- "thiserror",
  "tokio",
  "tower-http",
  "tower-livereload",
@@ -1067,7 +1066,6 @@ dependencies = [
  "http",
  "tauri",
  "tauri-build",
- "thiserror",
  "tokio",
  "tower",
 ]
@@ -1082,15 +1080,6 @@ dependencies = [
  "crypto-common",
 ]
 
-[[package]]
-name = "directories"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -3926,11 +3915,8 @@ dependencies = [
 name = "sesam-vitale"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "dotenv",
  "libc",
- "thiserror",
- "utils",
 ]
 
 [[package]]
@@ -5048,15 +5034,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utils"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "directories",
- "dotenv",
-]
-
 [[package]]
 name = "uuid"
 version = "0.8.2"

Cargo.toml

@@ -3,6 +3,5 @@ resolver = "2"
 members = [
     "crates/app",
     "crates/sesam-vitale",
-    "crates/desktop",
-    "crates/utils",
+    "crates/desktop"
 ]

README.md

@@ -7,20 +7,6 @@ Logiciel de Pharmacie libre et open-source.
 - `app`: Interface du logiciel, servie par un serveur web propulsé par Axum. Utilisable en mode endpoint ou encapsulé dans le client `desktop`
 - `desktop`: Client desktop propulsé par Tauri, encapsulant le serveur web `app`
 - `sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
-- `utils`: Bibliothèque de fonctions utilitaires
-
-## Installation
-
-### Fichiers de configuration
-
-Certaines librairies nécessitent de définir certaines paramètres de configuration pour fonctionner correctement, en particulier le moteur SESAM-Vitale.
-
-Ces paramètres sont définis dans un fichier de configuration `.env` situé dans un des dossiers suivant (par ordre de priorité) :
-- dans le dossier courant (`./.env`)
-- dans le dossier du manifeste (par exemple `crates/sesam-vitale/.env`)
-- dans le dossier de configuration standard de l'OS (par exemple, sur linux, `~/.config/krys4lide/.env` - [plus d'info](https://github.com/dirs-dev/directories-rs?tab=readme-ov-file#projectdirs))
-
-Des exemples de fichiers de configuration sont disponibles à la racine du projet : `.env.linux.example` et `.env.win.example`.
 
 ## Development
 

crates/app/Cargo.toml

@@ -10,7 +10,6 @@ axum = "0.7.5"
 listenfd = "1.0.1"
 notify = "6.1.1"
 serde = { version = "1.0.204", features = ["derive"] }
-thiserror = "1.0.63"
 tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
 tower-http = { version = "0.5.2", features = ["fs"] }
 tower-livereload = "0.9.3"

crates/app/src/main.rs

@@ -3,23 +3,12 @@ use axum::body::Body;
 use axum::http::Request;
 use listenfd::ListenFd;
 use notify::Watcher;
+use std::env;
 use std::path::Path;
-use std::{env, io};
-use thiserror::Error;
 use tokio::net::TcpListener;
 use tower_livereload::predicate::Predicate;
 use tower_livereload::LiveReloadLayer;
 
-#[derive(Error, Debug)]
-pub enum AppError {
-    #[error("Unable to bind to TCP listener")]
-    TCPListener(#[from] std::io::Error),
-    #[error("Error with the notify watcher")]
-    NotifyWatcher(#[from] notify::Error),
-    #[error("Missing environment variable {var}")]
-    MissingEnvVar { var: &'static str },
-}
-
 /// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
 /// Voir https://github.com/leotaku/tower-livereload/pull/3
 #[derive(Copy, Clone)]
@@ -31,47 +20,44 @@ impl<T> Predicate<Request<T>> for NotHtmxPredicate {
 }
 
 const DEFAULT_LISTENER: &str = "localhost:3000";
-async fn get_tcp_listener() -> Result<TcpListener, io::Error> {
+async fn get_tcp_listener() -> TcpListener {
     let mut listenfd = ListenFd::from_env();
 
-    match listenfd.take_tcp_listener(0)? {
+    match listenfd.take_tcp_listener(0).unwrap() {
         // if we are given a tcp listener on listen fd 0, we use that one
         Some(listener) => {
-            listener.set_nonblocking(true)?;
-            Ok(TcpListener::from_std(listener)?)
+            listener.set_nonblocking(true).unwrap();
+            TcpListener::from_std(listener).unwrap()
         }
         // otherwise fall back to local listening
-        None => Ok(TcpListener::bind(DEFAULT_LISTENER).await?),
+        None => TcpListener::bind(DEFAULT_LISTENER).await.unwrap(),
     }
 }
 
-fn get_livereload_layer(
-    templates_path: &Path,
-) -> Result<LiveReloadLayer<NotHtmxPredicate>, notify::Error> {
+fn get_livereload_layer(templates_path: &Path) -> LiveReloadLayer<NotHtmxPredicate> {
     let livereload = LiveReloadLayer::new();
     let reloader = livereload.reloader();
-    let mut watcher = notify::recommended_watcher(move |_| reloader.reload())?;
-    watcher.watch(templates_path, notify::RecursiveMode::Recursive)?;
-    Ok(livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate))
+    let mut watcher = notify::recommended_watcher(move |_| reloader.reload()).unwrap();
+    watcher
+        .watch(templates_path, notify::RecursiveMode::Recursive)
+        .unwrap();
+    livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate)
 }
 
 #[tokio::main]
-async fn main() -> Result<(), AppError> {
-    let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
-        var: "CARGO_MANIFEST_DIR",
-    })?;
+async fn main() {
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let assets_path = Path::new(&manifest_dir).join("assets");
     let templates_path = Path::new(&manifest_dir).join("templates");
 
-    let livereload_layer =
-        get_livereload_layer(&templates_path).map_err(AppError::NotifyWatcher)?;
+    let livereload_layer = get_livereload_layer(&templates_path);
     let router = get_router(assets_path.as_path()).layer(livereload_layer);
 
-    let listener: TcpListener = get_tcp_listener().await.map_err(AppError::TCPListener)?;
-    let local_addr = listener.local_addr().map_err(AppError::TCPListener)?;
-    println!("Listening on: http://{}", local_addr);
+    let listener: TcpListener = get_tcp_listener().await;
+    println!("Listening on: http://{}", listener.local_addr().unwrap());
 
     // Run the server with the router
-    axum::serve(listener, router.into_make_service()).await?;
-    Ok(())
+    axum::serve(listener, router.into_make_service())
+        .await
+        .unwrap();
 }

crates/desktop/Cargo.toml

@@ -21,5 +21,4 @@ tokio = "1.39.1"
 app = { path = "../app" }
 http = "1.1.0"
 bytes = "1.6.1"
-thiserror = "1.0.63"
 

crates/desktop/src/lib.rs

@@ -1,30 +1,21 @@
-use axum::body::{to_bytes, Body};
-use axum::Router;
 use bytes::Bytes;
 use http::{request, response, Request, Response};
 use std::path::PathBuf;
 use std::sync::Arc;
+
+use axum::body::{to_bytes, Body};
+
+use axum::Router;
+
 use tauri::path::BaseDirectory;
 use tauri::Manager;
-use thiserror::Error;
 use tokio::sync::{Mutex, MutexGuard};
 use tower::{Service, ServiceExt};
 
-#[derive(Error, Debug)]
-pub enum DesktopError {
-    #[error("Axum error:\n{0}")]
-    Axum(#[from] axum::Error),
-    #[error("Infallible error")]
-    Infallible(#[from] std::convert::Infallible),
-}
-
-/// Process requests sent to Tauri (with the `axum://` protocol) and handle them with Axum
-/// When an error occurs, this function is expected to panic, which should result in a 500 error
-/// being sent to the client, so we let the client handle the error recovering
 async fn process_tauri_request(
     tauri_request: Request<Vec<u8>>,
     mut router: MutexGuard<'_, Router>,
-) -> Result<Response<Vec<u8>>, DesktopError> {
+) -> Response<Vec<u8>> {
     let (parts, body): (request::Parts, Vec<u8>) = tauri_request.into_parts();
     let axum_request: Request<Body> = Request::from_parts(parts, body.into());
 
@@ -32,16 +23,17 @@ async fn process_tauri_request(
         .as_service()
         .ready()
         .await
-        .map_err(DesktopError::Infallible)?
+        .expect("Failed to get ready service from router")
         .call(axum_request)
         .await
-        .map_err(DesktopError::Infallible)?;
+        .expect("Could not get response from router");
 
     let (parts, body): (response::Parts, Body) = axum_response.into_parts();
-    let body: Bytes = to_bytes(body, usize::MAX).await?;
+    let body: Bytes = to_bytes(body, usize::MAX).await.unwrap_or_default();
 
     let tauri_response: Response<Vec<u8>> = Response::from_parts(parts, body.into());
-    Ok(tauri_response)
+
+    tauri_response
 }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -51,7 +43,7 @@ pub fn run() {
             let assets_path: PathBuf = app
                 .path()
                 .resolve("assets", BaseDirectory::Resource)
-                .expect("Assets path should be resolvable");
+                .expect("Path should be resolvable");
 
             // Adds Axum router to application state
             // This makes it so we can retrieve it from any app instance (see bellow)
@@ -68,19 +60,8 @@ pub fn run() {
             // Spawn a new async task to process the request
             tauri::async_runtime::spawn(async move {
                 let router = router.lock().await;
-                match process_tauri_request(request, router).await {
-                    Ok(response) => responder.respond(response),
-                    Err(err) => {
-                        let body = format!("Failed to process an axum:// request:\n{}", err);
-                        responder.respond(
-                            http::Response::builder()
-                                .status(http::StatusCode::BAD_REQUEST)
-                                .header(http::header::CONTENT_TYPE, "text/plain")
-                                .body::<Vec<u8>>(body.into())
-                                .expect("BAD_REQUEST response should be valid"),
-                        )
-                    }
-                }
+                let response = process_tauri_request(request, router).await;
+                responder.respond(response);
             });
         })
         .run(tauri::generate_context!())

crates/sesam-vitale/.env.build.win

@@ -0,0 +1,3 @@
+SESAM_FSV_VERSION=1.40.14
+SESAM_FSV_LIB_PATH="C:/Program Files/santesocial/fsv/${SESAM_FSV_VERSION}/lib"
+SESAM_FSV_SSVLIB=ssvw64

crates/sesam-vitale/.env.win

@@ -0,0 +1,2 @@
+SESAM_FSV_VERSION=1.40.14
+SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini

crates/sesam-vitale/.env.win copy.example

@@ -1,2 +1,2 @@
-SESAM_FSV_VERSION=1.40.13
-SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
+SESAM_FSV_VERSION=1.40.13
+SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini

crates/sesam-vitale/Cargo.toml

@@ -4,10 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0"
+dotenv = "0.15"
 libc = "0.2"
-thiserror = "1.0"
-utils = { path = "../utils" }
 
 [build-dependencies]
 dotenv = "0.15"

crates/sesam-vitale/build.rs

@@ -1,13 +1,13 @@
+extern crate dotenv;
+
 use std::env;
 use std::path::PathBuf;
 
-use dotenv::from_path;
-
 fn main() {
     // Load the .env.build file for build-time environment variables
-    let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR must be set");
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let manifest_path = PathBuf::from(manifest_dir);
-    from_path(manifest_path.join(".env.build")).ok();
+    dotenv::from_path(manifest_path.join(".env.build")).ok();
 
     println!("cargo::rerun-if-env-changed=SESAM_FSV_LIB_PATH");
     println!("cargo::rerun-if-env-changed=SESAM_FSV_SSVLIB");
@@ -22,13 +22,12 @@ fn main() {
     );
 
     // Add the SESAM_FSV_LIB_PATH to the linker search path
-    let fsv_lib_path =
-        PathBuf::from(env::var("SESAM_FSV_LIB_PATH").expect("SESAM_FSV_LIB_PATH must be set"));
+    let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
     println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
 
     // Add the SESAM_FSV_LIB_PATH to the PATH environment variable
     if cfg!(target_os = "windows") {
-        let path = env::var("PATH").unwrap_or_default();
+        let path = env::var("PATH").unwrap_or(String::new());
         println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
     } else if cfg!(target_os = "linux") {
         println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
@@ -37,7 +36,7 @@ fn main() {
     // Link the SESAM_FSV_SSVLIB dynamic library
     println!(
         "cargo::rustc-link-lib=dylib={}",
-        env::var("SESAM_FSV_SSVLIB").expect("SESAM_FSV_SSVLIB must be set")
+        env::var("SESAM_FSV_SSVLIB").unwrap()
     );
     // TODO : try `raw-dylib` instead of `dylib` on Windows to avoid the need of the `lib` headers compiled from the `def`
 }

crates/sesam-vitale/src/cartevitale.rs

@@ -0,0 +1,876 @@
+use libc::{c_void, size_t};
+use std::ffi::CString;
+use std::ptr;
+
+use crate::libssv::SSV_LireDroitsVitale;
+
+use crate::ssv_memory::{decode_ssv_memory, Block};
+
+#[derive(Debug, Default)]
+pub struct CarteVitale {
+    donneesAssure: DonneesAssure,
+    serviceAMOFamille: ServiceAMOFamille,
+    donneesAccidentTravail: DonneesAccidentTravail,
+    donneesBeneficiaire: Vec<DonneesBeneficiaire>,
+}
+
+// 1. CB = Caractères Binaires »
+// 2. CE = Caractères « Etendus » (ISO 8859-1)
+// 3. CA = Caractères Alphanumériques (ASCII?)
+// 4. CN = Caractères Numériques
+#[derive(Debug, Default)]
+struct DonneesAssure {
+    type_de_carte_vitale: char,                // CA
+    numero_de_serie: String,                   // CN - 1 -> 20
+    date_de_fin_de_validite: String,           // CN - Format AAAAMMJJ0000
+    donnees_administration_ruf1: char,         // CN
+    donnees_administration_ruf2: String,       // CA - 24
+    donnees_ruf_administration: String,        // CE - 10
+    type_d_identification_du_porteur: char,    // CA
+    numero_national_d_immatriculation: String, // CA - 13
+    cle_du_nir: String,                        // CA - 2
+    code_regime: String,                       // CN - 2
+    caisse_gestionnaire: String,               // CN - 3
+    centre_gestionnaire: String,               // CN - 4
+    code_gestion: String,                      // CA - 2
+    donnees_ruf_famille: String,               // CE - 55
+}
+
+#[derive(Debug, Default)]
+struct ServiceAMOFamille {
+    code_service_amo_famille: String,          // CN - 2
+    date_de_debut_service_amo_famille: String, // CN - Format AAAAMMJJ0000
+    date_de_fin_service_amo_famille: String,   // CN - Format AAAAMMJJ0000
+}
+
+#[derive(Debug, Default)]
+struct DonneesAccidentTravail {
+    organisme_gestionnaire_risque_at: String, // CN - 9
+    code_at: char,                            // CA - 2
+    identifiant_at: String,                   // CN - 9
+    organisme_gestionnaire_at1: String,       // CN - 9
+    code_at1: char,                           // CA - 2
+    identifiant_at1: String,                  // CN - 9
+    organisme_gestionnaire_at2: String,       // CN - 9
+    code_at2: char,                           // CA - 2
+    identifiant_at2: String,                  // CN - 9
+}
+
+#[derive(Debug, Default)]
+struct DonneesBeneficiaire {
+    nom_usuel: String,                    // CE - 27
+    nom_de_famille: String,               // CE - 27
+    prenom: String,                       // CE - 27
+    adresse_ligne_1: String,              // CE - 32
+    adresse_ligne_2: String,              // CE - 32
+    adresse_ligne_3: String,              // CE - 32
+    adresse_ligne_4: String,              // CE - 32
+    adresse_ligne_5: String,              // CE - 32
+    nir_certifie: String,                 // CA - 13
+    cle_du_nir_certifie: String,          // CN - 2
+    date_de_certification_du_nir: String, // CN - Format AAAAMMJJ0000
+    date_de_naissance: String,            // CN - Format AAAAMMJJ0000
+    rang_de_naissance: String,            // CN - 1
+    qualite: String,                      // CN - 2
+    code_service_amo_beneficiaire: char,  // CA - 2
+    date_de_debut_service_amo: String,    // CN - Format AAAAMMJJ0000
+    date_de_fin_service_amo: String,      // CN - Format AAAAMMJJ0000
+    donnees_ruf_amo: String,              // CE - 30
+    periodeDroitsAMO: Vec<PeriodeDroitsAMO>,
+    periodeCodeCouverture: Vec<PeriodeCodeCouverture>,
+    donneesMutuelle: DonneesMutuelle,
+    donneesComplementaire: DonneesComplementaire,
+    donneesRUFBeneficiaireComplementaire: DonneesRUFBeneficiaireComplementaire,
+}
+
+#[derive(Debug, Default)]
+struct PeriodeDroitsAMO {
+    date_de_debut_droits_amo: String, // CN - Format AAAAMMJJ0000
+    date_de_fin_droits_amo: String,   // CN - Format AAAAMMJJ0000
+}
+
+#[derive(Debug, Default)]
+struct PeriodeCodeCouverture {
+    date_de_debut_code_couverture: String, // CN - Format AAAAMMJJ0000
+    date_de_fin_code_couverture: String,   // CN - Format AAAAMMJJ0000
+    code_ald: String,                      // CN - 1
+    code_situation: String,                // CN - 4
+}
+
+#[derive(Debug, Default)]
+struct DonneesMutuelle {
+    identification_mutuelle: String,           // CN - 8
+    garanties_effectives: String,              // CA - 8
+    indicateur_de_traitement_mutuelle: String, // CN - 2
+    type_de_services_associes: char,           // CA - 1
+    services_associes_au_contrat: String,      // CA - 17
+    code_aiguillage_sts: char,                 // CA - 1
+    periodeDroitsMutuelle: Vec<PeriodeDroitsMutuelle>,
+}
+
+#[derive(Debug, Default)]
+struct PeriodeDroitsMutuelle {
+    date_de_debut_droits_mutuelle: String, // CN - Format AAAAMMJJ0000
+    date_de_fin_droits_mutuelle: String,   // CN - Format AAAAMMJJ0000
+}
+
+#[derive(Debug, Default)]
+struct DonneesComplementaire {
+    numero_complementaire_b2: String,     // CA - 10
+    numero_complementaire_edi: String,    // CA - 19
+    numero_adherent_amc: String,          // CA - 8
+    indicateur_de_traitement_amc: String, // CN - 2
+    date_de_debut_validite_amc: String,   // CN - Format AAAAMMJJ0000
+    date_de_fin_validite_amc: String,     // CN - Format AAAAMMJJ0000
+    code_routage_flux_amc: String,        // CA - 2
+    identifiant_hote: String,             // CA - 3
+    nom_de_domaine_amc: String,           // CE - 20
+    code_aiguillage_sts: char,            // CA - 1
+    type_de_services_associes: char,      // CA - 1
+    services_associes_au_contrat: String, // CE - 17
+}
+
+#[derive(Debug, Default)]
+struct DonneesRUFBeneficiaireComplementaire {
+    donnees_ruf_beneficiaire_complementaire: String, // CE - 115
+}
+
+pub fn LireDroitsVitale(
+    lecteurPS: &str,
+    lecteurVitale: &str,
+    codePorteurPS: &str,
+    dateConsultation: &str,
+) -> Result<CarteVitale, String> {
+    let resource_ps = CString::new(lecteurPS).expect("CString::new failed");
+    let resource_vitale = CString::new(lecteurVitale).expect("CString::new failed");
+    let card_number = CString::new(codePorteurPS).expect("CString::new failed");
+    let date_consultation = CString::new(dateConsultation).expect("CString::new failed");
+
+    let mut buffer: *mut c_void = ptr::null_mut();
+    let mut size: size_t = 0;
+   let mut hex_values: &[u8] = &[];
+    unsafe {
+        let result = SSV_LireDroitsVitale(
+            resource_ps.as_ptr(),
+            resource_vitale.as_ptr(),
+            card_number.as_ptr(),
+            date_consultation.as_ptr(),
+            &mut buffer,
+            &mut size,
+        );
+        println!("SSV_LireDroitsVitale result: {}", result);
+
+        if !buffer.is_null() {
+            hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
+        }
+    }
+
+    let groups = decode_ssv_memory(hex_values, hex_values.len());
+
+  let OUT =  decode_carte_vitale(groups);
+
+    unsafe {
+        if !buffer.is_null() {
+            libc::free(buffer); // ??? si liberer avant decode_ssv_memory et decode_carte_vitale alors hex_values n'est plus correct ???
+        }
+    }
+OUT
+ 
+}
+
+fn decode_carte_vitale(groups: Vec<Block>) -> Result<CarteVitale, String> {
+    let mut cartevitale = CarteVitale::default();
+
+    for group in groups {
+        for field in group.content {
+            match (group.id, field.id) {
+                (104, 1) => {
+                    cartevitale
+                        .donneesBeneficiaire
+                        .push(DonneesBeneficiaire::default());
+                }
+                (105, 1) => {
+                    cartevitale
+                        .donneesBeneficiaire
+                        .last_mut()
+                        .unwrap()
+                        .periodeDroitsAMO
+                        .push(PeriodeDroitsAMO::default());
+                }
+                (106, 1) => {
+                    cartevitale
+                        .donneesBeneficiaire
+                        .last_mut()
+                        .unwrap()
+                        .periodeCodeCouverture
+                        .push(PeriodeCodeCouverture::default());
+                }
+                (108, 1) => {
+                    cartevitale
+                        .donneesBeneficiaire
+                        .last_mut()
+                        .unwrap()
+                        .donneesMutuelle
+                        .periodeDroitsMutuelle
+                        .push(PeriodeDroitsMutuelle::default());
+                }
+                _ => {}
+            }
+            if field.content.len() > 0 {
+                match (group.id, field.id) {
+                    (101, 1) => {
+                        let byte = field.content[0];
+                        cartevitale.donneesAssure.type_de_carte_vitale = byte as char;
+                    }
+                    (101, 2) => {
+                        cartevitale.donneesAssure.numero_de_serie =  //bytes_to_decimal_string(&field.content);
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 3) => {
+                        cartevitale.donneesAssure.date_de_fin_de_validite =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 4) => {
+                        println!("101.4  field.size: {:#?}", field.size);
+                        let byte = field.content[0];
+                        cartevitale.donneesAssure.donnees_administration_ruf1 = byte as char;
+                    }
+                    (101, 5) => {
+                        cartevitale.donneesAssure.donnees_administration_ruf2 =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 6) => {
+                        cartevitale.donneesAssure.donnees_ruf_administration =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 7) => {
+                        let byte = field.content[0];
+                        cartevitale.donneesAssure.type_d_identification_du_porteur = byte as char;
+                    }
+                    (101, 8) => {
+                        cartevitale.donneesAssure.numero_national_d_immatriculation =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 9) => {
+                        cartevitale.donneesAssure.cle_du_nir =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 10) => {
+                        cartevitale.donneesAssure.code_regime =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 11) => {
+                        cartevitale.donneesAssure.caisse_gestionnaire =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 12) => {
+                        cartevitale.donneesAssure.centre_gestionnaire =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 13) => {
+                        cartevitale.donneesAssure.code_gestion =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (101, 14) => {
+                        cartevitale.donneesAssure.donnees_ruf_famille =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (102, 1) => {
+                        cartevitale.serviceAMOFamille.code_service_amo_famille =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (102, 2) => {
+                        cartevitale
+                            .serviceAMOFamille
+                            .date_de_debut_service_amo_famille =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (102, 3) => {
+                        cartevitale
+                            .serviceAMOFamille
+                            .date_de_fin_service_amo_famille =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (103, 1) => {
+                        cartevitale
+                            .donneesAccidentTravail
+                            .organisme_gestionnaire_risque_at =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (103, 2) => {
+                        let byte = field.content[0];
+                        cartevitale.donneesAccidentTravail.code_at = byte as char;
+                    }
+                    (103, 3) => {
+                        cartevitale.donneesAccidentTravail.identifiant_at =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (103, 4) => {
+                        cartevitale
+                            .donneesAccidentTravail
+                            .organisme_gestionnaire_at1 =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (103, 5) => {
+                        let byte = field.content[0];
+                        cartevitale.donneesAccidentTravail.code_at1 = byte as char;
+                    }
+                    (103, 6) => {
+                        cartevitale.donneesAccidentTravail.identifiant_at1 =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (103, 7) => {
+                        cartevitale
+                            .donneesAccidentTravail
+                            .organisme_gestionnaire_at2 =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (103, 8) => {
+                        let byte = field.content[0];
+                        cartevitale.donneesAccidentTravail.code_at2 = byte as char;
+                    }
+                    (103, 9) => {
+                        cartevitale.donneesAccidentTravail.identifiant_at2 =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .nom_usuel = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 2) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .nom_de_famille = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 3) => {
+                        cartevitale.donneesBeneficiaire.last_mut().unwrap().prenom =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 4) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .adresse_ligne_1 = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 5) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .adresse_ligne_2 = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 6) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .adresse_ligne_3 = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 7) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .adresse_ligne_4 = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 8) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .adresse_ligne_5 = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 9) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .nir_certifie = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 10) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .cle_du_nir_certifie =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 11) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .date_de_certification_du_nir =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 12) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .date_de_naissance = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 13) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .rang_de_naissance = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 14) => {
+                        cartevitale.donneesBeneficiaire.last_mut().unwrap().qualite =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 15) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .code_service_amo_beneficiaire = field.content[0] as char;
+                    }
+                    (104, 16) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .date_de_debut_service_amo =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 17) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .date_de_fin_service_amo =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (104, 18) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donnees_ruf_amo = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (105, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .periodeDroitsAMO
+                            .last_mut()
+                            .unwrap()
+                            .date_de_debut_droits_amo =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (105, 2) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .periodeDroitsAMO
+                            .last_mut()
+                            .unwrap()
+                            .date_de_fin_droits_amo =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (106, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .periodeCodeCouverture
+                            .last_mut()
+                            .unwrap()
+                            .date_de_debut_code_couverture =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (106, 2) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .periodeCodeCouverture
+                            .last_mut()
+                            .unwrap()
+                            .date_de_fin_code_couverture =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (106, 3) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .periodeCodeCouverture
+                            .last_mut()
+                            .unwrap()
+                            .code_ald = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (106, 4) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .periodeCodeCouverture
+                            .last_mut()
+                            .unwrap()
+                            .code_situation = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (107, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .identification_mutuelle =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (107, 2) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .garanties_effectives =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (107, 3) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .indicateur_de_traitement_mutuelle =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (107, 4) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .type_de_services_associes = field.content[0] as char;
+                    }
+                    (107, 5) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .services_associes_au_contrat =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (107, 6) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .code_aiguillage_sts = field.content[0] as char;
+                    }
+                    (108, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .periodeDroitsMutuelle
+                            .last_mut()
+                            .unwrap()
+                            .date_de_debut_droits_mutuelle =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (108, 2) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesMutuelle
+                            .periodeDroitsMutuelle
+                            .last_mut()
+                            .unwrap()
+                            .date_de_fin_droits_mutuelle =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .numero_complementaire_b2 =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 2) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .numero_complementaire_edi =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 3) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .numero_adherent_amc =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 4) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .indicateur_de_traitement_amc =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 5) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .date_de_debut_validite_amc =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 6) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .date_de_fin_validite_amc =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 7) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .code_routage_flux_amc =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 8) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .identifiant_hote = String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 9) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .nom_de_domaine_amc =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (109, 10) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .code_aiguillage_sts = field.content[0] as char;
+                    }
+                    (109, 11) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .type_de_services_associes = field.content[0] as char;
+                    }
+                    (109, 12) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesComplementaire
+                            .services_associes_au_contrat =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                    (111, 1) => {
+                        cartevitale
+                            .donneesBeneficiaire
+                            .last_mut()
+                            .unwrap()
+                            .donneesRUFBeneficiaireComplementaire
+                            .donnees_ruf_beneficiaire_complementaire =
+                            String::from_utf8_lossy(field.content).to_string();
+                    }
+                     _ =>  {
+                                return Err(format!(
+                                    "Unknown (group, field) pair: ({}, {})",
+                                    group.id, field.id
+                                ))
+                            }
+                }
+            }
+        }
+    }
+    Ok(cartevitale)
+}
+
+// #[cfg(test)]
+// mod test_decode_carte_ps {
+//     use super::*;
+
+//     #[test]
+//     fn test_francoise_pharmacien0052419() {
+//         let bytes: &[u8] = &[
+//             0, 1, 51, // Block 01, Content size 51
+//             1, 48, // Field 01, Content size 1
+//             1, 56, // Field 02, Content size 1
+//             11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // Field 03, Content size 11
+//             1, 52, // Field 04, Content size 1
+//             2, 50, 50, // Field 05, Content size 2
+//             17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49,
+//             57, // Field 06, Content size 17
+//             9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // Field 07, Content size 9
+//             1, 84, // Field 08, Content size 1
+//             0, 2, 83, // Block 02, Content size 83
+//             1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+//             80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+//             57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+//             48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
+//         ];
+//         let blocks = decode_ssv_memory(bytes, bytes.len());
+//         let carte_ps = decode_carte_ps(blocks).unwrap();
+
+//         assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
+//         assert_eq!(carte_ps.titulaire.type_d_identification_nationale, "8");
+//         assert_eq!(
+//             carte_ps.titulaire.numero_d_identification_nationale,
+//             "99700524194"
+//         );
+//         assert_eq!(
+//             carte_ps.titulaire.cle_du_numero_d_identification_nationale,
+//             "4"
+//         );
+//         assert_eq!(carte_ps.titulaire.code_civilite, "22");
+//         assert_eq!(carte_ps.titulaire.nom_du_ps, "PHARMACIEN0052419");
+//         assert_eq!(carte_ps.titulaire.prenom_du_ps, "FRANCOISE");
+//         assert_eq!(carte_ps.titulaire.categorie_carte, 'T');
+
+//         assert_eq!(carte_ps.situations.len(), 1);
+//         assert_eq!(
+//             carte_ps.situations[0].numero_logique_de_la_situation_de_facturation_du_ps,
+//             1
+//         );
+//         assert_eq!(carte_ps.situations[0].mode_d_exercice, "0");
+//         assert_eq!(carte_ps.situations[0].statut_d_exercice, "1");
+//         assert_eq!(carte_ps.situations[0].secteur_d_activite, "86");
+//         assert_eq!(carte_ps.situations[0].type_d_identification_structure, "1");
+//         assert_eq!(
+//             carte_ps.situations[0].numero_d_identification_structure,
+//             "0B0221958"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[0].cle_du_numero_d_identification_structure,
+//             "8"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[0].raison_sociale_structure,
+//             "PHARMACIE DU CENTRE22195"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[0].numero_d_identification_de_facturation_du_ps,
+//             "00202419"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[0].cle_du_numero_d_identification_de_facturation_du_ps,
+//             "8"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[0].numero_d_identification_du_ps_remplaçant,
+//             ""
+//         );
+//         assert_eq!(
+//             carte_ps.situations[0].cle_du_numero_d_identification_du_ps_remplaçant,
+//             "0"
+//         );
+//         assert_eq!(carte_ps.situations[0].code_conventionnel, "1");
+//         assert_eq!(carte_ps.situations[0].code_specialite, "50");
+//         assert_eq!(carte_ps.situations[0].code_zone_tarifaire, "10");
+//         assert_eq!(carte_ps.situations[0].code_zone_ik, "00");
+//         assert_eq!(carte_ps.situations[0].code_agrement_1, "0");
+//         assert_eq!(carte_ps.situations[0].code_agrement_2, "0");
+//         assert_eq!(carte_ps.situations[0].code_agrement_3, "0");
+//         assert_eq!(
+//             carte_ps.situations[0].habilitation_à_signer_une_facture,
+//             "1"
+//         );
+//         assert_eq!(carte_ps.situations[0].habilitation_à_signer_un_lot, "1");
+//     }
+
+//     #[test]
+//     fn test_multiple_situations() {
+//         let bytes: &[u8] = &[
+//             0, 1, 51, // Block 01, Content size 51
+//             1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17, 80,
+//             72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78, 67,
+//             79, 73, 83, 69, 1, 84, 0, 2, 83, // Block 02, Content size 83
+//             1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+//             80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+//             57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+//             48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 3,
+//             83, // Block 03, Content size 83
+//             1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+//             80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+//             57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+//             48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 4,
+//             83, // Block 04, Content size 83
+//             1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
+//             80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
+//             57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
+//             48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
+//         ];
+//         let blocks = decode_ssv_memory(bytes, bytes.len());
+//         let carte_ps = decode_carte_ps(blocks).unwrap();
+
+//         assert_eq!(carte_ps.situations.len(), 3);
+//         assert_eq!(
+//             carte_ps.situations[0].raison_sociale_structure,
+//             "PHARMACIE DU CENTRE22195"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[1].raison_sociale_structure,
+//             "PHARMACIE DU CENTRE22195"
+//         );
+//         assert_eq!(
+//             carte_ps.situations[2].raison_sociale_structure,
+//             "PHARMACIE DU CENTRE22195"
+//         );
+//     }
+
+//     #[test]
+//     #[should_panic]
+//     fn test_missing_field() {
+//         todo!();
+//     }
+
+//     #[test]
+//     #[should_panic]
+//     fn test_unknown_group_field_pair() {
+//         todo!();
+//     }
+
+//     #[test]
+//     #[should_panic]
+//     fn test_invalid_field_format() {
+//         todo!();
+//     }
+// }

crates/sesam-vitale/src/cps.rs

@@ -1,24 +1,9 @@
 use libc::{c_void, size_t};
 use std::ffi::CString;
 use std::ptr;
-use thiserror::Error;
 
-use crate::libssv::{self, SSV_LireCartePS};
-use crate::ssv_memory::{decode_ssv_memory, Block, SSVMemoryError};
-
-#[derive(Error, Debug)]
-pub enum CartePSError {
-    #[error("Unknown (group, field) pair: ({group}, {field})")]
-    UnknownGroupFieldPair { group: u16, field: u16 },
-    #[error("CString creation error: {0}")]
-    CString(#[from] std::ffi::NulError),
-    #[error("Unable to get the last situation while parsing a CartePS")]
-    InvalidLastSituation,
-    #[error(transparent)]
-    SSVMemory(#[from] SSVMemoryError),
-    #[error(transparent)]
-    SSVLibErrorCode(#[from] libssv::LibSSVError),
-}
+use crate::libssv::SSV_LireCartePS;
+use crate::ssv_memory::{decode_ssv_memory, Block};
 
 #[derive(Debug, Default)]
 pub struct CartePS {
@@ -67,10 +52,10 @@ struct SituationPS {
     habilitation_à_signer_un_lot: String,
 }
 
-pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, CartePSError> {
-    let resource_ps = CString::new(lecteur)?;
-    let resource_reader = CString::new("")?;
-    let card_number = CString::new(code_pin)?;
+pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, String> {
+    let resource_ps = CString::new(lecteur).expect("CString::new failed");
+    let resource_reader = CString::new("").expect("CString::new failed");
+    let card_number = CString::new(code_pin).expect("CString::new failed");
 
     let mut buffer: *mut c_void = ptr::null_mut();
     let mut size: size_t = 0;
@@ -84,32 +69,17 @@ pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, CartePSError
             &mut size,
         );
         println!("SSV_LireCartePS result: {}", result);
-        if result != 0 {
-            return Err(libssv::LibSSVError::StandardErrorCode {
-                code: result,
-                function: "SSV_LireCartePS",
-            }
-            .into());
-        }
 
         if !buffer.is_null() {
             hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
             libc::free(buffer);
         }
     }
-    let groups =
-        decode_ssv_memory(hex_values, hex_values.len()).map_err(CartePSError::SSVMemory)?;
+    let groups = decode_ssv_memory(hex_values, hex_values.len());
     decode_carte_ps(groups)
 }
 
-fn get_last_mut_situation(carte_ps: &mut CartePS) -> Result<&mut SituationPS, CartePSError> {
-    carte_ps
-        .situations
-        .last_mut()
-        .ok_or(CartePSError::InvalidLastSituation)
-}
-
-fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
+fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
     let mut carte_ps = CartePS::default();
     for group in groups {
         for field in group.content {
@@ -148,99 +118,137 @@ fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, CartePSError> {
                 }
                 (2..=16, 1) => {
                     carte_ps.situations.push(SituationPS::default());
-                    get_last_mut_situation(&mut carte_ps)?
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
                         .numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
                 }
                 (2..=16, 2) => {
-                    get_last_mut_situation(&mut carte_ps)?.mode_d_exercice =
+                    carte_ps.situations.last_mut().unwrap().mode_d_exercice =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 3) => {
-                    get_last_mut_situation(&mut carte_ps)?.statut_d_exercice =
+                    carte_ps.situations.last_mut().unwrap().statut_d_exercice =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 4) => {
-                    get_last_mut_situation(&mut carte_ps)?.secteur_d_activite =
+                    carte_ps.situations.last_mut().unwrap().secteur_d_activite =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 5) => {
-                    get_last_mut_situation(&mut carte_ps)?.type_d_identification_structure =
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .type_d_identification_structure =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 6) => {
-                    get_last_mut_situation(&mut carte_ps)?.numero_d_identification_structure =
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .numero_d_identification_structure =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 7) => {
-                    get_last_mut_situation(&mut carte_ps)?
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
                         .cle_du_numero_d_identification_structure =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 8) => {
-                    get_last_mut_situation(&mut carte_ps)?.raison_sociale_structure =
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .raison_sociale_structure =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 9) => {
-                    get_last_mut_situation(&mut carte_ps)?
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
                         .numero_d_identification_de_facturation_du_ps =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 10) => {
-                    get_last_mut_situation(&mut carte_ps)?
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
                         .cle_du_numero_d_identification_de_facturation_du_ps =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 11) => {
-                    get_last_mut_situation(&mut carte_ps)?
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
                         .numero_d_identification_du_ps_remplaçant =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 12) => {
-                    get_last_mut_situation(&mut carte_ps)?
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
                         .cle_du_numero_d_identification_du_ps_remplaçant =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 13) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_conventionnel =
+                    carte_ps.situations.last_mut().unwrap().code_conventionnel =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 14) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_specialite =
+                    carte_ps.situations.last_mut().unwrap().code_specialite =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 15) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_zone_tarifaire =
+                    carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 16) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_zone_ik =
+                    carte_ps.situations.last_mut().unwrap().code_zone_ik =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 17) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_agrement_1 =
+                    carte_ps.situations.last_mut().unwrap().code_agrement_1 =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 18) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_agrement_2 =
+                    carte_ps.situations.last_mut().unwrap().code_agrement_2 =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 19) => {
-                    get_last_mut_situation(&mut carte_ps)?.code_agrement_3 =
+                    carte_ps.situations.last_mut().unwrap().code_agrement_3 =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 20) => {
-                    get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_une_facture =
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .habilitation_à_signer_une_facture =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 (2..=16, 21) => {
-                    get_last_mut_situation(&mut carte_ps)?.habilitation_à_signer_un_lot =
+                    carte_ps
+                        .situations
+                        .last_mut()
+                        .unwrap()
+                        .habilitation_à_signer_un_lot =
                         String::from_utf8_lossy(field.content).to_string();
                 }
                 _ => {
-                    return Err(CartePSError::UnknownGroupFieldPair {
-                        group: group.id,
-                        field: field.id,
-                    });
+                    return Err(format!(
+                        "Unknown (group, field) pair: ({}, {})",
+                        group.id, field.id
+                    ))
                 }
             }
         }
@@ -271,7 +279,7 @@ mod test_decode_carte_ps {
             57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
             48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
         ];
-        let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
+        let blocks = decode_ssv_memory(bytes, bytes.len());
         let carte_ps = decode_carte_ps(blocks).unwrap();
 
         assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
@@ -362,7 +370,7 @@ mod test_decode_carte_ps {
             57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
             48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
         ];
-        let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
+        let blocks = decode_ssv_memory(bytes, bytes.len());
         let carte_ps = decode_carte_ps(blocks).unwrap();
 
         assert_eq!(carte_ps.situations.len(), 3);

crates/sesam-vitale/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod cps;
+pub mod cartevitale;
 pub mod libssv;
 pub mod ssv_memory;
 pub mod ssvlib_demo;

crates/sesam-vitale/src/libssv.rs

@@ -3,13 +3,6 @@
 /// Low level bindings to the SSVLIB dynamic library.
 // TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
 use libc::{c_char, c_ushort, c_void, size_t};
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum LibSSVError {
-    #[error("SSV library error in {function}: {code}")]
-    StandardErrorCode { code: u16, function: &'static str },
-}
 
 #[cfg_attr(target_os = "linux", link(name = "ssvlux64"))]
 #[cfg_attr(target_os = "windows", link(name = "ssvw64"))]
@@ -26,5 +19,13 @@ extern "C" {
         ZDonneesSortie: *mut *mut c_void,
         TTailleDonneesSortie: *mut size_t,
     ) -> c_ushort;
+    pub fn SSV_LireDroitsVitale(
+        NomRessourcePS: *const c_char,
+        NomRessourceLecteur: *const c_char,
+        CodePorteurPS: *const c_char,
+        DateConsultation: *const c_char,
+        ZDonneesSortie: *mut *mut c_void,
+        TTailleDonneesSortie: *mut size_t,
+    ) -> c_ushort;
 }
 // TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs

crates/sesam-vitale/src/main.rs

@@ -1,10 +1,9 @@
 mod cps;
+mod cartevitale;
 mod libssv;
 mod ssv_memory;
 mod ssvlib_demo;
 
-use anyhow::{Context, Result};
-
-fn main() -> Result<()> {
-    ssvlib_demo::demo().context("Error while running the SSV library demo")
+fn main() {
+    ssvlib_demo::demo();
 }

crates/sesam-vitale/src/ssv_memory.rs

@@ -1,33 +1,6 @@
 /// # SSV Memory
 /// Provide functions to manipulate raw memory from SSV library.
 use std::convert::TryFrom;
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum BytesReadingError {
-    #[error("Empty bytes input")]
-    EmptyBytes,
-    #[error("Invalid memory: not enough bytes ({actual}) to read the expected size ({expected})")]
-    InvalidSize { expected: usize, actual: usize },
-    #[error("Invalid memory: size ({actual}) is expected to be less than {expected} bytes")]
-    SizeTooBig { expected: usize, actual: usize },
-    #[error("Invalid memory: not enough bytes to read the block id")]
-    InvalidBlockId(#[from] std::array::TryFromSliceError),
-    #[error("Error while reading field at offset {offset}")]
-    InvalidField {
-        source: Box<BytesReadingError>,
-        offset: usize,
-    },
-}
-
-#[derive(Debug, Error)]
-pub enum SSVMemoryError {
-    #[error("Error while parsing block at offset {offset}")]
-    BlockParsing {
-        source: BytesReadingError,
-        offset: usize,
-    },
-}
 
 #[derive(PartialEq, Debug)]
 struct ElementSize {
@@ -36,12 +9,13 @@ struct ElementSize {
 }
 
 // TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
+
 impl TryFrom<&[u8]> for ElementSize {
-    type Error = BytesReadingError;
+    type Error = &'static str;
 
     fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
         if bytes.is_empty() {
-            return Err(BytesReadingError::EmptyBytes);
+            return Err("Empty bytes input");
         }
 
         let mut element_size = ElementSize { size: 0, pad: 1 };
@@ -56,15 +30,9 @@ impl TryFrom<&[u8]> for ElementSize {
             // N are the 7 lower bits of the first byte
             let size_bytes_len = (bytes[0] & 0b0111_1111) as usize;
             if size_bytes_len > bytes.len() - 1 {
-                return Err(BytesReadingError::InvalidSize {
-                    expected: size_bytes_len,
-                    actual: bytes.len() - 1,
-                });
+                return Err("Invalid memory: not enough bytes to read the size");
             } else if size_bytes_len > 4 {
-                return Err(BytesReadingError::SizeTooBig {
-                    expected: 4,
-                    actual: size_bytes_len,
-                });
+                return Err("Invalid memory: size is too big");
             }
             let size_bytes = &bytes[1..1 + size_bytes_len];
 
@@ -86,21 +54,15 @@ pub struct Block<'a> {
     pub content: Vec<Field<'a>>,
 }
 
-impl<'a> TryFrom<&'a [u8]> for Block<'a> {
-    type Error = BytesReadingError;
-
-    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+impl<'a> From<&'a [u8]> for Block<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
         let mut offset = 0;
-        let id = u16::from_be_bytes(
-            bytes[..2]
-                .try_into()
-                .map_err(BytesReadingError::InvalidBlockId)?,
-        );
+        let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
         offset += 2;
         let ElementSize {
             size: block_size,
             pad,
-        } = bytes[2..].try_into()?;
+        } = bytes[2..].try_into().unwrap();
         offset += pad;
         let raw_content = &bytes[offset..];
         let mut field_offset = 0;
@@ -108,22 +70,19 @@ impl<'a> TryFrom<&'a [u8]> for Block<'a> {
         let mut content = Vec::new();
         let mut field_id = 1;
         while field_offset < block_size {
-            let mut field: Field<'a> = raw_content[field_offset..].try_into().map_err(|err| {
-                BytesReadingError::InvalidField {
-                    source: Box::new(err),
-                    offset: field_offset,
-                }
-            })?;
+            let mut field: Field<'a> = raw_content[field_offset..].into();
+
+      
             field.id = field_id;
             field_offset += field.size;
             field_id += 1;
             content.push(field);
         }
-        Ok(Block {
+        Block {
             id,
             size: offset + block_size,
             content,
-        })
+        }
     }
 }
 
@@ -134,41 +93,31 @@ pub struct Field<'a> {
     pub content: &'a [u8],
 }
 
-impl<'a> TryFrom<&'a [u8]> for Field<'a> {
-    type Error = BytesReadingError;
-
-    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
-        let ElementSize { size, pad } = bytes.try_into()?;
+impl<'a> From<&'a [u8]> for Field<'a> {
+    fn from(bytes: &'a [u8]) -> Self {
+        let ElementSize { size, pad } = bytes.try_into().unwrap();
         let contenu = &bytes[pad..pad + size];
-        Ok(Field {
+        Field {
             id: 0,
             size: pad + size,
             content: contenu,
-        })
+        }
     }
 }
 
-pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Result<Vec<Block>, SSVMemoryError> {
+pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
     let mut blocks: Vec<Block> = Vec::new();
     let mut offset = 0;
     while offset < size {
-        let block: Block =
-            bytes[offset..]
-                .try_into()
-                .map_err(|err| SSVMemoryError::BlockParsing {
-                    source: err,
-                    offset,
-                })?;
+        let block: Block = bytes[offset..].into();
         offset += block.size;
         blocks.push(block);
     }
-    Ok(blocks)
+    blocks
 }
 
 #[cfg(test)]
 mod test_element_size {
-    use std::any::Any;
-
     use super::*;
 
     #[test]
@@ -195,51 +144,29 @@ mod test_element_size {
     #[test]
     fn null_size() {
         let bytes: &[u8] = &[];
-        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().type_id(),
-            BytesReadingError::EmptyBytes.type_id()
-        );
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(result, Err("Empty bytes input"),);
     }
 
     #[test]
     fn invalid_memory() {
         let bytes: &[u8] = &[0b_1000_0001_u8];
-        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
-        assert!(result.is_err());
+        let result: Result<ElementSize, &str> = bytes.try_into();
         assert_eq!(
-            result.unwrap_err().to_string(),
-            BytesReadingError::InvalidSize {
-                expected: 1,
-                actual: 0
-            }
-            .to_string()
+            result,
+            Err("Invalid memory: not enough bytes to read the size"),
         );
 
         let bytes: &[u8] = &[0b_1000_0010_u8, 1];
-        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
-        assert!(result.is_err());
+        let result: Result<ElementSize, &str> = bytes.try_into();
         assert_eq!(
-            result.unwrap_err().to_string(),
-            BytesReadingError::InvalidSize {
-                expected: 2,
-                actual: 1
-            }
-            .to_string()
+            result,
+            Err("Invalid memory: not enough bytes to read the size"),
         );
 
         let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
-        let result: Result<ElementSize, BytesReadingError> = bytes.try_into();
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            BytesReadingError::SizeTooBig {
-                expected: 4,
-                actual: 5
-            }
-            .to_string()
-        );
+        let result: Result<ElementSize, &str> = bytes.try_into();
+        assert_eq!(result, Err("Invalid memory: size is too big"),);
     }
 }
 
@@ -254,7 +181,7 @@ mod test_field {
             80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78,
             67, 79, 73, 83, 69, 1, 84,
         ];
-        let element: Field = bytes.try_into().unwrap();
+        let element: Field = bytes.into();
         assert_eq!(element.size, 52);
         assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
     }
@@ -269,7 +196,7 @@ mod test_field {
         // Add 256 bytes to the content
         bytes_vec.append(&mut vec![1; 256]);
         let bytes: &[u8] = &bytes_vec;
-        let element: Field = bytes.try_into().unwrap();
+        let element: Field = bytes.into();
         assert_eq!(element.size, 259);
         assert_eq!(element.content.len(), 256);
     }
@@ -283,15 +210,15 @@ mod test_block {
     fn test_francoise_pharmacien0052419_partial_block_1() {
         let bytes: &[u8] = &[1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52];
 
-        let field1: Field = bytes.try_into().unwrap();
+        let field1: Field = bytes.into();
         assert_eq!(field1.size, 2);
         assert_eq!(field1.content, &[48]);
 
-        let field2: Field = bytes[field1.size..].try_into().unwrap();
+        let field2: Field = bytes[field1.size..].into();
         assert_eq!(field2.size, 2);
         assert_eq!(field2.content, &[56]);
 
-        let field3: Field = bytes[field1.size + field2.size..].try_into().unwrap();
+        let field3: Field = bytes[field1.size + field2.size..].into();
         assert_eq!(field3.size, 12);
         assert_eq!(
             field3.content,
@@ -318,12 +245,12 @@ mod test_block {
             48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
         ];
 
-        let first_block: Block = bytes.try_into().unwrap();
+        let first_block: Block = bytes.into();
         assert_eq!(first_block.id, 1);
         assert_eq!(first_block.size, 54);
         assert_eq!(first_block.content.len(), 8);
 
-        let second_block: Block = bytes[first_block.size..].try_into().unwrap();
+        let second_block: Block = bytes[first_block.size..].into();
         assert_eq!(second_block.id, 2);
         assert_eq!(second_block.size, 86);
         assert_eq!(second_block.content.len(), 21);
@@ -352,7 +279,7 @@ mod test_decode_ssv_memory {
             50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
             48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
         ];
-        let blocks = decode_ssv_memory(bytes, bytes.len()).unwrap();
+        let blocks = decode_ssv_memory(bytes, bytes.len());
         assert_eq!(blocks.len(), 2);
     }
 }

crates/sesam-vitale/src/ssvlib_demo.rs

@@ -1,54 +1,33 @@
 /// High level API for the SSV library,
 /// based on the low level bindings in libssv.rs.
+extern crate dotenv;
 use libc::{c_void, size_t};
 use std::env;
 use std::ffi::CString;
+use std::path::PathBuf;
 use std::ptr;
-use thiserror::Error;
+
 
 use crate::cps::lire_carte;
+use crate::cartevitale::LireDroitsVitale;
+
 use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
 
-use ::utils::config::load_config;
-
-#[derive(Error, Debug)]
-pub enum SSVDemoError {
-    #[error(transparent)]
-    CartePSReading(#[from] crate::cps::CartePSError),
-    #[error(transparent)]
-    SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
-}
-
-fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
+fn ssv_init_lib_2() {
     let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
     let ini = CString::new(ini_str).expect("CString::new failed");
     unsafe {
         let result = SSV_InitLIB2(ini.as_ptr());
         println!("SSV_InitLIB2 result: {}", result);
-        if result != 0 {
-            return Err(crate::libssv::LibSSVError::StandardErrorCode {
-                code: result,
-                function: "SSV_InitLIB2",
-            }
-            .into());
-        }
     }
-    Ok(())
 }
 
-fn ssv_lire_config() -> Result<(), SSVDemoError> {
+fn ssv_lire_config() {
     let mut buffer: *mut c_void = ptr::null_mut();
     let mut size: size_t = 0;
     unsafe {
         let result = SSV_LireConfig(&mut buffer, &mut size);
         println!("SSV_LireConfig result: {}", result);
-        if result != 0 {
-            return Err(crate::libssv::LibSSVError::StandardErrorCode {
-                code: result,
-                function: "SSV_LireConfig",
-            }
-            .into());
-        }
 
         if !buffer.is_null() {
             let hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
@@ -60,26 +39,30 @@ fn ssv_lire_config() -> Result<(), SSVDemoError> {
             libc::free(buffer);
         }
     }
-    Ok(())
 }
 
-pub fn demo() -> Result<(), SSVDemoError> {
+pub fn demo() {
     // TODO : this is probably not working on release, because I'm not sure it exists a CARGO_MANIFEST_DIR and so it can find the `.env`
     // Maybe we could use a system standard config path to store a config file
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let manifest_path = PathBuf::from(manifest_dir);
+    dotenv::from_path(manifest_path.join(".env")).ok();
 
     println!("------- Demo for the SSV library --------");
 
-    load_config()?;
-
-    ssv_init_lib_2()?;
+    ssv_init_lib_2();
 
     let code_pin = "1234";
     let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
-    let carte_ps = lire_carte(code_pin, lecteur)?;
+   let lecteurvitale = "HID Global OMNIKEY 3x21 Smart Card Reader 1";
+   let dateconsultation ="20240813";
+    let carte_ps = lire_carte(code_pin, lecteur).unwrap();
     println!("CartePS: {:#?}", carte_ps);
 
-    ssv_lire_config()?;
+    ssv_lire_config();
+
+    let carte_vitale = LireDroitsVitale(lecteur, lecteurvitale, code_pin, dateconsultation).unwrap();
+    println!("carte_vitale: {:#?}", carte_vitale);
 
     println!("-----------------------------------------");
-    Ok(())
 }

crates/sesam-vitale/src/win/fsv/ssvw64.def

@@ -3,3 +3,4 @@ EXPORTS
     SSV_InitLIB2
     SSV_LireCartePS
     SSV_LireConfig
+    SSV_LireDroitsVitale

crates/utils/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "utils"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow = "1.0"
-directories = "5.0"
-dotenv = "0.15"

crates/utils/src/config.rs

@@ -1,48 +0,0 @@
-use std::{env, path::PathBuf};
-
-use anyhow::{bail, Context, Result};
-use directories::ProjectDirs;
-use dotenv::from_path;
-
-const CONFIG_FILE_NAME: &str = ".env";
-
-pub fn get_config_dirs() -> Vec<PathBuf> {
-    let mut config_dirs = vec![
-        PathBuf::from(""), // Current directory
-    ];
-    if let Ok(manifest_dir) = env::var("CARGO_MANIFEST_DIR") {
-        config_dirs.push(PathBuf::from(manifest_dir));
-    }
-    if let Some(proj_dirs) = ProjectDirs::from("org", "P4pillon", "Krys4lide") {
-        config_dirs.push(proj_dirs.config_dir().to_path_buf());
-    }
-    config_dirs
-}
-
-pub fn get_config_files() -> Result<Vec<PathBuf>> {
-    let config_dirs = get_config_dirs();
-    let mut config_files = Vec::new();
-    for config_dir in config_dirs.iter() {
-        let config_file = config_dir.join(CONFIG_FILE_NAME);
-        if config_file.exists() {
-            config_files.push(config_file);
-        }
-    }
-    if config_files.is_empty() {
-        bail!(
-            "No config file {CONFIG_FILE_NAME} found in the following directories: {config_dirs:#?}"
-        );
-    }
-    Ok(config_files)
-}
-
-pub fn load_config() -> Result<()> {
-    let config_files = get_config_files()?;
-    // Load the first config file found
-    // TODO: add a verbose log to list all config files found
-    println!(
-        "DEBUG: Config files found (1st loaded): {:#?}",
-        config_files
-    );
-    from_path(config_files[0].as_path()).context("Failed to load config file")
-}

crates/utils/src/lib.rs

@@ -1 +0,0 @@
-pub mod config;

docs/errors.md

@@ -1,85 +0,0 @@
-# Gestion des erreurs
-
-Ce document décrit comment les erreurs sont gérées dans le projet.
-
-## Gestion native
-
-Par principe, en Rust, on évite au maximum la gestion par exception, ne la réservant qu'aux situations où un crash du programme est la meilleure solution.
-En temps normal, on renvoie des `Result<Valeur, Erreur>` (pour les situations réussite/erreur) ou des `Option<Valeur>` (pour les situations valeur non-nulle/nulle).
-
-Quand on fait face à une situation d'erreur, on cherchera à la gérer de manière explicite (voir [Récupération des erreurs](#récupération-des-erreurs)) ou à la remonter à un niveau supérieur, généralement à l'aide de l'opérateur `?`.
-
-On évitera, par contre, au maximum de générer des exceptions (appelées "panics" en Rust), que ce soit par l'usage de `panic!` ou par des appels à des fonctions qui paniquent en cas d'erreur (comme `unwrap` ou `expect`).
-
-De nombreux exemples des idiomes natifs de gestion des erreurs en Rust sont disponibles dans la documentation [Rust by example](https://doc.rust-lang.org/rust-by-example/error.html).
-
-## Librairies de gestion des erreurs
-
-Deux librairies sont utilisées pour gérer les erreurs dans le projet :
-- [`anyhow`](https://docs.rs/anyhow/latest/anyhow/) : qui permet de renvoyer des erreurs faiblement typées, mais très facile à enrichir avec des messages d'explication. On l'utilise pour communiquer facilement des erreurs de haut niveau avec un utilisateur final.
-    ```rust
-    use anyhow::{anyhow, Result};
-
-    fn get_cluster_info() -> Result<ClusterInfo> {
-        let data = fs::read_to_string("cluster.json")
-            .with_context(|| "failed to read cluster config")?;
-        let info: ClusterInfo = serde_json::from_str(&data)
-            .with_context(|| "failed to parse cluster config")?;
-        Ok(info)
-    }
-    ```
-- [`thiserror`](https://docs.rs/thiserror/latest/thiserror/) : qui fournit des macros pour définir des erreurs fortement typées. On l'utilise pour définir des erreurs spécifiques à une partie du code, contextualisées avec des données structurées plutôt que de simples messages d'erreurs, afin de favoriser la "récupération" face aux erreurs.
-    ```rust
-    use thiserror::Error;
-
-    #[derive(Error, Debug)]
-    pub enum DataStoreError {
-        #[error("data store disconnected")]
-        Disconnect(#[from] io::Error),
-        #[error("the data for key `{0}` is not available")]
-        Redaction(String),
-        #[error("invalid header (expected {expected:?}, found {found:?})")]
-        InvalidHeader {
-            expected: String,
-            found: String,
-        },
-        #[error("unknown data store error")]
-        Unknown,
-    }
-    ```
-
-## Récupération des erreurs
-
-Dans la mesure du possible, on essaie de privilégier la "récupération" face à une erreur plutôt que le "crash". Les stratégies de récupération sont :
-- Réessayer l'opération, tel quel ou avec des paramètres différents
-- Contourner l'opération, en la remplaçant par une autre
-- À défaut, informer l'utilisateur de l'erreur et :
-    - arrêter / annuler l'opération en cours
-    - ignorer l'erreur et continuer l'exécution
-
-Quand on ne peut pas récupérer une erreur, on la remonte à un niveau supérieur, si besoin en la convertissant dans un type d'erreur plus générique et approprié au niveau considéré.
-
-## Conversion des erreurs
-
-Quand on remonte une erreur à un niveau supérieur, on peut être amené à la convertir dans un type d'erreur plus générique et approprié au niveau considéré. Pour faciliter cette conversion, on implémente le trait `From`. Avec `thiserror`, on peut utiliser l'attribut `#[from]` ou le paramètre `source` pour automatiser l'implémentation de telles conversions.
-
-On peut ensuite, lors de la gestion d'une erreur, on pourra :
-- soit directement renvoyer l'erreur à l'aide de l'opérateur `?`, qui se chargera de la conversion ;
-- soit convertir l'erreur explicitement, par exemple en utilisant la méthode `map_err` sur un `Result`, en particulier quand on veut enrichir l'erreur avec des informations supplémentaires.
-
-## Usages exceptionnels de `unwrap` et `expect`
-
-Provoquant des "panics" en cas d'erreur, les fonctions `unwrap` et `expect` ne doivent être utilisées que dans des cas exceptionnels :
-- Dans les tests, pour signaler une erreur de test
-- Au plus haut niveau de l'application, pour signaler une erreur fatale qui ne peut pas être récupérée
-- Dans des situations où l'erreur ne peut pas se produire, par exemple après une vérification de préconditions
-
-Dans l'idéal, on préférera l'usage de `expect` à `unwrap`, car il permet de donner un message d'erreur explicite.
-
-## Ressources
-
-- [The Rust Programming Language - Ch. 9: Error Handling](https://doc.rust-lang.org/book/ch09-00-error-handling.html)
-- [The NRC Book - Error Handling in Rust](https://nrc.github.io/error-docs/intro.html)
-- [The Error Design Patterns Book - by Project Error Handling WG](https://github.com/rust-lang/project-error-handling/blob/master/error-design-patterns-book/src/SUMMARY.md)
-- [The Rust Cookbook - Error Handling](https://rust-lang-nursery.github.io/rust-cookbook/error-handling.html)
-- [Le ticket initial de l'intégration de la gestion des erreurs dans le projet](https://forge.p4pillon.org/P4Pillon/Krys4lide/issues/34)

scripts/compile_win_headers - Copie.bat

@@ -0,0 +1,26 @@
+@echo off
+rem Set variables
+set LIB_DIR=crates/sesam-vitale/lib
+set DEF_DIR=crates/sesam-vitale/src/win/fsv
+
+if "%1"=="/clean" (
+    goto clean
+)
+
+rem Set the environment for the x64 platform
+call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+
+rem Create a ssvw64.lib file from the ssvw64.def file
+lib /def:ssvw64.def /out:%LIB_DIR%\ssvw64.lib /machine:x64
+
+rem Build complete
+pause
+exit /b 0
+
+:clean
+del %LIB_DIR%\*.lib
+del %LIB_DIR%\*.exp
+
+rem Clean complete
+pause
+exit /b 0

scripts/compile_win_headers.bat

@@ -1,7 +1,7 @@
 @echo off
 rem Set variables
-set LIB_DIR=crates/sesam-vitale/lib
-set DEF_DIR=crates/sesam-vitale/src/win/fsv
+set LIB_DIR=F:\PAPILLON\Krys4lideCopie\crates\sesam-vitale\lib
+set DEF_DIR=F:\PAPILLON\Krys4lideCopie\crates\sesam-vitale\src\win\fsv
 
 if "%1"=="/clean" (
     goto clean

scripts/ssvw64.def

@@ -0,0 +1,6 @@
+LIBRARY "ssvw64"
+EXPORTS
+    SSV_InitLIB2
+    SSV_LireCartePS
+    SSV_LireConfig
+    SSV_LireDroitsVitale