rmcguire/git-project-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begin move to project/alias by unique ID

Browse Source
This commit is contained in:
Ryan McGuire
2024-12-30 16:42:45 -05:00
parent 11a2ca434c
commit 70027a9880
7 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/alias/alias_add.go
View File

@ -28,7 +28,15 @@ func runAddAliasCmd(cmd *cobra.Command, args []string) {
// Check by flag
if projectID := viper.GetInt(util.ViperAliasAddPID); projectID > 0 {
utils.Logger().Debug(fmt.Sprintf("Adding for inbound project ID %d", projectID))
project = utils.Cache().GetProjectByID(projectID)
projects := utils.Cache().GetProjectsByID(projectID)
if len(projects) > 0 {
project = projects[0]
}
if len(projects) > 1 {
utils.Logger().
Warn(fmt.Sprintf("found %d remotes with same ID, using first remote", len(projects)))
}
}
// Check by arg
@ -45,10 +53,10 @@ func runAddAliasCmd(cmd *cobra.Command, args []string) {
}
}
AddNewAliases(cmd, project.ID)
AddNewAliases(cmd, project.GetID())
}
func AddNewAliases(cmd *cobra.Command, projectID int) {
func AddNewAliases(cmd *cobra.Command, projectID string) {
u := util.MustFromCtx(cmd.Context())
project := u.Cache().GetProjectByID(projectID)
if project == nil {
@ -65,7 +73,7 @@ func AddNewAliases(cmd *cobra.Command, projectID int) {
if a == "" {
continue
}
if err := u.Cache().AddAlias(a, project.ID, project.Remote); err != nil {
if err := u.Cache().AddAlias(a, project); err != nil {
u.Logger().Debug("Skipping alias add", u.Logger().Args(
"error", err,
"alias", a,

2
cmd/project/project.go
View File

@ -50,7 +50,7 @@ func getProject(cmd *cobra.Command, args []string) *projects.Project {
if len(utils.Cache().GetProjectAliases(project)) == 0 {
utils.Logger().Info("New project, set aliases or press enter for default")
alias.AddNewAliases(cmd, project.ID)
alias.AddNewAliases(cmd, project.GetID())
}
return project