Compare commits
2 commits
eb1f6eaebd
...
0cf0dd1450
Author | SHA1 | Date | |
---|---|---|---|
0cf0dd1450 | |||
961542283d |
5 changed files with 25 additions and 54 deletions
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
23
frontend/fic/package-lock.json
generated
23
frontend/fic/package-lock.json
generated
|
@ -1868,22 +1868,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-compat-utils": {
|
||||
"version": "0.6.4",
|
||||
"resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
|
||||
"integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"semver": "^7.5.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"eslint": ">=6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-config-prettier": {
|
||||
"version": "10.1.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz",
|
||||
|
@ -1898,15 +1882,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/eslint-plugin-svelte": {
|
||||
"version": "3.4.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.4.0.tgz",
|
||||
"integrity": "sha512-L0eX0W6M0YhIUhWRlOAaornY1lIz6xRSVKVJuiRovMM5wHUBQZmefwJRR0y+sqR0CHtJpFmxYiQbw3UaO8h5KA==",
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.5.1.tgz",
|
||||
"integrity": "sha512-Qn1slddZHfqYiDO6IN8/iN3YL+VuHlgYjm30FT+hh0Jf/TX0jeZMTJXQMajFm5f6f6hURi+XO8P+NPYD+T4jkg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@eslint-community/eslint-utils": "^4.4.1",
|
||||
"@jridgewell/sourcemap-codec": "^1.5.0",
|
||||
"eslint-compat-utils": "^0.6.4",
|
||||
"esutils": "^2.0.3",
|
||||
"known-css-properties": "^0.35.0",
|
||||
"postcss": "^8.4.49",
|
||||
|
|
23
qa/ui/package-lock.json
generated
23
qa/ui/package-lock.json
generated
|
@ -1498,22 +1498,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-compat-utils": {
|
||||
"version": "0.6.4",
|
||||
"resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
|
||||
"integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"semver": "^7.5.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"eslint": ">=6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-config-prettier": {
|
||||
"version": "10.1.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz",
|
||||
|
@ -1528,15 +1512,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/eslint-plugin-svelte": {
|
||||
"version": "3.4.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.4.0.tgz",
|
||||
"integrity": "sha512-L0eX0W6M0YhIUhWRlOAaornY1lIz6xRSVKVJuiRovMM5wHUBQZmefwJRR0y+sqR0CHtJpFmxYiQbw3UaO8h5KA==",
|
||||
"version": "3.5.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.5.1.tgz",
|
||||
"integrity": "sha512-Qn1slddZHfqYiDO6IN8/iN3YL+VuHlgYjm30FT+hh0Jf/TX0jeZMTJXQMajFm5f6f6hURi+XO8P+NPYD+T4jkg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@eslint-community/eslint-utils": "^4.4.1",
|
||||
"@jridgewell/sourcemap-codec": "^1.5.0",
|
||||
"eslint-compat-utils": "^0.6.4",
|
||||
"esutils": "^2.0.3",
|
||||
"known-css-properties": "^0.35.0",
|
||||
"postcss": "^8.4.49",
|
||||
|
|
Reference in a new issue