diff options
-rw-r--r-- | compiler/src/Processors.hs | 21 | ||||
-rw-r--r-- | compiler/src/Resource.hs | 28 | ||||
-rw-r--r-- | design-notes.md | 9 | ||||
-rw-r--r-- | viewer/src/@types/gallery.d.ts | 9 | ||||
-rw-r--r-- | viewer/src/assets/scss/global.scss | 1 | ||||
-rw-r--r-- | viewer/src/components/LdPicture.vue | 18 | ||||
-rw-r--r-- | viewer/src/components/LdThumbnail.vue | 24 |
7 files changed, 75 insertions, 35 deletions
diff --git a/compiler/src/Processors.hs b/compiler/src/Processors.hs index df7e632..fc719af 100644 --- a/compiler/src/Processors.hs +++ b/compiler/src/Processors.hs | |||
@@ -27,16 +27,17 @@ module Processors | |||
27 | import Control.Exception (Exception) | 27 | import Control.Exception (Exception) |
28 | import Data.Function ((&)) | 28 | import Data.Function ((&)) |
29 | import Data.Char (toLower) | 29 | import Data.Char (toLower) |
30 | import Data.List (break) | ||
30 | 31 | ||
31 | import System.Directory hiding (copyFile) | 32 | import System.Directory hiding (copyFile) |
32 | import qualified System.Directory | 33 | import qualified System.Directory |
33 | import System.FilePath | 34 | import System.FilePath |
34 | 35 | ||
35 | import System.Process (callProcess) | 36 | import System.Process (callProcess, readProcess) |
36 | 37 | ||
37 | import Resource | 38 | import Resource |
38 | ( ItemProcessor, ThumbnailProcessor | 39 | ( ItemProcessor, ThumbnailProcessor |
39 | , GalleryItemProps(..), Resolution(..), Resource(..) ) | 40 | , GalleryItemProps(..), Resolution(..), Resource(..), Thumbnail(..) ) |
40 | 41 | ||
41 | import Files | 42 | import Files |
42 | 43 | ||
@@ -123,6 +124,12 @@ withCached processor inputPath outputPath = | |||
123 | resourceAt :: FilePath -> Path -> IO Resource | 124 | resourceAt :: FilePath -> Path -> IO Resource |
124 | resourceAt fsPath resPath = getModificationTime fsPath >>= return . Resource resPath | 125 | resourceAt fsPath resPath = getModificationTime fsPath >>= return . Resource resPath |
125 | 126 | ||
127 | getImageResolution :: FilePath -> IO Resolution | ||
128 | getImageResolution fsPath = | ||
129 | readProcess "identify" ["-format", "%w %h", fsPath] [] | ||
130 | >>= return . break (== ' ') | ||
131 | >>= return . \(w, h) -> Resolution (read w) (read h) | ||
132 | |||
126 | 133 | ||
127 | type ItemFileProcessor = | 134 | type ItemFileProcessor = |
128 | FileName -- ^ Input base path | 135 | FileName -- ^ Input base path |
@@ -162,12 +169,14 @@ thumbnailFileProcessor maxRes cached inputBase outputBase resClass inputRes = | |||
162 | inPath = localPath $ inputBase /> inputRes | 169 | inPath = localPath $ inputBase /> inputRes |
163 | outPath = localPath $ outputBase /> relOutPath | 170 | outPath = localPath $ outputBase /> relOutPath |
164 | 171 | ||
165 | process :: Maybe FileProcessor -> IO (Maybe Resource) | 172 | process :: Maybe FileProcessor -> IO (Maybe Thumbnail) |
166 | process Nothing = return Nothing | 173 | process Nothing = return Nothing |
167 | process (Just proc) = | 174 | process (Just proc) = |
168 | proc inPath outPath | 175 | do |
169 | >> resourceAt outPath relOutPath | 176 | proc inPath outPath |
170 | >>= return . Just | 177 | resource <- resourceAt outPath relOutPath |
178 | resolution <- getImageResolution outPath | ||
179 | return $ Just $ Thumbnail resource resolution | ||
171 | 180 | ||
172 | processorFor :: Format -> Maybe FileProcessor | 181 | processorFor :: Format -> Maybe FileProcessor |
173 | processorFor PictureFormat = Just $ resizePictureUpTo maxRes | 182 | processorFor PictureFormat = Just $ resizePictureUpTo maxRes |
diff --git a/compiler/src/Resource.hs b/compiler/src/Resource.hs index 599509e..400e18a 100644 --- a/compiler/src/Resource.hs +++ b/compiler/src/Resource.hs | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | module Resource | 19 | module Resource |
20 | ( ItemProcessor, ThumbnailProcessor | 20 | ( ItemProcessor, ThumbnailProcessor |
21 | , GalleryItem(..), GalleryItemProps(..), Resolution(..), Resource(..) | 21 | , GalleryItem(..), GalleryItemProps(..), Resolution(..), Resource(..), Thumbnail(..) |
22 | , buildGalleryTree, galleryCleanupResourceDir | 22 | , buildGalleryTree, galleryCleanupResourceDir |
23 | ) where | 23 | ) where |
24 | 24 | ||
@@ -90,13 +90,23 @@ instance ToJSON GalleryItemProps where | |||
90 | toEncoding = genericToEncoding encodingOptions | 90 | toEncoding = genericToEncoding encodingOptions |
91 | 91 | ||
92 | 92 | ||
93 | data Thumbnail = Thumbnail | ||
94 | { resource :: Resource | ||
95 | , resolution :: Resolution | ||
96 | } deriving (Generic, Show) | ||
97 | |||
98 | instance ToJSON Thumbnail where | ||
99 | toJSON = genericToJSON encodingOptions | ||
100 | toEncoding = genericToEncoding encodingOptions | ||
101 | |||
102 | |||
93 | data GalleryItem = GalleryItem | 103 | data GalleryItem = GalleryItem |
94 | { title :: String | 104 | { title :: String |
95 | , datetime :: ZonedTime | 105 | , datetime :: ZonedTime |
96 | , description :: String | 106 | , description :: String |
97 | , tags :: [Tag] | 107 | , tags :: [Tag] |
98 | , path :: Path | 108 | , path :: Path |
99 | , thumbnail :: Maybe Resource | 109 | , thumbnail :: Maybe Thumbnail |
100 | , properties :: GalleryItemProps | 110 | , properties :: GalleryItemProps |
101 | } deriving (Generic, Show) | 111 | } deriving (Generic, Show) |
102 | 112 | ||
@@ -106,7 +116,7 @@ instance ToJSON GalleryItem where | |||
106 | 116 | ||
107 | 117 | ||
108 | type ItemProcessor = Path -> IO GalleryItemProps | 118 | type ItemProcessor = Path -> IO GalleryItemProps |
109 | type ThumbnailProcessor = Path -> IO (Maybe Resource) | 119 | type ThumbnailProcessor = Path -> IO (Maybe Thumbnail) |
110 | 120 | ||
111 | 121 | ||
112 | buildGalleryTree :: | 122 | buildGalleryTree :: |
@@ -150,7 +160,7 @@ buildGalleryTree processItem processThumbnail tagsFromDirectories galleryName in | |||
150 | subItemsParents :: [String] | 160 | subItemsParents :: [String] |
151 | subItemsParents = (maybeToList $ fileName path) ++ parentTitles | 161 | subItemsParents = (maybeToList $ fileName path) ++ parentTitles |
152 | 162 | ||
153 | maybeThumbnail :: Maybe Path -> IO (Maybe Resource) | 163 | maybeThumbnail :: Maybe Path -> IO (Maybe Thumbnail) |
154 | maybeThumbnail Nothing = return Nothing | 164 | maybeThumbnail Nothing = return Nothing |
155 | maybeThumbnail (Just thumbnailPath) = processThumbnail thumbnailPath | 165 | maybeThumbnail (Just thumbnailPath) = processThumbnail thumbnailPath |
156 | 166 | ||
@@ -197,10 +207,16 @@ galleryOutputDiff resources ref = | |||
197 | 207 | ||
198 | resPath :: GalleryItemProps -> Maybe Path | 208 | resPath :: GalleryItemProps -> Maybe Path |
199 | resPath Directory{} = Nothing | 209 | resPath Directory{} = Nothing |
200 | resPath resourceProps = Just (resourcePath $ resource resourceProps) | 210 | resPath resourceProps = |
211 | Just | ||
212 | $ resourcePath | ||
213 | $ (resource :: (GalleryItemProps -> Resource)) resourceProps | ||
201 | 214 | ||
202 | thumbnailPaths :: [GalleryItem] -> [Path] | 215 | thumbnailPaths :: [GalleryItem] -> [Path] |
203 | thumbnailPaths = (map resourcePath) . (mapMaybe thumbnail) | 216 | thumbnailPaths = |
217 | map resourcePath | ||
218 | . map (resource :: (Thumbnail -> Resource)) | ||
219 | . mapMaybe thumbnail | ||
204 | 220 | ||
205 | (\\) :: [Path] -> [Path] -> [Path] | 221 | (\\) :: [Path] -> [Path] -> [Path] |
206 | a \\ b = minusOn orderedForm (sortOn orderedForm a) (sortOn orderedForm b) | 222 | a \\ b = minusOn orderedForm (sortOn orderedForm a) (sortOn orderedForm b) |
diff --git a/design-notes.md b/design-notes.md index 91764cc..d59f511 100644 --- a/design-notes.md +++ b/design-notes.md | |||
@@ -143,7 +143,14 @@ Serialised item structure: | |||
143 | ], | 143 | ], |
144 | 144 | ||
145 | "path": "[resource path]", | 145 | "path": "[resource path]", |
146 | "thumbnail": "[resource path | null]", | 146 | |
147 | "thumbnail": null | { | ||
148 | "resource": "[resource path]", | ||
149 | "resolution": { | ||
150 | "width": 400, | ||
151 | "height": 200 | ||
152 | } | ||
153 | }, | ||
147 | 154 | ||
148 | 155 | ||
149 | "_comment": "type-dependent", | 156 | "_comment": "type-dependent", |
diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts index b112b6d..1987416 100644 --- a/viewer/src/@types/gallery.d.ts +++ b/viewer/src/@types/gallery.d.ts | |||
@@ -33,7 +33,7 @@ declare namespace Gallery { | |||
33 | description: string, | 33 | description: string, |
34 | tags: RawTag[], | 34 | tags: RawTag[], |
35 | path: string, | 35 | path: string, |
36 | thumbnail?: string, | 36 | thumbnail?: Thumbnail |
37 | properties: OtherProperties | PictureProperties | DirectoryProperties, | 37 | properties: OtherProperties | PictureProperties | DirectoryProperties, |
38 | } | 38 | } |
39 | interface OtherProperties { | 39 | interface OtherProperties { |
@@ -47,6 +47,13 @@ declare namespace Gallery { | |||
47 | type: "directory", | 47 | type: "directory", |
48 | items: Item[] | 48 | items: Item[] |
49 | } | 49 | } |
50 | interface Thumbnail { | ||
51 | resource: string, | ||
52 | resolution: { | ||
53 | width: number, | ||
54 | height: number, | ||
55 | } | ||
56 | } | ||
50 | type RawTag = string; | 57 | type RawTag = string; |
51 | type ItemType = "other" | "picture" | "directory"; | 58 | type ItemType = "other" | "picture" | "directory"; |
52 | } \ No newline at end of file | 59 | } \ No newline at end of file |
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss index 5de5946..1a5761e 100644 --- a/viewer/src/assets/scss/global.scss +++ b/viewer/src/assets/scss/global.scss | |||
@@ -97,6 +97,7 @@ img { | |||
97 | // === Effect to apply on lazy-image loading | 97 | // === Effect to apply on lazy-image loading |
98 | 98 | ||
99 | img { | 99 | img { |
100 | display: block; | ||
100 | &.v-lazy-image { | 101 | &.v-lazy-image { |
101 | opacity: 0; | 102 | opacity: 0; |
102 | transition: opacity 0.4s; | 103 | transition: opacity 0.4s; |
diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue index 5425a00..154c4bd 100644 --- a/viewer/src/components/LdPicture.vue +++ b/viewer/src/components/LdPicture.vue | |||
@@ -29,9 +29,9 @@ | |||
29 | :src="pictureSrc()" | 29 | :src="pictureSrc()" |
30 | :class="{'slow-loading': Boolean(slowLoadingStyle)}" | 30 | :class="{'slow-loading': Boolean(slowLoadingStyle)}" |
31 | :style="slowLoadingStyle" | 31 | :style="slowLoadingStyle" |
32 | @load="clearTimer" | 32 | @load="clearSlowLoading" |
33 | /> | 33 | /> |
34 | <b-loading :active="Boolean(slowLoadingStyle)" :is-full-page="false" class="ld-picture-loader" /> | 34 | <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" /> |
35 | </div> | 35 | </div> |
36 | </template> | 36 | </template> |
37 | 37 | ||
@@ -46,20 +46,22 @@ export default class LdPicture extends Vue { | |||
46 | 46 | ||
47 | dragging: boolean = false; | 47 | dragging: boolean = false; |
48 | slowLoadingStyle: string | null = null; |