From 6fef7d9cdbd7030f58d49e9ac18ab101fd186b56 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Wed, 29 Apr 2020 18:34:59 -0700
Subject: direction enum

---
 src/main.rs | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index 406b422..e059407 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -196,6 +196,10 @@ struct Bk {
 }
 
 struct Position(String, usize, usize);
+enum Direction {
+    Forward,
+    Backward,
+}
 
 impl Bk {
     fn new(pos: &Position, pad: u16) -> Result<Self, Error> {
@@ -323,19 +327,24 @@ impl Bk {
             self.pos = (self.chapter.len() / self.rows) * self.rows;
         }
     }
-    fn really_search(&mut self, forwards: bool) {
-        if forwards {
-            if let Some(pos) = self.chapter[self.pos + 1..]
-                .iter()
-                .position(|s| s.contains(&self.search))
-            {
-                self.pos += pos + 1;
+    fn really_search(&mut self, dir: Direction) {
+        match dir {
+            Direction::Forward => {
+                if let Some(i) = self.chapter[self.pos + 1..]
+                    .iter()
+                    .position(|s| s.contains(&self.search))
+                {
+                    self.pos += i + 1;
+                }
+            }
+            Direction::Backward => {
+                if let Some(i) = self.chapter[..self.pos]
+                    .iter()
+                    .rposition(|s| s.contains(&self.search))
+                {
+                    self.pos = i;
+                }
             }
-        } else if let Some(pos) = self.chapter[0..self.pos - 1]
-            .iter()
-            .rposition(|s| s.contains(&self.search))
-        {
-            self.pos = pos;
         }
     }
     fn match_search(&mut self, kc: KeyCode) {
@@ -346,7 +355,7 @@ impl Bk {
             }
             KeyCode::Enter => {
                 self.mode = Mode::Read;
-                self.really_search(true);
+                self.really_search(Direction::Forward);
             }
             KeyCode::Char(c) => {
                 self.search.push(c);
@@ -401,10 +410,10 @@ impl Bk {
                 self.mode = Mode::Search;
             }
             KeyCode::Char('N') => {
-                self.really_search(false);
+                self.really_search(Direction::Backward);
             }
             KeyCode::Char('n') => {
-                self.really_search(true);
+                self.really_search(Direction::Forward);
             }
             KeyCode::End | KeyCode::Char('G') => {
                 self.pos = (self.chapter.len() / self.rows) * self.rows;
@@ -499,8 +508,8 @@ PageDown Right Space f l  Page Down
                     Up k  Line Up
                   Home g  Chapter Start
                    End G  Chapter End
-                       n  Search Forwards
-                       N  Search Backwards
+                       n  Search Forward
+                       N  Search Backward
                    "#;
 
         let mut stdout = stdout();
-- 
cgit v1.2.3