X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FStorage.hs;h=73bc73499b762fdcc3ed1b56f407562e5831c8c7;hb=b4c0033f297c28d95ad9298b489126331224bc42;hp=fc5637d7b686dff5a6eefc900132e4641c7f5760;hpb=98e508613bb7a50a1f65998ce87f065df957b736;p=Rakka.git

diff --git a/Rakka/Storage.hs b/Rakka/Storage.hs
index fc5637d..73bc734 100644
--- a/Rakka/Storage.hs
+++ b/Rakka/Storage.hs
@@ -1,13 +1,30 @@
 module Rakka.Storage
     ( Storage
 
+    -- re-export from Rakka.Storage.Types
+    , SearchResult(..) 
+    , HitPage(..)
+    , SnippetFragment(..)
+
     , mkStorage -- private
 
     , getPage
     , putPage
+    , deletePage
 
     , getPageA
     , putPageA
+    , deletePageA
+
+    , getAttachment
+    , putAttachment
+
+    , getDirContents
+    , getDirContentsA
+
+    , searchPages
+
+    , rebuildIndex
     )
     where
 
@@ -15,110 +32,100 @@ import           Control.Arrow.ArrowIO
 import           Control.Concurrent.STM
 import           Control.Monad
 import           Control.Monad.Trans
-import           Data.Set (Set)
+import           Data.Maybe
+import           Network.HTTP.Lucu
+import           Rakka.Attachment
 import           Rakka.Page
-import           Rakka.Storage.DefaultPage
+import           Rakka.Storage.Impl
+import           Rakka.Storage.Types
 import           Subversion.Types
-import           System.Directory
-import           System.FilePath
-import           System.Log.Logger
+import           System.IO
 import           Subversion.Repository
-import           Text.HyperEstraier
-
--- FIXME
-import Data.Encoding
-import Data.Encoding.UTF8
-import qualified Data.ByteString.Lazy.Char8 as C8
--- FIXME
-
-logger = "Rakka.Storage"
-
-
-data Storage
-    = Storage {
-        stoIndexRevLocked :: !(TVar Bool)
-      , stoIndexRevFile   :: !FilePath
-      , stoIndexDB        :: !Database
-      , stoRepository     :: !Repository
-      , stoMakeDraft      :: !(Page -> IO Document)
-      }
+import           Text.HyperEstraier hiding (WriteLock)
 
 
 mkStorage :: FilePath -> Repository -> (Page -> IO Document) -> IO Storage
 mkStorage lsdir repos mkDraft
-    = do let indexDir = lsdir `combine` "index"
-             revFile  = lsdir `combine` "indexRev"
-             
-         revLocked <- newTVarIO False
-         indexDB   <- openIndex indexDir revFile
-
+    = do chan <- startIndexManager lsdir repos mkDraft
          let sto = Storage {
-                     stoIndexRevLocked = revLocked
-                   , stoIndexRevFile   = revFile
-                   , stoIndexDB        = indexDB
-                   , stoRepository     = repos
-                   , stoMakeDraft      = mkDraft
+                     stoRepository = repos
+                   , stoIndexChan  = chan
                    }
-
          syncIndex sto
          return sto
 
 
-getPage :: MonadIO m => Storage -> PageName -> m (Maybe Page)
-getPage sto name
-    = liftIO $ loadDefaultPage name -- FIXME
+getPage :: MonadIO m => Storage -> PageName -> Maybe RevNum -> m (Maybe Page)
+getPage = ((liftIO .) .) . getPage' . stoRepository
 
 
-putPage :: MonadIO m => Storage -> Maybe RevNum -> Page -> m ()
-putPage sto oldRev page
-    = error "FIXME: not implemented"
+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
 
 
-getPageA :: ArrowIO a => Storage -> a PageName (Maybe Page)
-getPageA = arrIO . getPage 
+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
 
 
-putPageA :: ArrowIO a => Storage -> a (Maybe RevNum, Page) ()
+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
 
 
-findAllPages :: Storage -> RevNum -> IO (Set PageName)
-findAllPages sto revNum
-    = findAllDefaultPages -- FIXME
+deletePageA :: ArrowIO a => Storage -> a (Maybe String, PageName) StatusCode
+deletePageA = arrIO2 . deletePage
+
 
+getDirContents :: MonadIO m => Storage -> PageName -> Maybe RevNum -> m [PageName]
+getDirContents = ((liftIO .) .) . getDirContents' . stoRepository
 
--- casket を R/W モードで開く。成功したらそのまま返し、失敗したら
--- indexDir と revFile を削除してから casket を R/W モードで開く。
-openIndex :: FilePath -> FilePath -> IO Database
-openIndex indexDir revFile
-    = do ret <- openDatabase indexDir (Writer [])
-         case ret of
-           Right db
-               -> do debugM logger ("Opened an H.E. database on " ++ indexDir)
-                     return db
 
-           Left err
-               -> do warningM logger ("Failed to open an H.E. database on "
-                                      ++ indexDir ++ ": " ++ show err)
+getDirContentsA :: ArrowIO a => Storage -> a (PageName, Maybe RevNum) [PageName]
+getDirContentsA = arrIO2 . getDirContents
 
-                     indexExists <- doesDirectoryExist indexDir
-                     when indexExists
-                              $ removeDirectoryRecursive indexDir
 
-                     revFileExists <- doesFileExist revFile
-                     when revFileExists
-                              $ removeFile revFile
+searchPages :: MonadIO m => Storage -> Condition -> m SearchResult
+searchPages sto cond
+    = liftIO $
+      do var <- newEmptyTMVarIO
+         atomically $ writeTChan (stoIndexChan sto) (SearchIndex cond var)
+         atomically $ takeTMVar var
 
-                     Right db <- openDatabase indexDir (Writer [Create []])
-                     noticeM logger ("Created an H.E. database on " ++ indexDir)
 
-                     return db
+rebuildIndex :: MonadIO m => Storage -> m ()
+rebuildIndex sto
+    = liftIO $ atomically $ writeTChan (stoIndexChan sto) RebuildIndex
 
 
 syncIndex :: Storage -> IO ()
 syncIndex sto
-    = do Just page <- getPage sto "MainPage"
-         doc       <- stoMakeDraft sto page
-         putStrLn "*** dumping draft..."
-         dumpDraft doc >>= C8.putStr . encodeLazy UTF8
-         putStrLn "*** dumped"
\ No newline at end of file
+    = atomically $ writeTChan (stoIndexChan sto) SyncIndex
+
+
+getAttachment :: (Attachment a, MonadIO m) =>
+                 Storage
+              -> PageName
+              -> String
+              -> Maybe RevNum
+              -> m (Maybe a)
+getAttachment = (((liftIO .) .) .) . getAttachment' . stoRepository
+
+
+putAttachment :: (Attachment a, MonadIO m) =>
+                 Storage
+              -> Maybe String
+              -> Maybe RevNum
+              -> PageName
+              -> String
+              -> a
+              -> m StatusCode
+putAttachment = (((((liftIO .) .) .) .) .) . putAttachment' . stoRepository