From 961542283d8d9014a920f71246235b4edee03851 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 7 Apr 2025 11:19:44 +0200 Subject: [PATCH 1/2] fileexporter: Include standalone exercices --- admin/sync/full.go | 13 ++----------- admin/sync/themes.go | 14 ++++++++++++++ fileexporter/main.go | 6 +++--- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/admin/sync/full.go b/admin/sync/full.go index 1a64158c..d112fd2e 100644 --- a/admin/sync/full.go +++ b/admin/sync/full.go @@ -72,13 +72,9 @@ func SpeedySyncDeep(i Importer) (errs SyncReport) { errs.ThemesSync = append(errs.ThemesSync, sterr.Error()) } - if themes, err := fic.GetThemes(); err == nil { + if themes, err := fic.GetThemesExtended(); err == nil { DeepSyncProgress = 2 - if i.Exists(fic.StandaloneExercicesDirectory) { - themes = append(themes, &fic.StandaloneExercicesTheme) - } - var themeStep uint8 = uint8(250) / uint8(len(themes)) for tid, theme := range themes { @@ -143,14 +139,9 @@ func SyncDeep(i Importer) (errs SyncReport) { } // Synchronize themes - if themes, err := fic.GetThemes(); err == nil { + if themes, err := fic.GetThemesExtended(); err == nil { DeepSyncProgress = 2 - // Also synchronize standalone exercices - if i.Exists(fic.StandaloneExercicesDirectory) { - themes = append(themes, &fic.StandaloneExercicesTheme) - } - var themeStep uint8 = uint8(250) / uint8(len(themes)) for tid, theme := range themes { diff --git a/admin/sync/themes.go b/admin/sync/themes.go index 8ac666d4..09a4440b 100644 --- a/admin/sync/themes.go +++ b/admin/sync/themes.go @@ -40,6 +40,20 @@ func GetThemes(i Importer) (themes []string, err error) { return themes, nil } +// GetThemesExtended returns all theme directories, including standalone exercices. +func GetThemesExtended(i Importer) (themes []string, err error) { + themes, err = GetThemes(i) + if err != nil { + return + } + + if i.Exists(fic.StandaloneExercicesDirectory) { + themes = append(themes, fic.StandaloneExercicesDirectory) + } + + return +} + // resizePicture makes the given image just fill the given rectangle. func resizePicture(i Importer, imgPath string, importedPath string, rect image.Rectangle) error { if fl, err := i.GetFile(imgPath); err != nil { diff --git a/fileexporter/main.go b/fileexporter/main.go index 7113c09d..2fa95ab9 100644 --- a/fileexporter/main.go +++ b/fileexporter/main.go @@ -33,7 +33,7 @@ func exportThemeFiles(tdir string) (errs error) { dmap := map[int64]*fic.Exercice{} for i, edir := range exercices { - log.Printf("In theme %s, doing exercice %d/%d: %s", tdir, i, len(exercices), tdir) + log.Printf("In theme %s, doing exercice %d/%d: %s", tdir, i+1, len(exercices), edir) err = exportExerciceFiles(theme, edir, &dmap, exceptions) errs = errors.Join(errs, err) } @@ -155,14 +155,14 @@ func main() { } } - themes, err := sync.GetThemes(sync.GlobalImporter) + themes, err := sync.GetThemesExtended(sync.GlobalImporter) if err != nil { log.Fatal(err) } hasError := false for i, tdir := range themes { - log.Printf("Doing theme %d/%d: %s", i, len(themes), tdir) + log.Printf("Doing theme %d/%d: %s", i+1, len(themes), tdir) err = exportThemeFiles(tdir) if err != nil { hasError = true From c53e5d9b9cbb1922bbb8c52102999565fcf8a7e6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 7 Apr 2025 16:22:21 +0000 Subject: [PATCH 2/2] chore(deps): update dependency bootstrap to v5.3.5 --- frontend/fic/package-lock.json | 6 +++--- qa/ui/package-lock.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/fic/package-lock.json b/frontend/fic/package-lock.json index d08b942c..c22adcaa 100644 --- a/frontend/fic/package-lock.json +++ b/frontend/fic/package-lock.json @@ -1500,9 +1500,9 @@ "license": "MIT" }, "node_modules/bootstrap": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", - "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.5.tgz", + "integrity": "sha512-ct1CHKtiobRimyGzmsSldEtM03E8fcEX4Tb3dGXz1V8faRwM50+vfHwTzOxB3IlKO7m+9vTH3s/3C6T2EAPeTA==", "funding": [ { "type": "github", diff --git a/qa/ui/package-lock.json b/qa/ui/package-lock.json index 775181b2..2b7e9acf 100644 --- a/qa/ui/package-lock.json +++ b/qa/ui/package-lock.json @@ -1180,9 +1180,9 @@ "license": "MIT" }, "node_modules/bootstrap": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", - "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.5.tgz", + "integrity": "sha512-ct1CHKtiobRimyGzmsSldEtM03E8fcEX4Tb3dGXz1V8faRwM50+vfHwTzOxB3IlKO7m+9vTH3s/3C6T2EAPeTA==", "funding": [ { "type": "github",