Skip to content

Refactor: use app_logo if app_logo_url is not present in installed apps #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sumitjain236 merged 2 commits into from
Sep 15, 2024
Merged

Refactor: use app_logo if app_logo_url is not present in installed apps #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72f359a
Refactor: use app_logo if app_logo_url is not present
sumitjain236 Sep 13, 2024
f6dd566
Refactor: Improve error handling in get_name_of_app function if repo …
sumitjain236 Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions commit/api/code_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,23 @@ def get_name_of_app(organization, repo):
'''
Get name of app from repo
'''
type = None
file_type = None
app_name = None
root_files = get_all_files_in_repo(access_token, organization, repo)
if type(root_files) == dict and root_files.get("message", "") == "Not Found":
return frappe.throw(f'Repository {repo} not found in organization {organization}')

for file in root_files:
if file["name"] == "pyproject.toml":
type = "pyproject.toml"
file_type = "pyproject.toml"
break
elif file["name"] == "setup.py":
type = "setup.py"
file_type = "setup.py"
break

if type == "pyproject.toml":
if file_type == "pyproject.toml":
app_name = get_app_name_from_pyproject_toml(organization, repo)
elif type == "setup.py":
elif file_type == "setup.py":
app_name = get_app_name_from_setup_py(organization, repo)

return app_name
Expand Down
9 changes: 8 additions & 1 deletion commit/api/meta_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@

@frappe.whitelist()
def get_installed_apps():
'''
Get all installed apps
1. Get the installed applications from the Installed Applications doctype
2. Get the app hooks for each app
3. Get the app description, publisher, logo, version and git branch
4. Return the updated apps
'''
install_app_doc = frappe.get_cached_doc('Installed Applications')
install_apps = install_app_doc.get('installed_applications')
updated_apps = []
Expand All @@ -18,7 +25,7 @@ def get_installed_apps():
if app_publisher is not None:
app_publisher = app_publisher[0]

app_logo_url = app_hooks.get('app_logo_url')
app_logo_url = app_hooks.get('app_logo_url') or app_hooks.get('app_logo')
if app_logo_url is not None:
app_logo_url = app_logo_url[0]

Expand Down