git.iko.soy/bat
on master help sign in
Add --pager option
commit154186a58deefd4b837677a5f27000c1a3beae73 authorPark Juhyung <majecty@gmail.com> dateSun 21 Oct 2018, 19:52 (8 years ago) parentb22a9f8
4 files changed+29−10
compare with master
unifiedsplit
src/app.rs+4 src/clap_app.rs+16−3 src/controller.rs+1−1 src/output.rs+8−6
src/app.rs+4
@@ -70,6 +70,9 @@ pub struct Config<'a> {
7070
7171 /// File extension/name mappings
7272 pub syntax_mapping: SyntaxMapping,
73+
74+ /// Pager option
75+ pub pager: Option<&'a str>,
7376}
7477
7578fn is_truecolor_terminal() -> bool {
@@ -228,6 +231,7 @@ impl App {
228231 ),
229232 output_components,
230233 syntax_mapping,
234+ pager: self.matches.value_of("pager"),
231235 })
232236 }
233237
src/clap_app.rs+16−3
@@ -204,12 +204,25 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
204204 .long_help(
205205 "Specify when to use the pager. To control which pager \
206206 is used, set the PAGER or BAT_PAGER environment \
207− variables (the latter takes precedence). The default \
208− pager is 'less'. To disable the pager permanently, set \
209− BAT_PAGER to an empty string. \
207+ variables (the latter takes precedence) or set --pager option.\
208+ The default pager is 'less'. To disable the pager permanently,\
209+ set BAT_PAGER to an empty string. \
210210 Possible values: *auto*, never, always.",
211211 ),
212212 )
213+ .arg(
214+ Arg::with_name("pager")
215+ .long("pager")
216+ .overrides_with("pager")
217+ .takes_value(true)
218+ .value_name("pager-command")
219+ .hidden_short_help(true)
220+ .help("Set pager")
221+ .long_help(
222+ "Set which pager is used. This option will overwrite \
223+ PAGER or BAT_PAGER environment variables.",
224+ ),
225+ )
213226 .arg(
214227 Arg::with_name("wrap")
215228 .long("wrap")
src/controller.rs+1−1
@@ -19,7 +19,7 @@ impl<'b> Controller<'b> {
1919 }
2020
2121 pub fn run(&self) -> Result<bool> {
22− let mut output_type = OutputType::from_mode(self.config.paging_mode)?;
22+ let mut output_type = OutputType::from_mode(self.config.paging_mode, self.config.pager)?;
2323 let writer = output_type.handle()?;
2424 let mut no_errors: bool = true;
2525
src/output.rs+8−6
@@ -15,19 +15,21 @@ pub enum OutputType {
1515}
1616
1717impl OutputType {
18− pub fn from_mode(mode: PagingMode) -> Result<Self> {
18+ pub fn from_mode(mode: PagingMode, pager: Option<&str>) -> Result<Self> {
1919 use self::PagingMode::*;
2020 Ok(match mode {
21− Always => OutputType::try_pager(false)?,
22− QuitIfOneScreen => OutputType::try_pager(true)?,
21+ Always => OutputType::try_pager(false, pager)?,
22+ QuitIfOneScreen => OutputType::try_pager(true, pager)?,
2323 _ => OutputType::stdout(),
2424 })
2525 }
2626
2727 /// Try to launch the pager. Fall back to stdout in case of errors.
28− fn try_pager(quit_if_one_screen: bool) -> Result<Self> {
29− let pager = env::var("BAT_PAGER")
30− .or_else(|_| env::var("PAGER"))
28+ fn try_pager(quit_if_one_screen: bool, pager_from_config: Option<&str>) -> Result<Self> {
29+ let pager_from_env = env::var("BAT_PAGER")
30+ .or_else(|_| env::var("PAGER"));
31+ let pager = pager_from_config.map(|p| p.to_string())
32+ .or(pager_from_env.ok())
3133 .unwrap_or(String::from("less"));
3234
3335 let pagerflags = shell_words::split(&pager)