Merge branch '81-dev-zip-upload' of...

Merge branch '81-dev-zip-upload' of ssh://gitlab.iscpif.fr:20022/gargantext/haskell-gargantext into dev-merge

src/Gargantext/API/Node/Corpus/New.hs

@@ -257,6 +257,7 @@ addToCorpusWithForm user cid (NewWithForm ft d l _n) logStatus jobLog = do
       CSV       -> Parser.parseFormat Parser.CsvGargV3
       WOS       -> Parser.parseFormat Parser.WOS
       PresseRIS -> Parser.parseFormat Parser.RisPresse
+      ZIP       -> Parser.parseFormat Parser.ZIP
 
   -- TODO granularity of the logStatus
   eDocs <- liftBase $ parse $ cs d
@@ -370,3 +371,4 @@ addToCorpusWithFile user cid nwf@(NewWithFile _d _l fName) logStatus = do
                 , _scst_remaining = Just 0
                 , _scst_events    = Just []
                 }
+

src/Gargantext/API/Node/Corpus/New/File.hs

@@ -45,25 +45,24 @@ data FileType = CSV
               | CSV_HAL
               | PresseRIS
               | WOS
+              | ZIP
   deriving (Eq, Show, Generic)
 
 instance ToSchema FileType
-instance Arbitrary FileType
-  where
-    arbitrary = elements [CSV, PresseRIS]
+instance Arbitrary FileType where arbitrary = elements [CSV, PresseRIS]
 instance ToParamSchema FileType
 
 instance FromJSON FileType
 instance ToJSON FileType
 
-instance ToParamSchema (MultipartData Mem) where
-  toParamSchema _ = toParamSchema (Proxy :: Proxy TODO)
+instance ToParamSchema (MultipartData Mem) where toParamSchema _ = toParamSchema (Proxy :: Proxy TODO)
 
 instance FromHttpApiData FileType
   where
     parseUrlPiece "CSV"       = pure CSV
     parseUrlPiece "CSV_HAL"   = pure CSV_HAL
     parseUrlPiece "PresseRis" = pure PresseRIS
+    parseUrlPiece "ZIP"       = pure ZIP
     parseUrlPiece _           = pure CSV -- TODO error here
 
 

src/Gargantext/Core/Text/Corpus/Parsers.hs

@@ -68,6 +68,7 @@ type ParseError = String
 -- different parser are available.
 data FileFormat = WOS | RIS | RisPresse
                 | CsvGargV3 | CsvHal
+                | ZIP
   deriving (Show)
 
 -- Implemented (ISI Format)
@@ -94,6 +95,9 @@ parseFormat WOS bs = do
           $ partitionEithers
           $ [runParser'  WOS bs]
   pure $ Right docs
+parseFormat ZIP _bs = do
+  printDebug "[parseFormat]" ZIP
+  pure $ Left "Not implemented for ZIP"
 parseFormat _ _ = undefined
 
 -- | Parse file into documents