1 files changed, 29 insertions, 10 deletions

diff --git a/src/schema.rs b/src/schema.rs
index 80cf73f..cb353e4 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -24,15 +24,34 @@ use std::vec::Vec;
 
 pub type Fingerprint = String;
 
-fn last_block_exists() -> Option<String> {
+fn block_parser(path: String) -> u64 {
+    let end_pos = path.find(".block").unwrap();
+    let block_str = path[9..end_pos].to_string();
+    let block_u64 : u64 = block_str.parse().unwrap();
+    block_u64
+}
+
+fn last_block_content() -> (bool, String) {
     let blocks = read_block_name().unwrap();
-    for block in blocks {
+
+    if blocks.len() == 0 {
+        return (false, "".to_string());
+    }
+
+    let last_block = blocks[0].to_str().unwrap();
+    let mut last_block = block_parser(last_block.to_string());
+    let mut last_block_index = 0;
+
+    for (index, block) in blocks.iter().enumerate() {
         let block = block.to_str().unwrap();
-        if block.contains("last.block") {
-            return Some(block.to_string());
+        let block = block_parser(block.to_string());
+        if block > last_block {
+            last_block = block;
+            last_block_index = index;
         }
     }
-    None
+    return (true, blocks[last_block_index].to_str().unwrap().parse().unwrap());
+
 }
 
 fn read_block_name() -> io::Result<Vec<PathBuf>> {
@@ -89,11 +108,11 @@ fn populate_db_with_users(db: &mut Db, files: Vec<PathBuf>) -> &mut Db {
 pub fn create_database() -> Db {
     fs::create_dir_all("blocks").unwrap();
     fs::create_dir_all("users").unwrap();
-
-    let mut db = Db::new();
-
-    if let Some(blocks_path) = last_block_exists() {
-        populate_db_with_last_block(&mut db, blocks_path);
+    let (res, path) = last_block_content();
+    if res {
+        return create_db_with_last_block(path);
+    } else {
+        return Db::new();
     }
 
     if let Ok(users_path) = read_users() {