From 70c948a7519e7e3f74dedf44baf5bcdace227ec8 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Thu, 23 Jul 2020 11:23:45 -0500 Subject: [PATCH] move isURL --- command/repo.go | 6 +----- pkg/cmd/repo/view/view.go | 6 +----- utils/utils.go | 4 ++++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/command/repo.go b/command/repo.go index e0114a080..364366b3e 100644 --- a/command/repo.go +++ b/command/repo.go @@ -353,10 +353,6 @@ func repoCreate(cmd *cobra.Command, args []string) error { return nil } -func isURL(arg string) bool { - return strings.HasPrefix(arg, "http:/") || strings.HasPrefix(arg, "https:/") -} - var Since = func(t time.Time) time.Duration { return time.Since(t) } @@ -390,7 +386,7 @@ func repoFork(cmd *cobra.Command, args []string) error { } else { repoArg := args[0] - if isURL(repoArg) { + if utils.IsURL(repoArg) { parsedURL, err := url.Parse(repoArg) if err != nil { return fmt.Errorf("did not understand argument: %w", err) diff --git a/pkg/cmd/repo/view/view.go b/pkg/cmd/repo/view/view.go index aaa553371..b4c0436d9 100644 --- a/pkg/cmd/repo/view/view.go +++ b/pkg/cmd/repo/view/view.go @@ -71,7 +71,7 @@ func viewRun(opts *ViewOptions) error { return err } } else { - if isURL(opts.RepoArg) { + if utils.IsURL(opts.RepoArg) { parsedURL, err := url.Parse(opts.RepoArg) if err != nil { return fmt.Errorf("did not understand argument: %w", err) @@ -188,10 +188,6 @@ func isMarkdownFile(filename string) bool { } // TODO COPYPASTA FROM command; CONSIDER FOR cmdutil? -func isURL(arg string) bool { - return strings.HasPrefix(arg, "http:/") || strings.HasPrefix(arg, "https:/") -} - func displayURL(urlStr string) string { u, err := url.Parse(urlStr) if err != nil { diff --git a/utils/utils.go b/utils/utils.go index 2f100883f..ca011b9f3 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -102,3 +102,7 @@ var StopSpinner = func(s *spinner.Spinner) { func Spinner(w io.Writer) *spinner.Spinner { return spinner.New(spinner.CharSets[11], 400*time.Millisecond, spinner.WithWriter(w)) } + +func IsURL(s string) bool { + return strings.HasPrefix(s, "http:/") || strings.HasPrefix(s, "https:/") +}