V1.0.3 (#19)

* updt crates

* Fix BOM bug in CSV file

* Fix: Dialog not closing in database config

Author: Maxime-Cllt

README.md

@@ -4,7 +4,7 @@
   <div align="center">
     <img src="https://img.shields.io/badge/Rust-dea584?style=for-the-badge&logo=rust&logoColor=white" alt="Rust" />
     <img src="https://img.shields.io/badge/Tauri-ffc130?style=for-the-badge&logo=tauri&logoColor=white" alt="Tauri" />
-    <img src="https://img.shields.io/badge/Version-1.0.1-7073f6?style=for-the-badge" alt="Version" />
+    <img src="https://img.shields.io/badge/Version-1.0.3-7073f6?style=for-the-badge" alt="Version" />
   </div>
 </div>
 

package.json

@@ -10,45 +10,45 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@radix-ui/react-checkbox": "^1.1.5",
-    "@radix-ui/react-dialog": "^1.1.7",
-    "@radix-ui/react-dropdown-menu": "^2.1.7",
+    "@radix-ui/react-checkbox": "^1.3.2",
+    "@radix-ui/react-dialog": "^1.1.14",
+    "@radix-ui/react-dropdown-menu": "^2.1.15",
     "@radix-ui/react-icons": "^1.3.2",
-    "@radix-ui/react-label": "^2.1.3",
-    "@radix-ui/react-menubar": "^1.1.7",
-    "@radix-ui/react-popover": "^1.1.7",
-    "@radix-ui/react-radio-group": "^1.2.4",
-    "@radix-ui/react-select": "^2.1.7",
-    "@radix-ui/react-separator": "^1.1.3",
-    "@radix-ui/react-slot": "^1.2.0",
-    "@radix-ui/react-switch": "^1.1.4",
-    "@radix-ui/react-tabs": "^1.1.4",
-    "@radix-ui/react-tooltip": "^1.2.0",
-    "@tauri-apps/api": "^2.4.1",
-    "@tauri-apps/plugin-dialog": "~2.2.1",
+    "@radix-ui/react-label": "^2.1.7",
+    "@radix-ui/react-menubar": "^1.1.15",
+    "@radix-ui/react-popover": "^1.1.14",
+    "@radix-ui/react-radio-group": "^1.3.7",
+    "@radix-ui/react-select": "^2.2.5",
+    "@radix-ui/react-separator": "^1.1.7",
+    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-switch": "^1.2.5",
+    "@radix-ui/react-tabs": "^1.1.12",
+    "@radix-ui/react-tooltip": "^1.2.7",
+    "@tauri-apps/api": "^2.5.0",
+    "@tauri-apps/plugin-dialog": "~2.2.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "1.0.0",
-    "framer-motion": "^12.6.5",
+    "framer-motion": "^12.17.0",
     "lucide-react": "^0.441.0",
     "next-themes": "^0.4.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.30.0",
+    "react-router-dom": "^6.30.1",
     "sonner": "^1.7.4",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.4.1",
-    "@types/node": "^22.14.1",
-    "@types/react": "^18.3.20",
-    "@types/react-dom": "^18.3.6",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@tauri-apps/cli": "^2.5.0",
+    "@types/node": "^22.15.31",
+    "@types/react": "^18.3.23",
+    "@types/react-dom": "^18.3.7",
+    "@vitejs/plugin-react": "^4.5.2",
     "autoprefixer": "^10.4.21",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.4",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.8.3",
-    "vite": "^5.4.18"
+    "vite": "^5.4.19"
   }
 }

pnpm-lock.yaml

@@ -1,6 +1,6 @@
 [package]
 name = "FileFlow"
-version = "1.0.2"
+version = "1.0.3"
 description = "An app to manipulate DBMS tables"
 authors = ["Maxime-Cllt"]
 edition = "2021"

src-tauri/Cargo.lock

@@ -3,10 +3,10 @@ use crate::fileflow::database::connection::Connection;
 use crate::fileflow::enumeration::insertion_type::InsertionType;
 use crate::fileflow::stuct::insert_config::InsertConfig;
 use crate::fileflow::stuct::save_config::SaveConfig;
+use crate::fileflow::stuct::string_formater::StringFormatter;
 use crate::fileflow::utils::constants::DATABASE_CONFIG_FILE;
 use crate::fileflow::utils::csv_utils::{find_separator, read_first_line};
 use crate::fileflow::utils::fileflowlib::{get_all_saved_configs, save_config};
-use crate::fileflow::utils::string_formater::{get_formated_column_names, sanitize_column};
 use csv::{Reader, ReaderBuilder};
 use std::fs::{File, Metadata};
 use std::sync::Arc;
@@ -35,10 +35,10 @@ pub async fn insert_csv_data(
     let first_line: String = read_first_line(&csv.file_path).expect("Failed to read first line"); // Read the first line of the file to detect the separator
     let separator: char = find_separator(&first_line).expect("Failed to find separator"); // Separator detection of the file
 
-    let final_columns_name: Vec<String> = get_formated_column_names(
+    let final_columns_name: Vec<String> = StringFormatter::get_formated_column_names(
         &first_line
             .split(separator)
-            .map(|s| sanitize_column(s))
+            .map(|s| StringFormatter::sanitize_column(s))
             .collect::<Vec<String>>(),
     );
 

src-tauri/Cargo.toml

@@ -11,7 +11,6 @@ use crate::fileflow::enumeration::database_engine::DatabaseEngine;
 use crate::fileflow::stuct::combo_item::ComboItem;
 use crate::fileflow::stuct::db_config::DbConfig;
 use crate::fileflow::stuct::download_config::DownloadConfig;
-use crate::fileflow::utils::string_formater::{escaped_record, sanitize_value};
 use csv::{Reader, StringRecord};
 use serde_json::{json, Value};
 use sqlx::Row;
@@ -20,6 +19,7 @@ use std::fs::File;
 use std::sync::Arc;
 use std::time::Instant;
 use tauri::{command, State};
+use crate::fileflow::stuct::string_formater::StringFormatter;
 
 #[command]
 pub async fn connect_to_database(
@@ -215,7 +215,7 @@ pub async fn fast_insert(
 
     for result in reader.records() {
         let values: String = match result {
-            Ok(record) => escaped_record(record),
+            Ok(record) => StringFormatter::escaped_record(record),
             Err(_) => continue,
         };
 
@@ -284,7 +284,7 @@ pub async fn optimized_insert(
         let mut values: Vec<String> = Vec::with_capacity(record.len());
 
         for (i, value) in record.iter().enumerate() {
-            let sanitized_value: String = sanitize_value(value);
+            let sanitized_value: String = StringFormatter::sanitize_value(value);
             let max_length: &mut usize = columns_size_map
                 .get_mut(final_columns_name[i].as_str())
                 .ok_or("Column name mismatch")

src-tauri/src/fileflow/action/actions.rs

@@ -3,7 +3,6 @@ use crate::fileflow::database::sql_builder::{
     build_copy_table_sql, build_create_with_fixed_size_sql, build_drop_statement_sql,
 };
 use crate::fileflow::enumeration::database_engine::DatabaseEngine;
-use crate::fileflow::enumeration::separator::SeparatorType;
 use crate::fileflow::stuct::download_config::DownloadConfig;
 use csv::{Writer, WriterBuilder};
 use sqlx::{Column, Row};
@@ -16,20 +15,13 @@ pub async fn export_table(
     download_config: &DownloadConfig,
     table_name: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    const LIMIT: i32 = 5000;
+    const LIMIT: i32 = 5_000;
     let mut offset: i32 = 0;
     let mut header_written: bool = false;
     let file_path: String = format!("{}/{table_name}_export.csv", download_config.location);
 
-    let separator: u8 = match download_config.separator {
-        SeparatorType::Comma => b',',
-        SeparatorType::Semicolon => b';',
-        SeparatorType::Pipe => b'|',
-        SeparatorType::Space => b' ',
-    };
-
     let mut wtr: Writer<File> = WriterBuilder::new()
-        .delimiter(separator)
+        .delimiter(download_config.separator.as_u8())
         .from_path(&file_path)
         .expect("Failed to create CSV writer");
 

src-tauri/src/fileflow/action/database_command.rs

@@ -8,14 +8,3 @@ pub enum DatabaseEngine {
     Postgres,
     SQLite,
 }
-
-// impl DatabaseEngine {
-// pub fn as_str(&self) -> &'static str {
-//     match self {
-//         DatabaseEngine::MariaDB => "mariadb",
-//         DatabaseEngine::MySQL => "mysql",
-//         DatabaseEngine::Postgres => "postgres",
-//         DatabaseEngine::SQLite => "sqlite",
-//     }
-// }
-// }

src-tauri/src/fileflow/database/database_actions.rs

@@ -9,3 +9,16 @@ pub enum SeparatorType {
     Space,
     Pipe,
 }
+
+impl SeparatorType {
+    
+    /// Returns the separator as a u8.
+    pub const fn as_u8(&self) -> u8 {
+        match self {
+            SeparatorType::Comma => b',',
+            SeparatorType::Semicolon => b';',
+            SeparatorType::Space => b' ',
+            SeparatorType::Pipe => b'|',
+        }
+    }
+}