X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FStorage.hs;h=9ab15be2f1b88921e17810a9599a55e373d2808e;hb=b101c0a9aad609704eaa9157fe809be80d2aacf7;hp=7a0d0c212997aef4a51f619678ee803c1823d501;hpb=03585f9c5773f6c0b59497f4f563909576c402b5;p=Rakka.git

diff --git a/Rakka/Storage.hs b/Rakka/Storage.hs
index 7a0d0c2..9ab15be 100644
--- a/Rakka/Storage.hs
+++ b/Rakka/Storage.hs
@@ -5,38 +5,99 @@ module Rakka.Storage
 
     , getPage
     , putPage
+    , deletePage
 
     , getPageA
     , putPageA
+    , deletePageA
+
+    , getDirContents
+    , getDirContentsA
+
+    , searchPages
+
+    , rebuildIndex
     )
     where
 
 import           Control.Arrow.ArrowIO
+import           Control.Concurrent.STM
+import           Control.Monad
+import           Control.Monad.Trans
+import           Data.Maybe
+import           Network.HTTP.Lucu
 import           Rakka.Page
-import           Rakka.Storage.DefaultPage
+import           Rakka.Storage.Impl
+import           Rakka.Storage.Types
 import           Subversion.Types
+import           System.IO
+import           Subversion.Repository
+import           Text.HyperEstraier hiding (WriteLock)
+
+
+mkStorage :: FilePath -> Repository -> (Page -> IO Document) -> IO Storage
+mkStorage lsdir repos mkDraft
+    = do chan <- startIndexManager lsdir repos mkDraft
+         let sto = Storage {
+                     stoRepository = repos
+                   , stoIndexChan  = chan
+                   }
+         syncIndex sto
+         return sto
+
+
+getPage :: MonadIO m => Storage -> PageName -> Maybe RevNum -> m (Maybe Page)
+getPage = ((liftIO .) .) . getPage' . stoRepository
+
+
+putPage :: MonadIO m => Storage -> Maybe String -> Page -> m StatusCode
+putPage sto userID page
+    = liftIO $ do st <- putPage' (stoRepository sto) userID page
+                  syncIndex sto
+                  return st
+
+
+deletePage :: MonadIO m => Storage -> Maybe String -> PageName -> m StatusCode
+deletePage sto userID name
+    = liftIO $ do st <- deletePage' (stoRepository sto) userID name
+                  syncIndex sto
+                  return st
+
+
+getPageA :: ArrowIO a => Storage -> a (PageName, Maybe RevNum) (Maybe Page)
+getPageA = arrIO2 . getPage 
+
+
+putPageA :: ArrowIO a => Storage -> a (Maybe String, Page) StatusCode
+putPageA = arrIO2 . putPage
+
 
+deletePageA :: ArrowIO a => Storage -> a (Maybe String, PageName) StatusCode
+deletePageA = arrIO2 . deletePage
 
-data Storage = Storage -- FIXME
 
+getDirContents :: MonadIO m => Storage -> PageName -> Maybe RevNum -> m [PageName]
+getDirContents = ((liftIO .) .) . getDirContents' . stoRepository
 
-mkStorage :: IO Storage -- FIXME
-mkStorage = return Storage
 
+getDirContentsA :: ArrowIO a => Storage -> a (PageName, Maybe RevNum) [PageName]
+getDirContentsA = arrIO2 . getDirContents
 
-getPage :: Storage -> PageName -> IO (Maybe Page)
-getPage sto name
-    = loadDefaultPage name -- FIXME
 
+searchPages :: MonadIO m => Storage -> Condition -> m [(PageName, RevNum)]
+searchPages sto cond
+    = liftIO $
+      do var <- newEmptyTMVarIO
+         atomically $ writeTChan (stoIndexChan sto) (SearchIndex cond var)
+         atomically $ takeTMVar var
 
-putPage :: Storage -> Maybe RevNum -> Page -> IO ()
-putPage sto oldRev page
-    = error "FIXME: not implemented"
 
+rebuildIndex :: MonadIO m => Storage -> m ()
+rebuildIndex sto
+    = liftIO $ atomically $ writeTChan (stoIndexChan sto) RebuildIndex
 
-getPageA :: ArrowIO a => Storage -> a PageName (Maybe Page)
-getPageA = arrIO . getPage 
 
+syncIndex :: Storage -> IO ()
+syncIndex sto
+    = atomically $ writeTChan (stoIndexChan sto) SyncIndex
 
-putPageA :: ArrowIO a => Storage -> a (Maybe RevNum, Page) ()
-putPageA = arrIO2 . putPage
\ No newline at end of file