From 9bb2d1f8bbadfef6738f4b3f17c2d7aeebad3219 Mon Sep 17 00:00:00 2001 From: dvkt Date: Mon, 23 Dec 2019 00:24:28 -0800 Subject: [PATCH] wire up bookmarks --- src/bookmarks.rs | 1 - src/help.rs | 5 +++-- src/history.rs | 1 - src/lib.rs | 1 + src/ui.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bookmarks.rs b/src/bookmarks.rs index 98f94bd..1d3c62d 100644 --- a/src/bookmarks.rs +++ b/src/bookmarks.rs @@ -1,5 +1,4 @@ use config; -use std::io::{BufRead, BufReader, Result, Write}; const BOOKMARKS_FILE: &str = "bookmarks.gph"; diff --git a/src/help.rs b/src/help.rs index b05e644..86a1808 100644 --- a/src/help.rs +++ b/src/help.rs @@ -1,11 +1,12 @@ +use bookmarks; use history; pub fn lookup(name: &str) -> Option { Some(match name { "" | "/" | "help" => format!("{}{}", HEADER, HELP), "home" => format!("{}{}", HEADER, HOME), - "history" => history::load_as_raw_menu(), - "bookmarks" => format!("{}", "3Coming soon"), + "history" => history::as_raw_menu(), + "bookmarks" => bookmarks::as_raw_menu(), "keys" => format!("{}{}", HEADER, KEYS), "nav" => format!("{}{}", HEADER, NAV), "types" => format!("{}{}", HEADER, TYPES), diff --git a/src/history.rs b/src/history.rs index bdc9970..3357758 100644 --- a/src/history.rs +++ b/src/history.rs @@ -1,5 +1,4 @@ use config; -use std::io::BufRead; const HISTORY_FILE: &str = "history.gph"; diff --git a/src/lib.rs b/src/lib.rs index f4c2ffc..7f157aa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,7 @@ extern crate termion; #[macro_use] pub mod gopher; pub mod bookmarks; +pub mod config; pub mod help; pub mod history; pub mod menu; diff --git a/src/ui.rs b/src/ui.rs index 9e2bcac..d4cbbbf 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -329,7 +329,7 @@ impl UI { if let Some(page) = self.views.get(self.focused) { let url = page.url(); self.set_status(format!("Saved bookmark: {}", url)); - bookmarks::save(url, url); + bookmarks::save(&url, &url); } } Action::Keypress(Key::Ctrl('u')) => {