diff --git a/hugo.scm b/hugo.scm index 7efa753f..2c858ddd 100755 --- a/hugo.scm +++ b/hugo.scm @@ -25,7 +25,7 @@ (let ((dishes (read-dishes)) (words (read-words)) (phrases (read-phrases)) - (places (read-places))) + (places (read-places))) (if i (copy-images)) (if v (print dishes)) (if o (write-dishes dishes)))))) @@ -247,11 +247,17 @@ (define (read-words) (let ((files (read-json "assets/json/words.json"))) (concatenate (map (lambda (file) - (vector->list (read-json #"assets/json/words/~|file|.json"))) - files)))) + (vector->list (read-json #"assets/json/words/~|file|.json"))) + files)))) (define (read-places) - (read-json "assets/json/countries.json")) + (let ((files (read-json "assets/json/countries.json"))) + (concatenate (map (lambda (file) + (read-json #"assets/json/place/~|file|.json")) + files)))) (define (read-phrases) - (read-json "assets/json/phrases.json")) + (let ((files (read-json "assets/json/phrases.json"))) + (concatenate (map (lambda (file) + (read-json #"assets/json/phrases/~|file|.json")) + files))))