2 files changed, 32 insertions, 1 deletions

diff --git a/src/app/impl_self.rs b/src/app/impl_self.rs
index 1ed19e6..1dfe268 100644
--- a/src/app/impl_self.rs
+++ b/src/app/impl_self.rs
@@ -33,8 +33,25 @@ impl App {
         };
     }
 
+    pub fn list_habit(&self) -> Vec<String> {
+        let habits_names = self.habits.iter().map(|x| x.name()).collect::<Vec<_>>();
+        return habits_names;
+    }
+
     pub fn add_habit(&mut self, h: Box<dyn HabitWrapper>) {
-        self.habits.push(h);
+        if self
+            .habits
+            .iter()
+            .filter(|hab| hab.name() == h.name())
+            .count()
+            > 0
+        {
+            self.message.set_kind(MessageKind::Error);
+            self.message
+                .set_message(format!("Habit `{}` allready exist", h.name()))
+        } else {
+            self.habits.push(h);
+        }
     }
 
     pub fn list_habits(&self) -> Vec<String> {
diff --git a/src/main.rs b/src/main.rs
index d96119e..050a296 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,6 +33,14 @@ fn main() {
                 .value_name("CMD")
                 .help("run a dijo command"),
         )
+        .arg(
+            Arg::with_name("list")
+                .short("l")
+                .long("list")
+                .takes_value(false)
+                .help("list dijo habits")
+                .conflicts_with("command"),
+        )
         .get_matches();
     if let Some(c) = matches.value_of("command") {
         let command = Command::from_string(c);
@@ -49,6 +57,12 @@ fn main() {
                 "Commands other than `track-up` and `track-down` are currently not supported!"
             ),
         }
+    } else if matches.is_present("list") {
+        let app = App::load_state();
+        let _habit_names = app.list_habit();
+        for h in _habit_names {
+            println!("{}", h);
+        }
     } else {
         let mut s = termion().unwrap();
         let app = App::load_state();