X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FSystemConfig.hs;h=09c45166530dfc4b5f53fe700ff6aeec0aa0543f;hb=57831112f1aec09a5891260b5ff7e0f9ea5577e8;hp=58de2bec0ca22afb68ce1534dc23691617136cd1;hpb=0b1235464affca4fb349c713278d2e37fd8e9584;p=Rakka.git diff --git a/Rakka/SystemConfig.hs b/Rakka/SystemConfig.hs index 58de2be..09c4516 100644 --- a/Rakka/SystemConfig.hs +++ b/Rakka/SystemConfig.hs @@ -6,6 +6,12 @@ module Rakka.SystemConfig , getSysConf , getSysConfA + + , SiteName(..) + , BaseURI(..) + , DefaultPage(..) + , StyleSheet(..) + , Languages(..) ) where @@ -13,6 +19,7 @@ import Control.Arrow.ArrowIO import Control.Concurrent.STM import Control.Monad.Trans import qualified Data.ByteString.Char8 as C8 +import Data.Dynamic import Data.Encoding import Data.Encoding.UTF8 import Data.Map (Map) @@ -21,7 +28,9 @@ import Data.Maybe import GHC.Conc (unsafeIOToSTM) import Network import qualified Network.HTTP.Lucu.Config as LC +import Network.HTTP.Lucu.Utils import Network.URI +import Rakka.Page import Rakka.Utils import Subversion.FileSystem import Subversion.FileSystem.Revision @@ -36,16 +45,15 @@ logger = "Rakka.SystemConfig" data SystemConfig = SystemConfig { scLucuConf :: !LC.Config , scRepository :: !Repository - , scCache :: !(TVar (Map FilePath SysConfValue)) + , scCache :: !(TVar (Map FilePath Dynamic)) } -data SysConfValue - = SiteName String - | BaseURI URI - | DefaultPage String - | StyleSheet String - deriving (Eq, Show) +class (Typeable a, Show a) => SysConfValue a where + confPath :: a -> FilePath + serialize :: a -> String + deserialize :: String -> Maybe a + defaultValue :: SystemConfig -> a mkSystemConfig :: LC.Config -> Repository -> IO SystemConfig @@ -57,25 +65,24 @@ mkSystemConfig lc repos , scCache = cache } - -getSysConf :: MonadIO m => SystemConfig -> SysConfValue -> m SysConfValue -getSysConf sc key +getSysConf :: forall m a. (MonadIO m, SysConfValue a) => SystemConfig -> m a +getSysConf sc = liftIO $ atomically $ - do let path = sysConfPath key + do let path = confPath (undefined :: a) cache <- readTVar (scCache sc) case M.lookup path cache of - Just val -> return val - Nothing -> do val <- unsafeIOToSTM (getSysConf' sc key) - writeTVar (scCache sc) (M.insert path val cache) + Just val -> return $ fromJust $ fromDynamic val + Nothing -> do val <- unsafeIOToSTM (getSysConf' sc) + writeTVar (scCache sc) (M.insert path (toDyn val) cache) return val -getSysConf' :: SystemConfig -> SysConfValue -> IO SysConfValue -getSysConf' sc key - = do let path = fromConfPath (sysConfPath key) +getSysConf' :: forall a. SysConfValue a => SystemConfig -> IO a +getSysConf' sc + = do let path = fromConfPath $ confPath (undefined :: a) fs <- getRepositoryFS (scRepository sc) rev <- getYoungestRev fs @@ -90,69 +97,103 @@ getSysConf' sc key case value of Just str - -> do let val = unmarshalSysConf key str - debugM logger ("Got a config value at `" ++ path ++ "': " ++ show val) - return val + -> case deserialize str of + Just val + -> do debugM logger ("Got a config value at `" ++ path ++ "': " ++ show val) + return val + Nothing + -> fail ("Got an invalid config value at `" ++ path ++ "': " ++ str) Nothing - -> do val <- sysConfDefault sc key + -> do let val = defaultValue sc debugM logger ("Got no config value at `" ++ path ++ "'. Defaulting to " ++ show val) return val -getSysConfA :: ArrowIO a => SystemConfig -> SysConfValue -> a b SysConfValue -getSysConfA = (arrIO0 .) . getSysConf +getSysConfA :: (ArrowIO a, SysConfValue c) => SystemConfig -> a b c +getSysConfA = arrIO0 . getSysConf fromConfPath :: FilePath -> FilePath -fromConfPath = combine "/config" +fromConfPath = ("/config" ) -{- paths -} -sysConfPath :: SysConfValue -> FilePath -sysConfPath (SiteName _) = "siteName" -sysConfPath (BaseURI _) = "baseURI" -sysConfPath (DefaultPage _) = "defaultPage" -sysConfPath (StyleSheet _) = "styleSheet" +serializeStringPairs :: [(String, String)] -> String +serializeStringPairs = joinWith "\n" . map serializePair' + where + serializePair' :: (String, String) -> String + serializePair' (a, b) = a ++ " " ++ b -{- marshalling -} -marshalSysConf :: SysConfValue -> String -marshalSysConf (SiteName name) = name -marshalSysConf (BaseURI uri ) = uriToString id uri "" -marshalSysConf (DefaultPage name) = name -marshalSysConf (StyleSheet name) = name +deserializeStringPairs :: String -> Maybe [(String, String)] +deserializeStringPairs = sequence . map deserializePair' . lines + where + deserializePair' :: String -> Maybe (String, String) + deserializePair' s = case break (/= ' ') s of + (a, ' ':b) -> Just (a, b) + _ -> Nothing -{- unmarshalling -} -unmarshalSysConf :: SysConfValue -> String -> SysConfValue -unmarshalSysConf (SiteName _) name = SiteName name -unmarshalSysConf (BaseURI _) uri = BaseURI $ fromJust $ parseURI uri -unmarshalSysConf (DefaultPage _) name = DefaultPage name -unmarshalSysConf (StyleSheet _) name = StyleSheet name +{- config values -} -{- getting default value -} -sysConfDefault :: SystemConfig -> SysConfValue -> IO SysConfValue +newtype SiteName = SiteName String deriving (Show, Typeable) +instance SysConfValue SiteName where + confPath _ = "siteName" + serialize (SiteName name) = name + deserialize name = Just (SiteName name) + defaultValue _ = SiteName "Rakka" -sysConfDefault _ (SiteName _) - = return $ SiteName "Rakka" -sysConfDefault sc (BaseURI _) - = do let conf = scLucuConf sc - host = C8.unpack $ LC.cnfServerHost conf - port = case LC.cnfServerPort conf of - PortNumber num -> fromIntegral num - - defaultURI - = "http://" ++ host ++ +newtype BaseURI = BaseURI URI deriving (Show, Typeable) +instance SysConfValue BaseURI where + confPath _ = "baseURI" + serialize (BaseURI uri) = uriToString id uri "" + deserialize uri = fmap BaseURI (parseURI uri) + defaultValue sc + = let conf = scLucuConf sc + host = C8.unpack $ LC.cnfServerHost conf + port = case LC.cnfServerPort conf of + PortNumber num -> fromIntegral num + + defaultURI + = "http://" ++ host ++ -- FIXME: consider IPv6 address (if port == 80 then "" else ':' : show port) ++ "/" - - return $ BaseURI $ fromJust $ parseURI defaultURI - -sysConfDefault _ (DefaultPage _) - = return $ DefaultPage "MainPage" - -sysConfDefault _ (StyleSheet _) - = return $ StyleSheet "StyleSheet/Default" + in + BaseURI $ fromJust $ parseURI defaultURI + + +newtype DefaultPage = DefaultPage String deriving (Show, Typeable) +instance SysConfValue DefaultPage where + confPath _ = "defaultPage" + serialize (DefaultPage name) = name + deserialize name = Just (DefaultPage name) + defaultValue _ = DefaultPage "MainPage" + + +newtype StyleSheet = StyleSheet String deriving (Show, Typeable) +instance SysConfValue StyleSheet where + confPath _ = "styleSheet" + serialize (StyleSheet name) = name + deserialize name = Just (StyleSheet name) + defaultValue _ = StyleSheet "StyleSheet/Default" + + +newtype Languages = Languages (Map LanguageTag LanguageName) deriving (Show, Typeable) +instance SysConfValue Languages where + confPath _ = "languages" + serialize (Languages langs) = serializeStringPairs (M.toList langs) + deserialize langs = fmap (Languages . M.fromList) (deserializeStringPairs langs) + defaultValue _ + = Languages $ M.fromList [ ("en", "English" ) + , ("es", "Español" ) + , ("de", "Deutsch" ) + , ("fi", "Suomi" ) + , ("fr", "Français" ) + , ("ga", "Gaeilge" ) + , ("gd", "Gàidhlig" ) + , ("ja", "日本語" ) + , ("pt", "Português") + , ("sv", "Svenska" ) + ]