6 files changed, 157 insertions, 32 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..c8ccbae
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,84 @@
+name: Rust
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  rustfmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - run: rustup component add rustfmt
+      - run: cargo fmt -- --check
+  
+  build-linux:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      # cache the build assets so they dont recompile every time.
+      - name: Cache Rust dependencies
+        uses: actions/[email protected]
+        with:
+          path: target
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-build-
+      - name: Install latest rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: beta
+          default: true
+          override: true
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update \
+          && sudo apt-get install -y \
+          libdbus-1-dev
+      - name: Build
+        run: cargo build --all --release && strip target/release/dijo
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v1-release
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/dijo
+          asset_name: dijo-x86_64-linux
+          tag: ${{ github.ref }}
+          overwrite: true
+
+  build-apple:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Cache Rust dependencies
+        uses: actions/[email protected]
+        with:
+          path: target
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-build-
+      - name: Install latest rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: beta
+          target: x86_64-apple-darwin
+          default: true
+          override: true
+
+      - name: Build for mac
+        run: cargo build --all --release && strip target/release/dijo
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v1-release
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/dijo
+          asset_name: dijo-x86_64-apple
+          tag: ${{ github.ref }}
+          overwrite: true
diff --git a/Cargo.lock b/Cargo.lock
index bda3c1e..a299289 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -260,7 +260,7 @@ dependencies = [
 
 [[package]]
 name = "dijo"
-version = "0.1.5"
+version = "0.2.0"
 dependencies = [
  "chrono",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 3f297b8..f215503 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dijo"
-version = "0.1.5"
+version = "0.2.0"
 authors = ["Akshay <[email protected]>"]
 edition = "2018"
 description = "Scriptable, curses-based, digital habit tracker"
diff --git a/src/app/impl_self.rs b/src/app/impl_self.rs
index 8a84cb2..1dfe268 100644
--- a/src/app/impl_self.rs
+++ b/src/app/impl_self.rs
@@ -54,6 +54,10 @@ impl App {
         }
     }
 
+    pub fn list_habits(&self) -> Vec<String> {
+        self.habits.iter().map(|x| x.name()).collect::<Vec<_>>()
+    }
+
     pub fn delete_by_name(&mut self, name: &str) {
         let old_len = self.habits.len();
         self.habits.retain(|h| h.name() != name);
@@ -141,7 +145,7 @@ impl App {
         let completed = total - remaining;
 
         let timestamp = if self.view_month_offset == 0 {
-            format!("{}", Local::now().date().format("%d/%b/%y"),)
+            format!("{}", Local::now().naive_local().date().format("%d/%b/%y"),)
         } else {
             let months = self.view_month_offset;
             format!("{}", format!("{} months ago", months),)
@@ -270,7 +274,7 @@ impl App {
                         self.message.set_message("help <command>|commands|keys")
                     }
                 }
-                Command::Quit => self.save_state(),
+                Command::Quit | Command::Write => self.save_state(),
                 Command::MonthNext => self.sift_forward(),
                 Command::MonthPrev => self.sift_backward(),
                 Command::Blank => {}
diff --git a/src/app/impl_view.rs b/src/app/impl_view.rs
index 892b00c..0dfd20b 100644
--- a/src/app/impl_view.rs
+++ b/src/app/impl_view.rs
@@ -102,25 +102,6 @@ impl View for App {
                 self.set_focus(Absolute::Down);
                 return EventResult::Consumed(None);
             }
-            Event::Char('d') => {
-                if self.habits.is_empty() {
-                    return EventResult::Consumed(None);
-                }
-                self.habits.remove(self.focus);
-                self.focus = self.focus.checked_sub(1).unwrap_or(0);
-                return EventResult::Consumed(None);
-            }
-            Event::Char('w') => {
-                // helper bind to test write to file
-                let j = serde_json::to_string_pretty(&self.habits).unwrap();
-                let mut file = File::create("foo.txt").unwrap();
-                file.write_all(j.as_bytes()).unwrap();
-                return EventResult::Consumed(None);
-            }
-            Event::Char('q') => {
-                self.save_state();
-                return EventResult::with_cb(|s| s.quit());
-            }
             Event::Char('v') => {
                 if self.habits.is_empty() {
                     return EventResult::Consumed(None);
diff --git a/src/command.rs b/src/command.rs
index 29908f4..38d48e9 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,21 +1,75 @@
 use std::fmt;
 
+use cursive::event::{Event, EventResult, Key};
 use cursive::theme::{BaseColor, Color, ColorStyle};
 use cursive::view::Resizable;
-use cursive::views::{EditView, LinearLayout, TextView};
+use cursive::views::{EditView, LinearLayout, OnEventView, TextView};
 use cursive::Cursive;
 
 use crate::{app::App, CONFIGURATION};
 
+static COMMANDS: &'static [&'static str] = &[
+    "add",
+    "add-auto",
+    "delete",
+    "track-up",
+    "track-down",
+    "month-prev",
+    "month-next",
+    "quit",
+    "write",
+    "help",
+];
+
+fn get_command_completion(prefix: &str) -> Option<String> {
+    let first_match = COMMANDS.iter().filter(|&x| x.starts_with(prefix)).next();
+    return first_match.map(|&x| x.into());
+}
+
+fn get_habit_completion(prefix: &str, habit_names: &[String]) -> Option<String> {
+    let first_match = habit_names.iter().filter(|&x| x.starts_with(prefix)).next();
+    eprintln!("{:?}| {:?}", prefix, first_match);
+    return first_match.map(|x| x.into());
+}
+
 pub fn open_command_window(s: &mut Cursive) {
-    let command_window = EditView::new()
-        .filler(" ")
-        .on_submit(call_on_app)
-        .style(ColorStyle::new(
-            Color::Dark(BaseColor::Black),
-            Color::Dark(BaseColor::White),
-        ))
-        .fixed_width(CONFIGURATION.view_width * CONFIGURATION.grid_width);
+    let habit_list: Vec<String> = s
+        .call_on_name("Main", |view: &mut App| {
+            return view.list_habits();
+        })
+        .unwrap();
+    let style = ColorStyle::new(Color::Dark(BaseColor::Black), Color::Dark(BaseColor::White));
+    let command_window = OnEventView::new(
+        EditView::new()
+            .filler(" ")
+            .on_submit(call_on_app)
+            .style(style),
+    )
+    .on_event_inner(
+        Event::Key(Key::Tab),
+        move |view: &mut EditView, _: &Event| {
+            let contents = view.get_content();
+            if !contents.contains(" ") {
+                let completion = get_command_completion(&*contents);
+                if let Some(c) = completion {
+                    let cb = view.set_content(c);
+                    return Some(EventResult::Consumed(Some(cb)));
+                };
+                return None;
+            } else {
+                let word = contents.split(' ').last().unwrap();
+                let completion = get_habit_completion(word, &habit_list);
+                eprintln!("{:?} | {:?}", completion, contents);
+                if let Some(c) = completion {
+                    let cb =
+                        view.set_content(format!("{}", contents) + c.strip_prefix(word).unwrap());
+                    return Some(EventResult::Consumed(Some(cb)));
+                };
+                return None;
+            }
+        },
+    )
+    .fixed_width(CONFIGURATION.view_width * CONFIGURATION.grid_width);
     s.call_on_name("Frame", |view: &mut LinearLayout| {
         let mut commandline = LinearLayout::horizontal()
             .child(TextView::new(":"))
@@ -60,6 +114,7 @@ pub enum Command {
     TrackUp(String),
     TrackDown(String),
     Help(Option<String>),
+    Write,
     Quit,
     Blank,
 }
@@ -144,6 +199,7 @@ impl Command {
             "mprev" | "month-prev" => return Ok(Command::MonthPrev),
             "mnext" | "month-next" => return Ok(Command::MonthNext),
             "q" | "quit" => return Ok(Command::Quit),
+            "w" | "write" => return Ok(Command::Write),
             "" => return Ok(Command::Blank),
             s => return Err(CommandLineError::InvalidCommand(s.into())),
         }