From 26eab7ed679a09f240a95509d3a3cb65db0b44a3 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 23 Nov 2019 11:59:13 +0100 Subject: [PATCH] sync: import heading.jpg only in Sync phase --- admin/sync/themes.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/admin/sync/themes.go b/admin/sync/themes.go index d3aa485c..8623eccc 100644 --- a/admin/sync/themes.go +++ b/admin/sync/themes.go @@ -99,17 +99,6 @@ func BuildTheme(i Importer, tdir string) (th *fic.Theme, errs []string) { th.Image = path.Join(tdir, "heading.png") } - if len(th.Image) > 0 { - if _, err := i.importFile(th.Image, - func(filePath string, origin string) (interface{}, error) { - th.Image = strings.TrimPrefix(filePath, fic.FilesDir) - return nil, nil - }); err != nil { - errs = append(errs, fmt.Sprintf("%q: unable to import heading image: %s", tdir, err)) - return nil, errs - } - } - return } @@ -132,6 +121,16 @@ func SyncThemes(i Importer) []string { continue } + if len(btheme.Image) > 0 { + if _, err := i.importFile(btheme.Image, + func(filePath string, origin string) (interface{}, error) { + btheme.Image = strings.TrimPrefix(filePath, fic.FilesDir) + return nil, nil + }); err != nil { + errs = append(errs, fmt.Sprintf("%q: unable to import heading image: %s", tdir, err)) + } + } + var theme fic.Theme if theme, err = fic.GetThemeByPath(btheme.Path); err != nil { if _, err := fic.CreateTheme(*btheme); err != nil {