feat: do not use multi module project

smartive · Jul 22, 2024 · 698245f · 698245f
1 parent 3e571e5
commit 698245f
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 71 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,30 @@
-[workspace]
-members = [
-    "lib",
-    "cli",
-]
-resolver = "2"
+[package]
+name = "swiss-qr-bill-decoder"
+version = "0.1.0"
+edition = "2021"
+publish = false
+authors = ["Mike Schmid <[email protected]>"]
+description = "A simple tool to decode QR codes of Swiss QR bills"
+
+[lints.rust]
+unsafe_code = "forbid"
 
 [profile.release]
 codegen-units = 1
 lto = "fat"
 strip = "symbols"
-panic = "abort"
+panic = "abort"
+
+[dependencies]
+clap = { version = "4.5.7", features = ["derive"] }
+serde_json = "1.0.117"
+rqrr = "0.7.1"
+image = "0.25.1"
+tempfile = "3.10.1"
+serde = { version = "1.0.203", features = ["derive"] }
+
+[dev-dependencies]
+assert_cmd = "2.0.14"
+predicates = "3.1.0"
+indoc = "2.0.5"
+assert-json-diff = "2.0.2"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
diff --git a/cli/src/args.rs → src/args.rs b/cli/src/args.rs → src/args.rs
diff --git a/lib/src/lib.rs → src/lib.rs b/lib/src/lib.rs → src/lib.rs
@@ -4,15 +4,15 @@
 //!
 //! See [the standard definition](https://www.six-group.com/de/products-services/banking-services/payment-standardization/standards/qr-bill.html#ig-qr-bill-v2.3)
 
+pub mod models;
+mod pdf_converter;
+mod qr_parser;
+
 use crate::models::qr_data::QRData;
 use image;
 use rqrr::PreparedImage;
 use tempfile::tempdir;
 
-pub mod models;
-mod pdf_converter;
-mod qr_parser;
-
 pub fn get_qr_bill_data(file_path: String, fail_on_error: bool) -> Vec<QRData> {
     let tmp_dir = tempdir().expect("Error creating temporary directory");
     let images = match file_path.as_str() {

diff --git a/cli/src/main.rs → src/main.rs b/cli/src/main.rs → src/main.rs
@@ -4,9 +4,10 @@
 //!
 //! See [the standard definition](https://www.six-group.com/de/products-services/banking-services/payment-standardization/standards/qr-bill.html#ig-qr-bill-v2.3)
 
+mod args;
+
 use clap::Parser;
-use swiss_qr_bill_decoder_lib::get_qr_bill_data;
- mod args;
+use swiss_qr_bill_decoder::get_qr_bill_data;
 
 fn main() {
     let args = args::Args::parse();

diff --git a/lib/src/models/address.rs → src/models/address.rs b/lib/src/models/address.rs → src/models/address.rs
diff --git a/lib/src/models/mod.rs → src/models/mod.rs b/lib/src/models/mod.rs → src/models/mod.rs
diff --git a/lib/src/models/qr_data.rs → src/models/qr_data.rs b/lib/src/models/qr_data.rs → src/models/qr_data.rs
diff --git a/lib/src/pdf_converter.rs → src/pdf_converter.rs b/lib/src/pdf_converter.rs → src/pdf_converter.rs
diff --git a/lib/src/qr_parser.rs → src/qr_parser.rs b/lib/src/qr_parser.rs → src/qr_parser.rs
diff --git a/lib/tests/data/double.pdf → tests/data/double.pdf b/lib/tests/data/double.pdf → tests/data/double.pdf
diff --git a/lib/tests/data/double.png → tests/data/double.png b/lib/tests/data/double.png → tests/data/double.png
diff --git a/lib/tests/data/full.pdf → tests/data/full.pdf b/lib/tests/data/full.pdf → tests/data/full.pdf
diff --git a/lib/tests/data/full.png → tests/data/full.png b/lib/tests/data/full.png → tests/data/full.png
diff --git a/lib/tests/data/minimal.pdf → tests/data/minimal.pdf b/lib/tests/data/minimal.pdf → tests/data/minimal.pdf
diff --git a/lib/tests/data/minimal.png → tests/data/minimal.png b/lib/tests/data/minimal.png → tests/data/minimal.png
diff --git a/lib/tests/data/none.pdf → tests/data/none.pdf b/lib/tests/data/none.pdf → tests/data/none.pdf
diff --git a/lib/tests/data/none.png → tests/data/none.png b/lib/tests/data/none.png → tests/data/none.png
diff --git a/lib/tests/data/rotated.pdf → tests/data/rotated.pdf b/lib/tests/data/rotated.pdf → tests/data/rotated.pdf
diff --git a/lib/tests/data/rotated.png → tests/data/rotated.png b/lib/tests/data/rotated.png → tests/data/rotated.png
diff --git a/lib/tests/data/six_examples/01.png → tests/data/six_examples/01.png b/lib/tests/data/six_examples/01.png → tests/data/six_examples/01.png
diff --git a/lib/tests/data/six_examples/02.png → tests/data/six_examples/02.png b/lib/tests/data/six_examples/02.png → tests/data/six_examples/02.png
diff --git a/lib/tests/data/six_examples/03.png → tests/data/six_examples/03.png b/lib/tests/data/six_examples/03.png → tests/data/six_examples/03.png
diff --git a/lib/tests/data/six_examples/04.png → tests/data/six_examples/04.png b/lib/tests/data/six_examples/04.png → tests/data/six_examples/04.png
diff --git a/lib/tests/data/six_examples/05.png → tests/data/six_examples/05.png b/lib/tests/data/six_examples/05.png → tests/data/six_examples/05.png
diff --git a/lib/tests/data/six_examples/06.png → tests/data/six_examples/06.png b/lib/tests/data/six_examples/06.png → tests/data/six_examples/06.png
diff --git a/lib/tests/edge_cases.rs → tests/edge_cases.rs b/lib/tests/edge_cases.rs → tests/edge_cases.rs
@@ -1,7 +1,6 @@
-use swiss_qr_bill_decoder_lib::get_qr_bill_data;
-use swiss_qr_bill_decoder_lib::models::address::Address;
-use swiss_qr_bill_decoder_lib::models::qr_data::QRData;
-
+use swiss_qr_bill_decoder::get_qr_bill_data;
+use swiss_qr_bill_decoder::models::address::Address;
+use swiss_qr_bill_decoder::models::qr_data::QRData;
 
 #[test]
 fn minimal_png() {

diff --git a/lib/tests/six_examples.rs → tests/six_examples.rs b/lib/tests/six_examples.rs → tests/six_examples.rs
@@ -1,6 +1,6 @@
-use swiss_qr_bill_decoder_lib::get_qr_bill_data;
-use swiss_qr_bill_decoder_lib::models::address::Address;
-use swiss_qr_bill_decoder_lib::models::qr_data::QRData;
+use swiss_qr_bill_decoder::get_qr_bill_data;
+use swiss_qr_bill_decoder::models::address::Address;
+use swiss_qr_bill_decoder::models::qr_data::QRData;
 
 #[test]
 fn six_example_01() {