lmika/hugo-cms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pages: some fixups

Browse source
This commit is contained in:
Leon Mika 2025-02-18 21:26:24 +11:00
parent 68aa9c0e13
commit 295811411e
7 changed files with 64 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
services/sitebuilder/service.go
View file

@ -172,11 +172,11 @@ func (s *Service) createSite(ctx context.Context, site models.Site) error {
return err
}
if err := s.hugo.ReconfigureSite(ctx, "hugo", site); err != nil {
if err := s.hugo.ReconfigureSite(ctx, false, "hugo", site); err != nil {
return err
}
if err := s.hugo.ReconfigureSite(ctx, "hugoPreview", site); err != nil {
if err := s.hugo.ReconfigureSite(ctx, true, "hugoPreview", site); err != nil {
return err
}

38
services/sites/service.go
View file

@ -61,26 +61,28 @@ func (s *Service) SaveSettings(ctx context.Context, site models.Site, newSetting
return err
}
pubTarget, err := s.db.GetPublishTargetBySiteRole(ctx, newSite.ID, models.TargetRoleProduction)
if err == nil {
pubTarget.TargetRef = newSettings.TargetRef
pubTarget.URL = newSettings.TargetURL
if err := s.db.UpdatePublishTarget(ctx, pubTarget); err != nil {
if newSettings.TargetRef != "" && newSettings.TargetURL != "" {
pubTarget, err := s.db.GetPublishTargetBySiteRole(ctx, newSite.ID, models.TargetRoleProduction)
if err == nil {
pubTarget.TargetRef = newSettings.TargetRef
pubTarget.URL = newSettings.TargetURL
if err := s.db.UpdatePublishTarget(ctx, pubTarget); err != nil {
return err
}
} else if errors.Is(err, pgx.ErrNoRows) {
pubTarget = models.PublishTarget{
SiteID: newSite.ID,
Role: models.TargetRoleProduction,
Type: models.TargetTypeNetlify,
URL: newSettings.TargetURL,
TargetRef: newSettings.TargetRef,
}
if err := s.db.InsertPublishTarget(ctx, &pubTarget); err != nil {
return err
}
} else {
return err
}
} else if errors.Is(err, pgx.ErrNoRows) {
pubTarget = models.PublishTarget{
SiteID: newSite.ID,
Role: models.TargetRoleProduction,
Type: models.TargetTypeNetlify,
URL: newSettings.TargetURL,
TargetRef: newSettings.TargetRef,
}
if err := s.db.InsertPublishTarget(ctx, &pubTarget); err != nil {
return err
}
} else {
return err
}
return s.jobs.Queue(ctx, s.sb.RebuildSite(site, newSite))