Undownloaded remote gems are shown in Gem Catalog and searchable by repo name

Signed-off-by: nggieber <nggieber@amazon.com>
This commit is contained in:
nggieber
2021-10-22 16:22:16 -07:00
parent 9ce6f43a22
commit 15f4c1a091
6 changed files with 77 additions and 11 deletions
+5 -2
View File
@@ -494,7 +494,7 @@ def get_project_json_data(project_name: str = None,
def get_gem_json_data(gem_name: str = None, gem_path: str or pathlib.Path = None,
project_path: pathlib.Path = None) -> dict or None:
project_path: pathlib.Path = None, full_path_given: bool = False) -> dict or None:
if not gem_name and not gem_path:
logger.error('Must specify either a Gem name or Gem Path.')
return None
@@ -502,7 +502,10 @@ def get_gem_json_data(gem_name: str = None, gem_path: str or pathlib.Path = None
if gem_name and not gem_path:
gem_path = get_registered(gem_name=gem_name, project_path=project_path)
return get_json_data('gem', gem_path, validation.valid_o3de_gem_json)
if not full_path_given:
return get_json_data('gem', gem_path, validation.valid_o3de_gem_json)
else:
return get_json_data_file(gem_path, 'gem', validation.valid_o3de_gem_json)
def get_template_json_data(template_name: str = None, template_path: str or pathlib.Path = None,
+15 -4
View File
@@ -92,13 +92,13 @@ def process_add_o3de_repo(file_name: str or pathlib.Path,
return 0
def get_gem_json_paths_from_cached_repo(repo_uri: str) -> list:
def get_gem_json_paths_from_cached_repo(repo_uri: str) -> set:
url = f'{repo_uri}/repo.json'
repo_sha256 = hashlib.sha256(url.encode())
cache_folder = manifest.get_o3de_cache_folder()
cache_filename = cache_folder / str(repo_sha256.hexdigest() + '.json')
gem_list = []
gem_set = set()
file_name = pathlib.Path(cache_filename).resolve()
if not file_name.is_file():
@@ -125,10 +125,21 @@ def get_gem_json_paths_from_cached_repo(repo_uri: str) -> list:
manifest_json_sha256 = hashlib.sha256(manifest_json_uri.encode())
cache_gem_json_filepath = cache_folder / str(manifest_json_sha256.hexdigest() + '.json')
if cache_gem_json_filepath.is_file():
logger.warn(f'Could not find cached gem json file for {o3de_object_uri} in repo {repo_uri}')
gem_list.append(cache_gem_json_filepath)
gem_set.add(cache_gem_json_filepath)
else:
logger.warn(f'Could not find cached gem json file {cache_gem_json_filepath} for {o3de_object_uri} in repo {repo_uri}')
return gem_set
def get_gem_json_paths_from_all_cached_repos() -> set:
json_data = manifest.load_o3de_manifest()
gem_list = set()
for repo_uri in json_data['repos']:
gem_list.update(get_gem_json_paths_from_cached_repo(repo_uri))
return gem_list
def refresh_repos() -> int:
json_data = manifest.load_o3de_manifest()