readme, fmt

2 files changed, 25 insertions, 19 deletions

diff --git a/README.md b/README.md
index aefe1ee..bc04df8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # bk
-bk is a terminal Epub reader. Currently only Linux is tested, but macOS and Windows support is planned.
+bk is a WIP terminal Epub reader, written in Rust.
+
+bk supports Linux and macOS. Windows runs but doesn't save position on exit.
 
 # Usage
 
@@ -17,14 +19,15 @@ Running `bk` without an argument will load the most recent Epub.
 - Vim bindings
 
 # TODO
-- macOS, Windows
+- fix Windows
 - configuration
 - links
 - better unicode support
 - better html rendering
 - mobi?
+- images?
 - css?
 - gui?
 
-# inspiration
+# Inspiration
 <https://github.com/wustho/epr>
diff --git a/src/epub.rs b/src/epub.rs
index fa5f33f..48263c2 100644
--- a/src/epub.rs
+++ b/src/epub.rs
@@ -18,21 +18,24 @@ impl Epub {
             nav: Vec::new(),
             chapters: Vec::new(),
         };
-        let (nav, chapters) = epub.get_nav().into_iter().filter_map(|(path, label)| {
-            let xml = epub.get_text(&path);
-            // https://github.com/RazrFalcon/roxmltree/issues/12
-            // UnknownEntityReference for HTML entities
-            let doc = Document::parse(&xml).unwrap();
-            let body = doc.root_element().last_element_child().unwrap();
-            let mut chapter = String::new();
-            Epub::render(&mut chapter, body);
-            if chapter.is_empty() {
-                None
-            } else {
-                Some((label, chapter))
-            }
-        })
-        .unzip();
+        let (nav, chapters) = epub
+            .get_nav()
+            .into_iter()
+            .filter_map(|(path, label)| {
+                let xml = epub.get_text(&path);
+                // https://github.com/RazrFalcon/roxmltree/issues/12
+                // UnknownEntityReference for HTML entities
+                let doc = Document::parse(&xml).unwrap();
+                let body = doc.root_element().last_element_child().unwrap();
+                let mut chapter = String::new();
+                Epub::render(&mut chapter, body);
+                if chapter.is_empty() {
+                    None
+                } else {
+                    Some((label, chapter))
+                }
+            })
+            .unzip();
         epub.nav = nav;
         epub.chapters = chapters;
         Ok(epub)
@@ -99,7 +102,7 @@ impl Epub {
         let doc = Document::parse(&xml).unwrap();
         // zip expects unix path even on windows
         let rootdir = match path.rfind('/') {
-            Some(n) => &path[..n+1],
+            Some(n) => &path[..n + 1],
             None => "",
         };