Merge pull request #114 from JakeRoggenbuck/make-folders

Make folders

Author: JakeRoggenbuck

.gitignore

@@ -82,3 +82,5 @@ tests/flamegraph.svg
 tests/perf.data
 tests/perf.data.old
 # ----------------#
+
+redoxdata/

redoxdata/.empty

@@ -0,0 +1,2 @@
+A file so that I can check this into Git.
+This allows this folder to exist for our automated testing.

src/container.rs

@@ -222,7 +222,7 @@ impl BaseContainer {
 
     pub fn save_state(&self) {
         let base_meta = self.get_metadata();
-        let hardcoded_filename = "./base_container.data";
+        let hardcoded_filename = "./redoxdata/base_container.data";
 
         let mut index = 0;
         // The Rust compiler suggested that I clone here but it's definitely way better to not copy
@@ -463,7 +463,7 @@ impl TailContainer {
 
     pub fn save_state(&self) {
         let tail_meta = self.get_metadata();
-        let hardcoded_filename = "./tail_container.data";
+        let hardcoded_filename = "./redoxdata/tail_container.data";
 
         let mut index = 0;
         // The Rust compiler suggested that I clone here but it's definitely way better to not copy

src/database.rs

@@ -4,7 +4,7 @@ use super::table::{RTable, RTableMetadata, StatePersistence};
 use pyo3::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::fs::File;
+use std::fs::{create_dir_all, File};
 use std::io::{BufReader, BufWriter, Write};
 use std::path::Path;
 use std::sync::{Arc, Weak};
@@ -42,6 +42,10 @@ impl RDatabase {
             self.db_filepath = Some(path.clone());
         }
 
+        if !Path::new("./redoxdata").exists() {
+            create_dir_all("./redoxdata").expect("Should be able to make dir");
+        }
+
         if let Some(p) = &self.db_filepath {
             if !Path::new(&p).exists() {
                 // The database has not been closed yet

src/page.rs

@@ -40,7 +40,7 @@ impl PhysicalPage {
     }
 
     pub fn save_state(&self, id: i64) {
-        let hardcoded_filename = format!("./{}-page.data", id);
+        let hardcoded_filename = format!("./redoxdata/{}-page.data", id);
 
         let table_bytes: Vec<u8> = bincode::serialize(&self).expect("Should serialize.");
 
@@ -49,7 +49,7 @@ impl PhysicalPage {
     }
 
     pub fn load_state(id: i64) -> PhysicalPage {
-        let hardcoded_filename = format!("./{}-page.data", id);
+        let hardcoded_filename = format!("./redoxdata/{}-page.data", id);
 
         let file = BufReader::new(File::open(hardcoded_filename).expect("Should open file."));
         let page: PhysicalPage = bincode::deserialize_from(file).expect("Should deserialize.");

src/pagerange.rs

@@ -46,7 +46,7 @@ impl PageRange {
         self.base_container.save_state();
         self.tail_container.save_state();
 
-        let hardcoded_filename = "./pagerange.data";
+        let hardcoded_filename = "./redoxdata/pagerange.data";
 
         let pr_meta = self.get_metadata();
 
@@ -57,7 +57,7 @@ impl PageRange {
     }
 
     pub fn load_state() -> PageRange {
-        let hardcoded_filename = "./pagerange.data";
+        let hardcoded_filename = "./redoxdata/pagerange.data";
 
         let file = BufReader::new(File::open(hardcoded_filename).expect("Should open file."));
         let pr_meta: PageRangeMetadata =

src/table.rs

@@ -19,7 +19,7 @@ pub struct RTableMetadata {
 
 pub trait StatePersistence {
     fn load_state(&self) -> RTable {
-        let hardcoded_filename = "./table.data";
+        let hardcoded_filename = "./redoxdata/table.data";
 
         let file = BufReader::new(File::open(hardcoded_filename).expect("Should open file."));
         let table_meta: RTableMetadata =
@@ -211,7 +211,7 @@ impl RTable {
 
     /// Save the state of RTable in a file
     pub fn save_state(&self) {
-        let hardcoded_filename = "./table.data";
+        let hardcoded_filename = "./redoxdata/table.data";
 
         // Save the state of the page range
         self.page_range.save_state();