tweaks paths in marks and history

pull/6/head
dvkt 5 years ago
parent b7f4131de5
commit 57096fc8b9

@ -8,20 +8,23 @@ macro_rules! dir_missing_fmt {
() => { () => {
"i\r\ni\r "i\r\ni\r
i\r\ni\x1b[91m{error}\x1b[0m\r i\r\ni\x1b[91m{error}\x1b[0m\r
i\r\niBookmarks can only be saved if {dir} exists.\r
i\r\niRun this in your terminal to enable bookmarking:\r i\r\niRun this in your terminal to enable bookmarking:\r
i\r\nimkdir -p {dir}" i\r\nimkdir -p {dir}"
}; };
} }
pub fn as_raw_menu() -> String { pub fn as_raw_menu() -> String {
let mut out = format!("i** bookmarks **\r\ni\r\n");
let path = config::path(); let path = config::path();
if let Err(e) = path { if let Err(e) = path {
return format!(dir_missing_fmt!(), error = e, dir = config::DIR); return format!(dir_missing_fmt!(), error = e, dir = config::DIR);
} }
let mut out = format!("i{}{}:\r\ni\r\n", config::DIR, BOOKMARKS_FILE);
let path = path.unwrap().join(BOOKMARKS_FILE); let path = path.unwrap().join(BOOKMARKS_FILE);
if !path.exists() { if !path.exists() {
out.push_str("iNo bookmarks found.\r\ni\r\niUse <ctrl-s> to bookmark a page.\r\n"); out.push_str("iNo bookmarks yet.\r\ni\r\niUse <ctrl-s> to bookmark a page.\r\n");
return out; return out;
} }

@ -36,7 +36,7 @@ pub fn as_raw_menu() -> String {
); );
} }
let mut out = vec![format!("i{}:\r\ni", file.to_string_lossy())]; let mut out = vec![format!("i{}:\r\ni", homepath)];
config::load(HISTORY_FILE) config::load(HISTORY_FILE)
.and_then(|reader| { .and_then(|reader| {
let mut lines = reader.lines(); let mut lines = reader.lines();

Loading…
Cancel
Save