Skip to content

Commit 99c717c

Browse files
committed
Improve command-line tool output.
1 parent 0ee527c commit 99c717c

2 files changed

Lines changed: 34 additions & 16 deletions

File tree

‎language_tool/__init__.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,18 @@ def _ordered_dict_repr():
112112

113113
return "{}({})".format(self.__class__.__name__, _ordered_dict_repr())
114114

115+
def __str__(self):
116+
ruleId = self.ruleId
117+
if self.subId is not None:
118+
ruleId += "[{}]".format(self.subId)
119+
s = "Line {}, column {}, Rule ID: {}".format(
120+
self.fromy + 1, self.fromx + 1, ruleId)
121+
if self.msg:
122+
s += "\nMessage: {}".format(self.msg)
123+
if self.replacements:
124+
s += "\nSuggestion: {}".format("; ".join(self.replacements))
125+
return s
126+
115127
def __getattr__(self, name):
116128
# Fallback to calculated `frompos` and `topos` attributes
117129
# if using unpatched LanguageTool server.

‎language_tool/__main__.py‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import argparse
55
import os
6+
import re
67
import sys
78

89
import language_tool
@@ -16,25 +17,27 @@ def parse_args():
1617
prog="{} -m {}".format(os.path.basename(sys.executable),
1718
"language_tool")
1819
)
19-
parser.add_argument("file", nargs="?", help="plain text file")
20-
parser.add_argument("--encoding", dest="encoding", help="input encoding")
21-
parser.add_argument("--language", dest="language",
20+
parser.add_argument("file", nargs="?",
21+
help="plain text file")
22+
parser.add_argument("--encoding",
23+
help="input encoding")
24+
parser.add_argument("--language", metavar="CODE",
2225
help='language code of the input or "auto"')
23-
parser.add_argument("--mothertongue", dest="motherTongue",
26+
parser.add_argument("--mother-tongue", metavar="CODE",
2427
help="language code of your first language")
25-
parser.add_argument("--disable", dest="disable",
26-
help="comma-separated list of rule IDs to be disabled")
27-
parser.add_argument("--enable", dest="enable",
28-
help="comma-separated list of rule IDs to be enabled")
29-
parser.add_argument("--version", dest="version", action="store_true",
28+
parser.add_argument("--disable", metavar="RULES", type=get_rules,
29+
help="list of rule IDs to be disabled")
30+
parser.add_argument("--enable", metavar="RULES", type=get_rules,
31+
help="list of rule IDs to be enabled")
32+
parser.add_argument("--version", action="store_true",
3033
help="print LanguageTool version number")
31-
parser.add_argument("--apply", dest="apply", action="store_true",
34+
parser.add_argument("--apply", action="store_true",
3235
help="automatically apply suggestions if available")
3336
return parser.parse_args()
3437

3538

3639
def get_rules(rules: str) -> set:
37-
return {rule.strip() for rule in rules.split(",")}
40+
return {rule.upper() for rule in re.findall(r"\w+", rules)}
3841

3942

4043
def get_text(file, encoding):
@@ -57,7 +60,7 @@ def main():
5760
file = sys.stdin.fileno()
5861
encoding = args.encoding if args.encoding else sys.stdin.encoding
5962

60-
lang_tool = language_tool.LanguageTool(motherTongue=args.motherTongue)
63+
lang_tool = language_tool.LanguageTool(motherTongue=args.mother_tongue)
6164
guess_language = None
6265

6366
if args.language:
@@ -70,7 +73,7 @@ def main():
7073
else:
7174
text = get_text(file, encoding)
7275
language = guess_language(text)
73-
print("Detected language: {!r}".format(language),
76+
print("Detected language: {}".format(language),
7477
file=sys.stderr)
7578
if not language:
7679
return 1
@@ -79,19 +82,22 @@ def main():
7982
lang_tool.language = args.language
8083

8184
if not guess_language:
82-
print("Language: {!r}".format(lang_tool.language))
85+
print("Language: {}".format(lang_tool.language))
8386
text = get_text(file, encoding)
8487

8588
if args.disable is not None:
86-
lang_tool.disable(get_rules(args.disable))
89+
lang_tool.disable(args.disable)
8790
if args.enable is not None:
88-
lang_tool.enable(get_rules(args.enable))
91+
lang_tool.enable(args.enable)
8992

9093
if args.apply:
9194
print(lang_tool.correct(text))
9295
else:
96+
print()
9397
for match in lang_tool.check(text):
9498
print(match)
99+
print()
100+
95101

96102
if __name__ == "__main__":
97103
sys.exit(main())

0 commit comments

Comments
 (0)