STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move displayURL

Browse source
This commit is contained in:
vilmibm 2020-07-23 11:25:31 -05:00
parent 70c948a751
commit 086fb48d31
5 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
command/issue.go
View file

@ -240,7 +240,7 @@ func issueList(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
return utils.OpenInBrowser(openURL)
}
@ -518,7 +518,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
openURL += "/choose"
}
if connectedToTerminal(cmd) {
cmd.Printf("Opening %s in your browser.\n", displayURL(openURL))
cmd.Printf("Opening %s in your browser.\n", utils.DisplayURL(openURL))
}
return utils.OpenInBrowser(openURL)
}
@ -592,7 +592,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
return err
}
// TODO could exceed max url length for explorer
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
return utils.OpenInBrowser(openURL)
} else if action == SubmitAction {
params := map[string]interface{}{
@ -836,11 +836,3 @@ func issueReopen(cmd *cobra.Command, args []string) error {
return nil
}
func displayURL(urlStr string) string {
u, err := url.Parse(urlStr)
if err != nil {
return urlStr
}
return u.Hostname() + u.Path
}

2
command/pr.go
View file

@ -246,7 +246,7 @@ func prList(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
return utils.OpenInBrowser(openURL)
}

2
command/pr_create.go
View file

@ -367,7 +367,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {
}
if connectedToTerminal(cmd) {
// TODO could exceed max url length for explorer
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
}
return utils.OpenInBrowser(openURL)
} else {

11
pkg/cmd/repo/view/view.go
View file

@ -100,7 +100,7 @@ func viewRun(opts *ViewOptions) error {
openURL := ghrepo.GenerateRepoURL(toView, "")
if opts.Web {
if opts.IO.IsStdoutTTY() {
fmt.Fprintf(opts.IO.ErrOut, "Opening %s in your browser.\n", displayURL(openURL))
fmt.Fprintf(opts.IO.ErrOut, "Opening %s in your browser.\n", utils.DisplayURL(openURL))
}
return utils.OpenInBrowser(openURL)
}
@ -186,12 +186,3 @@ func isMarkdownFile(filename string) bool {
strings.HasSuffix(filename, ".mdown") ||
strings.HasSuffix(filename, ".mkdown")
}
// TODO COPYPASTA FROM command; CONSIDER FOR cmdutil?
func displayURL(urlStr string) string {
u, err := url.Parse(urlStr)
if err != nil {
return urlStr
}
return u.Hostname() + u.Path
}

9
utils/utils.go
View file

@ -3,6 +3,7 @@ package utils
import (
"fmt"
"io"
"net/url"
"strings"
"time"
@ -106,3 +107,11 @@ func Spinner(w io.Writer) *spinner.Spinner {
func IsURL(s string) bool {
return strings.HasPrefix(s, "http:/") || strings.HasPrefix(s, "https:/")
}
func DisplayURL(urlStr string) string {
u, err := url.Parse(urlStr)
if err != nil {
return urlStr
}
return u.Hostname() + u.Path
}