fix: fixed the url parser

rawnly · Sep 26, 2023 · 3d51229 · 3d51229
2 parents 717565c + ed18f47
commit 3d51229
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -152,6 +152,11 @@ var rootCmd = &cobra.Command{
  handleSpinnerError(err, connectionSpinner, cmd, ConnectionSpinnerSuffix[1])
  } else if idFlag != "" {
  idFlag = lib.ParsePhotoIDFromUrl(idFlag)
+
+ fmt.Println(idFlag)
+
+ return
+
  photo, err = api.GetPhoto(idFlag)
  handleSpinnerError(err, connectionSpinner, cmd, ConnectionSpinnerSuffix[1])
  } else {

diff --git a/lib/expressions/expressions.go b/lib/expressions/expressions.go
@@ -4,7 +4,7 @@ import "regexp"
 
 const (
  CollectionIdExtractor string = "unsplash\\.com\\/collections\\/([A-z0-9]+)\\/([a-z\\-]+)\\/?$"
- PhotoIdExtractor string = "unsplash\\.com\\/photos\\/([A-z0-9]+)\\/?$"
+ PhotoIdExtractor string = "https?:\\/\\/unsplash\\.com\\/photos\\/(\\w+-)+(\\w+)$"
 )
 
 func IsPhotoUrl(url string) bool {
@@ -23,7 +23,7 @@ func ExtractPhotoId(url string) string {
  re := regexp.MustCompile(PhotoIdExtractor)
 
  if re.MatchString(url) {
- return re.FindStringSubmatch(url)[1]
+ return re.FindStringSubmatch(url)[2]
  }
 
  return ""