updated and fixed code, deleted 'sqlite' database

Author: knoxydev

src/add_file.rs

@@ -24,17 +24,17 @@ pub mod add_fn
 	{
 		crate::log::logger::start("ADD   ".to_string());
 
-		let TIME_DATE : [String; 2] = crate::time::time_fn::start();
+		let time_date : [String; 2] = crate::time::time_fn::start();
 
 		let save_info : [String; 4] = [
 			file_path.to_string(),
 			unq_name.to_string(),
-			TIME_DATE[0].to_string(),
-			TIME_DATE[1].to_string()];
+			time_date[0].to_string(),
+			time_date[1].to_string()];
 
 
-		let CREATE_COPY = crate::database::add::start(save_info);
-		if (CREATE_COPY == true) { create_save(&unq_name, &file_path); }
+		let create_copy = crate::database::add::start(save_info);
+		if create_copy == true { create_save(&unq_name, &file_path); }
 		else { println!(":("); }
 	}
 }

src/delete.rs

@@ -1,89 +1,8 @@
-pub mod delete_fn {
-	#![allow(warnings)]
-
-	// PACKAGES
-	use std::fs;
-	use std::error::Error;
-	
-	extern crate rusqlite;
-	use rusqlite::{params, Connection, Result, NO_PARAMS};
-	// PACKAGES
-
-	#[derive(Debug)]
-	struct FileStr {
-		id: i64,
-		file_path: String,
-		save_name: String,
-		saved_date: String,
-		saved_time: String
-	}
-
-
-	// CREATE NEW CLEARED ARRAY with DELETED ELEMENT, and DELETE SAVE FILE
-	fn delete_save(save_name: String) -> Result<Vec<FileStr>, Box<dyn Error>> {
-
-		{ // BLOCK FOR DELETE SAVE FILE
-			let save_path = format!("rustix/saves/{:02}.txt", save_name);
-
-			match fs::remove_file(save_path) {
-				Err(error) => println!("{:?}", error.kind()),
-				Ok(_) => println!("The save was successfully deleted !"),
-			}
-		}
-
-		let conn = Connection::open("rustix/storage.db3")?;
-		let mut stmt = conn.prepare("SELECT * FROM main")?;
-
-		let mut base = stmt.query_map(NO_PARAMS, |row| {
-			Ok(FileStr {
-				id: row.get(0)?,
-				file_path: row.get(1)?, save_name: row.get(2)?,
-				saved_date: row.get(3)?, saved_time: row.get(4)?,
-			})
-		})?;
-		
-		let mut new_base: Vec<FileStr> = Vec::new();
-		let mut new_id: i64 = 1;
-
-		for x in base.into_iter() {
-			if x.as_ref().unwrap().save_name == save_name { continue; }
-			else { new_base.push(x.unwrap()); }
-		}
-		for x in new_base.iter_mut() {
-			x.id = new_id;
-			new_id += 1;
-		}
-
-		Ok(new_base)
-	}
-
-
-	// UPDATE DB and INSERT UPDATED DB
-	fn update_db(base: Vec<FileStr>) -> Result<(), Box<dyn Error>> {
-		let conn = Connection::open("rustix/storage.db3")?;
-		conn.execute("DROP TABLE IF EXISTS main", NO_PARAMS)?;
-
-		conn.execute("CREATE TABLE IF NOT EXISTS main (
-			id INTEGER PRIMARY KEY,
-			file_path TEXT NOT NULL, save_name TEXT UNIQUE,
-			saved_date TEXT NOT NULL, saved_time TEXT NOT NULL)", NO_PARAMS,
-		)?;
-
-		for x in base {
-			conn.execute("INSERT INTO main (
-				id, file_path, save_name, saved_date, saved_time) VALUES (?1, ?2, ?3, ?4, ?5)",
-				params![x.id, x.file_path, x.save_name, x.saved_date, x.saved_time],
-			)?;
-		}
-
-		conn.close();
-		Ok(())
-	}
-
+pub mod delete_fn
+{
 	// START POINT
 	pub fn start(save_name: String) {
 		crate::log::logger::start("DELETE".to_string());
-
-		update_db(delete_save(save_name).unwrap());
+		crate::database::del::start(save_name);
 	}
 }

src/initialize.rs

@@ -1,52 +1,19 @@
-pub mod init_fn {
-	#![allow(warnings)]
-
+pub mod init_fn
+{
 	// PACKAGES
 	use std::env;
 	use std::fs;
-	use std::fs::{File, OpenOptions};
-
-	use serde::{Deserialize, Serialize};
-	use serde_yaml::{self};
-
-	extern crate rusqlite;
-	use rusqlite::{params, Connection, Result, NO_PARAMS};
-	// PACKAGES
-
-	#[derive(Debug, Serialize, Deserialize)]
-	struct Config {
-		name: String,
-		os_name: String,
-		created_date: String,
-		created_time: String,
-	}
-
-
-	fn create_db() -> Result<()>
-	{
-		let conn = Connection::open("rustix/storage.db3")?;
-
-		conn.execute("CREATE TABLE IF NOT EXISTS main (
-			id INTEGER PRIMARY KEY,
-			file_path TEXT NOT NULL, save_name TEXT UNIQUE,
-			saved_date TEXT NOT NULL, saved_time TEXT NOT NULL)", NO_PARAMS,
-		)?;
-
-		conn.close();
-
-		Ok(())
-	}
 
 
 	fn create_yaml()
 	{
-		let TIME_DATE: [String; 2] = crate::time::time_fn::start();
+		let time_date: [String; 2] = crate::time::time_fn::start();
 
 		let cwd = env::current_dir().unwrap();
 		let folder: String = String::from(cwd.to_string_lossy());
 		let os_name = String::from(env::consts::OS);
-		let created_date = &TIME_DATE[0];
-		let created_time = &TIME_DATE[1];
+		let created_date = &time_date[0];
+		let created_time = &time_date[1];
 
 		let info = format!("name: {folder}\nos_name: {os_name}\ncreated_date: {created_date}\ncreated_time: {created_time}");
 
@@ -61,11 +28,11 @@ pub mod init_fn {
 		match fs::create_dir("rustix") {
 			Err(why) => println!("{:?} !", why.kind()),
 			Ok(_) => {
-				File::create("rustix/log.txt");
-				File::create("rustix/init.yml");
+				fs::File::create("rustix/log.txt");
+				fs::File::create("rustix/init.yml");
+				fs::File::create("rustix/storage.txt");
 				fs::create_dir("rustix/saves");
 				create_yaml();
-				create_db();
 			},
 		}
 

src/log.rs

@@ -1,12 +1,14 @@
-pub mod logger {
+pub mod logger
+{
 	use std::fs::OpenOptions;
 	use std::io::prelude::*;
 
-	pub fn start(action: String) {
-		let TIME_DATE: [String; 2] = crate::time::time_fn::start();
+	pub fn start(action: String)
+	{
+		let time_date: [String; 2] = crate::time::time_fn::start();
 
-		let created_date = &TIME_DATE[0];
-		let created_time = &TIME_DATE[1];
+		let created_date = &time_date[0];
+		let created_time = &time_date[1];
 
 		let info = format!("{} | {} - {}", action, created_date, created_time);
 

src/main.rs

@@ -22,6 +22,8 @@ pub use crate::print::print_fn;
 mod log;
 
 mod time;
+
+mod database;
 // MODULES
 
 

src/print.rs

@@ -1,8 +1,7 @@
 pub mod print_fn
 {
 	// PACKAGES
-	use std::fs::File;
-	use std::error::Error;
+	use std::fs;
 	use std::io::{prelude::*, BufReader};
 
 	use serde::{Deserialize, Serialize};
@@ -21,7 +20,6 @@ pub mod print_fn
 
 	pub fn print_commands() {
 		println!("Commands:\n");
-
 		println!("rustix-vcs init\n  command to initialize the project\n");
 		println!("rustix-vcs add src/main.js save_name\n  command to save the file.\n");
 		println!("rustix-vcs delete save_name\n  command to delete the save.\n");
@@ -34,7 +32,7 @@ pub mod print_fn
 
 
 	fn show_log() -> std::io::Result<()> {
-		let file = File::open("rustix/log.txt")?;
+		let file = fs::File::open("rustix/log.txt")?;
 		let reader = BufReader::new(file);
 		for line in reader.lines() { println!("{}", line?); }
 
@@ -43,19 +41,19 @@ pub mod print_fn
 
 
 	pub fn read_yaml() {
-		let f = File::open("rustix/init.yml").expect("Could not open file.");
-		let mut data: Config = serde_yaml::from_reader(f).expect("Couldn't read");
+		let f = fs::File::open("rustix/init.yml").expect("Could not open file.");
+		let data: Config = serde_yaml::from_reader(f).expect("Couldn't read");
 
 		println!("INFO\n  os: {}\n  created date: {} - {}\n  current path: {}\n\n",
 			data.os_name, data.created_date, data.created_time, data.name);
 	}
 
 
 	fn print_db() {
-		let SAVES_BASE = crate::database::get::start().unwrap();
+		let saves_base = crate::database::get::start().unwrap();
 		let mut id : i64 = 1;
 
-		for x in SAVES_BASE.into_iter() {
+		for x in saves_base.into_iter() {
 			println!("{}. {}\n   - path\n      {}\n   - saved\n      {}\n      {}\n",
 			id, x[1], x[0], x[2], x[3]);
 

src/select.rs

@@ -1,55 +1,8 @@
-pub mod select_fn {
-	#![allow(warnings)]
-
+pub mod select_fn
+{
 	// PACKAGES
 	use std::fs;
-	use std::fs::File;
 	use std::io::Write;
-	use std::error::Error;
-	
-	extern crate rusqlite;
-	use rusqlite::{params, Connection, Result, NO_PARAMS};
-	// PACKAGES
-
-	#[derive(Debug)]
-	struct FileStr {
-		id: i64,
-		file_path: String,
-		save_name: String,
-		saved_date: String,
-		saved_time: String
-	}
-
-	#[derive(Debug)]
-	struct DBStr {
-		id: i64,
-		save_name: String,
-		file_path: String
-	}
-
-
-	fn check_save_exist(save_name: &String) -> Result<[String; 4], Box<dyn Error>>
-	{
-		let conn = Connection::open("rustix/storage.db3")?;
-		let mut stmt = conn.prepare("SELECT id, save_name, file_path FROM main")?;
-		let mut base = stmt.query_map(NO_PARAMS, |row| { Ok(DBStr { id: row.get(0)?, save_name: row.get(1)?, file_path: row.get(2)?, }) })?;
-
-		let mut data: [String; 4] = ["".to_string(), "0".to_string(), "".to_string(), "".to_string()];
-
-		for e in base.into_iter() {
-			let x = e.unwrap();
-			if &x.save_name == save_name {
-				data[0] = format!("{:?}", x.id); // ID
-				data[1] = "1".to_string(); // EXIST {1 = YES, 0 = NO}
-				data[2] = x.file_path; // FILE PATH
-				data[3] = x.save_name; // NAME
-
-				break;
-			} else { continue; }
-		}
-
-		Ok(data)
-	}
 
 
 	fn write_content(file_path: &String, file_name: &String)
@@ -58,21 +11,23 @@ pub mod select_fn {
 		match fs::read_to_string(new_file_name) {
 			Err(error) => println!("{:?}", error.kind()),
 			Ok(x) => {
-				let mut f = File::create(file_path).expect("Unable to create file");;
+				let mut f = fs::File::create(file_path).expect("Unable to create file");
     		f.write_all(x.as_bytes()).expect("Unable to write data");
 
     		println!("To a file {:?} moved saving {:?}", file_path, file_name);
 			},
 		}
 	}
 
+
 	// START POINT
-	pub fn start(save_name: String) {
+	pub fn start(save_name: String)
+	{
 		crate::log::logger::start("SELECT".to_string());
 
-		let db_str = check_save_exist(&save_name).unwrap();
-		if db_str[1] == "0" { return println!("there is no save with this name !"); }
+		let save_info : (bool, String) = crate::database::slc::start(&save_name);
 
-		write_content(&db_str[2], &db_str[3]);
+		if save_info.0 == true { write_content(&save_info.1, &save_name); }
+		else { println!("there is no save with this name !"); }
 	}
 }

src/time.rs

@@ -1,6 +1,5 @@
-pub mod time_fn {
-	#![allow(warnings)]
-
+pub mod time_fn
+{
 	// PACKAGES
 	use std::process::Command;