From 27cc362791a2cd5675ac21cd0c0fc1d69848d81d Mon Sep 17 00:00:00 2001 From: Sylwester Fraczek Date: Wed, 11 Oct 2023 11:28:40 +0200 Subject: [PATCH 1/4] Update CI to windows-latest --- .github/workflows/building.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/building.yaml b/.github/workflows/building.yaml index 1976279..51e8025 100644 --- a/.github/workflows/building.yaml +++ b/.github/workflows/building.yaml @@ -22,7 +22,7 @@ jobs: build_windows: name: etradeTaxReturnHelper windows artifacts publish - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: toolchain: From fba87f3cb9961b008a38d38c41ac9e7bdc7a425d Mon Sep 17 00:00:00 2001 From: Sylwester Fraczek Date: Wed, 11 Oct 2023 14:36:36 +0200 Subject: [PATCH 2/4] add wild package --- Cargo.lock | 10 ++++++++++ Cargo.toml | 1 + src/main.rs | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 420acb8..8f35958 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,6 +394,7 @@ dependencies = [ "reqwest", "serde", "simple_logger", + "wild", ] [[package]] @@ -1653,6 +1654,15 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +[[package]] +name = "wild" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" +dependencies = [ + "glob", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 7bb48f2..cbf5bc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,3 +20,4 @@ log = "0.4.0" clap = "~2.27.0" regex = "1.3.3" calamine = "0.18.0" +wild = "2.2.0" \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index b379f70..7c97161 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,7 +31,7 @@ fn main() { let myapp = App::new("etradeTaxHelper ".to_string() + VERSION) .setting(AppSettings::ArgRequiredElseHelp); - let matches = create_cmd_line_pattern(myapp).get_matches(); + let matches = create_cmd_line_pattern(myapp).get_matches_from(wild::args()); log::info!("Started etradeTaxHelper"); From fc708fde34395185da64c89c0689ca86a63850c4 Mon Sep 17 00:00:00 2001 From: Sylwester Fraczek Date: Wed, 11 Oct 2023 15:07:47 +0200 Subject: [PATCH 3/4] update windows readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e7bb94..6435315 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Project that parse e-trade PDF brokerage statements and Gain and Losses document ### FAQ 1. How to install this project? - 1. For Windows OS you can download binary (zip archive holding executable) from [releases](https://github.com/jczaja/e-trade-tax-return-pl-helper/releases) webpage. Place executable in the same directory as desired e-trade documents. Open Windows PowerShell and type `etradeTaxReturnHelper.exe (dir * -n | findstr /i /r "\.pdf$ \.xlsx$")` + 1. For Windows OS you can download binary (zip archive holding executable) from [releases](https://github.com/jczaja/e-trade-tax-return-pl-helper/releases) webpage. Place executable in the same directory as desired e-trade documents. Open Windows PowerShell and type `etradeTaxReturnHelper.exe *.pdf *.xlsx` 2. For Linux you need Rust and Cargo installed and then you can install this project (crate): `cargo install etradeTaxReturnHelper` From 50a523d2a2008d53ce89d329b00e35545f116bb8 Mon Sep 17 00:00:00 2001 From: Sylwester Fraczek Date: Wed, 11 Oct 2023 15:17:16 +0200 Subject: [PATCH 4/4] add newline at end of Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cbf5bc9..405dfba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,4 +20,4 @@ log = "0.4.0" clap = "~2.27.0" regex = "1.3.3" calamine = "0.18.0" -wild = "2.2.0" \ No newline at end of file +wild = "2.2.0"