diff options
author | Ben Sima <ben@bsima.me> | 2020-04-15 10:06:24 -0700 |
---|---|---|
committer | Ben Sima <ben@bsima.me> | 2020-04-15 10:07:02 -0700 |
commit | afa9d701538b9e56622a0bfdf8e04aa358c9cd82 (patch) | |
tree | dee95c3955b3fe3d11e80d89823660d28eee0587 /Biz/Ibb/Keep.hs | |
parent | f4b8c0df041b063c0b47d2ec6c818a9c202fd833 (diff) |
Reformatting
Now I'm using ormolu instead of brittany for Haskell formatting
now. Figured I should just make all of these big changes at once.
Diffstat (limited to 'Biz/Ibb/Keep.hs')
-rw-r--r-- | Biz/Ibb/Keep.hs | 116 |
1 files changed, 63 insertions, 53 deletions
diff --git a/Biz/Ibb/Keep.hs b/Biz/Ibb/Keep.hs index ad6dc5c..d546aae 100644 --- a/Biz/Ibb/Keep.hs +++ b/Biz/Ibb/Keep.hs @@ -1,6 +1,6 @@ -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -9,68 +9,74 @@ -- If this proves useful, maybe we could make it a more general thing. Like -- `Biz.Keep`. I could wrap all the safecopy stuff in my own template haskell -- like `$(keep ''MyType)`. --- module Biz.Ibb.Keep where -import Biz.Ibb.Core (Person(..), Book(..)) +import Biz.Ibb.Core (Book (..), Person (..)) import qualified Biz.Ibb.Influencers as Influencers -import Control.Monad.Reader (ask) -import Control.Monad.State (get, put) -import Data.Acid (Update, makeAcidic) +import Control.Monad.Reader (ask) +import Control.Monad.State (get, put) +import Data.Acid (Update, makeAcidic) import qualified Data.Acid as Acid -import Data.Data (Data, Typeable) -import Data.IxSet (Indexable(..), IxSet, ixFun, ixSet) +import Data.Data (Data, Typeable) +import Data.IxSet (Indexable (..), IxSet, ixFun, ixSet) import qualified Data.IxSet as IxSet -import Data.SafeCopy -import Data.Text (Text) +import Data.SafeCopy +import Data.Text (Text) import qualified Data.Text as Text -- * Keep -- | Main database. Need to think of a better name for this. -data IbbKeep = IbbKeep - { _people :: IxSet Person - } +data IbbKeep + = IbbKeep + { _people :: IxSet Person + } deriving (Data, Typeable) $(deriveSafeCopy 0 'base ''IbbKeep) -- * Index @Person@ -$(deriveSafeCopy 0 'base ''Person) +$(deriveSafeCopy 0 'base ''Person) -newtype PersonName = - PersonName Text deriving (Eq, Ord, Data, Typeable) +newtype PersonName + = PersonName Text + deriving (Eq, Ord, Data, Typeable) -newtype PersonBlurb = - PersonBlurb Text deriving (Eq, Ord, Data, Typeable) +newtype PersonBlurb + = PersonBlurb Text + deriving (Eq, Ord, Data, Typeable) instance Indexable Person where - empty = ixSet - [ ixFun $ \p -> [ PersonName $ _name p ] - , ixFun $ \p -> [ _pic p ] - , ixFun $ \p -> [ _twitter p ] - , ixFun $ \p -> [ _website p ] - , ixFun $ \p -> [ _books p ] - , ixFun $ \p -> [ PersonBlurb $ _blurb p ] - ] + empty = + ixSet + [ ixFun $ \p -> [PersonName $ _name p], + ixFun $ \p -> [_pic p], + ixFun $ \p -> [_twitter p], + ixFun $ \p -> [_website p], + ixFun $ \p -> [_books p], + ixFun $ \p -> [PersonBlurb $ _blurb p] + ] -- | updates the `IbbKeep` with a new `Person` newPerson :: Text -> Text -> Update IbbKeep Person newPerson name blurb = do k <- get - put $ k { _people = IxSet.insert p (_people k) - } + put $ + k + { _people = IxSet.insert p (_people k) + } return p - where - p = Person - { _name = name - , _pic = Text.empty - , _twitter = Text.empty - , _website = Text.empty - , _books = [] - , _blurb = blurb - } + where + p = + Person + { _name = name, + _pic = Text.empty, + _twitter = Text.empty, + _website = Text.empty, + _books = [], + _blurb = blurb + } getPeople :: Int -> Acid.Query IbbKeep [Person] getPeople n = do @@ -79,24 +85,27 @@ getPeople n = do -- * Index @Book@ -$(deriveSafeCopy 0 'base ''Book) +$(deriveSafeCopy 0 'base ''Book) -newtype BookTitle = - BookTitle Text deriving (Eq, Ord, Data, Typeable) +newtype BookTitle + = BookTitle Text + deriving (Eq, Ord, Data, Typeable) -newtype BookAuthor = - BookAuthor Text deriving (Eq, Ord, Data, Typeable) +newtype BookAuthor + = BookAuthor Text + deriving (Eq, Ord, Data, Typeable) instance Indexable Book where - empty = ixSet - [ ixFun $ \b -> [ BookTitle $ _title b ] - , ixFun $ \b -> [ BookAuthor $ _author b ] - , ixFun $ \b -> [ _amznref b ] - ] + empty = + ixSet + [ ixFun $ \b -> [BookTitle $ _title b], + ixFun $ \b -> [BookAuthor $ _author b], + ixFun $ \b -> [_amznref b] + ] -- | updates the `IbbKeep` with a new `Book` ---newBook :: Text -> Text -> Text -> Update IbbKeep Book ---newBook title author amznref = do +-- newBook :: Text -> Text -> Text -> Update IbbKeep Book +-- newBook title author amznref = do -- ibbKeep <- get -- put $ ibbKeep { _books = IxSet.insert b (_books ibbKeep) -- , _people = _people ibbKeep @@ -114,9 +123,10 @@ instance Indexable Book where $(makeAcidic ''IbbKeep ['newPerson, 'getPeople]) initialIbbKeep :: IbbKeep -initialIbbKeep = IbbKeep - { _people = IxSet.fromList Influencers.allPeople - } +initialIbbKeep = + IbbKeep + { _people = IxSet.fromList Influencers.allPeople + } openLocal :: String -> IO (Acid.AcidState IbbKeep) openLocal dir = |