diff options
author | pacien | 2022-09-04 18:18:27 +0200 |
---|---|---|
committer | pacien | 2022-09-04 18:18:27 +0200 |
commit | 11bbbae2850b9c45da697a8ed9626495a50a38c0 (patch) | |
tree | ff2713118f8b45d36905bfea2933f08d8e70066d /compiler/src/Input.hs | |
parent | e93f7b1eb84c083d67567115284c0002a3a7d5fc (diff) | |
parent | 8349be992b46b77dee921f484cfbff8b758ff756 (diff) | |
download | ldgallery-11bbbae2850b9c45da697a8ed9626495a50a38c0.tar.gz |
Merge branch 'develop': release v2.1v2.1
GitHub: related to #315
Diffstat (limited to 'compiler/src/Input.hs')
-rw-r--r-- | compiler/src/Input.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs index 48931ec..4cfabe6 100644 --- a/compiler/src/Input.hs +++ b/compiler/src/Input.hs | |||
@@ -1,7 +1,7 @@ | |||
1 | -- ldgallery - A static generator which turns a collection of tagged | 1 | -- ldgallery - A static generator which turns a collection of tagged |
2 | -- pictures into a searchable web gallery. | 2 | -- pictures into a searchable web gallery. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2019-2020 Pacien TRAN-GIRARD | 4 | -- Copyright (C) 2019-2021 Pacien TRAN-GIRARD |
5 | -- | 5 | -- |
6 | -- This program is free software: you can redistribute it and/or modify | 6 | -- This program is free software: you can redistribute it and/or modify |
7 | -- it under the terms of the GNU Affero General Public License as | 7 | -- it under the terms of the GNU Affero General Public License as |
@@ -100,9 +100,7 @@ readSidecarFile filepath = | |||
100 | 100 | ||
101 | 101 | ||
102 | readInputTree :: AnchoredFSNode -> IO InputTree | 102 | readInputTree :: AnchoredFSNode -> IO InputTree |
103 | readInputTree (AnchoredFSNode _ File{}) = | 103 | readInputTree (AnchoredFSNode anchor root) = mkDirNode root |
104 | throw $ AssertionFailed "Input directory is a file" | ||
105 | readInputTree (AnchoredFSNode anchor root@Dir{}) = mkDirNode root | ||
106 | where | 104 | where |
107 | mkInputNode :: Map.Map FileName FSNode -> FSNode -> IO (Maybe InputTree) | 105 | mkInputNode :: Map.Map FileName FSNode -> FSNode -> IO (Maybe InputTree) |
108 | mkInputNode dir file@File{path} | not (isSidecar file) && not (isThumbnail file) = | 106 | mkInputNode dir file@File{path} | not (isSidecar file) && not (isThumbnail file) = |