nek0/eidolon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated yesod newsfeeed and imagemagick deps

Browse source
This commit is contained in:
nek0 2016-03-02 09:51:42 +01:00
parent 98767bb01c
commit edf906e418
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Handler/RootFeed.hs
View file

@ -190,11 +190,10 @@ mediumToEntry ent = do
, feedEntryUpdated = mediumTime (entityVal ent) , feedEntryUpdated = mediumTime (entityVal ent)
, feedEntryTitle = mediumTitle (entityVal ent) , feedEntryTitle = mediumTitle (entityVal ent)
, feedEntryContent = toHtml (fromMaybe (Textarea "") $ mediumDescription $ entityVal ent) , feedEntryContent = toHtml (fromMaybe (Textarea "") $ mediumDescription $ entityVal ent)
, feedEntryEnclosure = Just , feedEntryEnclosure = Just $ EntryEnclosure
( StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumPreview $ entityVal ent) [] (StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumPreview $ entityVal ent) [])
, size size
, "image/jpeg" "image/jpeg"
)
} }
getSize :: FilePath -> IO Int getSize :: FilePath -> IO Int

8
Handler/Upload.hs
View file

@ -128,8 +128,8 @@ generateThumb path userId albumId = do
(iWidth, tWidth, pWidth) <- liftIO $ withMagickWandGenesis $ do (iWidth, tWidth, pWidth) <- liftIO $ withMagickWandGenesis $ do
(_, w) <- magickWand (_, w) <- magickWand
(_, p) <- magickWand (_, p) <- magickWand
readImage w (decodeString path) readImage w (T.pack path)
readImage p (decodeString path) readImage p (T.pack path)
w1 <- getImageWidth w w1 <- getImageWidth w
h1 <- getImageHeight w h1 <- getImageHeight w
let h2 = 230 let h2 = 230
@ -144,8 +144,8 @@ generateThumb path userId albumId = do
resizeImage p w3 h3 lanczosFilter 1 resizeImage p w3 h3 lanczosFilter 1
setImageCompressionQuality w 95 setImageCompressionQuality w 95
setImageCompressionQuality p 95 setImageCompressionQuality p 95
writeImage w (Just (decodeString newPath)) writeImage w (Just (T.pack newPath))
writeImage p (Just (decodeString prevPath)) writeImage p (Just (T.pack prevPath))
return (w1, w2, w3) return (w1, w2, w3)
return (newPath, prevPath, iWidth, tWidth, pWidth) return (newPath, prevPath, iWidth, tWidth, pWidth)

2
Helper.hs
View file

@ -194,7 +194,7 @@ getThumbWidth path
| path == Nothing = pure 230 | path == Nothing = pure 230
| otherwise = liftIO $ withMagickWandGenesis $ do | otherwise = liftIO $ withMagickWandGenesis $ do
(_, w) <- magickWand (_, w) <- magickWand
readImage w (decodeString $ fromJust path) readImage w (T.pack $ fromJust path)
getImageWidth w getImageWidth w
multiFileField :: (Monad m, RenderMessage (HandlerSite m) FormMessage) => Field m [FileInfo] multiFileField :: (Monad m, RenderMessage (HandlerSite m) FormMessage) => Field m [FileInfo]

4
eidolon.cabal
View file

@ -113,14 +113,14 @@ library
, yesod-markdown >= 0.10 , yesod-markdown >= 0.10
, blaze-markup >= 0.7 , blaze-markup >= 0.7
, wai >= 3.0 , wai >= 3.0
, yesod-newsfeed >= 1.5 , yesod-newsfeed >= 1.6
, unix >= 2.7 , unix >= 2.7
, bloodhound >= 0.8 , bloodhound >= 0.8
, http-types , http-types
-- for Migrations -- for Migrations
, HDBC , HDBC
, HDBC-postgresql , HDBC-postgresql
, imagemagick , imagemagick >= 0.0.4
, text , text
, filepath , filepath
, system-filepath , system-filepath

4
stack.yaml
View file

@ -107,7 +107,7 @@ extra-deps:
- http-date-0.0.6.1 - http-date-0.0.6.1
- http-types-0.9 - http-types-0.9
- http2-1.3.1 - http2-1.3.1
- imagemagick-0.0.3.5 - imagemagick-0.0.4.1
- iproute-1.7.0 - iproute-1.7.0
- kan-extensions-4.2.3 - kan-extensions-4.2.3
- keys-3.10.2 - keys-3.10.2
@ -213,7 +213,7 @@ extra-deps:
- yesod-core-1.4.18.1 - yesod-core-1.4.18.1
- yesod-form-1.4.6 - yesod-form-1.4.6
- yesod-markdown-0.10.0 - yesod-markdown-0.10.0
- yesod-newsfeed-1.5 - yesod-newsfeed-1.6
- yesod-persistent-1.4.0.3 - yesod-persistent-1.4.0.3
- yesod-static-1.5.0.3 - yesod-static-1.5.0.3
- yesod-test-1.5.0.1 - yesod-test-1.5.0.1