-
-
Notifications
You must be signed in to change notification settings - Fork 389
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix:#477 Normalize command-line arguments with various dash types #853
Closed
avijitdas126
wants to merge
5
commits into
zulip:main
from
avijitdas126:fix/-normalize-argument-dashes-477
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d4dc77e
Fix:#477 Normalize command-line arguments with various dash types
avijitdas126 c81bdaf
Fix some bug
avijitdas126 7407078
Fix some bug
avijitdas126 7b6909d
Fix some format
avijitdas126 3507b74
Fix: Normalize various dash variations in CLI arguments #477
avijitdas126 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
import argparse | ||
import logging | ||
import os | ||
import re | ||
import sys | ||
from typing import Optional | ||
|
||
|
@@ -17,7 +18,32 @@ | |
current_dir = os.path.dirname(os.path.abspath(__file__)) | ||
|
||
|
||
def normalize_args() -> None: | ||
"""Replaces various dash variations in arguments with standard options in command lines interfaces.""" | ||
dash_variations = r"[\u002D\u2010\u2011\u2012\u2013\u2014\u2015]" | ||
for i, arg in enumerate(sys.argv): | ||
if re.match(rf"^{dash_variations}{{2}}config{dash_variations}file$", arg): | ||
sys.argv[i] = "--config-file" | ||
elif re.match(rf"^{dash_variations}c$", arg): | ||
sys.argv[i] = "-c" | ||
elif re.match( | ||
rf"^{dash_variations}{{2}}bot{dash_variations}config{dash_variations}file$", arg | ||
): | ||
sys.argv[i] = "--bot-config-file" | ||
elif re.match(rf"^{dash_variations}c$", arg): | ||
sys.argv[i] = "-b" | ||
elif re.match(rf"^{dash_variations}{{2}}force$", arg): | ||
sys.argv[i] = "--force" | ||
elif re.match(rf"^{dash_variations}{{2}}registry$", arg): | ||
sys.argv[i] = "--registry" | ||
elif re.match(rf"^{dash_variations}r$", arg): | ||
sys.argv[i] = "-r" | ||
elif re.match(rf"^{dash_variations}{{2}}provision$", arg): | ||
sys.argv[i] = "--provision" | ||
|
||
|
||
def parse_args() -> argparse.Namespace: | ||
normalize_args() # Fix arguments before parsing | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use |
||
usage = """ | ||
zulip-run-bot <bot_name> --config-file ~/zuliprc | ||
zulip-run-bot --help | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Import re module for fix:#477