Skip to content

Commit 7ea1218

Browse files
committed
refactor: reorganize module structure and update imports for consistency
1 parent b734eb1 commit 7ea1218

30 files changed

Lines changed: 414 additions & 219 deletions

src-tauri/Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ custom-protocol = ["tauri/custom-protocol"]
3131

3232
[dev-dependencies]
3333
criterion = "0.7.0"
34+
tempfile = "^3.23.0"
3435

3536
[profile.dev]
3637
incremental = true

src-tauri/src/benches/application_bench.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use criterion::{criterion_group, criterion_main, Criterion};
22
use csv::{Reader, ReaderBuilder};
33
use fileflow::fileflow::action::database_command::fast_insert;
44
use fileflow::fileflow::enums::database_engine::DatabaseEngine;
5-
use fileflow::fileflow::stuct::db_config::DatabaseConfig;
5+
use fileflow::fileflow::stuct::config::db_config::DatabaseConfig;
66
use fileflow::fileflow::stuct::string_formater::StringFormatter;
7-
use fileflow::fileflow::utils::csv_utils::{find_separator, read_first_line};
87
use sqlx::Error;
98
use std::fs::File;
10-
use fileflow::fileflow::stuct::database_connection::DatabaseConnection;
9+
use fileflow::fileflow::stuct::database::database_connection::DatabaseConnection;
10+
use fileflow::fileflow::stuct::io::file_utils::FileUtils;
1111

1212
#[allow(dead_code)]
1313
async fn test_insert_file() {
@@ -37,9 +37,9 @@ async fn test_insert_file() {
3737
Err(_) => return,
3838
};
3939

40-
let first_line: String = read_first_line(TEST_FILE).unwrap();
40+
let first_line: String = FileUtils::read_first_line(TEST_FILE).unwrap();
4141

42-
let separator: char = find_separator(&first_line).unwrap();
42+
let separator: char = FileUtils::find_separator(&first_line).unwrap();
4343

4444
let final_columns_name: Vec<String> = StringFormatter::get_formated_column_names(
4545
&first_line

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
use crate::fileflow::action::database_command::{fast_insert, optimized_insert};
22
use crate::fileflow::enums::insertion_type::InsertionType;
3-
use crate::fileflow::stuct::insert_config::InsertConfig;
4-
use crate::fileflow::stuct::save_config::SaveConfig;
3+
use crate::fileflow::stuct::config::insert_config::InsertConfig;
4+
use crate::fileflow::stuct::config::save_config::SaveConfig;
55
use crate::fileflow::stuct::string_formater::StringFormatter;
66
use crate::fileflow::utils::constants::DATABASE_CONFIG_FILE;
7-
use crate::fileflow::utils::csv_utils::{find_separator, read_first_line};
87
use crate::fileflow::utils::fileflowlib::{get_all_saved_configs, save_config};
98
use csv::{Reader, ReaderBuilder};
109
use std::fs::{File, Metadata};
1110
use std::sync::Arc;
1211
use std::time::Instant;
1312
use tauri::{command, State};
1413
use tokio::sync::Mutex;
15-
use crate::fileflow::stuct::database_connection::DatabaseConnection;
14+
use crate::fileflow::stuct::database::database_connection::DatabaseConnection;
15+
use crate::fileflow::stuct::io::file_utils::FileUtils;
1616

1717
pub struct DatabaseState(pub Mutex<Option<DatabaseConnection>>);
1818

@@ -36,10 +36,10 @@ pub async fn insert_csv_data(
3636
Err(e) => return Err(format!("Error: Failed to open file: {}", e.to_string())),
3737
};
3838

39-
let first_line: String = read_first_line(&csv.file_path)
39+
let first_line: String = FileUtils::read_first_line(&csv.file_path)
4040
.map_err(|e| format!("Error: Failed to read first line: {}", e.to_string()))?;
4141

42-
let separator: char = find_separator(&first_line)?;
42+
let separator: char = FileUtils::find_separator(&first_line)?;
4343

4444
let final_columns_name: Vec<String> = StringFormatter::get_formated_column_names(
4545
&first_line

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use crate::fileflow::action::actions::DatabaseState;
22
use crate::fileflow::enums::database_engine::DatabaseEngine;
33
use crate::fileflow::enums::query_rows::QueryRows;
4-
use crate::fileflow::stuct::combo_item::ComboItem;
5-
use crate::fileflow::stuct::database_action::DatabaseAction;
6-
use crate::fileflow::stuct::database_connection::DatabaseConnection;
7-
use crate::fileflow::stuct::db_config::DatabaseConfig;
8-
use crate::fileflow::stuct::download_config::DownloadConfig;
9-
use crate::fileflow::stuct::sql_builder::SqlBuilder;
4+
use crate::fileflow::stuct::config::combo_item::ComboItem;
5+
use crate::fileflow::stuct::database::database_action::DatabaseAction;
6+
use crate::fileflow::stuct::database::database_connection::DatabaseConnection;
7+
use crate::fileflow::stuct::config::db_config::DatabaseConfig;
8+
use crate::fileflow::stuct::config::download_config::DownloadConfig;
9+
use crate::fileflow::stuct::database::sql_builder::SqlBuilder;
1010
use crate::fileflow::stuct::string_formater::StringFormatter;
1111
use csv::{Reader, StringRecord};
1212
use serde_json::{json, Value};
@@ -17,7 +17,7 @@ use std::fs::File;
1717
use std::sync::Arc;
1818
use std::time::Instant;
1919
use tauri::{command, State};
20-
use crate::fileflow::stuct::table_exporter::TableExporter;
20+
use crate::fileflow::stuct::io::table_exporter::TableExporter;
2121

2222
#[command]
2323
pub async fn connect_to_database(
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pub mod db_config;
2+
pub mod download_config;
3+
pub mod insert_config;
4+
pub mod save_config;
5+
pub mod combo_item;

0 commit comments

Comments
 (0)