From d765dc84066b955b6eac488acdd6051645f969a0 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 21 Dec 2019 04:03:12 +0100 Subject: add example gallery with reference gallery index --- example/Glacier 3000/_DSC5475.jpg | Bin 0 -> 363216 bytes example/Glacier 3000/_DSC5475.jpg.yaml | 15 ++++++ example/Glacier 3000/_DSC5542.jpg | Bin 0 -> 457873 bytes example/Glacier 3000/_DSC5542.jpg.yaml | 15 ++++++ example/_DSC8808-1.jpg | Bin 0 -> 1010643 bytes example/_DSC8808-1.jpg.yaml | 12 +++++ example/index.json | 90 +++++++++++++++++++++++++++++++++ example/readme.md | 21 ++++++++ 8 files changed, 153 insertions(+) create mode 100644 example/Glacier 3000/_DSC5475.jpg create mode 100644 example/Glacier 3000/_DSC5475.jpg.yaml create mode 100644 example/Glacier 3000/_DSC5542.jpg create mode 100644 example/Glacier 3000/_DSC5542.jpg.yaml create mode 100644 example/_DSC8808-1.jpg create mode 100644 example/_DSC8808-1.jpg.yaml create mode 100644 example/index.json create mode 100644 example/readme.md (limited to 'example') diff --git a/example/Glacier 3000/_DSC5475.jpg b/example/Glacier 3000/_DSC5475.jpg new file mode 100644 index 0000000..9835447 Binary files /dev/null and b/example/Glacier 3000/_DSC5475.jpg differ diff --git a/example/Glacier 3000/_DSC5475.jpg.yaml b/example/Glacier 3000/_DSC5475.jpg.yaml new file mode 100644 index 0000000..0d89888 --- /dev/null +++ b/example/Glacier 3000/_DSC5475.jpg.yaml @@ -0,0 +1,15 @@ +title: Fog 3000 + +date: 2019:08:10T14:38:47+01:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - location.switzerland.ormont-dessus + - glacier3000 + - time.day + - weather.foggy + - forest + - trees diff --git a/example/Glacier 3000/_DSC5542.jpg b/example/Glacier 3000/_DSC5542.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/Glacier 3000/_DSC5542.jpg differ diff --git a/example/Glacier 3000/_DSC5542.jpg.yaml b/example/Glacier 3000/_DSC5542.jpg.yaml new file mode 100644 index 0000000..b513c0e --- /dev/null +++ b/example/Glacier 3000/_DSC5542.jpg.yaml @@ -0,0 +1,15 @@ +title: Foggy catwalk + +date: 2019:08:10T16:00:45+01:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - location.switzerland.ormont-dessus + - glacier3000 + - time.day + - weather.foggy + - catwalk + - mountain diff --git a/example/_DSC8808-1.jpg b/example/_DSC8808-1.jpg new file mode 100644 index 0000000..51b43b0 Binary files /dev/null and b/example/_DSC8808-1.jpg differ diff --git a/example/_DSC8808-1.jpg.yaml b/example/_DSC8808-1.jpg.yaml new file mode 100644 index 0000000..d7631db --- /dev/null +++ b/example/_DSC8808-1.jpg.yaml @@ -0,0 +1,12 @@ +title: Book shop + +date: 2016:12:19T16:48:50+02:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - location.germany.berlin + - books + - book-shop diff --git a/example/index.json b/example/index.json new file mode 100644 index 0000000..3a1d841 --- /dev/null +++ b/example/index.json @@ -0,0 +1,90 @@ +/* reference gallery index file, manually aggregated */ + +{ + "title": "", + "date": "", + "description": "", + "tags": [], + "filesize": 0, + "path": "/", + "thumbnail": { "path": "/thumbnails/_DSC8808-1.jpg" }, + "properties": { + "type": "directory", + "items": [ + { + "title": "Book shop", + "date": "2016:12:19T16:48:50+02:00", + "description": "© Philippe NGUYEN", + "tags": [ + "photographer.nphilou", + "location.germany.berlin", + "books", + "book-shop" + ], + "filesize": 987, + "path": "/items/_DSC8808-1.jpg", + "thumbnail": { "path": "/thumbnails/_DSC8808-1.jpg" }, + "properties": { + "type": "image", + "resolution": { "width": 3840, "height": 2160 }, + } + }, + { + "title": "Glacier 3000", + "date": "", + "description": "", + "tags": [], + "filesize": 0, + "path": "/items/Glacier 3000", + "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5475.jpg" }, + "properties": { + "type": "directory", + "items": [ + { + "title": "Fog 3000", + "date": "2019:08:10T14:38:47+01:00", + "description": "© Philippe NGUYEN", + "tags": [ + "photographer.nphilou", + "location.switzerland.ormont-dessus", + "glacier3000", + "time.day", + "weather.foggy", + "forest", + "trees" + ], + "filesize": 355, + "path": "/items/Glacier 3000/_DSC5475.jpg", + "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5475.jpg" }, + "properties": { + "type": "image", + "resolution": { "width": 3840, "height": 2160 }, + } + }, + { + "title": "Foggy catwalk", + "date": " 2019:08:10T16:00:45+01:00", + "description": "© Philippe NGUYEN", + "tags": [ + "photographer.nphilou", + "location.switzerland.ormont-dessus", + "glacier3000", + "time.day", + "weather.foggy", + "catwalk", + "mountain" + ], + "filesize": 447, + "path": "/items/Glacier 3000/_DSC5542.jpg", + "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5542.jpg" }, + "properties": { + "type": "image", + "resolution": { "width": 3840, "height": 2160 }, + } + } + ] + } + } + ] + } +} diff --git a/example/readme.md b/example/readme.md new file mode 100644 index 0000000..11e20c1 --- /dev/null +++ b/example/readme.md @@ -0,0 +1,21 @@ +ldgallery example gallery +========================= + +This directory contains an example source directory that _ldgallery_ can understand to generate a gallery. + + +Content +------- + +``` +./example +├── _DSC8808-1.jpg -- a picture +├── _DSC8808-1.jpg.yaml -- its associated sidecar metadata file +├── Glacier 3000 -- a directory grouping gallery items +│   ├── _DSC5475.jpg +│   ├── _DSC5475.jpg.yaml +│   ├── _DSC5542.jpg +│   └── _DSC5542.jpg.yaml +├── index.json -- reference gallery index file +└── readme.md -- this README +``` -- cgit v1.2.3 From 2a69fb14ba65909a3abb51406a07791eeaa55809 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 21 Dec 2019 06:36:30 +0100 Subject: example: aggregate tags and move filesize field --- example/index.json | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'example') diff --git a/example/index.json b/example/index.json index 3a1d841..eef35c7 100644 --- a/example/index.json +++ b/example/index.json @@ -4,8 +4,20 @@ "title": "", "date": "", "description": "", - "tags": [], - "filesize": 0, + "tags": [ + "photographer.nphilou", + "location.germany.berlin", + "books", + "book-shop" + "location.switzerland.ormont-dessus", + "glacier3000", + "time.day", + "weather.foggy", + "forest", + "trees", + "catwalk", + "mountain" + ], "path": "/", "thumbnail": { "path": "/thumbnails/_DSC8808-1.jpg" }, "properties": { @@ -21,11 +33,11 @@ "books", "book-shop" ], - "filesize": 987, "path": "/items/_DSC8808-1.jpg", "thumbnail": { "path": "/thumbnails/_DSC8808-1.jpg" }, "properties": { "type": "image", + "filesize": 987, "resolution": { "width": 3840, "height": 2160 }, } }, @@ -33,8 +45,17 @@ "title": "Glacier 3000", "date": "", "description": "", - "tags": [], - "filesize": 0, + "tags": [ + "photographer.nphilou", + "location.switzerland.ormont-dessus", + "glacier3000", + "time.day", + "weather.foggy", + "forest", + "trees", + "catwalk", + "mountain" + ], "path": "/items/Glacier 3000", "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5475.jpg" }, "properties": { @@ -53,11 +74,11 @@ "forest", "trees" ], - "filesize": 355, "path": "/items/Glacier 3000/_DSC5475.jpg", "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5475.jpg" }, "properties": { "type": "image", + "filesize": 355, "resolution": { "width": 3840, "height": 2160 }, } }, @@ -74,11 +95,11 @@ "catwalk", "mountain" ], - "filesize": 447, "path": "/items/Glacier 3000/_DSC5542.jpg", "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5542.jpg" }, "properties": { "type": "image", + "filesize": 447, "resolution": { "width": 3840, "height": 2160 }, } } -- cgit v1.2.3 From 085bd8dc48d8d0e690cec829a21e672281b8b0f1 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 21 Dec 2019 06:54:40 +0100 Subject: replace unsupported comments in json files --- example/index.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'example') diff --git a/example/index.json b/example/index.json index eef35c7..c7d75e6 100644 --- a/example/index.json +++ b/example/index.json @@ -1,6 +1,6 @@ -/* reference gallery index file, manually aggregated */ - { + "_comment": "reference gallery index file, manually aggregated", + "title": "", "date": "", "description": "", -- cgit v1.2.3 From 93d2fb4280aef9ba99e0c1b7f854a83e2db646b6 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 21 Dec 2019 06:56:38 +0100 Subject: example: fix index json --- example/index.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'example') diff --git a/example/index.json b/example/index.json index c7d75e6..741760c 100644 --- a/example/index.json +++ b/example/index.json @@ -8,7 +8,7 @@ "photographer.nphilou", "location.germany.berlin", "books", - "book-shop" + "book-shop", "location.switzerland.ormont-dessus", "glacier3000", "time.day", @@ -38,7 +38,7 @@ "properties": { "type": "image", "filesize": 987, - "resolution": { "width": 3840, "height": 2160 }, + "resolution": { "width": 3840, "height": 2160 } } }, { @@ -79,7 +79,7 @@ "properties": { "type": "image", "filesize": 355, - "resolution": { "width": 3840, "height": 2160 }, + "resolution": { "width": 3840, "height": 2160 } } }, { @@ -100,7 +100,7 @@ "properties": { "type": "image", "filesize": 447, - "resolution": { "width": 3840, "height": 2160 }, + "resolution": { "width": 3840, "height": 2160 } } } ] -- cgit v1.2.3 From d589c4d9fa0f177aa20cf7de70227a9e23e75316 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Sat, 21 Dec 2019 20:53:18 +0100 Subject: example: Ignoring "items" and "thumbnails" symlinks --- example/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 example/.gitignore (limited to 'example') diff --git a/example/.gitignore b/example/.gitignore new file mode 100644 index 0000000..fbded57 --- /dev/null +++ b/example/.gitignore @@ -0,0 +1,2 @@ +items +thumbs -- cgit v1.2.3 From c2b4c5d144db17ebf2dc9de32ba25cc836831ae2 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Sat, 21 Dec 2019 21:15:59 +0100 Subject: viewer: Improved the Gallery type definitions. Basic display of the images and thumbnails example: "thumbnails" instead of "thumbs" --- example/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'example') diff --git a/example/.gitignore b/example/.gitignore index fbded57..f1212bc 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,2 +1,2 @@ items -thumbs +thumbnails -- cgit v1.2.3 From 65465dd7d76b5729b62e39711004529e8d444241 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 22 Dec 2019 04:41:43 +0100 Subject: make thumbnail field nullable --- example/index.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'example') diff --git a/example/index.json b/example/index.json index 741760c..d693f7b 100644 --- a/example/index.json +++ b/example/index.json @@ -19,7 +19,7 @@ "mountain" ], "path": "/", - "thumbnail": { "path": "/thumbnails/_DSC8808-1.jpg" }, + "thumbnail": null, "properties": { "type": "directory", "items": [ @@ -34,7 +34,7 @@ "book-shop" ], "path": "/items/_DSC8808-1.jpg", - "thumbnail": { "path": "/thumbnails/_DSC8808-1.jpg" }, + "thumbnail": "/thumbnails/_DSC8808-1.jpg", "properties": { "type": "image", "filesize": 987, @@ -57,7 +57,7 @@ "mountain" ], "path": "/items/Glacier 3000", - "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5475.jpg" }, + "thumbnail": null, "properties": { "type": "directory", "items": [ @@ -75,7 +75,7 @@ "trees" ], "path": "/items/Glacier 3000/_DSC5475.jpg", - "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5475.jpg" }, + "thumbnail": "/thumbnails/Glacier 3000/_DSC5475.jpg", "properties": { "type": "image", "filesize": 355, @@ -96,7 +96,7 @@ "mountain" ], "path": "/items/Glacier 3000/_DSC5542.jpg", - "thumbnail": { "path": "/thumbnails/Glacier 3000/_DSC5542.jpg" }, + "thumbnail": "/thumbnails/Glacier 3000/_DSC5542.jpg", "properties": { "type": "image", "filesize": 447, -- cgit v1.2.3 From 5b35285daa62fb9c10280fb43e340ba7b0746f5a Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 25 Dec 2019 22:48:34 +0100 Subject: compiler: add gallery config file handling --- example/gallery.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 example/gallery.yaml (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml new file mode 100644 index 0000000..fc4bdf9 --- /dev/null +++ b/example/gallery.yaml @@ -0,0 +1,2 @@ +compiler: {} +viewer: {} -- cgit v1.2.3 From eb7a652b2244ffa4dd5ba2440b7879127e7c6078 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 27 Dec 2019 10:08:19 +0100 Subject: compiler: implement resource processing but break directory cleanup --- example/Glacier 3000/thumbnail.jpg | Bin 0 -> 457873 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 example/Glacier 3000/thumbnail.jpg (limited to 'example') diff --git a/example/Glacier 3000/thumbnail.jpg b/example/Glacier 3000/thumbnail.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/Glacier 3000/thumbnail.jpg differ -- cgit v1.2.3 From 1e57d76eadb2192be2b3d9343d4ddfeccc996bcb Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 27 Dec 2019 13:38:47 +0100 Subject: compiler: exclude output dir from input --- example/.gitignore | 3 +- example/gallery.yaml | 6 ++- example/index.json | 111 --------------------------------------------------- 3 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 example/index.json (limited to 'example') diff --git a/example/.gitignore b/example/.gitignore index f1212bc..1fcb152 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,2 +1 @@ -items -thumbnails +out diff --git a/example/gallery.yaml b/example/gallery.yaml index fc4bdf9..0a16e59 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,2 +1,6 @@ -compiler: {} +compiler: + pictureMaxResolution: + width: 1024 + height: 768 + viewer: {} diff --git a/example/index.json b/example/index.json deleted file mode 100644 index d693f7b..0000000 --- a/example/index.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "_comment": "reference gallery index file, manually aggregated", - - "title": "", - "date": "", - "description": "", - "tags": [ - "photographer.nphilou", - "location.germany.berlin", - "books", - "book-shop", - "location.switzerland.ormont-dessus", - "glacier3000", - "time.day", - "weather.foggy", - "forest", - "trees", - "catwalk", - "mountain" - ], - "path": "/", - "thumbnail": null, - "properties": { - "type": "directory", - "items": [ - { - "title": "Book shop", - "date": "2016:12:19T16:48:50+02:00", - "description": "© Philippe NGUYEN", - "tags": [ - "photographer.nphilou", - "location.germany.berlin", - "books", - "book-shop" - ], - "path": "/items/_DSC8808-1.jpg", - "thumbnail": "/thumbnails/_DSC8808-1.jpg", - "properties": { - "type": "image", - "filesize": 987, - "resolution": { "width": 3840, "height": 2160 } - } - }, - { - "title": "Glacier 3000", - "date": "", - "description": "", - "tags": [ - "photographer.nphilou", - "location.switzerland.ormont-dessus", - "glacier3000", - "time.day", - "weather.foggy", - "forest", - "trees", - "catwalk", - "mountain" - ], - "path": "/items/Glacier 3000", - "thumbnail": null, - "properties": { - "type": "directory", - "items": [ - { - "title": "Fog 3000", - "date": "2019:08:10T14:38:47+01:00", - "description": "© Philippe NGUYEN", - "tags": [ - "photographer.nphilou", - "location.switzerland.ormont-dessus", - "glacier3000", - "time.day", - "weather.foggy", - "forest", - "trees" - ], - "path": "/items/Glacier 3000/_DSC5475.jpg", - "thumbnail": "/thumbnails/Glacier 3000/_DSC5475.jpg", - "properties": { - "type": "image", - "filesize": 355, - "resolution": { "width": 3840, "height": 2160 } - } - }, - { - "title": "Foggy catwalk", - "date": " 2019:08:10T16:00:45+01:00", - "description": "© Philippe NGUYEN", - "tags": [ - "photographer.nphilou", - "location.switzerland.ormont-dessus", - "glacier3000", - "time.day", - "weather.foggy", - "catwalk", - "mountain" - ], - "path": "/items/Glacier 3000/_DSC5542.jpg", - "thumbnail": "/thumbnails/Glacier 3000/_DSC5542.jpg", - "properties": { - "type": "image", - "filesize": 447, - "resolution": { "width": 3840, "height": 2160 } - } - } - ] - } - } - ] - } -} -- cgit v1.2.3 From c8179bba5a33878f9128ae862def9eafef634b99 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Sat, 28 Dec 2019 04:55:23 +0100 Subject: example: gitignore for symlinks (reverted) --- example/.gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to 'example') diff --git a/example/.gitignore b/example/.gitignore index 1fcb152..c5ae58b 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1 +1,3 @@ out +items +thumbnails \ No newline at end of file -- cgit v1.2.3 From 538996dc84b03eab1429ddd693334673b857c005 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 28 Dec 2019 19:04:54 +0100 Subject: compiler: parameterise gallery name --- example/gallery.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index 0a16e59..85b1edd 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,6 +1,13 @@ compiler: + galleryName: Example gallery + + #thumbnailResolution: + # width: 400 # default + # height: 400 # default + pictureMaxResolution: width: 1024 height: 768 + viewer: {} -- cgit v1.2.3 From 8a5d1600746bbe878b9ff1c4e9a70c7d5bdb3e95 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 28 Dec 2019 19:07:09 +0100 Subject: example: update readme --- example/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'example') diff --git a/example/readme.md b/example/readme.md index 11e20c1..38b8a0a 100644 --- a/example/readme.md +++ b/example/readme.md @@ -16,6 +16,6 @@ Content │   ├── _DSC5475.jpg.yaml │   ├── _DSC5542.jpg │   └── _DSC5542.jpg.yaml -├── index.json -- reference gallery index file +├── gallery.yaml -- gallery settings file └── readme.md -- this README ``` -- cgit v1.2.3 From ab84d0503e39f0a3acb6f8f5e6706a377aaeaf33 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 29 Dec 2019 22:03:51 +0100 Subject: example: fix iso 8601 dates --- example/Glacier 3000/_DSC5475.jpg.yaml | 2 +- example/Glacier 3000/_DSC5542.jpg.yaml | 2 +- example/_DSC8808-1.jpg.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'example') diff --git a/example/Glacier 3000/_DSC5475.jpg.yaml b/example/Glacier 3000/_DSC5475.jpg.yaml index 0d89888..d60efc3 100644 --- a/example/Glacier 3000/_DSC5475.jpg.yaml +++ b/example/Glacier 3000/_DSC5475.jpg.yaml @@ -1,6 +1,6 @@ title: Fog 3000 -date: 2019:08:10T14:38:47+01:00 +date: 2019-08-10T14:38:47+01:00 description: > © Philippe NGUYEN diff --git a/example/Glacier 3000/_DSC5542.jpg.yaml b/example/Glacier 3000/_DSC5542.jpg.yaml index b513c0e..a67b284 100644 --- a/example/Glacier 3000/_DSC5542.jpg.yaml +++ b/example/Glacier 3000/_DSC5542.jpg.yaml @@ -1,6 +1,6 @@ title: Foggy catwalk -date: 2019:08:10T16:00:45+01:00 +date: 2019-08-10T16:00:45+01:00 description: > © Philippe NGUYEN diff --git a/example/_DSC8808-1.jpg.yaml b/example/_DSC8808-1.jpg.yaml index d7631db..ce334c2 100644 --- a/example/_DSC8808-1.jpg.yaml +++ b/example/_DSC8808-1.jpg.yaml @@ -1,6 +1,6 @@ title: Book shop -date: 2016:12:19T16:48:50+02:00 +date: 2016-12-19T16:48:50+02:00 description: > © Philippe NGUYEN -- cgit v1.2.3 From 7ef9f09c0f3be1cd5e1f38c9abc845abc9ed3639 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 31 Dec 2019 01:39:23 +0100 Subject: compiler: add option to add implicit directory tags GitHub: closes #7 --- example/gallery.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index 85b1edd..3fd2265 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,6 +1,8 @@ compiler: galleryName: Example gallery + #implicitDirectoryTag: false # default + #thumbnailResolution: # width: 400 # default # height: 400 # default -- cgit v1.2.3 From 6691b14cf4e867a9018f38c174fa98f1ada19f82 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 31 Dec 2019 08:38:15 +0100 Subject: compiler: add option to ignore files matching a regex GitHub: closes #10 --- example/gallery.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index 3fd2265..fb25161 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,11 +1,11 @@ compiler: galleryName: Example gallery + ignoreFiles: .*\.md + implicitDirectoryTag: false # default - #implicitDirectoryTag: false # default - - #thumbnailResolution: - # width: 400 # default - # height: 400 # default + thumbnailResolution: + width: 400 # default + height: 400 # default pictureMaxResolution: width: 1024 -- cgit v1.2.3 From 7da7ae1848a23b13ec4b258fd9e714c0f4943850 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 31 Dec 2019 11:16:09 +0100 Subject: example: update readme --- example/readme.md | 1 + 1 file changed, 1 insertion(+) (limited to 'example') diff --git a/example/readme.md b/example/readme.md index 38b8a0a..d5a7563 100644 --- a/example/readme.md +++ b/example/readme.md @@ -12,6 +12,7 @@ Content ├── _DSC8808-1.jpg -- a picture ├── _DSC8808-1.jpg.yaml -- its associated sidecar metadata file ├── Glacier 3000 -- a directory grouping gallery items +│   ├── thumbnail.jpg -- a thumbnail for the "Glacier 3000" directory │   ├── _DSC5475.jpg │   ├── _DSC5475.jpg.yaml │   ├── _DSC5542.jpg -- cgit v1.2.3 From 5367781f0c7fd1ce274492ba91895fef9d44dab3 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 5 Jan 2020 10:43:48 +0100 Subject: add manual --- example/gallery.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index fb25161..53e1448 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -3,7 +3,7 @@ compiler: ignoreFiles: .*\.md implicitDirectoryTag: false # default - thumbnailResolution: + thumbnailMaxResolution: width: 400 # default height: 400 # default -- cgit v1.2.3 From 2ad60869c2e8d0846672ccb18b2de99c9cf33671 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 5 Jan 2020 19:24:50 +0100 Subject: compiler: add option to add tags from n parent directories GitHub: closes #15 --- example/gallery.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index 53e1448..5da7328 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,7 +1,8 @@ compiler: galleryName: Example gallery ignoreFiles: .*\.md - implicitDirectoryTag: false # default + + tagsFromDirectories: 0 # default thumbnailMaxResolution: width: 400 # default -- cgit v1.2.3 From 1e3a0e39cb6cdc86a6ba6b570c72c44931cf1c3b Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 5 Jan 2020 20:40:41 +0100 Subject: compiler: replace file filter with inclusino and exclusion glob lists GitHub: closes #16 --- example/gallery.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index 5da7328..ccdb16b 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,6 +1,11 @@ compiler: galleryName: Example gallery - ignoreFiles: .*\.md + + includeFiles: + - "*.jpg" + + #excludeFiles: + #- "*.md" tagsFromDirectories: 0 # default -- cgit v1.2.3 From f1ffff03ad6bf86c32c3af90393bd53ca21ad4db Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 6 Jan 2020 11:05:18 +0100 Subject: compiler: rename date field to more explicit datetime --- example/Glacier 3000/_DSC5475.jpg.yaml | 2 +- example/Glacier 3000/_DSC5542.jpg.yaml | 2 +- example/_DSC8808-1.jpg.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'example') diff --git a/example/Glacier 3000/_DSC5475.jpg.yaml b/example/Glacier 3000/_DSC5475.jpg.yaml index d60efc3..3454a68 100644 --- a/example/Glacier 3000/_DSC5475.jpg.yaml +++ b/example/Glacier 3000/_DSC5475.jpg.yaml @@ -1,6 +1,6 @@ title: Fog 3000 -date: 2019-08-10T14:38:47+01:00 +datetime: 2019-08-10T14:38:47+01:00 description: > © Philippe NGUYEN diff --git a/example/Glacier 3000/_DSC5542.jpg.yaml b/example/Glacier 3000/_DSC5542.jpg.yaml index a67b284..d174911 100644 --- a/example/Glacier 3000/_DSC5542.jpg.yaml +++ b/example/Glacier 3000/_DSC5542.jpg.yaml @@ -1,6 +1,6 @@ title: Foggy catwalk -date: 2019-08-10T16:00:45+01:00 +datetime: 2019-08-10T16:00:45+01:00 description: > © Philippe NGUYEN diff --git a/example/_DSC8808-1.jpg.yaml b/example/_DSC8808-1.jpg.yaml index ce334c2..b946ff7 100644 --- a/example/_DSC8808-1.jpg.yaml +++ b/example/_DSC8808-1.jpg.yaml @@ -1,6 +1,6 @@ title: Book shop -date: 2016-12-19T16:48:50+02:00 +datetime: 2016-12-19T16:48:50+02:00 description: > © Philippe NGUYEN -- cgit v1.2.3