Add sections `poster` and `illustration`

layout/work/illustration.html

@@ -1,19 +1,21 @@
 {% extends "_work_no_all.html"%}
 
 {% set illustration_selected = True %}
+{% set work_path = "work/illustration" %}
+
 {% block main %}
 <style>
 	:root {
 		--columns: 3;
 	}
 </style>
-{% for _ in range(15) %}
+{% for image in sorted(images("work/illustration"), reverse=True) %}
 	<figure>
-		<svg width="1.75px" height="1px" style="background-color: gray"></svg>
+		<img class="tile" src="{{ (image.main or image.filenames[0]) | static }}">
 		<figcaption class="hbox">
 			<div class="caption">
-				<h1>Work Name Here / Year</h1>
-				illustration
+				<h1>{{ image.name }} / {{ image.year }}</h1>
+				{{ image.category }}
 			</div>
 		</figcaption>
 	</figure>

layout/work/poster.html

@@ -4,9 +4,9 @@
 {% set work_path = "work/poster" %}
 
 {% block main %}
-{% for image in images("work/poster") %}
+{% for image in sorted(images("work/poster"), reverse=True) %}
 	<figure>
-		<img class="tile" src="{{ image.main or image.filenames[0] | static }}">
+		<img class="tile" src="{{ (image.main or image.filenames[0]) | static }}">
 		<figcaption class="hbox">
 			<div class="caption">
 				<h1>{{ image.name }} / {{ image.year }}</h1>

plugins/alucho_images.py

@@ -1,6 +1,7 @@
 from collections import namedtuple
 from json import loads as from_json
 from pathlib import Path
+from unicodedata import normalize
 
 '''
 This plugin helps loading images for each section.
@@ -32,7 +33,7 @@ Along with the image files which should be called
 IMAGE_PATH = 'image' # relative to the static path
 STATIC = ''
 
-Image = namedtuple('Image', ['name', 'year', 'category', 'description', 'filenames'])
+Image = namedtuple('Image', ['key', 'name', 'year', 'category', 'description', 'main', 'filenames'])
 
 # Functions
 
@@ -45,13 +46,17 @@ def images(section):
         if metafile.exists():
             img_base = path.relative_to(STATIC)
             metadata = from_json(metafile.read_text())
+            key = path.name.split()[0]
+            key = int(key) if key.isnumeric() else 0
             img = Image(
+                # key should always be the first field to sort images
+                key,
                 metadata.get('name'),
                 metadata.get('year'),
                 metadata.get('category'),
                 metadata.get('description'),
-                [img_base.joinpath(img_name) for img_name in metadata.get('images', [])])
-            print(img)
+                img_base.joinpath(normalize('NFC', metadata.get('main'))) if 'main' in metadata else None,
+                [img_base.joinpath(normalize('NFC', img_name)) for img_name in metadata.get('images', [])])
             yield img
 
 
@@ -59,3 +64,4 @@ def init_plugin(env, config):
     global STATIC
     STATIC = config['STATIC']
     env.globals['images'] = images
+    env.globals['sorted'] = sorted

sitegen.py

@@ -16,6 +16,7 @@ LANGUAGES = 'languages'
 PLUGINS = 'plugins'
 ROOT = 'root'
 STATIC = 'static'
+STATIC_URL = '/static'
 DEFAULT_LANG = 'en'
 OTHER_LANGS = set(['es'])
 WATCH_INTERVAL = 1 # in secs
@@ -197,7 +198,7 @@ def cur_lang(ctx, path):
 def static(value):
     parts = value.parts if isinstance(value, Path) else value.split('/')
     sub_path = '/'.join(map(lambda s: quote(s), parts))
-    return f"/static/{sub_path}"
+    return f"{STATIC_URL}/{sub_path}"
 
 def svg(resource):
     with Path(STATIC, 'svg', f'{resource}.svg').open() as f:

static/image/work/all/Fiart/_metadata.json

@@ -1,6 +0,0 @@
-{
-    "name": "Fiart",
-    "year": "2017",
-    "category": "other",
-    "images": ["Fiart.jpg"]
-}

static/image/work/all/Unicornio/_metadata.json

@@ -1,6 +0,0 @@
-{
-    "name": "Unicornio",
-    "year": "2017",
-    "category": "poster",
-    "images": ["Unicornio.jpg"]
-}

static/image/work/illustration/1 - El gato y la luna - 15_08_2009/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "El gato y la luna",
+    "priority": 1,
+    "year": "2009",
+    "category": "illustration",
+    "main": "El gato y la luna - 450 x 785 px.jpg",
+    "images": ["El gato y la luna - 450 x 785 px.jpg"]
+}

static/image/work/illustration/10 - Mi tío el empleado - 01_11_2012/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Mi tío el empleado",
+    "priority": 10,
+    "year": "2013",
+    "category": "illustration",
+    "main": "Mi tío el empleado - 450 x 785 px.jpg",
+    "images": ["Mi tío el empleado - 450 x 785 px.jpg"]
+}

static/image/work/illustration/11 - El cuento del cuento - 14_07_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "El cuento del cuento",
+    "priority":11,
+    "year": "2015",
+    "category": "illustration",
+    "main": "El cuento del cuento - 450 x 785 px.jpg",
+    "images": ["El cuento del cuento - 450 x 785 px.jpg"]
+}

static/image/work/illustration/12 - Mi gato alfonsino - 19_06_2016/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Mi gato alfonsino",
+    "priority": 12,
+    "year": "2016",
+    "category": "illustration",
+    "main": "Mi gato alfonsino - 450 x 785 px.jpg",
+    "images": ["Mi gato alfonsino - 450 x 785 px.jpg"]
+}

static/image/work/illustration/2 - La Jiribilla de Papel - 03_05_2009 al 12_04_2013/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "La Jiribilla de Papel",
+    "priority": 2,
+    "year": "2009",
+    "category": "illustration",
+    "main": "La Jiribilla de Papel - 450 x 785 px.jpg",
+    "images": ["La Jiribilla de Papel - 450 x 785 px.jpg"]
+}

static/image/work/illustration/3 - Un pueblo de antes - 20_04_2010/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Un pueblo de antes",
+    "priority": 3,
+    "year": "2010",
+    "category": "illustration",
+    "main": "Un pueblo de antes - 450 x 785 px.jpg",
+    "images": ["Un pueblo de antes - 450 x 785 px.jpg"]
+}

static/image/work/illustration/4 - Mónica caida del cielo - 03_03_2011/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Mónica caída del cielo",
+    "priority": 4,
+    "year": "2011",
+    "category": "illustration",
+    "main": "Mónica caída del cielo - 450 x 785 px.jpg",
+    "images": ["Mónica caída del cielo - 450 x 785 px.jpg"]
+}

static/image/work/illustration/5 - La abuela llora en el patio - 28_03_2012/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "La abuela llora en el patio",
+    "priority": 5,
+    "year": "2012",
+    "category": "illustration",
+    "main": "La abuela llora en el patio - 450 x 785 px.jpg",
+    "images": ["La abuela llora en el patio - 450 x 785 px.jpg"]
+}

static/image/work/illustration/6 - Quién les pone el cascabel - 15_06_2012/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Quién les pone el cascabel",
+    "priority": 6,
+    "year": "2012",
+    "category": "illustration",
+    "main": "Quién les pone el cascabel - 450 x 785 px.jpg",
+    "images": ["Quién les pone el cascabel - 450 x 785 px.jpg"]
+}

static/image/work/illustration/7 - Cuentos rusos - 28_06_2012/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Cuentos rusos",
+    "priority": 7,
+    "year": "2012",
+    "category": "illustration",
+    "main": "Cuentos rusos - 450 x 785 px.jpg",
+    "images": ["Cuentos rusos - 450 x 785 px.jpg"]
+}

static/image/work/illustration/8 - Zambilé - 07_07_2012/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Zambilé",
+    "priority": 8,
+    "year": "2012",
+    "category": "illustration",
+    "main": "Zambilé - 450 x 785 px.jpg",
+    "images": ["Zambilé - 450 x 785 px.jpg"]
+}

static/image/work/illustration/9 - Una isla en el tiempo - 22_05_2013/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Una isla en el tiempo",
+    "priority": 9,
+    "year": "2013",
+    "category": "illustration",
+    "main": "Una isla en el tiempo - 450 x 785 px.jpg",
+    "images": ["Una isla en el tiempo - 450 x 785 px.jpg"]
+}

static/image/work/poster/10 - Pájaros - 19_11_2013/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Pájaros",
+    "priority": 10,
+    "year": "2013",
+    "category": "poster",
+    "main": "Pájaros - 450 x 643 px.jpg",
+    "images": ["Pájaros - 696 x 995 px.jpg"]
+}

static/image/work/poster/11 - Crisis financiera - 21_11_2013/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Crisis financiera",
+    "priority": 11,
+    "year": "2013",
+    "category": "poster",
+    "main": "Crisis financiera global - 450 x 643 px.jpg",
+    "images": ["Crisis financiera global - 696 x 995 px.jpg"]
+}

static/image/work/poster/12 - Vinicius - 25_11_2013/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Vinicius",
+    "priority": 12,
+    "year": "2013",
+    "category": "poster",
+    "main": "Vinicius - 450 x 643 px.jpg",
+    "images": ["Vinicius - 696 x 995 px.jpg"]
+}

static/image/work/poster/13 - Buey - 24_02_2014/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Buey",
+    "priority": 13,
+    "year": "2014",
+    "category": "poster",
+    "main": "Buey - 450 x 643 px.jpg",
+    "images": ["Buey - 696 x 995 px.jpg"]
+}

static/image/work/poster/14 - Homenaje a Chaplin - 18_07_2014/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Homenaje a Chaplin",
+    "priority": 14,
+    "year": "2014",
+    "category": "poster",
+    "main": "Homenaje a Chaplin - 450 x 643 px.jpg",
+    "images": ["Homenaje a Chaplin - 696 x 995 px.jpg"]
+}

static/image/work/poster/15 - Come come - 15_10_2014/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Come come",
+    "priority": 15,
+    "year": "2014",
+    "category": "poster",
+    "main": "Come come - 450 x 643 px.jpg",
+    "images": ["Come come - 696 x 995 px.jpg"]
+}

static/image/work/poster/16 - Crepúsculo - 29_10_2014/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Crepúsculo",
+    "priority": 16,
+    "year": "2014",
+    "category": "poster",
+    "main": "Crepúsculo - 450 x 643 px.jpg",
+    "images": ["Crepúsculo - 696 x 995 px.jpg"]
+}

static/image/work/poster/17 - El robo del cochino - 17_01_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "El robo del cochino",
+    "priority": 17,
+    "year": "2015",
+    "category": "poster",
+    "main": "El robo del cochino - 450 x 643 px.jpg",
+    "images": ["El robo del cochino - 696 x 995 px.jpg"]
+}

static/image/work/poster/18 - Kikiriki - 21_01_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Kikiriki",
+    "priority": 18,
+    "year": "2015",
+    "category": "poster",
+    "main": "Kikiriki - 450 x 643 px.jpg",
+    "images": ["Kikiriki - 696 x 995 px.jpg"]
+}

static/image/work/poster/19 - Canción de autor - 02_03_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Canción de autor",
+    "priority": 19,
+    "year": "2015",
+    "category": "poster",
+    "main": "Canción de autor - 450 x 643 px.jpg",
+    "images": ["Canción de autor - 696 x 995 px.jpg"]
+}

static/image/work/poster/20 - Fátima - 05_03_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Fátima",
+    "priority": 20,
+    "year": "2015",
+    "category": "poster",
+    "main": "Fátima - 450 x 643 px.jpg",
+    "images": ["Fátima - 696 x 995 px.jpg"]
+}

static/image/work/poster/21 - The red panther - 06_05_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "The red panther",
+    "priority": 21,
+    "year": "2015",
+    "category": "poster",
+    "main": "The red panther - 450 x 643 px.jpg",
+    "images": ["The red panther - 696 x 995 px.jpg"]
+}

static/image/work/poster/22 - Arte para mamá - 07_05_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Arte para mamá",
+    "priority": 22,
+    "year": "2015",
+    "category": "poster",
+    "main": "Arte para mamá - 450 x 643 px.jpg",
+    "images": ["Arte para mamá - 696 x 995 px.jpg"]
+}

static/image/work/poster/23 - La obra del siglo - 10_10_2015/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "La obra del siglo",
+    "priority": 23,
+    "year": "2015",
+    "category": "poster",
+    "main": "La obra del siglo - 450 x 643 px.jpg",
+    "images": ["La obra del siglo - 696 x 995 px.jpg"]
+}

static/image/work/poster/24 - Now more violence - 20_04_2016/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "No more violence",
+    "priority": 24,
+    "year": "2016",
+    "category": "poster",
+    "main": "No more violence - 450 x 643 px.jpg",
+    "images": ["No more violence - 696 x 995 px.jpg"]
+}

static/image/work/poster/25 - Severo secreto - 20_07_2016/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Severo secreto",
+    "priority": 25,
+    "year": "2016",
+    "category": "poster",
+    "main": "Severo secreto - 450 x 643 px.jpg",
+    "images": ["Severo secreto - 696 x 995 px.jpg"]
+}

static/image/work/poster/26 - Habaneros U12 - 19_08_2016/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Habaneros U12",
+    "priority": 26,
+    "year": "2016",
+    "category": "poster",
+    "main": "Habaneros U12 - 450 x 643 px.jpg",
+    "images": ["Habaneros U12 - 696 x 995 px.jpg"]
+}

static/image/work/poster/27 - Dulces sueños - 10_09_2016/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Dulces sueños",
+    "priority": 27,
+    "year": "2016",
+    "category": "poster",
+    "main": "Dulces sueños - 450 x 643 px.jpg",
+    "images": ["Dulces sueños - 696 x 995 px.jpg"]
+}

static/image/work/poster/5 - Sueños Latinos - 27_05_11/_metadata.json

@@ -1,8 +1,8 @@
 {
-    "name": "Sueños Latinos",
+    "name": "Sueños Latinos",
     "priority": 5,
     "year": "2011",
     "category": "poster",
-    "main": "Suenos Latinos - 450 x 643 px.jpg",
-    "images": ["Suenos Latinos - 696 x 995 px.jpg"]
+    "main": "Sueños Latinos - 450 x 643 px.jpg",
+    "images": ["Sueños Latinos - 696 x 995 px.jpg"]
 }

static/image/work/poster/6 - Huellas - 05_06_2011/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "Huellas",
+    "priority": 6,
+    "year": "2011",
+    "category": "poster",
+    "main": "Huellas - 450 x 643 px.jpg",
+    "images": ["Huellas - 696 x 995 px.jpg"]
+}

static/image/work/poster/7 - The swimming pool - 25_11_2011/_metadata.json

@@ -0,0 +1,8 @@
+{
+    "name": "The swimming pool",
+    "priority": 7,
+    "year": "2011",
+    "category": "poster",
+    "main": "The swimming pool - 450 x 643 px.jpg",
+    "images": ["The swimming pool - 696 x 995 px.jpg"]
+}