Merge pull request #11916 from Alchez/fix-release-check

fix: error on trying to check semantic version

frappe/utils/change_log.py

@@ -1,15 +1,17 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
 
-from __future__ import unicode_literals
-from six.moves import range
-import json, os
+import json
+import os
+import subprocess  # nosec
+
+import requests
 from semantic_version import Version
+from six.moves import range
+
 import frappe
-import requests
-import subprocess # nosec
-from frappe.utils import cstr
 from frappe import _, safe_decode
+from frappe.utils import cstr
 
 
 def get_change_log(user=None):
@@ -165,9 +167,10 @@ def check_for_update():
 
 	add_message_to_redis(updates)
 
+
 def parse_latest_non_beta_release(response):
 	"""
-	Pasrses the response JSON for all the releases and returns the latest non prerelease
+	Parses the response JSON for all the releases and returns the latest non prerelease
 
 	Parameters
 	response (list): response object returned by github
@@ -182,32 +185,51 @@ def parse_latest_non_beta_release(response):
 
 	return None
 
-def check_release_on_github(app):
-	# Check if repo remote is on github
-	from subprocess import CalledProcessError
+
+def check_release_on_github(app: str):
+	"""
+	Check the latest release for a given Frappe application hosted on Github.
+
+	Args:
+		app (str): The name of the Frappe application.
+
+	Returns:
+		tuple(Version, str): The semantic version object of the latest release and the
+			organization name, if the application exists, otherwise None.
+	"""
+
+	from giturlparse import parse
+	from giturlparse.parser import ParserError
+
 	try:
-		remote_url = subprocess.check_output("cd ../apps/{} && git ls-remote --get-url".format(app), shell=True).decode()
-	except CalledProcessError:
-		# Passing this since some apps may not have git initializaed in them
-		return None
+		# Check if repo remote is on github
+		remote_url = subprocess.check_output("cd ../apps/{} && git ls-remote --get-url".format(app), shell=True)
+	except subprocess.CalledProcessError:
+		# Passing this since some apps may not have git initialized in them
+		return
 
 	if isinstance(remote_url, bytes):
 		remote_url = remote_url.decode()
 
-	if "github.com" not in remote_url:
-		return None
+	try:
+		parsed_url = parse(remote_url)
+	except ParserError:
+		# Invalid URL
+		return
+
+	if parsed_url.resource != "github.com":
+		return
 
-	# Get latest version from github
-	if 'https' not in remote_url:
-		return None
+	owner = parsed_url.owner
+	repo = parsed_url.name
 
-	org_name = remote_url.split('/')[3]
-	r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(org_name, app))
+	# Get latest version from GitHub
+	r = requests.get(f"https://api.github.com/repos/{owner}/{repo}/releases")
 	if r.ok:
-		lastest_non_beta_release = parse_latest_non_beta_release(r.json())
-		return Version(lastest_non_beta_release), org_name
-	# In case of an improper response or if there are no releases
-	return None
+		latest_non_beta_release = parse_latest_non_beta_release(r.json())
+		if latest_non_beta_release:
+			return Version(latest_non_beta_release), owner
+
 
 def add_message_to_redis(update_json):
 	# "update-message" will store the update message string

requirements.txt

@@ -15,6 +15,7 @@ Faker==2.0.4
 future==0.18.2
 gitdb2==2.0.6;python_version<'3.4'
 GitPython==2.1.15
+git-url-parse==1.2.2
 google-api-python-client==1.9.3
 google-auth-httplib2==0.0.3
 google-auth-oauthlib==0.4.1