Skipping malformed lines in Cartfile.resolved

Rome.cabal

@@ -1,5 +1,5 @@
 name:                Rome
-version:             0.10.1.22
+version:             0.10.2.23
 synopsis:            An S3 cache for Carthage
 description:         Please see README.md
 homepage:            https://github.com/blender/Rome

app/Main.hs

@@ -9,7 +9,7 @@ import           Options.Applicative  as Opts
 
 
 romeVersion :: String
-romeVersion = "0.10.1.22"
+romeVersion = "0.10.2.23"
 
 
 

src/Configuration.hs

@@ -12,7 +12,7 @@ import           Types
 
 getCartfileEntires :: RomeMonad [CartfileEntry]
 getCartfileEntires = do
-  eitherCartfileEntries <- liftIO $ parseCartfileResolved cartfileResolved
+  eitherCartfileEntries <- parseCartfileResolved cartfileResolved
   case eitherCartfileEntries of
     Left e -> throwError $ "Carfile.resolved parse error: " ++ show e
     Right cartfileEntries -> return cartfileEntries

src/Data/Carthage/Cartfile.hs

@@ -16,7 +16,10 @@ import qualified Text.Parsec          as Parsec
 import qualified Text.Parsec.String   as Parsec
 import qualified Text.Parsec.Utils    as Parsec
 
+import           Control.Monad.Trans  (MonadIO, liftIO)
 import           Data.Carthage.Common
+import           Data.Maybe           (fromJust, isJust)
+
 
 newtype Location = Location { unLocation :: String }
                    deriving (Eq, Show, Ord)
@@ -45,7 +48,7 @@ parseGit :: Parsec.Parsec String () RepoHosting
 parseGit = Parsec.string "git" >> Parsec.many1 Parsec.space >> pure Git
 
 repoHosting :: Parsec.Parsec String () RepoHosting
-repoHosting = Parsec.try parseGit <|> parseGitHub
+repoHosting = Parsec.try parseGit <|> Parsec.try parseGitHub
 
 quotedContent :: Parsec.Parsec String () String
 quotedContent = do
@@ -60,8 +63,12 @@ parseCartfileResolvedLine = do
   location <- fmap Location quotedContent
   Parsec.many1 Parsec.space
   version <- fmap Version quotedContent
-  Parsec.endOfLine
   return CartfileEntry {..}
 
-parseCartfileResolved :: String -> IO (Either Parsec.ParseError [CartfileEntry])
-parseCartfileResolved = Parsec.parseFromFile (Parsec.many1 (Parsec.optional Parsec.spaces >> parseCartfileResolvedLine))
+parseCartfileResolved :: MonadIO m => String -> m (Either Parsec.ParseError [CartfileEntry])
+parseCartfileResolved f = liftIO $ do
+  parseResult <- Parsec.parseFromFile (Parsec.many1 (Parsec.optional Parsec.spaces
+                                        >> Parsec.optionMaybe parseCartfileResolvedLine
+                                        >>= \cartFileLines -> Parsec.manyTill Parsec.anyChar Parsec.endOfLine
+                                            >> return cartFileLines)) f
+  return $ parseResult >>= \r -> pure [fromJust x | x <- r, isJust x]