Merge pull request #9 from marverix/improve-pattern

Improve pattern

Author: marverix

gah

@@ -82,6 +82,7 @@ EXT_ALL_ARCHIVES="$EXT_ZIP|$EXT_TAR"
 REGEXP_EXT_ZIP=".+(${EXT_ZIP})$"
 REGEXP_EXT_TAR=".+(${EXT_TAR})$"
 
+REGEXP_IGNORE_PATTERN="(linux-android)"
 REGEXP_SKIP_FILES="^(license|readme|changelog).*|.*\.(md|txt)$"
 
 function get_os() {
@@ -123,9 +124,11 @@ function get_filename_regexp() {
 	local version_regexp_part='([_-]v?[0-9.]+)?'
 	local os_regexp_part=$(get_os_regexp_part)
 	local arch_regexp_part=$(get_arch_regexp_part)
+	local suffix_regexp_part='([_-][a-z0-9_-]+)?'
 
 	local regexp="${name_regexp_part}${version_regexp_part}"
 	regexp+="(${os_regexp_part}${arch_regexp_part}|${arch_regexp_part}${os_regexp_part})"
+	regexp+="${suffix_regexp_part}"
 	regexp+="(${EXT_ALL_ARCHIVES})?"
 	echo "$regexp"
 }
@@ -142,6 +145,8 @@ function get_md_url_regexp() {
 #--------------------------------------------------
 #region GitHub API functions
 
+REGEXP_NAME_FROM_HTML_URL='^https:\/\/[^/]+\/[^/]+\/([^/]+)'
+
 function get_fetch_release_info_url() {
 	local suffix="latest"
 	if [[ -n "$2" && "$2" != "latest" ]]; then
@@ -168,6 +173,14 @@ function fetch_release_info() {
 	print_green "Found release: $release_name"
 }
 
+function get_repo_name() {
+	local release_json="$1"
+	local html_url=$(jq -r '.html_url' "$release_json")
+	if [[ "$html_url" =~ $REGEXP_NAME_FROM_HTML_URL ]]; then
+		echo "${BASH_REMATCH[1]}"
+	fi
+}
+
 function find_download_url() {
 	local release_json="$1"
 
@@ -180,9 +193,13 @@ function find_download_url() {
 	for name in $(jq -r '.assets[].name' "$release_json"); do
 		local lower_name=$(echo "$name" | tr '[A-Z]' '[a-z]')
 		if [[ "$lower_name" =~ $regexp ]]; then
-			print_debug "  $name ... Match!"
-			found="true"
-			jq -r --arg name "$name" '.assets[] | select(.name == $name) | .browser_download_url' "$release_json"
+			if [[ "$lower_name" =~ $REGEXP_IGNORE_PATTERN ]]; then
+				print_debug "  $name ... Ignored"
+			else
+				print_debug "  $name ... Match!"
+				found="true"
+				jq -r --arg name "$name" '.assets[] | select(.name == $name) | .browser_download_url' "$release_json"
+			fi
 		else
 			print_debug "  $name ... Doesn't match"
 		fi

test/01_regexp_functions.bats

@@ -157,7 +157,7 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](unknown[._-])?(linux|linux-gnu|linux-musl)[._-](amd64|x86_64|x64|universal)|[._-](amd64|x86_64|x64|universal)[._-](unknown[._-])?(linux|linux-gnu|linux-musl))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](unknown[._-])?(linux|linux-gnu|linux-musl)[._-](amd64|x86_64|x64|universal)|[._-](amd64|x86_64|x64|universal)[._-](unknown[._-])?(linux|linux-gnu|linux-musl))([_-][a-z0-9_-]+)?(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }
 
 @test "get_filename_regexp should return proper string for linux/arm64" {
@@ -168,7 +168,7 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](unknown[._-])?(linux|linux-gnu|linux-musl)[._-](arm64|aarch64|universal)|[._-](arm64|aarch64|universal)[._-](unknown[._-])?(linux|linux-gnu|linux-musl))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](unknown[._-])?(linux|linux-gnu|linux-musl)[._-](arm64|aarch64|universal)|[._-](arm64|aarch64|universal)[._-](unknown[._-])?(linux|linux-gnu|linux-musl))([_-][a-z0-9_-]+)?(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }
 
 @test "get_filename_regexp should return proper string for macos/amd64" {
@@ -179,7 +179,7 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos|osx)[._-](amd64|x86_64|x64|universal)|[._-](amd64|x86_64|x64|universal)[._-](apple[._-])?(darwin|macos|osx))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos|osx)[._-](amd64|x86_64|x64|universal)|[._-](amd64|x86_64|x64|universal)[._-](apple[._-])?(darwin|macos|osx))([_-][a-z0-9_-]+)?(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }
 
 @test "get_filename_regexp should return proper string for macos/arm64" {
@@ -190,5 +190,5 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos|osx)[._-](arm64|aarch64|universal)|[._-](arm64|aarch64|universal)[._-](apple[._-])?(darwin|macos|osx))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos|osx)[._-](arm64|aarch64|universal)|[._-](arm64|aarch64|universal)[._-](apple[._-])?(darwin|macos|osx))([_-][a-z0-9_-]+)?(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }