diff --git a/dental-notation-cli/.gitignore b/dental-notation-cli/.gitignore deleted file mode 100644 index ea8c4bf..0000000 --- a/dental-notation-cli/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/dental-notation-cli/Cargo.lock b/dental-notation-cli/Cargo.lock deleted file mode 100644 index b73cfd4..0000000 --- a/dental-notation-cli/Cargo.lock +++ /dev/null @@ -1,252 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "clap" -version = "3.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "dental-notation" -version = "0.1.0" -dependencies = [ - "owo-colors", -] - -[[package]] -name = "dental-notation-cli" -version = "0.1.0" -dependencies = [ - "clap", - "dental-notation", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "libc" -version = "0.2.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" - -[[package]] -name = "once_cell" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "os_str_bytes" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" - -[[package]] -name = "owo-colors" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - -[[package]] -name = "unicode-ident" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/dental-notation-cli/Cargo.toml b/dental-notation-cli/Cargo.toml deleted file mode 100644 index 9887ebd..0000000 --- a/dental-notation-cli/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "dental-notation-cli" -version = "0.1.0" -edition = "2021" -description = "CLI used to represent mouth in different tooth numbering systems and converting between these systems" -repository = "https://git.barthes.xyz/guilhem/dental-notation-cli" -license = "GPL-3.0-or-later" -categories = ["parsing", "command-line-utilities"] - -[dependencies] -clap = {version = "3.2.5", features = [ "derive" ] } -dental-notation = { path = ".." } \ No newline at end of file diff --git a/dental-notation-cli/src/cli.rs b/dental-notation-cli/src/cli.rs deleted file mode 100644 index 407d8ec..0000000 --- a/dental-notation-cli/src/cli.rs +++ /dev/null @@ -1,93 +0,0 @@ -use clap::{Parser, Subcommand, ValueEnum}; -use dental_notation::display::{ToothCliFormatter, ToothDisplay}; -use dental_notation::NotationKind; -use dental_notation::Tooth; - -#[derive(Copy, Clone, Debug, ValueEnum)] -enum NotationKindArg { - Iso, - Uns, - Alphanumeric, -} -#[derive(Debug, Subcommand)] -enum Action { - Convert { - #[clap(value_enum, short = 'f', long)] - from: NotationKindArg, - - #[clap(value_enum, short = 't', long)] - to: NotationKindArg, - - #[clap(value_parser)] - value: String, - }, - Display { - #[clap(value_enum, short = 'n', long)] - notation: NotationKindArg, - #[clap(takes_value = false, short = 'p', long)] - primary: bool, - #[clap(value_parser)] - value: Option, - }, -} -#[derive(Parser, Debug)] -struct Args { - #[clap(subcommand)] - action: Action, -} - -impl Into for NotationKindArg { - fn into(self) -> NotationKind { - (&self).into() - } -} - -impl Into for &NotationKindArg { - fn into(self) -> NotationKind { - match self { - NotationKindArg::Iso => NotationKind::Iso, - NotationKindArg::Uns => NotationKind::Uns, - NotationKindArg::Alphanumeric => NotationKind::Alphanumeric, - } - } -} - -pub fn run_cli() { - let args = Args::parse(); - - match &args.action { - Action::Convert { from, to, value } => { - let tooth_result = Tooth::from(value, &from.into()); - - let output_string = match tooth_result { - Ok(tooth) => tooth.to(&to.into()), - Err(err) => err, - }; - - println!("{}", output_string); - } - Action::Display { - notation, - primary, - value, - } => { - let converted_value = match value { - Some(t) => { - let tooth_result = Tooth::from(t, ¬ation.into()); - match tooth_result { - Ok(tr) => Some(tr), - Err(err) => { - eprintln!("{}", err); - return; - } - } - } - None => None, - }; - println!( - "{}", - ToothCliFormatter::format(¬ation.into(), !primary, &converted_value) - ); - } - }; -} diff --git a/dental-notation-cli/src/main.rs b/dental-notation-cli/src/main.rs deleted file mode 100644 index 0b87e87..0000000 --- a/dental-notation-cli/src/main.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod cli; - -fn main() { - cli::run_cli() -}