Add support for GNU-compatible printf by refi64 · Pull Request #120 · uutils/findutils

refi64 · 2021-12-17T17:29:32Z

This adds initial support for GNU find-compatible printf syntax. As far
as I can tell, it should implement all the specifiers, with the
following exceptions:

Using zero as padding instead of space: GNU find isn't consistent with
which numeric format specifiers support this.
Specifying precision (%x.yz): I believe sparseness (%S)
and seconds-since-epoch (%A@ / %C@ / %T@) are the only ones that
allow this, making it only partially useful.
Printing SELinux contexts (%Z): requires some extra dependencies and
isn't within our scope.

uucore is added as a dependency, because it has several utility
functions that we need, the complexity of which is high enough that
using the extra dependency is quite helpful.

This also stubs out many of the specifiers for Windows, simply because I
have no idea how these should work there. (The defaults chosen should be
"good enough" for the moment, though.)

Signed-off-by: Ryan Gonzalez ryan.gonzalez@collabora.com

Okay, so some more meta notes on this:

Right now, printing the filesystem doesn't work reliably without: uucore::fsext: Fix mountinfo parsing w/ multiple optional fields coreutils#2778
I'm not sure if what I put for the copyright in the new file is correct, please point it out if not!
Also not sure if it would be worth removing printer.rs in favor of just putting Printf::new("%p").unwrap() (which I believe should be identical) in the main file.

codecov · 2021-12-17T20:23:05Z

Codecov Report

Merging #120 (dd443b9) into master (d385362) will increase coverage by 2.10%.
The diff coverage is 65.06%.

@@            Coverage Diff             @@
##           master     #120      +/-   ##
==========================================
+ Coverage   47.70%   49.80%   +2.10%     
==========================================
  Files          18       19       +1     
  Lines        2111     2594     +483     
  Branches      495      702     +207     
==========================================
+ Hits         1007     1292     +285     
- Misses        933     1046     +113     
- Partials      171      256      +85

Impacted Files	Coverage Δ
src/find/matchers/delete.rs	`79.16% <ø> (ø)`
src/find/mod.rs	`61.36% <ø> (ø)`
tests/find_cmd_tests.rs	`70.58% <47.36%> (-18.78%)`	⬇️
src/find/matchers/mod.rs	`65.78% <50.00%> (-0.43%)`	⬇️
src/find/matchers/printf.rs	`67.70% <67.70%> (ø)`
src/lib.rs	`25.54% <0.00%> (+2.81%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d385362...dd443b9. Read the comment docs.

wlozano0collabora · 2021-12-18T02:13:39Z

Very strange test failure, it doesn't seem to be related to this PR.

refi64 · 2021-12-18T03:25:56Z

oh oops I had fixed it locally but forgot to push, just did it now

sylvestre · 2021-12-22T17:33:39Z

Would it be possible to have high level tests?
https://github.com/uutils/findutils/blob/master/tests/find_cmd_tests.rs
thanks

refi64 · 2021-12-23T00:46:17Z

@sylvestre I added some high-level tests in src/find/mod.rs with a lot of the others there, does that look okay?

sylvestre · 2021-12-23T08:26:55Z

@sylvestre I added some high-level tests in src/find/mod.rs with a lot of the others there, does that look okay?

could you please move them into the tests directory? I prefer to have all integration tests at the same place. thanks

refi64 · 2021-12-23T15:08:35Z

@sylvestre Ah I misunderstood, just moved it over and actually testing the find binary itself (not find_main).

refi64 · 2021-12-23T18:26:59Z

Okay got CI on Windows working again with the moved tests 😅 Should be good now. (I also pointed it to uucore from Git so that it has the mentioned fix for grabbing the filesystem (otherwise %F doesn't work).)

sylvestre · 2021-12-24T10:14:37Z

thanks
Seems that the coverage could be improved:
https://codecov.io/github/uutils/findutils/commit/f9ab5847cf4d41bfc15ed9464218ec6915977641
do you think you could add a few more tests ?

refi64 · 2021-12-27T15:58:35Z

@sylvestre I added a few more tests, with that, though, most of the still-remaining red is things that can't easily be tested in CI due to a high dependence on host system config (e.g. filesystem type, block count, sparseness)

refi64 · 2021-12-27T16:21:34Z

(and CI is passing now, again)

sylvestre · 2021-12-27T18:42:24Z

fails on ubuntu:

---- find::matchers::printf::tests::test_printf_special_types stdout ----
thread 'find::matchers::printf::tests::test_printf_special_types' panicked at 'called `Result::unwrap()` on an `Err` value: Error { depth: 2, inner: Io { path: Some("/dev/shm/multipath"), err: Os { code: 13, kind: PermissionDenied, message: "Permission denied" } } }', src/find/matchers/mod.rs:433:47
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

This adds initial support for GNU find-compatible printf syntax. As far as I can tell, it should implement all the specifiers, with the following exceptions: - Using zero as padding instead of space: GNU find isn't consistent with which numeric format specifiers support this. - Specifying precision (`%x.yz`): I believe sparseness (%S) and seconds-since-epoch (`%A@` / `%C@` / `%T@`) are the only ones that allow this, making it only partially useful. - Printing SELinux contexts (`%Z`): requires some extra dependencies and isn't within our scope. uucore is added as a dependency, because it has several utility functions that we need, the complexity of which is high enough that using the extra dependency is quite helpful. This also stubs out many of the specifiers for Windows, simply because I have no idea how these should work there. (The defaults chosen should be "good enough" for the moment, though.) Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

refi64 · 2021-12-27T19:45:14Z

@sylvestre Well in retrospect, trying to use /dev here was a terrible idea 😅 new version uses some custom FIFO/socket files instead in order to test special file types

sylvestre · 2022-01-10T09:32:41Z

thanks and sorry for the latency :(

refi64 force-pushed the printf branch 2 times, most recently from 1911818 to 361fad3 Compare December 17, 2021 17:41

refi64 force-pushed the printf branch from 361fad3 to f8c788d Compare December 18, 2021 03:25

refi64 force-pushed the printf branch from f8c788d to f2dc493 Compare December 23, 2021 00:45

refi64 force-pushed the printf branch 3 times, most recently from b0c5bdf to e2bf11b Compare December 23, 2021 02:07

refi64 force-pushed the printf branch from e2bf11b to 57aafc1 Compare December 23, 2021 15:07

refi64 force-pushed the printf branch 8 times, most recently from da16f97 to f9ab584 Compare December 23, 2021 18:21

refi64 force-pushed the printf branch from f9ab584 to 664786c Compare December 27, 2021 15:57

refi64 force-pushed the printf branch 3 times, most recently from c6998a7 to eae08ae Compare December 27, 2021 16:16

refi64 mentioned this pull request Dec 27, 2021

Add an initial implementation of xargs #121

Merged

refi64 force-pushed the printf branch from eae08ae to 0ea822c Compare December 27, 2021 19:44

Merge branch 'master' into printf

dd443b9

sylvestre merged commit 81402f3 into uutils:master Jan 10, 2022

refi64 mentioned this pull request Jan 10, 2022

Add support for -print0 #123

Merged

chenrui333 mentioned this pull request Apr 2, 2023

uutils-findutils 0.4.0 Homebrew/homebrew-core#127369

Merged

Conversation

refi64 commented Dec 17, 2021

Uh oh!

codecov Bot commented Dec 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

wlozano0collabora commented Dec 18, 2021

Uh oh!

refi64 commented Dec 18, 2021

Uh oh!

sylvestre commented Dec 22, 2021

Uh oh!

refi64 commented Dec 23, 2021

Uh oh!

sylvestre commented Dec 23, 2021

Uh oh!

refi64 commented Dec 23, 2021

Uh oh!

refi64 commented Dec 23, 2021

Uh oh!

sylvestre commented Dec 24, 2021

Uh oh!

refi64 commented Dec 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

refi64 commented Dec 27, 2021

Uh oh!

sylvestre commented Dec 27, 2021

Uh oh!

refi64 commented Dec 27, 2021

Uh oh!

sylvestre commented Jan 10, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov Bot commented Dec 17, 2021 •

edited

Loading

refi64 commented Dec 27, 2021 •

edited

Loading