Yvee1/hascard
1
1
Fork 0
mirror of https://github.com/Yvee1/hascard.git synced 2024-11-22 04:33:06 +03:00
Code Issues Projects Releases Wiki Activity

Fix import to definition card

Browse Source
This commit is contained in:
Steven van den Broek 2021-07-16 22:41:16 +02:00
parent 3e34b42599
commit 9554a3d75b
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Import.hs
View File

@ -61,20 +61,28 @@ pRow opts =
pTerm = manyTill anySingle . lookAhead . try $ pSpecial opts
pDefs = maybe (fmap (:[]) (pDef opts)) (pDef opts `sepBy`) pDefDelimiter
defBeforeTerm = opts ^. optImportReverse
in do
(term, defs) <- if defBeforeTerm
then do
defs' <- pDefs
in
case (defBeforeTerm, opts ^. optImportType) of
(False, Open) -> do
term <- pTerm
pTermDefDelimiter
term' <- pTerm
return (term', defs')
else do
term' <- pTerm
defs <- pDefs
return $ OpenQuestion (filter (/= '\n') term) Nothing (P "" (NE.fromList (map (dropWhile isSpace) defs)) (Normal ""))
(True, Open) -> do
defs <- pDefs
pTermDefDelimiter
defs' <- pDefs
return (term', defs')
return $ OpenQuestion (filter (/= '\n') term) Nothing (P "" (NE.fromList (map (dropWhile isSpace) defs)) (Normal ""))
term <- pTerm
return $ OpenQuestion (filter (/= '\n') term) Nothing (P "" (NE.fromList (map (dropWhile isSpace) defs)) (Normal ""))
(False, Def) -> do
term <- pTerm
pTermDefDelimiter
def <- pDef opts
return $ Definition (filter (/= '\n') term) Nothing def
(True, Def) -> do
def <- pDef opts
pTermDefDelimiter
term <- pTerm
return $ Definition (filter (/= '\n') term) Nothing def
pDef :: ImportOpts -> Parser String
pDef opts = maybe