feat: refactor transfer handling to use ImportHandlers for database n…

…ame validation
Kremilly · Dec 7, 2024 · 2ac5074 · 2ac5074
1 parent 8706d32
commit 2ac5074
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/engine/import.rs b/src/engine/import.rs
@@ -23,6 +23,7 @@ use std::{
 
 use crate::{
     engine::connection::Connection,
+    helpers::import_handlers::ImportHandlers,
 
     ui::{
         errors_alerts::ErrorsAlerts,
@@ -95,6 +96,8 @@ impl Import {
             content
         };
 
+        let dump_content = ImportHandlers::new(&self.dbname, &dump_content).check_db_name();
+
         let create_table_regex = Regex::new(r"(?i)CREATE TABLE\s+`?(\w+)`?").unwrap();
 
         for statement in dump_content.split(';') {

diff --git a/src/engine/transfer.rs b/src/engine/transfer.rs
@@ -23,7 +23,7 @@ use std::{
 
 use crate::{
     engine::connection::Connection,
-    helpers::transfer_handlers::TransferHandlers,
+    helpers::import_handlers::ImportHandlers,
 
     ui::{
         errors_alerts::ErrorsAlerts,
@@ -104,8 +104,7 @@ impl Transfer {
             content
         };
 
-        let transfer_handlers = TransferHandlers::new(&self.dbname, &dump_content);
-        let dump_content = transfer_handlers.check_db_name();
+        let dump_content = ImportHandlers::new(&self.dbname, &dump_content).check_db_name();
 
         let create_table_regex = Regex::new(r"(?i)CREATE TABLE\s+`?(\w+)`?").unwrap();
 

diff --git a/src/helpers/transfer_handlers.rs → src/helpers/import_handlers.rs b/src/helpers/transfer_handlers.rs → src/helpers/import_handlers.rs
@@ -1,11 +1,11 @@
 use regex::Regex;
 
-pub struct TransferHandlers {
+pub struct ImportHandlers {
     dbname: String,
     dump_content: String,
 }
 
-impl TransferHandlers {
+impl ImportHandlers {
 
     pub fn new(dbname: &str, dump_content: &str) -> Self {
         Self {

diff --git a/src/helpers/mod.rs b/src/helpers/mod.rs
@@ -2,4 +2,4 @@ pub mod env;
 pub mod configs;
 pub mod dump_handlers;
 pub mod export_handlers;
-pub mod transfer_handlers;
+pub mod import_handlers;