[WIP] Optimistic download

src/CommandParsers.hs

@@ -56,6 +56,13 @@ concurrentlyParser = ConcurrentlyFlag <$> Opts.switch
        "Maximise concurrency while performing the operation. Might make verbose output hard to follow."
   )
 
+optimisticParser :: Opts.Parser OptimisticFlag
+optimisticParser = OptimisticFlag <$> Opts.switch
+  (  Opts.long "optimistic"
+  <> Opts.help
+        "If there are .version files, skip frameworks and related artifacts. Only affects download."
+  )
+
 reposParser :: Opts.Parser [ProjectName]
 reposParser = Opts.many
   (Opts.argument
@@ -96,6 +103,7 @@ udcPayloadParser =
     <*> noIgnoreParser
     <*> noSkipCurrentParser
     <*> concurrentlyParser
+    <*> optimisticParser
 
 uploadParser :: Opts.Parser RomeCommand
 uploadParser = pure Upload <*> udcPayloadParser

src/Data/Carthage/VersionFile.hs

@@ -4,34 +4,25 @@ module Data.Carthage.VersionFile where
 
 
 import           Data.Carthage.Common
-import           Data.Carthage.TargetPlatform
-import qualified Data.Map.Strict              as M
 import           Data.Aeson
 import           Data.Aeson.Types
 
 
-type FrameworkPlatformInfoMap = M.Map TargetPlatform [FrameworkPlatformInfo]
 
-
-data FrameworkInfo = FrameworkInfo { _hash           :: String
-                                   , _frameworkName  :: String
+data FrameworkInfo = FrameworkInfo { _hash                  :: String
+                                   , _frameworkName         :: String
+                                   , _swiftToolChainVersion :: Maybe String
                                    }
                                   deriving (Show, Eq)
 
 instance FromJSON FrameworkInfo where
   parseJSON (Object v) = FrameworkInfo <$>
                        v .: "hash" <*>
-                       v .: "name"
+                       v .: "name" <*>
+                       v .:? "swiftToolchainVersion"
   parseJSON invalid    = typeMismatch "FrameworkInfo" invalid
 
-data FrameworkPlatformInfo = FrameworkPlatformInfo { targetPlatform :: TargetPlatform
-                                                   , hash           :: String
-                                                   , frameworkName  :: String
-                                                   }
-                                                   deriving (Show, Eq)
-
 data VersionFileEntry = VersionFileEntry { commitish    :: Version
-                                         , xcodeVersion :: String
                                          , iOSFramewoksInfo :: Maybe [FrameworkInfo]
                                          , tvOSFrameworksInfo :: Maybe [FrameworkInfo]
                                          , watchOSFrameworksInfo :: Maybe [FrameworkInfo]
@@ -42,10 +33,8 @@ data VersionFileEntry = VersionFileEntry { commitish    :: Version
 instance FromJSON VersionFileEntry where
   parseJSON (Object v) = VersionFileEntry
                       <$> (Version <$> v .: "commitish")
-                      <*> v .: "xcodeVersion"
                       <*> v .:? "iOS"
                       <*> v .:? "tvOS"
                       <*> v .:? "watchOS"
                       <*> v .:? "Mac"
-
   parseJSON invalid    = typeMismatch "VersionFileEntry" invalid