From 987eb81cb5d98262299c7917d752c54907cbbc33 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 23 Jan 2020 22:36:21 +0100 Subject: compiler: add directory incl and excl glob settings GitHub: closes #41 --- example/gallery.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index ccdb16b..7fb2c92 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -1,10 +1,13 @@ compiler: galleryName: Example gallery - includeFiles: + #includedDirectories: ["*"] + #excludedDirectories: [] + + includedFiles: - "*.jpg" - #excludeFiles: + #excludedFiles: #- "*.md" tagsFromDirectories: 0 # default -- cgit v1.2.3 From cf91102432b1196b8f3c1fa388b3963948ad49a6 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 23 Jan 2020 23:16:07 +0100 Subject: compiler: add jpeg export quality setting GitHub: closes #2 --- example/gallery.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'example') diff --git a/example/gallery.yaml b/example/gallery.yaml index 7fb2c92..dfb6265 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -20,5 +20,7 @@ compiler: width: 1024 height: 768 + #jpegExportQuality: 80 # default + viewer: {} -- cgit v1.2.3 From a524bc557ee154d5880153d9b8da680e0b5f3e85 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 2 Feb 2020 20:58:10 +0100 Subject: compiler: tweak default thumbnail size For better packing. --- 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 dfb6265..ea23d8a 100644 --- a/example/gallery.yaml +++ b/example/gallery.yaml @@ -14,7 +14,7 @@ compiler: thumbnailMaxResolution: width: 400 # default - height: 400 # default + height: 300 # default pictureMaxResolution: width: 1024 -- cgit v1.2.3 From 1d7299bced057e3c0e6cc76507fc25d6f493968e Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 3 Feb 2020 14:33:44 +0100 Subject: example: simplify .gitignore --- example/.gitignore | 2 -- 1 file changed, 2 deletions(-) (limited to 'example') diff --git a/example/.gitignore b/example/.gitignore index c5ae58b..1fcb152 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -1,3 +1 @@ out -items -thumbnails \ No newline at end of file -- cgit v1.2.3 From 19d40a5ee98fb1f244612155acc559ff2f21bf6b Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Wed, 12 Feb 2020 00:09:34 +0100 Subject: viewer: implemented config.json Note: The DevServer needs to know when the file is from the App, or from the FileSystem. We use a tilde to make this separation. The tilde URL is declared in '.env.development' GitHub: Resolves #32 --- example/config.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 example/config.json (limited to 'example') diff --git a/example/config.json b/example/config.json new file mode 100644 index 0000000..6487594 --- /dev/null +++ b/example/config.json @@ -0,0 +1,4 @@ +{ + "generationTimestamp": 0, + "galleryRoot": "out/" +} \ No newline at end of file -- cgit v1.2.3 From ee9d82d0b307dee1c9138babf954a3864a0c2f83 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Wed, 12 Feb 2020 00:33:45 +0100 Subject: example: cleaner examples --- example/Glacier 3000/_DSC5475.jpg | Bin 363216 -> 0 bytes example/Glacier 3000/_DSC5475.jpg.yaml | 15 --------------- example/Glacier 3000/_DSC5542.jpg | Bin 457873 -> 0 bytes example/Glacier 3000/_DSC5542.jpg.yaml | 15 --------------- example/Glacier 3000/thumbnail.jpg | Bin 457873 -> 0 bytes example/_DSC8808-1.jpg | Bin 1010643 -> 0 bytes example/_DSC8808-1.jpg.yaml | 12 ------------ example/gallery.yaml | 26 -------------------------- example/readme.md | 3 +-- example/src/Glacier 3000/_DSC5475.jpg | Bin 0 -> 363216 bytes example/src/Glacier 3000/_DSC5475.jpg.yaml | 15 +++++++++++++++ example/src/Glacier 3000/_DSC5542.jpg | Bin 0 -> 457873 bytes example/src/Glacier 3000/_DSC5542.jpg.yaml | 15 +++++++++++++++ example/src/Glacier 3000/thumbnail.jpg | Bin 0 -> 457873 bytes example/src/_DSC8808-1.jpg | Bin 0 -> 1010643 bytes example/src/_DSC8808-1.jpg.yaml | 12 ++++++++++++ example/src/gallery.yaml | 26 ++++++++++++++++++++++++++ 17 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 example/Glacier 3000/_DSC5475.jpg delete mode 100644 example/Glacier 3000/_DSC5475.jpg.yaml delete mode 100644 example/Glacier 3000/_DSC5542.jpg delete mode 100644 example/Glacier 3000/_DSC5542.jpg.yaml delete mode 100644 example/Glacier 3000/thumbnail.jpg delete mode 100644 example/_DSC8808-1.jpg delete mode 100644 example/_DSC8808-1.jpg.yaml delete mode 100644 example/gallery.yaml create mode 100644 example/src/Glacier 3000/_DSC5475.jpg create mode 100644 example/src/Glacier 3000/_DSC5475.jpg.yaml create mode 100644 example/src/Glacier 3000/_DSC5542.jpg create mode 100644 example/src/Glacier 3000/_DSC5542.jpg.yaml create mode 100644 example/src/Glacier 3000/thumbnail.jpg create mode 100644 example/src/_DSC8808-1.jpg create mode 100644 example/src/_DSC8808-1.jpg.yaml create mode 100644 example/src/gallery.yaml (limited to 'example') diff --git a/example/Glacier 3000/_DSC5475.jpg b/example/Glacier 3000/_DSC5475.jpg deleted file mode 100644 index 9835447..0000000 Binary files a/example/Glacier 3000/_DSC5475.jpg and /dev/null differ diff --git a/example/Glacier 3000/_DSC5475.jpg.yaml b/example/Glacier 3000/_DSC5475.jpg.yaml deleted file mode 100644 index 3454a68..0000000 --- a/example/Glacier 3000/_DSC5475.jpg.yaml +++ /dev/null @@ -1,15 +0,0 @@ -title: Fog 3000 - -datetime: 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 deleted file mode 100644 index 19a716e..0000000 Binary files a/example/Glacier 3000/_DSC5542.jpg and /dev/null differ diff --git a/example/Glacier 3000/_DSC5542.jpg.yaml b/example/Glacier 3000/_DSC5542.jpg.yaml deleted file mode 100644 index d174911..0000000 --- a/example/Glacier 3000/_DSC5542.jpg.yaml +++ /dev/null @@ -1,15 +0,0 @@ -title: Foggy catwalk - -datetime: 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/Glacier 3000/thumbnail.jpg b/example/Glacier 3000/thumbnail.jpg deleted file mode 100644 index 19a716e..0000000 Binary files a/example/Glacier 3000/thumbnail.jpg and /dev/null differ diff --git a/example/_DSC8808-1.jpg b/example/_DSC8808-1.jpg deleted file mode 100644 index 51b43b0..0000000 Binary files a/example/_DSC8808-1.jpg and /dev/null differ diff --git a/example/_DSC8808-1.jpg.yaml b/example/_DSC8808-1.jpg.yaml deleted file mode 100644 index b946ff7..0000000 --- a/example/_DSC8808-1.jpg.yaml +++ /dev/null @@ -1,12 +0,0 @@ -title: Book shop - -datetime: 2016-12-19T16:48:50+02:00 - -description: > - © Philippe NGUYEN - -tags: - - photographer.nphilou - - location.germany.berlin - - books - - book-shop diff --git a/example/gallery.yaml b/example/gallery.yaml deleted file mode 100644 index ea23d8a..0000000 --- a/example/gallery.yaml +++ /dev/null @@ -1,26 +0,0 @@ -compiler: - galleryName: Example gallery - - #includedDirectories: ["*"] - #excludedDirectories: [] - - includedFiles: - - "*.jpg" - - #excludedFiles: - #- "*.md" - - tagsFromDirectories: 0 # default - - thumbnailMaxResolution: - width: 400 # default - height: 300 # default - - pictureMaxResolution: - width: 1024 - height: 768 - - #jpegExportQuality: 80 # default - - -viewer: {} diff --git a/example/readme.md b/example/readme.md index d5a7563..087a8bc 100644 --- a/example/readme.md +++ b/example/readme.md @@ -8,7 +8,7 @@ Content ------- ``` -./example +./example/src ├── _DSC8808-1.jpg -- a picture ├── _DSC8808-1.jpg.yaml -- its associated sidecar metadata file ├── Glacier 3000 -- a directory grouping gallery items @@ -18,5 +18,4 @@ Content │   ├── _DSC5542.jpg │   └── _DSC5542.jpg.yaml ├── gallery.yaml -- gallery settings file -└── readme.md -- this README ``` diff --git a/example/src/Glacier 3000/_DSC5475.jpg b/example/src/Glacier 3000/_DSC5475.jpg new file mode 100644 index 0000000..9835447 Binary files /dev/null and b/example/src/Glacier 3000/_DSC5475.jpg differ diff --git a/example/src/Glacier 3000/_DSC5475.jpg.yaml b/example/src/Glacier 3000/_DSC5475.jpg.yaml new file mode 100644 index 0000000..3454a68 --- /dev/null +++ b/example/src/Glacier 3000/_DSC5475.jpg.yaml @@ -0,0 +1,15 @@ +title: Fog 3000 + +datetime: 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/src/Glacier 3000/_DSC5542.jpg b/example/src/Glacier 3000/_DSC5542.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/src/Glacier 3000/_DSC5542.jpg differ diff --git a/example/src/Glacier 3000/_DSC5542.jpg.yaml b/example/src/Glacier 3000/_DSC5542.jpg.yaml new file mode 100644 index 0000000..d174911 --- /dev/null +++ b/example/src/Glacier 3000/_DSC5542.jpg.yaml @@ -0,0 +1,15 @@ +title: Foggy catwalk + +datetime: 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/src/Glacier 3000/thumbnail.jpg b/example/src/Glacier 3000/thumbnail.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/src/Glacier 3000/thumbnail.jpg differ diff --git a/example/src/_DSC8808-1.jpg b/example/src/_DSC8808-1.jpg new file mode 100644 index 0000000..51b43b0 Binary files /dev/null and b/example/src/_DSC8808-1.jpg differ diff --git a/example/src/_DSC8808-1.jpg.yaml b/example/src/_DSC8808-1.jpg.yaml new file mode 100644 index 0000000..b946ff7 --- /dev/null +++ b/example/src/_DSC8808-1.jpg.yaml @@ -0,0 +1,12 @@ +title: Book shop + +datetime: 2016-12-19T16:48:50+02:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - location.germany.berlin + - books + - book-shop diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml new file mode 100644 index 0000000..ea23d8a --- /dev/null +++ b/example/src/gallery.yaml @@ -0,0 +1,26 @@ +compiler: + galleryName: Example gallery + + #includedDirectories: ["*"] + #excludedDirectories: [] + + includedFiles: + - "*.jpg" + + #excludedFiles: + #- "*.md" + + tagsFromDirectories: 0 # default + + thumbnailMaxResolution: + width: 400 # default + height: 300 # default + + pictureMaxResolution: + width: 1024 + height: 768 + + #jpegExportQuality: 80 # default + + +viewer: {} -- cgit v1.2.3 From 1763c8ce725098100618079553a9ec4f79386a5d Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Thu, 13 Feb 2020 17:44:34 +0100 Subject: viewer: no-cache for config.json and index.json --- example/config.json | 1 - 1 file changed, 1 deletion(-) (limited to 'example') diff --git a/example/config.json b/example/config.json index 6487594..51baf84 100644 --- a/example/config.json +++ b/example/config.json @@ -1,4 +1,3 @@ { - "generationTimestamp": 0, "galleryRoot": "out/" } \ No newline at end of file -- cgit v1.2.3 From ef1778e051e007f08f9188a479d04fdf95a57d21 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Thu, 13 Feb 2020 18:13:55 +0100 Subject: documentation --- example/readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'example') diff --git a/example/readme.md b/example/readme.md index 087a8bc..e455f03 100644 --- a/example/readme.md +++ b/example/readme.md @@ -8,7 +8,8 @@ Content ------- ``` -./example/src +./example/out -- the output directory for the compiled version of the gallery +./example/src -- source directory with pictures, configuration, tags and metadata ├── _DSC8808-1.jpg -- a picture ├── _DSC8808-1.jpg.yaml -- its associated sidecar metadata file ├── Glacier 3000 -- a directory grouping gallery items @@ -17,5 +18,5 @@ Content │   ├── _DSC5475.jpg.yaml │   ├── _DSC5542.jpg │   └── _DSC5542.jpg.yaml -├── gallery.yaml -- gallery settings file +└── gallery.yaml -- gallery settings file ``` -- cgit v1.2.3 From c3c69b601d834c8df7cba88a0d3149b56cdd5d14 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 17 Feb 2020 18:10:10 +0100 Subject: example: remove deprecated option --- example/src/gallery.yaml | 2 -- 1 file changed, 2 deletions(-) (limited to 'example') diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index ea23d8a..5efbfef 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -20,7 +20,5 @@ compiler: width: 1024 height: 768 - #jpegExportQuality: 80 # default - viewer: {} -- cgit v1.2.3 From 395a76bc4193c0c7182f87778458a68d0079e836 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 14 Feb 2020 15:39:56 +0100 Subject: compiler: metadata sidecar for whole directories GitHub: closes #3 --- example/readme.md | 2 ++ example/src/Glacier 3000/_DSC5475.jpg.yaml | 2 -- example/src/Glacier 3000/_DSC5542.jpg.yaml | 2 -- example/src/Glacier 3000/directory.yaml | 4 ++++ example/src/directory.yaml | 1 + example/src/gallery.yaml | 2 -- 6 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 example/src/Glacier 3000/directory.yaml create mode 100644 example/src/directory.yaml (limited to 'example') diff --git a/example/readme.md b/example/readme.md index e455f03..eafdaf5 100644 --- a/example/readme.md +++ b/example/readme.md @@ -14,9 +14,11 @@ Content ├── _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 +│   ├── directory.yaml -- sidecar metadata file for the "Glacier 3000" directory │   ├── _DSC5475.jpg │   ├── _DSC5475.jpg.yaml │   ├── _DSC5542.jpg │   └── _DSC5542.jpg.yaml +├── directory.yaml -- sidecar metadata file for the root directory └── gallery.yaml -- gallery settings file ``` diff --git a/example/src/Glacier 3000/_DSC5475.jpg.yaml b/example/src/Glacier 3000/_DSC5475.jpg.yaml index 3454a68..dfff6e8 100644 --- a/example/src/Glacier 3000/_DSC5475.jpg.yaml +++ b/example/src/Glacier 3000/_DSC5475.jpg.yaml @@ -7,8 +7,6 @@ description: > tags: - photographer.nphilou - - location.switzerland.ormont-dessus - - glacier3000 - time.day - weather.foggy - forest diff --git a/example/src/Glacier 3000/_DSC5542.jpg.yaml b/example/src/Glacier 3000/_DSC5542.jpg.yaml index d174911..f2c6a94 100644 --- a/example/src/Glacier 3000/_DSC5542.jpg.yaml +++ b/example/src/Glacier 3000/_DSC5542.jpg.yaml @@ -7,8 +7,6 @@ description: > tags: - photographer.nphilou - - location.switzerland.ormont-dessus - - glacier3000 - time.day - weather.foggy - catwalk diff --git a/example/src/Glacier 3000/directory.yaml b/example/src/Glacier 3000/directory.yaml new file mode 100644 index 0000000..44674cf --- /dev/null +++ b/example/src/Glacier 3000/directory.yaml @@ -0,0 +1,4 @@ +# The following tags are applied to all items in the directory +tags: + - location.switzerland.ormont-dessus + - glacier3000 diff --git a/example/src/directory.yaml b/example/src/directory.yaml new file mode 100644 index 0000000..ab81bb2 --- /dev/null +++ b/example/src/directory.yaml @@ -0,0 +1 @@ +title: Example gallery diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index 5efbfef..bef19e0 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -1,6 +1,4 @@ compiler: - galleryName: Example gallery - #includedDirectories: ["*"] #excludedDirectories: [] -- cgit v1.2.3 From 26a85722e74eae23a22350064eed204480bbd032 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 16 Feb 2020 12:15:08 +0100 Subject: compiler: unify directory special files --- example/readme.md | 5 ++--- example/src/Glacier 3000/_directory.jpg | Bin 0 -> 457873 bytes example/src/Glacier 3000/_directory.yaml | 4 ++++ example/src/Glacier 3000/directory.yaml | 4 ---- example/src/Glacier 3000/thumbnail.jpg | Bin 457873 -> 0 bytes example/src/_directory.yaml | 1 + example/src/directory.yaml | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 example/src/Glacier 3000/_directory.jpg create mode 100644 example/src/Glacier 3000/_directory.yaml delete mode 100644 example/src/Glacier 3000/directory.yaml delete mode 100644 example/src/Glacier 3000/thumbnail.jpg create mode 100644 example/src/_directory.yaml delete mode 100644 example/src/directory.yaml (limited to 'example') diff --git a/example/readme.md b/example/readme.md index eafdaf5..809ae68 100644 --- a/example/readme.md +++ b/example/readme.md @@ -13,12 +13,11 @@ 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 -│   ├── directory.yaml -- sidecar metadata file for the "Glacier 3000" directory +│   ├── _directory.jpg -- a thumbnail for the "Glacier 3000" directory +│   ├── _directory.yaml -- sidecar metadata file for the "Glacier 3000" directory │   ├── _DSC5475.jpg │   ├── _DSC5475.jpg.yaml │   ├── _DSC5542.jpg │   └── _DSC5542.jpg.yaml -├── directory.yaml -- sidecar metadata file for the root directory └── gallery.yaml -- gallery settings file ``` diff --git a/example/src/Glacier 3000/_directory.jpg b/example/src/Glacier 3000/_directory.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/src/Glacier 3000/_directory.jpg differ diff --git a/example/src/Glacier 3000/_directory.yaml b/example/src/Glacier 3000/_directory.yaml new file mode 100644 index 0000000..44674cf --- /dev/null +++ b/example/src/Glacier 3000/_directory.yaml @@ -0,0 +1,4 @@ +# The following tags are applied to all items in the directory +tags: + - location.switzerland.ormont-dessus + - glacier3000 diff --git a/example/src/Glacier 3000/directory.yaml b/example/src/Glacier 3000/directory.yaml deleted file mode 100644 index 44674cf..0000000 --- a/example/src/Glacier 3000/directory.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# The following tags are applied to all items in the directory -tags: - - location.switzerland.ormont-dessus - - glacier3000 diff --git a/example/src/Glacier 3000/thumbnail.jpg b/example/src/Glacier 3000/thumbnail.jpg deleted file mode 100644 index 19a716e..0000000 Binary files a/example/src/Glacier 3000/thumbnail.jpg and /dev/null differ diff --git a/example/src/_directory.yaml b/example/src/_directory.yaml new file mode 100644 index 0000000..ab81bb2 --- /dev/null +++ b/example/src/_directory.yaml @@ -0,0 +1 @@ +title: Example gallery diff --git a/example/src/directory.yaml b/example/src/directory.yaml deleted file mode 100644 index ab81bb2..0000000 --- a/example/src/directory.yaml +++ /dev/null @@ -1 +0,0 @@ -title: Example gallery -- cgit v1.2.3 From 68899f0c1ba4f641c376fda1e51d9694b02b9c5d Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 17 Feb 2020 18:09:20 +0100 Subject: compiler: add a prefix setting for tags generated from parent dirs GitHub: closes #59 --- example/src/gallery.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'example') diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index bef19e0..3408571 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -8,7 +8,9 @@ compiler: #excludedFiles: #- "*.md" - tagsFromDirectories: 0 # default + tagsFromDirectories: + fromParents: 0 # default + prefix: "" # default thumbnailMaxResolution: width: 400 # default -- cgit v1.2.3 From e42f4e864bac21ed3b19d1869df2cdd4f8c3433c Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 22 Feb 2020 14:53:03 +0100 Subject: compiler: flatten gallery config GitHub: closes #129 --- example/src/gallery.yaml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'example') diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index 3408571..b25b657 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -1,24 +1,22 @@ -compiler: - #includedDirectories: ["*"] - #excludedDirectories: [] +# ldgallery example gallery configuration file - includedFiles: - - "*.jpg" - - #excludedFiles: - #- "*.md" +#includedDirectories: ["*"] +#excludedDirectories: [] - tagsFromDirectories: - fromParents: 0 # default - prefix: "" # default +includedFiles: + - "*.jpg" - thumbnailMaxResolution: - width: 400 # default - height: 300 # default +#excludedFiles: +# - "*.md" - pictureMaxResolution: - width: 1024 - height: 768 +tagsFromDirectories: + fromParents: 0 # default + prefix: "" # default +thumbnailMaxResolution: + width: 400 # default + height: 300 # default -viewer: {} +pictureMaxResolution: + width: 1024 + height: 768 -- cgit v1.2.3 From 20790ffcf740103f59ae41386e6c074ce80f7a02 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 26 Feb 2020 02:15:33 +0100 Subject: example: renaming --- example/readme.md | 24 ++++++++++++------------ example/src/DSC0001.jpg | Bin 0 -> 1010643 bytes example/src/DSC0001.jpg.yaml | 12 ++++++++++++ example/src/Glacier 3000/_DSC5475.jpg | Bin 363216 -> 0 bytes example/src/Glacier 3000/_DSC5475.jpg.yaml | 13 ------------- example/src/Glacier 3000/_DSC5542.jpg | Bin 457873 -> 0 bytes example/src/Glacier 3000/_DSC5542.jpg.yaml | 13 ------------- example/src/Glacier 3000/_directory.jpg | Bin 457873 -> 0 bytes example/src/Glacier 3000/_directory.yaml | 4 ---- example/src/Ormont-Dessus/DSC0002.jpg | Bin 0 -> 457873 bytes example/src/Ormont-Dessus/DSC0002.jpg.yaml | 13 +++++++++++++ example/src/Ormont-Dessus/DSC0003.jpg | Bin 0 -> 363216 bytes example/src/Ormont-Dessus/DSC0003.jpg.yaml | 13 +++++++++++++ example/src/Ormont-Dessus/_directory.jpg | Bin 0 -> 457873 bytes example/src/Ormont-Dessus/_directory.yaml | 3 +++ example/src/_DSC8808-1.jpg | Bin 1010643 -> 0 bytes example/src/_DSC8808-1.jpg.yaml | 12 ------------ 17 files changed, 53 insertions(+), 54 deletions(-) create mode 100644 example/src/DSC0001.jpg create mode 100644 example/src/DSC0001.jpg.yaml delete mode 100644 example/src/Glacier 3000/_DSC5475.jpg delete mode 100644 example/src/Glacier 3000/_DSC5475.jpg.yaml delete mode 100644 example/src/Glacier 3000/_DSC5542.jpg delete mode 100644 example/src/Glacier 3000/_DSC5542.jpg.yaml delete mode 100644 example/src/Glacier 3000/_directory.jpg delete mode 100644 example/src/Glacier 3000/_directory.yaml create mode 100644 example/src/Ormont-Dessus/DSC0002.jpg create mode 100644 example/src/Ormont-Dessus/DSC0002.jpg.yaml create mode 100644 example/src/Ormont-Dessus/DSC0003.jpg create mode 100644 example/src/Ormont-Dessus/DSC0003.jpg.yaml create mode 100644 example/src/Ormont-Dessus/_directory.jpg create mode 100644 example/src/Ormont-Dessus/_directory.yaml delete mode 100644 example/src/_DSC8808-1.jpg delete mode 100644 example/src/_DSC8808-1.jpg.yaml (limited to 'example') diff --git a/example/readme.md b/example/readme.md index 809ae68..2c03260 100644 --- a/example/readme.md +++ b/example/readme.md @@ -8,16 +8,16 @@ Content ------- ``` -./example/out -- the output directory for the compiled version of the gallery -./example/src -- source directory with pictures, configuration, tags and metadata -├── _DSC8808-1.jpg -- a picture -├── _DSC8808-1.jpg.yaml -- its associated sidecar metadata file -├── Glacier 3000 -- a directory grouping gallery items -│   ├── _directory.jpg -- a thumbnail for the "Glacier 3000" directory -│   ├── _directory.yaml -- sidecar metadata file for the "Glacier 3000" directory -│   ├── _DSC5475.jpg -│   ├── _DSC5475.jpg.yaml -│   ├── _DSC5542.jpg -│   └── _DSC5542.jpg.yaml -└── gallery.yaml -- gallery settings file +./example/out ----------- the output directory for the compiled version of the gallery +./example/src ----------- source directory with pictures, configuration, tags and metadata +├── DSC0001.jpg --------- a picture +├── DSC0001.jpg.yaml ---- its associated sidecar metadata file +├── Ormont-Dessus ------- a directory grouping gallery items +│ ├── _directory.jpg -- a thumbnail for its parent directory +│ ├── _directory.yaml - directory sidecar metadata file +│ ├── DSC0002.jpg +│ ├── DSC0002.jpg.yaml +│ ├── DSC0003.jpg +│ └── DSC0003.jpg.yaml +└── gallery.yaml -------- gallery settings file ``` diff --git a/example/src/DSC0001.jpg b/example/src/DSC0001.jpg new file mode 100644 index 0000000..51b43b0 Binary files /dev/null and b/example/src/DSC0001.jpg differ diff --git a/example/src/DSC0001.jpg.yaml b/example/src/DSC0001.jpg.yaml new file mode 100644 index 0000000..b946ff7 --- /dev/null +++ b/example/src/DSC0001.jpg.yaml @@ -0,0 +1,12 @@ +title: Book shop + +datetime: 2016-12-19T16:48:50+02:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - location.germany.berlin + - books + - book-shop diff --git a/example/src/Glacier 3000/_DSC5475.jpg b/example/src/Glacier 3000/_DSC5475.jpg deleted file mode 100644 index 9835447..0000000 Binary files a/example/src/Glacier 3000/_DSC5475.jpg and /dev/null differ diff --git a/example/src/Glacier 3000/_DSC5475.jpg.yaml b/example/src/Glacier 3000/_DSC5475.jpg.yaml deleted file mode 100644 index dfff6e8..0000000 --- a/example/src/Glacier 3000/_DSC5475.jpg.yaml +++ /dev/null @@ -1,13 +0,0 @@ -title: Fog 3000 - -datetime: 2019-08-10T14:38:47+01:00 - -description: > - © Philippe NGUYEN - -tags: - - photographer.nphilou - - time.day - - weather.foggy - - forest - - trees diff --git a/example/src/Glacier 3000/_DSC5542.jpg b/example/src/Glacier 3000/_DSC5542.jpg deleted file mode 100644 index 19a716e..0000000 Binary files a/example/src/Glacier 3000/_DSC5542.jpg and /dev/null differ diff --git a/example/src/Glacier 3000/_DSC5542.jpg.yaml b/example/src/Glacier 3000/_DSC5542.jpg.yaml deleted file mode 100644 index f2c6a94..0000000 --- a/example/src/Glacier 3000/_DSC5542.jpg.yaml +++ /dev/null @@ -1,13 +0,0 @@ -title: Foggy catwalk - -datetime: 2019-08-10T16:00:45+01:00 - -description: > - © Philippe NGUYEN - -tags: - - photographer.nphilou - - time.day - - weather.foggy - - catwalk - - mountain diff --git a/example/src/Glacier 3000/_directory.jpg b/example/src/Glacier 3000/_directory.jpg deleted file mode 100644 index 19a716e..0000000 Binary files a/example/src/Glacier 3000/_directory.jpg and /dev/null differ diff --git a/example/src/Glacier 3000/_directory.yaml b/example/src/Glacier 3000/_directory.yaml deleted file mode 100644 index 44674cf..0000000 --- a/example/src/Glacier 3000/_directory.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# The following tags are applied to all items in the directory -tags: - - location.switzerland.ormont-dessus - - glacier3000 diff --git a/example/src/Ormont-Dessus/DSC0002.jpg b/example/src/Ormont-Dessus/DSC0002.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/src/Ormont-Dessus/DSC0002.jpg differ diff --git a/example/src/Ormont-Dessus/DSC0002.jpg.yaml b/example/src/Ormont-Dessus/DSC0002.jpg.yaml new file mode 100644 index 0000000..5b845b6 --- /dev/null +++ b/example/src/Ormont-Dessus/DSC0002.jpg.yaml @@ -0,0 +1,13 @@ +title: Walking towards the unknown + +datetime: 2019-08-10T16:00:45+01:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - time.day + - weather.foggy + - catwalk + - mountain diff --git a/example/src/Ormont-Dessus/DSC0003.jpg b/example/src/Ormont-Dessus/DSC0003.jpg new file mode 100644 index 0000000..9835447 Binary files /dev/null and b/example/src/Ormont-Dessus/DSC0003.jpg differ diff --git a/example/src/Ormont-Dessus/DSC0003.jpg.yaml b/example/src/Ormont-Dessus/DSC0003.jpg.yaml new file mode 100644 index 0000000..85a88ec --- /dev/null +++ b/example/src/Ormont-Dessus/DSC0003.jpg.yaml @@ -0,0 +1,13 @@ +title: Diffusion + +datetime: 2019-08-10T14:38:47+01:00 + +description: > + © Philippe NGUYEN + +tags: + - photographer.nphilou + - time.day + - weather.foggy + - forest + - trees diff --git a/example/src/Ormont-Dessus/_directory.jpg b/example/src/Ormont-Dessus/_directory.jpg new file mode 100644 index 0000000..19a716e Binary files /dev/null and b/example/src/Ormont-Dessus/_directory.jpg differ diff --git a/example/src/Ormont-Dessus/_directory.yaml b/example/src/Ormont-Dessus/_directory.yaml new file mode 100644 index 0000000..75ad01b --- /dev/null +++ b/example/src/Ormont-Dessus/_directory.yaml @@ -0,0 +1,3 @@ +# The following tags are applied to all items in the directory +tags: + - location.switzerland.ormont-dessus diff --git a/example/src/_DSC8808-1.jpg b/example/src/_DSC8808-1.jpg deleted file mode 100644 index 51b43b0..0000000 Binary files a/example/src/_DSC8808-1.jpg and /dev/null differ diff --git a/example/src/_DSC8808-1.jpg.yaml b/example/src/_DSC8808-1.jpg.yaml deleted file mode 100644 index b946ff7..0000000 --- a/example/src/_DSC8808-1.jpg.yaml +++ /dev/null @@ -1,12 +0,0 @@ -title: Book shop - -datetime: 2016-12-19T16:48:50+02:00 - -description: > - © Philippe NGUYEN - -tags: - - photographer.nphilou - - location.germany.berlin - - books - - book-shop -- cgit v1.2.3 From b468dcbf3343ea251703078ec89d3215116fc2f6 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 25 Feb 2020 19:25:16 +0100 Subject: compiler: re-introduce gallery title --- example/src/gallery.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'example') diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index b25b657..d2f90aa 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -1,5 +1,7 @@ # ldgallery example gallery configuration file +#galleryTitle: "ldgallery" + #includedDirectories: ["*"] #excludedDirectories: [] -- cgit v1.2.3 From c7fa5bd40d0e5c9ea50190a90a0ccfee8ad96c25 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 27 Feb 2020 21:05:51 +0100 Subject: viewer: use colon as tag separator instead of dot For consistency with the query language and allowing the use of the very common dot in tags. This also introduces a migration script. GitHub: closes #164 --- example/src/DSC0001.jpg.yaml | 4 ++-- example/src/Ormont-Dessus/DSC0002.jpg.yaml | 6 +++--- example/src/Ormont-Dessus/DSC0003.jpg.yaml | 6 +++--- example/src/Ormont-Dessus/_directory.yaml | 2 +- example/src/gallery.yaml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'example') diff --git a/example/src/DSC0001.jpg.yaml b/example/src/DSC0001.jpg.yaml index b946ff7..cca1379 100644 --- a/example/src/DSC0001.jpg.yaml +++ b/example/src/DSC0001.jpg.yaml @@ -6,7 +6,7 @@ description: > © Philippe NGUYEN tags: - - photographer.nphilou - - location.germany.berlin + - photographer:nphilou + - location:germany:berlin - books - book-shop diff --git a/example/src/Ormont-Dessus/DSC0002.jpg.yaml b/example/src/Ormont-Dessus/DSC0002.jpg.yaml index 5b845b6..a69deb9 100644 --- a/example/src/Ormont-Dessus/DSC0002.jpg.yaml +++ b/example/src/Ormont-Dessus/DSC0002.jpg.yaml @@ -6,8 +6,8 @@ description: > © Philippe NGUYEN tags: - - photographer.nphilou - - time.day - - weather.foggy + - photographer:nphilou + - time:day + - weather:foggy - catwalk - mountain diff --git a/example/src/Ormont-Dessus/DSC0003.jpg.yaml b/example/src/Ormont-Dessus/DSC0003.jpg.yaml index 85a88ec..558f921 100644 --- a/example/src/Ormont-Dessus/DSC0003.jpg.yaml +++ b/example/src/Ormont-Dessus/DSC0003.jpg.yaml @@ -6,8 +6,8 @@ description: > © Philippe NGUYEN tags: - - photographer.nphilou - - time.day - - weather.foggy + - photographer:nphilou + - time:day + - weather:foggy - forest - trees diff --git a/example/src/Ormont-Dessus/_directory.yaml b/example/src/Ormont-Dessus/_directory.yaml index 75ad01b..5b3e0c7 100644 --- a/example/src/Ormont-Dessus/_directory.yaml +++ b/example/src/Ormont-Dessus/_directory.yaml @@ -1,3 +1,3 @@ # The following tags are applied to all items in the directory tags: - - location.switzerland.ormont-dessus + - location:switzerland:ormont-dessus diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index d2f90aa..c4a5077 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -6,14 +6,14 @@ #excludedDirectories: [] includedFiles: - - "*.jpg" + - '*.jpg' #excludedFiles: # - "*.md" tagsFromDirectories: fromParents: 0 # default - prefix: "" # default + prefix: '' # default thumbnailMaxResolution: width: 400 # default -- cgit v1.2.3 From f09e9d9fa29284bd9ae872efe5ba1d526e349011 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 26 Feb 2020 22:13:00 +0100 Subject: compiler: add tag inclusion and exclusion globs GitHub: closes #30 --- example/src/gallery.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'example') diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index c4a5077..dba6b39 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -11,13 +11,16 @@ includedFiles: #excludedFiles: # - "*.md" -tagsFromDirectories: - fromParents: 0 # default - prefix: '' # default +#includedTags: ["*"] +#excludedTags: [] -thumbnailMaxResolution: - width: 400 # default - height: 300 # default +#tagsFromDirectories: +# fromParents: 0 +# prefix: '' + +#thumbnailMaxResolution: +# width: 400 +# height: 300 pictureMaxResolution: width: 1024 -- cgit v1.2.3 From 54790c6c73d7c51ff22cf5e9722b141cdc0249df Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 29 Feb 2020 16:39:55 +0100 Subject: compiler: add tagCategories setting to gallery.yaml --- example/src/gallery.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'example') diff --git a/example/src/gallery.yaml b/example/src/gallery.yaml index dba6b39..b569910 100644 --- a/example/src/gallery.yaml +++ b/example/src/gallery.yaml @@ -14,6 +14,10 @@ includedFiles: #includedTags: ["*"] #excludedTags: [] +tagCategories: + - photographer + - location + #tagsFromDirectories: # fromParents: 0 # prefix: '' -- cgit v1.2.3