move displayURL

vilmibm · vilmibm · commit 086fb48d31be · 2020-07-23T11:25:31.000-05:00
diff --git a/command/issue.go b/command/issue.go
@@ -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
-}
diff --git a/command/pr.go b/command/pr.go
@@ -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)
 	}
 
diff --git a/command/pr_create.go b/command/pr_create.go
@@ -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 {
diff --git a/pkg/cmd/repo/view/view.go b/pkg/cmd/repo/view/view.go
@@ -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
-}
diff --git a/utils/utils.go b/utils/utils.go
@@ -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
+}

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ func issueList(cmd *cobra.Command, args []string) error {`
`240`	`240`	`if err != nil {`
`241`	`241`	`return err`
`242`	`242`	`}`
`243`		`- fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))`
	`243`	`+ fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))`
`244`	`244`	`return utils.OpenInBrowser(openURL)`
`245`	`245`	`}`
`246`	`246`
`@@ -518,7 +518,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {`
`518`	`518`	`openURL += "/choose"`
`519`	`519`	`}`
`520`	`520`	`if connectedToTerminal(cmd) {`
`521`		`- cmd.Printf("Opening %s in your browser.\n", displayURL(openURL))`
	`521`	`+ cmd.Printf("Opening %s in your browser.\n", utils.DisplayURL(openURL))`
`522`	`522`	`}`
`523`	`523`	`return utils.OpenInBrowser(openURL)`
`524`	`524`	`}`
`@@ -592,7 +592,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {`
`592`	`592`	`return err`
`593`	`593`	`}`
`594`	`594`	`// TODO could exceed max url length for explorer`
`595`		`- fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))`
	`595`	`+ fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))`
`596`	`596`	`return utils.OpenInBrowser(openURL)`
`597`	`597`	`} else if action == SubmitAction {`
`598`	`598`	`params := map[string]interface{}{`
`@@ -836,11 +836,3 @@ func issueReopen(cmd *cobra.Command, args []string) error {`
`836`	`836`
`837`	`837`	`return nil`
`838`	`838`	`}`
`839`		`-`
`840`		`-func displayURL(urlStr string) string {`
`841`		`- u, err := url.Parse(urlStr)`
`842`		`- if err != nil {`
`843`		`- return urlStr`
`844`		`- }`
`845`		`- return u.Hostname() + u.Path`
`846`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ func prList(cmd *cobra.Command, args []string) error {`
`246`	`246`	`if err != nil {`
`247`	`247`	`return err`
`248`	`248`	`}`
`249`		`- fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))`
	`249`	`+ fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))`
`250`	`250`	`return utils.OpenInBrowser(openURL)`
`251`	`251`	`}`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {`
`367`	`367`	`}`
`368`	`368`	`if connectedToTerminal(cmd) {`
`369`	`369`	`// TODO could exceed max url length for explorer`
`370`		`- fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))`
	`370`	`+ fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))`
`371`	`371`	`}`
`372`	`372`	`return utils.OpenInBrowser(openURL)`
`373`	`373`	`} else {`