MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-31 10:11:07 +00:00
Code Issues Releases Wiki Activity

Load themes from ~/.config/bat/themes

Browse Source
This commit is contained in:
sharkdp 2018-04-22 16:03:47 +02:00
parent a978ec7604
commit de0198920a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.rs
View File

@ -8,7 +8,8 @@ extern crate syntect;
extern crate clap; extern crate clap;
use std::collections::HashMap; use std::collections::HashMap;
use std::io::{self, BufRead, Result, Write, ErrorKind, StdoutLock}; use std::env;
use std::io::{self, BufRead, ErrorKind, Result, StdoutLock, Write};
use std::path::Path; use std::path::Path;
use std::process; use std::process;
@ -37,7 +38,11 @@ type LineChanges = HashMap<u32, LineChange>;
const PANEL_WIDTH: usize = 7; const PANEL_WIDTH: usize = 7;
const GRID_COLOR: u8 = 238; const GRID_COLOR: u8 = 238;
fn print_horizontal_line(handle: &mut StdoutLock, grid_char: char, term_width: usize) -> io::Result<()> { fn print_horizontal_line(
handle: &mut StdoutLock,
grid_char: char,
term_width: usize,
) -> io::Result<()> {
let bar = "─".repeat(term_width - (PANEL_WIDTH + 1)); let bar = "─".repeat(term_width - (PANEL_WIDTH + 1));
let line = format!("{}{}{}", "─".repeat(PANEL_WIDTH), grid_char, bar); let line = format!("{}{}{}", "─".repeat(PANEL_WIDTH), grid_char, bar);
@ -159,7 +164,14 @@ fn get_git_diff(filename: String) -> Option<LineChanges> {
} }
fn run(matches: &ArgMatches) -> Result<()> { fn run(matches: &ArgMatches) -> Result<()> {
let theme_set = ThemeSet::load_from_folder("/home/shark/Informatik/rust/bat/themes").unwrap(); let home_dir = env::home_dir().ok_or(io::Error::new(
ErrorKind::Other,
"Could not get home directory",
))?;
let theme_dir = home_dir.join(".config").join("bat").join("themes");
let theme_set = ThemeSet::load_from_folder(theme_dir)
.map_err(|_| io::Error::new(ErrorKind::Other, "Could not load themes"))?;
let theme = &theme_set.themes["Monokai"]; let theme = &theme_set.themes["Monokai"];
let syntax_set = SyntaxSet::load_defaults_nonewlines(); let syntax_set = SyntaxSet::load_defaults_nonewlines();