hasufell
/
ghup
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix repo parser

This commit is contained in:
Julian Ospald 2020-02-01 00:26:40 +01:00
parent 20a9fcd210
commit f8dd4b9f95
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/GHup.hs
View File

@ -44,6 +44,7 @@ import Control.Monad.Fail
import Control.Monad.Reader hiding ( fail )
import Data.Attoparsec.ByteString
import Data.ByteString ( ByteString )
import qualified Data.ByteString as B
import qualified Data.ByteString.UTF8 as UTF8
import qualified Data.ByteString.Lazy.UTF8 as LUTF8
import Data.Functor ( (<&>) )
@ -361,11 +362,17 @@ ghURLParser =
*> takeWhile1 (/= _slash)
<* word8 _slash
)
<*> (takeWhile1 (/= _period) <* ((str ".git" <|> empty') <* endOfInput))
<*> parseRepoName
where
str = string . u8
empty' = str ""
parseRepoName :: Parser ByteString
parseRepoName = do
c <- fmap B.singleton anyWord8
r <- many1' ((str ".git" <* endOfInput) <|> fmap B.singleton anyWord8)
if last r == u8 ".git"
then pure $ mconcat (c : (init r))
else pure (mconcat (c : r)) <* endOfInput