mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 11:01:25 +01:00
refactor: load settings once per run and reuse shared helpers
The application caches the settings snapshot and reloads it only after an update through the store, so output and prompt helpers no longer read and parse config.yml and hosts.yml several times per command. canPrompt and chooser replace the inline prompt-policy checks. Checks are tallied by one services.Tally, terminal.Plural replaces the two app copies, refKind.article/noun replace the comment group's own words, list commands use servicePage, and web URLs are built by repositoryURL and webURL in browser.go. Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
42 files changed
+157
-204
No files matched your search
@@ -21,14 +21,14 @@ const commentTitle = "Comment (markdown):"
|
||||
|
||||
// commentNouns are the words for the commands of an issue or pull request comment group.
|
||||
type commentNouns struct {
|
||||
group, noun, arguments, example string
|
||||
group, arguments, example string
|
||||
}
|
||||
|
||||
func commentWords(kind refKind) commentNouns {
|
||||
if kind == pullRef {
|
||||
return commentNouns{group: "pr", noun: "pull request", arguments: pullNumberArguments, example: "13"}
|
||||
return commentNouns{group: "pr", arguments: pullNumberArguments, example: "13"}
|
||||
}
|
||||
return commentNouns{group: "issue", noun: "issue", arguments: issueArguments, example: "12"}
|
||||
return commentNouns{group: "issue", arguments: issueArguments, example: "12"}
|
||||
}
|
||||
|
||||
// pullNumberArguments is the ARGUMENTS help of pr comment and pr attachment commands, which take pull
|
||||
@@ -258,10 +258,10 @@ func (a *application) commentCommand(kind refKind) *cobra.Command {
|
||||
words := commentWords(kind)
|
||||
var flags commentFlags
|
||||
var editLast, deleteLast bool
|
||||
group := &cobra.Command{Use: "comment {<number> | <url>}", Short: "Add a comment to " + article(words.noun), Long: fmt.Sprintf(`Add a comment to %[1]s, or edit or delete your last comment on it.
|
||||
group := &cobra.Command{Use: "comment {<number> | <url>}", Short: "Add a comment to " + kind.article(), Long: fmt.Sprintf(`Add a comment to %[1]s, or edit or delete your last comment on it.
|
||||
|
||||
Without --body, --body-file or --editor, the configured editor opens, or a multi-line prompt
|
||||
asks for the comment. The subcommands list, view, edit and delete comments by their ID.`, article(words.noun)), Example: fmt.Sprintf(`$ tea %[1]s comment %[2]s --body "Fixed in #14"
|
||||
asks for the comment. The subcommands list, view, edit and delete comments by their ID.`, kind.article()), Example: fmt.Sprintf(`$ tea %[1]s comment %[2]s --body "Fixed in #14"
|
||||
$ tea %[1]s comment %[2]s --body-file notes.md
|
||||
# Change or remove your last comment
|
||||
$ tea %[1]s comment %[2]s --edit-last --body "Fixed in #15"
|
||||
@@ -269,7 +269,7 @@ $ tea %[1]s comment %[2]s --delete-last --yes
|
||||
$ tea %[1]s comment list %[2]s`, words.group, words.example), Annotations: map[string]string{"tea.arguments": words.arguments, "tea.confirm": "true"}, Args: commentArgs(kind), RunE: func(cmd *cobra.Command, args []string) error {
|
||||
if len(args) == 0 {
|
||||
if localFlagsChanged(cmd) {
|
||||
return clierr.Wrap(clierr.Usage, &argumentError{problem: "missing " + words.noun + " number", cmd: cmd})
|
||||
return clierr.Wrap(clierr.Usage, &argumentError{problem: "missing " + kind.noun() + " number", cmd: cmd})
|
||||
}
|
||||
return cmd.Help()
|
||||
}
|
||||
@@ -308,7 +308,7 @@ $ tea %[1]s comment list %[2]s`, words.group, words.example), Annotations: map[s
|
||||
group.ValidArgsFunction = a.completeDiscussions(kind)
|
||||
|
||||
var limit, page int
|
||||
list := &cobra.Command{Use: "list {<number> | <url>}", Short: "List the comments on " + article(words.noun), Example: fmt.Sprintf(`$ tea %[1]s comment list %[2]s
|
||||
list := &cobra.Command{Use: "list {<number> | <url>}", Short: "List the comments on " + kind.article(), Example: fmt.Sprintf(`$ tea %[1]s comment list %[2]s
|
||||
$ tea %[1]s comment list %[2]s --json id,author,body`, words.group, words.example), Annotations: map[string]string{"tea.arguments": words.arguments}, Args: argsExact(1), RunE: func(cmd *cobra.Command, args []string) error {
|
||||
t, n, err := a.resolveRef(cmd, args[0], kind)
|
||||
if err != nil {
|
||||
@@ -345,7 +345,7 @@ $ tea %[1]s comment list %[2]s --json id,author,body`, words.group, words.exampl
|
||||
}}
|
||||
|
||||
var createFlags commentFlags
|
||||
create := &cobra.Command{Use: "create {<number> | <url>}", Aliases: []string{"add"}, Short: "Add a comment to " + article(words.noun), Example: fmt.Sprintf(`$ tea %[1]s comment create %[2]s --body "Looks good"
|
||||
create := &cobra.Command{Use: "create {<number> | <url>}", Aliases: []string{"add"}, Short: "Add a comment to " + kind.article(), Example: fmt.Sprintf(`$ tea %[1]s comment create %[2]s --body "Looks good"
|
||||
$ tea %[1]s comment add %[2]s --editor`, words.group, words.example), Annotations: map[string]string{"tea.arguments": words.arguments}, Args: argsExact(1), RunE: func(cmd *cobra.Command, args []string) error {
|
||||
if err := createFlags.validate(cmd); err != nil {
|
||||
return err
|
||||
@@ -415,14 +415,6 @@ func commentArgs(kind refKind) cobra.PositionalArgs {
|
||||
}
|
||||
}
|
||||
|
||||
// article returns noun with its indefinite article: "an issue", "a pull request".
|
||||
func article(noun string) string {
|
||||
if strings.ContainsRune("aeiou", rune(noun[0])) {
|
||||
return "an " + noun
|
||||
}
|
||||
return "a " + noun
|
||||
}
|
||||
|
||||
// completeDiscussions completes the open issues or pull requests that a command of kind takes.
|
||||
func (a *application) completeDiscussions(kind refKind) cobra.CompletionFunc {
|
||||
if kind == pullRef {
|
||||
|
||||
Reference in new issue
Block a user