Closed
Conversation
pr: Add -h to print custom header instead of file name pr: Add -n to print line numbers
pr: code refactoring for references
…umbers pr: Add -l option set number of lines pr: Refactor opts
pr: Add -F to print line feed character for page separator
pr: Fix number of lines printed per page pr: Fix first short page getting skipped due to page range
pr: Remove parameter header from build_options pr: Remove unnecessary get_input_type
pr: Add test for -h option pr: Add test for -d option
pr: Fix long name for -n pr: Add -N first line number option pr: Add -n[char][width] support
pr: Fix page ranges
pr: Add test for -l option pr: Add test for -r suppress error option
pr: Print fixed padded string for each column pr: Fix display length vs str length due to tabs
pr: Remove unwanted brancing in fill_missing_lines pr: Remove unnecessary error check pr: Rename key to group_key in FileLine pr: Reformat test_pr with rustfmt
pr: fix form feed pr: Rustfmt pr: add test for ff and -l option
pr: add -J option pr: add -S option
pr: refactor batching of pages in pr
pr: refactor common iterator between pr and mpr pr: remove fill lines in mpr
pr: extract recreate_arguments pr: refactor get_line_for_printing pr: refactor get_lines_for_printing pr: refactor fetch_indexes generate for write_columns pr: refactor write_columns pr: refactor write_columns
Only the minimum needed to: * Make everything compile without warnings * Move files according to the new project structure * Make tests pass
sylvestre
reviewed
Mar 26, 2021
Contributor
sylvestre
left a comment
sylvestre
left a comment
There was a problem hiding this comment.
it will take some time to review it but here is a few comments
|
|
||
| type IOError = std::io::Error; | ||
|
|
||
| static NAME: &str = "pr"; |
Contributor
There was a problem hiding this comment.
Could you please follow this example to declarations the options?
https://github.com/uutils/coreutils/blob/master/src/uu/ls/src/ls.rs#L78-L80
|
|
||
| pub fn uumain(args: impl uucore::Args) -> i32 { | ||
| let args = args.collect_str(); | ||
| let mut opts = getopts::Options::new(); |
Contributor
There was a problem hiding this comment.
Not blocker but it would be nice to use clap instead of getopts
| fn recreate_arguments(args: &Vec<String>) -> Vec<String> { | ||
| let column_page_option = Regex::new(r"^[-+]\d+.*").unwrap(); | ||
| let num_regex: Regex = Regex::new(r"(.\d+)|(\d+)|^[^-]$").unwrap(); | ||
| //let a_file: Regex = Regex::new(r"^[^-+].*").unwrap(); |
Contributor
There was a problem hiding this comment.
please remove useless comments
sylvestre
requested changes
Mar 27, 2021
| } | ||
| } | ||
|
|
||
| fn print_usage(opts: &mut Options, matches: &Matches) -> i32 { |
Contributor
There was a problem hiding this comment.
this can be removed when/if moved to clap
| let option = value_to_parse.1; | ||
| i.parse::<usize>().map_err(|_e| { | ||
| PrError::EncounteredErrors(format!("invalid {} argument '{}'", option, i)) | ||
| }) |
Contributor
There was a problem hiding this comment.
please add a test to cover this
| } | ||
| }); | ||
|
|
||
| let default_first_number: usize = NumberingMode::default().first_number; |
| @@ -0,0 +1,513 @@ | |||
| use crate::common::util::*; | |||
| @@ -0,0 +1,1343 @@ | |||
| #![crate_name = "uu_pr"] | |||
Contributor
There was a problem hiding this comment.
the file is quite long, maybe it would make sense to split it?
Closed
Contributor
|
@MaxSem ping? |
Contributor
Author
|
Sorry, was busy doing something else. Will try to find time in the next few days. |
Contributor
|
@MaxSem ping? :) |
Contributor
|
@MaxSem ping? :) |
Contributor
|
@MaxSem ping? |
Contributor
|
moved to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR is a resurrection of #1327 by @tilakpatidar.
Closes #1874