Adding some consts, additional comments and simplifying some code

Signed-off-by: AMZN-Phil <[email protected]>

Code/Tools/ProjectManager/Source/AddRemoteProjectDialog.cpp

@@ -49,7 +49,7 @@ namespace O3DE::ProjectManager
         m_repoPath = new FormLineEditWidget(tr("Remote URL"), "", this);
         m_repoPath->setMinimumSize(QSize(600, 0));
         m_repoPath->setErrorLabelText(tr("Not a valid remote source."));
-        m_repoPath->lineEdit()->setPlaceholderText("http://github.com/o3de/example.git");
+        m_repoPath->lineEdit()->setPlaceholderText("https://github.com/o3de/example.git");
         vLayout->addWidget(m_repoPath);
 
         vLayout->addSpacing(10);

Code/Tools/ProjectManager/Source/AddRemoteTemplateDialog.cpp

@@ -49,7 +49,7 @@ namespace O3DE::ProjectManager
         m_repoPath = new FormLineEditWidget(tr("Remote URL"), "", this);
         m_repoPath->setMinimumSize(QSize(600, 0));
         m_repoPath->setErrorLabelText(tr("Not a valid remote template source."));
-        m_repoPath->lineEdit()->setPlaceholderText("http://github.com/o3de/example.git");
+        m_repoPath->lineEdit()->setPlaceholderText("https://github.com/o3de/example.git");
         vLayout->addWidget(m_repoPath);
 
         vLayout->addSpacing(10);

Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp

@@ -280,7 +280,7 @@ namespace O3DE::ProjectManager
         }
         else
         {
-            QString& errorMessage = settingsValidation.GetError();
+            const QString& errorMessage = settingsValidation.GetError();
             if (errorMessage.isEmpty())
             {
                 QMessageBox::warning(

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp

@@ -41,7 +41,6 @@
 namespace O3DE::ProjectManager
 {
     constexpr const char* k_templateIndexProperty = "TemplateIndex";
-    constexpr const char* k_addRemoteTemplateProperty = "AddRemoteTemplate";
     constexpr const char* k_templateNameProperty = "TemplateName";
 
     NewProjectSettingsScreen::NewProjectSettingsScreen(DownloadController* downloadController, QWidget* parent)
@@ -101,7 +100,7 @@ namespace O3DE::ProjectManager
                             emit OnTemplateSelectionChanged(/*oldIndex=*/oldIndex, /*newIndex=*/m_selectedTemplateIndex);
                         }
                     }
-                    else if (button && button->property(k_addRemoteTemplateProperty).isValid())
+                    else if (button == m_remoteTemplateButton)
                     {
                         AddRemoteTemplateDialog* addRemoteTemplateDialog = new AddRemoteTemplateDialog(this);
                         if (addRemoteTemplateDialog->exec() == QDialog::DialogCode::Accepted)
@@ -298,7 +297,6 @@ namespace O3DE::ProjectManager
 
             // Insert the add a remote template button
             m_remoteTemplateButton = new TemplateButton(":/DefaultTemplate.png", tr("Add remote Template"), this);
-            m_remoteTemplateButton->setProperty(k_addRemoteTemplateProperty, true);
             m_projectTemplateButtonGroup->addButton(m_remoteTemplateButton);
             m_templateFlowLayout->addWidget(m_remoteTemplateButton);
 
@@ -436,7 +434,7 @@ namespace O3DE::ProjectManager
         }
     }
 
-    AZ::Outcome<void, QString> NewProjectSettingsScreen::Validate()
+    AZ::Outcome<void, QString> NewProjectSettingsScreen::Validate() const
     {
         if (m_selectedTemplateIndex != -1 && m_templates[m_selectedTemplateIndex].m_isRemote)
         {

Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h

@@ -41,7 +41,7 @@ namespace O3DE::ProjectManager
 
         void SelectProjectTemplate(int index, bool blockSignals = false);
 
-        AZ::Outcome<void, QString> Validate() override;
+        AZ::Outcome<void, QString> Validate() const override;
 
     signals:
         void OnTemplateSelectionChanged(int oldIndex, int newIndex);

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp

@@ -90,7 +90,7 @@ namespace O3DE::ProjectManager
         return projectInfo;
     }
 
-    bool ProjectSettingsScreen::ValidateProjectName()
+    bool ProjectSettingsScreen::ValidateProjectName() const
     {
         bool projectNameIsValid = true;
         if (m_projectName->lineEdit()->text().isEmpty())
@@ -116,7 +116,7 @@ namespace O3DE::ProjectManager
         return projectNameIsValid;
     }
 
-    bool ProjectSettingsScreen::ValidateProjectPath()
+    bool ProjectSettingsScreen::ValidateProjectPath() const
     {
         bool projectPathIsValid = true;
         QDir path(m_projectPath->lineEdit()->text());
@@ -145,13 +145,14 @@ namespace O3DE::ProjectManager
         ValidateProjectName() && ValidateProjectPath();
     }
 
-    AZ::Outcome<void, QString> ProjectSettingsScreen::Validate()
+    AZ::Outcome<void, QString> ProjectSettingsScreen::Validate() const
     {
         if (ValidateProjectName() && ValidateProjectPath())
         {
             return AZ::Success();
         }
 
+        // Returning empty string to use the default error message
         return AZ::Failure<QString>("");
     }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/ProjectSettingsScreen.h

@@ -32,15 +32,15 @@ namespace O3DE::ProjectManager
 
         virtual ProjectInfo GetProjectInfo();
 
-        virtual AZ::Outcome<void, QString> Validate();
+        virtual AZ::Outcome<void, QString> Validate() const;
 
     protected slots:
         virtual void OnProjectNameUpdated();
         virtual void OnProjectPathUpdated();
 
     protected:
-        bool ValidateProjectName();
-        virtual bool ValidateProjectPath();
+        bool ValidateProjectName() const;
+        virtual bool ValidateProjectPath() const;
 
         QString GetDefaultProjectPath();
 

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -662,7 +662,7 @@ namespace O3DE::ProjectManager
         return AZ::Success(AZStd::move(gems));
     }
 
-    AZ::Outcome<QVector<AZStd::string>, AZStd::string> PythonBindings::GetEnabledGemNames(const QString& projectPath)
+    AZ::Outcome<QVector<AZStd::string>, AZStd::string> PythonBindings::GetEnabledGemNames(const QString& projectPath) const
     {
         // Retrieve the path to the cmake file that lists the enabled gems.
         pybind11::str enabledGemsFilename;
@@ -1180,7 +1180,7 @@ namespace O3DE::ProjectManager
         return AZ::Success();
     }
 
-    ProjectTemplateInfo PythonBindings::ProjectTemplateInfoFromPath(pybind11::handle path)
+    ProjectTemplateInfo PythonBindings::ProjectTemplateInfoFromPath(pybind11::handle path) const
     {
         ProjectTemplateInfo templateInfo(TemplateInfoFromPath(path));
         if (templateInfo.IsValid())
@@ -1204,7 +1204,7 @@ namespace O3DE::ProjectManager
         return templateInfo;
     }
 
-    TemplateInfo PythonBindings::TemplateInfoFromPath(pybind11::handle path)
+    TemplateInfo PythonBindings::TemplateInfoFromPath(pybind11::handle path) const
     {
         TemplateInfo templateInfo;
         templateInfo.m_path = Py_To_String(path);
@@ -1294,7 +1294,7 @@ namespace O3DE::ProjectManager
         }
     }
 
-    AZ::Outcome<QVector<ProjectTemplateInfo>> PythonBindings::GetProjectTemplatesForRepo(const QString& repoUri)
+    AZ::Outcome<QVector<ProjectTemplateInfo>> PythonBindings::GetProjectTemplatesForRepo(const QString& repoUri) const
     {
         QVector<ProjectTemplateInfo> templates;
 
@@ -1328,7 +1328,7 @@ namespace O3DE::ProjectManager
         }
     }
 
-    AZ::Outcome<QVector<ProjectTemplateInfo>> PythonBindings::GetProjectTemplatesForAllRepos()
+    AZ::Outcome<QVector<ProjectTemplateInfo>> PythonBindings::GetProjectTemplatesForAllRepos() const
     {
         QVector<ProjectTemplateInfo> templates;
 

Code/Tools/ProjectManager/Source/PythonBindings.h

@@ -48,7 +48,7 @@ namespace O3DE::ProjectManager
         AZ::Outcome<GemInfo> GetGemInfo(const QString& path, const QString& projectPath = {}) override;
         AZ::Outcome<QVector<GemInfo>, AZStd::string> GetEngineGemInfos() override;
         AZ::Outcome<QVector<GemInfo>, AZStd::string> GetAllGemInfos(const QString& projectPath) override;
-        AZ::Outcome<QVector<AZStd::string>, AZStd::string> GetEnabledGemNames(const QString& projectPath) override;
+        AZ::Outcome<QVector<AZStd::string>, AZStd::string> GetEnabledGemNames(const QString& projectPath) const override;
         AZ::Outcome<void, AZStd::string> RegisterGem(const QString& gemPath, const QString& projectPath = {}) override;
         AZ::Outcome<void, AZStd::string> UnregisterGem(const QString& gemPath, const QString& projectPath = {}) override;
 
@@ -84,8 +84,8 @@ namespace O3DE::ProjectManager
 
         // Templates
         AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplates() override;
-        AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForRepo(const QString& repoUri) override;
-        AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForAllRepos() override;
+        AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForRepo(const QString& repoUri) const override;
+        AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForAllRepos() const override;
         AZ::Outcome<QVector<TemplateInfo>> GetGemTemplates() override;
 
         void AddErrorString(AZStd::string errorString) override;
@@ -103,8 +103,8 @@ namespace O3DE::ProjectManager
         GemInfo GemInfoFromPath(pybind11::handle path, pybind11::handle pyProjectPath);
         GemRepoInfo GetGemRepoInfo(pybind11::handle repoUri);
         ProjectInfo ProjectInfoFromPath(pybind11::handle path);
-        ProjectTemplateInfo ProjectTemplateInfoFromPath(pybind11::handle path);
-        TemplateInfo TemplateInfoFromPath(pybind11::handle path);
+        ProjectTemplateInfo ProjectTemplateInfoFromPath(pybind11::handle path) const;
+        TemplateInfo TemplateInfoFromPath(pybind11::handle path) const;
         AZ::Outcome<void, AZStd::string> GemRegistration(const QString& gemPath, const QString& projectPath, bool remove = false);
         bool StopPython();
         IPythonBindings::ErrorPair GetErrorPair();

Code/Tools/ProjectManager/Source/PythonBindingsInterface.h

@@ -141,7 +141,7 @@ namespace O3DE::ProjectManager
          * @param[in] projectPath Absolute file path to the project.
          * @return A list of gem names of all the enabled gems for a given project or a error message on failure.
          */
-        virtual AZ::Outcome<QVector<AZStd::string>, AZStd::string> GetEnabledGemNames(const QString& projectPath) = 0;
+        virtual AZ::Outcome<QVector<AZStd::string>, AZStd::string> GetEnabledGemNames(const QString& projectPath) const = 0;
 
         /**
          * Registers the gem to the specified project, or to the o3de_manifest.json if no project path is given
@@ -252,13 +252,13 @@ namespace O3DE::ProjectManager
          * Gathers all project templates for the given repo.
          * @return An outcome with a list of all ProjectTemplateInfos from the given repo on success
          */
-        virtual AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForRepo(const QString& repoUri) = 0;
+        virtual AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForRepo(const QString& repoUri) const = 0;
 
         /**
          * Gathers all project templates for all templates registered from repos.
          * @return An outcome with a list of all ProjectTemplateInfos on success
          */
-        virtual AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForAllRepos() = 0;
+        virtual AZ::Outcome<QVector<ProjectTemplateInfo>> GetProjectTemplatesForAllRepos() const = 0;
 
         // Gem Repos
 

Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp

@@ -176,10 +176,11 @@ namespace O3DE::ProjectManager
         }
     }
 
-    AZ::Outcome<void, QString> UpdateProjectSettingsScreen::Validate()
+    AZ::Outcome<void, QString> UpdateProjectSettingsScreen::Validate() const
     {
         if (!(ValidateProjectPreview() && ValidateProjectId()))
         {
+            // Returning empty string to use the default error message
             return AZ::Failure<QString>("");
         }
 
@@ -217,7 +218,7 @@ namespace O3DE::ProjectManager
     } 
 
 
-    bool UpdateProjectSettingsScreen::ValidateProjectPath()
+    bool UpdateProjectSettingsScreen::ValidateProjectPath() const
     {
         bool projectPathIsValid = true;
         QDir path(m_projectPath->lineEdit()->text());
@@ -231,7 +232,7 @@ namespace O3DE::ProjectManager
         return projectPathIsValid;
     }
 
-    bool UpdateProjectSettingsScreen::ValidateProjectPreview()
+    bool UpdateProjectSettingsScreen::ValidateProjectPreview() const
     {
         bool projectPreviewIsValid = true;
 
@@ -266,7 +267,7 @@ namespace O3DE::ProjectManager
         return projectPreviewIsValid;
     }
 
-    bool UpdateProjectSettingsScreen::ValidateProjectId()
+    bool UpdateProjectSettingsScreen::ValidateProjectId() const
     {
         bool projectIdIsValid = true;
         if (m_projectId->lineEdit()->text().isEmpty())

Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.h

@@ -29,7 +29,7 @@ namespace O3DE::ProjectManager
         ProjectInfo GetProjectInfo() override;
         void SetProjectInfo(const ProjectInfo& projectInfo);
 
-        AZ::Outcome<void, QString> Validate() override;
+        AZ::Outcome<void, QString> Validate() const override;
 
         void ResetProjectPreviewPath();
 
@@ -40,9 +40,9 @@ namespace O3DE::ProjectManager
         void OnProjectEngineUpdated(int index);
 
     protected:
-        bool ValidateProjectPath() override;
-        virtual bool ValidateProjectPreview();
-        bool ValidateProjectId();
+        bool ValidateProjectPath() const override;
+        virtual bool ValidateProjectPreview() const;
+        bool ValidateProjectId() const;
 
         inline constexpr static int s_collapseButtonSize = 24;
 

scripts/o3de/o3de/repo.py

@@ -295,44 +295,28 @@ def search_repo(manifest_json_data: dict,
                 gem_name: str = None,
                 template_name: str = None,
                 restricted_name: str = None) -> dict or None:
-    o3de_object_uris = []
     if isinstance(engine_name, str) or isinstance(engine_name, pathlib.PurePath):
-        try:
-            o3de_object_uris = manifest_json_data['engines']
-        except KeyError:
-            pass
+        o3de_object_uris = manifest_json_data.get('engines', [])
         manifest_json = 'engine.json'
         json_key = 'engine_name'
         search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == engine_name else None
     elif isinstance(project_name, str) or isinstance(project_name, pathlib.PurePath):
-        try:
-            o3de_object_uris = manifest_json_data['projects']
-        except KeyError:
-            pass
+        o3de_object_uris = manifest_json_data.get('projects', [])
         manifest_json = 'project.json'
         json_key = 'project_name'
         search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == project_name else None
     elif isinstance(gem_name, str) or isinstance(gem_name, pathlib.PurePath):
-        try:
-            o3de_object_uris = manifest_json_data['gems']
-        except KeyError:
-            pass
+        o3de_object_uris = manifest_json_data.get('gems', [])
         manifest_json = 'gem.json'
         json_key = 'gem_name'
         search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == gem_name else None
     elif isinstance(template_name, str) or isinstance(template_name, pathlib.PurePath):
-        try:
-            o3de_object_uris = manifest_json_data['templates']
-        except KeyError:
-            pass
+        o3de_object_uris = manifest_json_data.get('templates', [])
         manifest_json = 'template.json'
         json_key = 'template_name'
         search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == template_name else None
     elif isinstance(restricted_name, str) or isinstance(restricted_name, pathlib.PurePath):
-        try:
-            o3de_object_uris = manifest_json_data['restricted']
-        except KeyError:
-            pass
+        o3de_object_uris = manifest_json_data.get('restricted', [])
         manifest_json = 'restricted.json'
         json_key = 'restricted_name'
         search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == restricted_name else None