diff --git a/src/Text/Xournal/Parse.hs b/src/Text/Xournal/Parse.hs
--- a/src/Text/Xournal/Parse.hs
+++ b/src/Text/Xournal/Parse.hs
@@ -29,21 +29,33 @@
import Prelude hiding (takeWhile)
+-- |
+
skipSpaces :: Parser ()
skipSpaces = satisfy isHorizontalSpace *> skipWhile isHorizontalSpace
+-- |
+
trim_starting_space :: Parser ()
trim_starting_space = do try endOfInput
<|> takeWhile (inClass " \n") *> return ()
-
+
+-- |
+
langle :: Parser Char
langle = char '<'
+-- |
+
rangle :: Parser Char
rangle = char '>'
+-- |
+
xmlheader :: Parser B.ByteString
xmlheader = string " takeTill (inClass "?>") <* string "?>"
+
+-- |
headercontentWorker :: B.ByteString -> Parser B.ByteString
headercontentWorker bstr = do
@@ -51,9 +63,13 @@
((string "?>" >>= return . (bstr `B.append` h `B.append`))
<|> headercontentWorker (bstr `B.append` h))
+-- |
+
headercontent :: Parser B.ByteString
headercontent = headercontentWorker B.empty
-
+
+-- |
+
stroketagopen :: Parser Stroke -- B.ByteString
stroketagopen = do
trim
@@ -76,9 +92,13 @@
char '>'
return $ Stroke tool color width []
+-- |
+
stroketagclose :: Parser B.ByteString
stroketagclose = string ""
+-- |
+
onestroke :: Parser Stroke
onestroke = do trim
strokeinit <- stroketagopen
@@ -91,15 +111,20 @@
stroketagclose
return $ strokeinit { stroke_data = coordlist }
+-- |
+
trim :: Parser ()
trim = trim_starting_space
+-- |
+
parser_xournal :: Parser Xournal
parser_xournal = do trim
xmlheader "xmlheader"
trim
xournal "xournal"
+-- |
xournal :: Parser Xournal
xournal = do trim
@@ -113,6 +138,8 @@
trim
xournalclose
return $ Xournal t pgs
+
+-- |
page :: Parser Page
page = do trim
@@ -125,7 +152,8 @@
pageclose
return $ Page dim bkg layers
-
+-- |
+
layer :: Parser Layer
layer = do trim
layerheader
@@ -135,6 +163,7 @@
layerclose
return $ Layer strokes
+-- |
title :: Parser B.ByteString
title = do trim
@@ -143,12 +172,18 @@
titleclose
return str
+-- |
+
titleheader :: Parser B.ByteString
titleheader = string ""
+-- |
+
titleclose :: Parser B.ByteString
titleclose = string ""
+-- |
+
preview :: Parser ()
preview = do trim
previewheader
@@ -156,24 +191,38 @@
previewclose
trim
+-- |
+
previewheader :: Parser B.ByteString
previewheader = string ""
+-- |
+
previewclose :: Parser B.ByteString
previewclose = string ""
+-- |
+
xournalheader :: Parser B.ByteString
xournalheader = xournalheaderstart *> takeTill (inClass ">") <* xournalheaderend
+-- |
+
xournalheaderstart :: Parser B.ByteString
xournalheaderstart = string "'
+-- |
+
xournalclose :: Parser B.ByteString
xournalclose = string ""
+-- |
+
pageheader :: Parser Dimension
pageheader = do pageheaderstart
trim
@@ -189,22 +238,34 @@
takeTill (inClass ">")
pageheaderend
return $ Dim w h
+
+-- |
pageheaderstart :: Parser B.ByteString
pageheaderstart = string "'
+-- |
+
pageclose :: Parser B.ByteString
pageclose = string ""
+-- |
+
layerheader :: Parser B.ByteString
layerheader = string ""
+-- |
+
layerclose :: Parser B.ByteString
layerclose = string ""
+-- |
+
background :: Parser Background
background = do
trim
@@ -257,11 +318,13 @@
backgroundclose
return $ BackgroundPdf typ mdomain mfilename pnum
-
+-- |
alphabet :: Parser B.ByteString
alphabet = takeWhile1 (\w -> (w >= 65 && w <= 90) || (w >= 97 && w <= 122))
+-- |
+
alphanumsharp :: Parser B.ByteString
alphanumsharp = takeWhile1 (\w -> (w >= 65 && w <= 90)
|| (w >= 97 && w <= 122)
@@ -269,6 +332,7 @@
|| ( w== 35) )
-- | need to be reimplemented
+
parseFileName :: Parser B.ByteString
parseFileName = takeTill (inClass ['"'])
-- takeWhilw1 (\w -> (w >= 65 && w <= 90)
@@ -276,25 +340,38 @@
-- || (w >= 48 && w <= 57)
-- || (w == 35)
+-- |
+
backgroundheader :: Parser B.ByteString
backgroundheader = string ""
+-- |
+
iter_xournal :: Iter.Iteratee B.ByteString IO Xournal
iter_xournal = AI.parserToIteratee parser_xournal
+-- |
+
read_xournal :: String -> IO Xournal
read_xournal str = Iter.fileDriver iter_xournal str
+-- |
+
read_xojgz :: String -> IO Xournal
read_xojgz str = Iter.fileDriver (Iter.joinIM (ungzipXoj iter_xournal)) str
+-- |
cat_xournalgz :: String -> IO ()
cat_xournalgz str = Iter.fileDriver
(Iter.joinIM (ungzipXoj printLinesUnterminated)) str
+
+-- |
onlyresult (Done _ r) = r
diff --git a/src/Text/Xournal/Parse/Enumerator.hs b/src/Text/Xournal/Parse/Enumerator.hs
--- a/src/Text/Xournal/Parse/Enumerator.hs
+++ b/src/Text/Xournal/Parse/Enumerator.hs
@@ -18,7 +18,8 @@
import Debug.Trace
import qualified Data.ByteString as S
import Data.Enumerator as E hiding (foldl')
-import qualified Data.Enumerator.List as EL
+import qualified Data.Enumerator.List as EL
+import qualified Codec.Zlib.Enum as EZ
import Control.Applicative
import Control.Monad.Trans
import Control.Monad
@@ -34,10 +35,11 @@
import Data.XML.Types
import Text.XML.Stream.Render
import Text.XML.Stream.Parse hiding (many)
+import Text.Xournal.Parse.Zlib
import System.IO
import Data.Xournal.Simple
-import Data.Enumerator.Binary (enumHandle)
+import Data.Enumerator.Binary (enumHandle, enumFile)
import Prelude hiding ((.),id)
@@ -373,6 +375,20 @@
parseXojFile :: FilePath -> IO (Either String Xournal)
parseXojFile fp = withFile fp ReadMode $ \ih -> parseXmlFile ih pXournal
+
+-- |
+
+parseXojGzFile :: FilePath -> IO (Either String Xournal)
+parseXojGzFile fp =
+ run_ $ enumFile fp $$ EZ.ungzip =$ parseBytes def =$ pXournal
+
+-- |
+
+parseXournal :: FilePath -> IO (Either String Xournal)
+parseXournal fname =
+ checkIfBinary fname >>= \b ->
+ if b then parseXojGzFile fname else parseXojFile fname
+
-- | printing for debug
diff --git a/src/Text/Xournal/Parse/Zlib.hs b/src/Text/Xournal/Parse/Zlib.hs
--- a/src/Text/Xournal/Parse/Zlib.hs
+++ b/src/Text/Xournal/Parse/Zlib.hs
@@ -1,4 +1,3 @@
-
-----------------------------------------------------------------------------
-- |
-- Module : Text.Xournal.Parse.Zlib
@@ -9,13 +8,37 @@
-- Stability : experimental
-- Portability : GHC
--
+-----------------------------------------------------------------------------
+
module Text.Xournal.Parse.Zlib where
import Control.Monad.IO.Class
-import Data.Iteratee.ZLib
-import Data.Iteratee
-import Data.ByteString
+import Data.Iteratee.ZLib as IZ
+import Data.Iteratee as I
+-- import Codec.Zlib.Enum as EZ
+-- import Data.Enumerator as E
+import Data.ByteString
+import qualified Data.ByteString.Lazy as LB
-ungzipXoj :: MonadIO m => Enumerator ByteString m a
-ungzipXoj = enumInflate GZip defaultDecompressParams
+import System.IO
+
+-- |
+
+ungzipXoj :: MonadIO m => I.Enumerator ByteString m a
+ungzipXoj = IZ.enumInflate IZ.GZip IZ.defaultDecompressParams
+
+-- |
+
+-- gunzipXojEnum :: MonadIO m => E.Enumeratee ByteString ByteString m a
+-- gunzipXojEnum = EZ.decompress EZ.defaultWindowBits
+
+
+
+-- | check if gzip or not
+
+checkIfBinary :: FilePath -> IO Bool
+checkIfBinary fname =
+ withFile fname ReadMode $ \h -> do
+ b <- return . LB.any ( == 0 ) . LB.take 100 =<< LB.hGetContents h
+ b `seq` return b
diff --git a/xournal-parser.cabal b/xournal-parser.cabal
--- a/xournal-parser.cabal
+++ b/xournal-parser.cabal
@@ -1,5 +1,5 @@
Name: xournal-parser
-Version: 0.4
+Version: 0.4.1
Synopsis: Xournal file parser
Description: Text parser for xournal xml file
Homepage: http://ianwookim.org/hxournal
@@ -14,19 +14,7 @@
type: git
location: http://www.github.com/wavewave/xournal-parser
--- Executable xptest
--- Main-is: xptest.hs
--- hs-source-dirs: test
--- ghc-options: -Wall -threaded -funbox-strict-fields -fno-warn-unused-do-bind
--- ghc-prof-options: -caf-all -auto-all
--- Build-Depends:
--- base>4,
--- xml-types == 0.3.*,
--- enumerator == 0.4.*,
--- mtl,
--- xournal-parser
-
Library
hs-source-dirs: src
ghc-options: -Wall -funbox-strict-fields -fno-warn-unused-do-bind
@@ -46,7 +34,8 @@
xournal-types == 0.4.*,
xml-types == 0.3.*,
text == 0.11.*,
- fclabels == 1.0.*
+ fclabels == 1.0.*,
+ zlib-enum == 0.2.*
Exposed-Modules:
Text.Xournal.Parse