CLI: --text/--file の同時指定を clap 競合で弾くようにし入力取得を簡素化#13
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
textとfileを同時に指定した場合にランタイムでエラー判定していたため、引数パース段階で弾いて実行ロジックを単純化する必要があった。clapに任せることでコマンド利用者へのエラーメッセージを早期に出力し、get_input_textの分岐を簡潔にできる。Description
src/cli.rsの共通引数CipherArgsのtext/fileにそれぞれ#[arg(conflicts_with = "...")]を追加してencrypt/decryptで同時指定をclapが検出するようにした。Commands::BruteForceのtext/fileにも同様のconflicts_withを追加した。get_input_textをtext→file→stdinの順で早期 return する実装に整理してmatch (text,file)の冗長な分岐を削除した。text優先の期待に合わせて修正し、統合テスト群(tests/cli_output_tests.rs)にencryptとbrute-forceの同時指定でclapが即時エラーを返すケースを追加した。Testing
cargo test --test cli_output_testsが成功(全テスト通過)。cargo test test_get_input_text_prefers_text_when_both_providedが成功(該当ユニットテスト通過)。Codex Task