|
21 | 21 | #' |
22 | 22 | #' @export |
23 | 23 | xlsx_diff = function(path_one, path_two, ...) { |
| 24 | + value_one = value_two = NULL |
24 | 25 | one = (path_one |
25 | 26 | |> xlsx_cells(...) |
26 | | - |> filter(!is_blank) |
| 27 | + |> dplyr::filter(!is_blank) |
27 | 28 | |> collapse_xlsx_value_columns() |
28 | | - |> select(address, sheet, value) |
| 29 | + |> dplyr::select(address, sheet, value) |
29 | 30 | ) |
30 | 31 | two = (path_two |
31 | 32 | |> xlsx_cells(...) |
32 | | - |> filter(!is_blank) |
| 33 | + |> dplyr::filter(!is_blank) |
33 | 34 | |> collapse_xlsx_value_columns() |
34 | | - |> select(address, sheet, value) |
| 35 | + |> dplyr::select(address, sheet, value) |
35 | 36 | ) |
36 | 37 | all_equal = all.equal(one, two) |
37 | 38 | if (isTRUE(all_equal)) return(TRUE) |
38 | 39 | by = c("sheet", "address") |
39 | 40 | in_both_but_different = (one |
40 | 41 | |> dplyr::inner_join(two, by = by, suffix = c("_one", "_two")) |
41 | | - |> filter(value_one != value_two) |
| 42 | + |> dplyr::filter(value_one != value_two) |
42 | 43 | ) |
43 | 44 | in_two_only = (two |
44 | 45 | |> dplyr::anti_join(one, by = by) |
45 | | - |> distinct() |
| 46 | + |> dplyr::distinct() |
46 | 47 | ) |
47 | 48 | in_one_only = (one |
48 | 49 | |> dplyr::anti_join(two, by = by) |
49 | | - |> distinct() |
| 50 | + |> dplyr::distinct() |
50 | 51 | ) |
51 | 52 |
|
52 | 53 | nlist(all_equal, in_both_but_different, in_one_only, in_two_only) |
|
0 commit comments