Make --tool and --show-criteria 'many'

Fixes #1235

Author: hasufell

lib-opt/GHCup/OptParse/Common.hs

@@ -322,7 +322,7 @@ versionCompleter' criteria tool filter' = listIOCompleter $ do
 
           runEnv = flip runReaderT appState
 
-      installedVersions <- runEnv $ listVersions (Just tool) criteria False False (Nothing, Nothing)
+      installedVersions <- runEnv $ listVersions [tool] criteria False False (Nothing, Nothing)
       return $ fmap (T.unpack . prettyVer) . filter filter' . fmap lVer $ installedVersions
 
 
@@ -481,7 +481,7 @@ checkForUpdates :: ( MonadReader env m
                 => m [(Tool, GHCTargetVersion)]
 checkForUpdates = do
   GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
-  lInstalled <- listVersions Nothing [ListInstalled True] False False (Nothing, Nothing)
+  lInstalled <- listVersions [] [ListInstalled True] False False (Nothing, Nothing)
   let latestInstalled tool = (fmap (\lr -> GHCTargetVersion (lCross lr) (lVer lr)) . lastMay . filter (\lr -> lTool lr == tool)) lInstalled
 
   ghcup <- forMM (getLatest dls GHCup) $ \(GHCTargetVersion _ l, _) -> do

lib-opt/GHCup/OptParse/List.hs

@@ -55,8 +55,8 @@ import GHCup.Prelude.Logger (logDebug)
 
 
 data ListOptions = ListOptions
-  { loTool     :: Maybe Tool
-  , lCriteria  :: Maybe ListCriteria
+  { loTool     :: [Tool]
+  , lCriteria  :: [ListCriteria]
   , lFrom      :: Maybe Day
   , lTo        :: Maybe Day
   , lHideOld   :: Bool
@@ -74,15 +74,15 @@ data ListOptions = ListOptions
 listOpts :: Parser ListOptions
 listOpts =
   ListOptions
-    <$> optional
+    <$> many
           (option
             (eitherReader toolParser)
-            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|stack>" <> help
+            (short 't' <> long "tool" <> metavar "<ghc|cabal|hls|stack|ghcup>" <> help
               "Tool to list versions for. Default is all"
               <> completer toolCompleter
             )
           )
-    <*> optional
+    <*> many
           (option
             (eitherReader criteriaParser)
             (  short 'c'
@@ -238,7 +238,7 @@ list :: ( Monad m
       -> m ExitCode
 list ListOptions{..} no_color pgc runAppState =
   runAppState (do
-      l <- listVersions loTool (maybeToList lCriteria) lHideOld lShowNightly (lFrom, lTo)
+      l <- listVersions loTool lCriteria lHideOld lShowNightly (lFrom, lTo)
       printListResult no_color pgc lRawFormat l
       pure ExitSuccess
     )

lib-opt/GHCup/OptParse/Nuke.hs

@@ -78,7 +78,7 @@ nuke appState runLogger = do
        lift $ logInfo "Initiating Nuclear Sequence 🚀🚀🚀"
        lift $ logInfo "Nuking in 3...2...1"
 
-       lInstalled <- lift $ listVersions Nothing [ListInstalled True] False True (Nothing, Nothing)
+       lInstalled <- lift $ listVersions [] [ListInstalled True] False True (Nothing, Nothing)
 
        forM_ lInstalled (liftE . rmTool)
 

lib-tui/GHCup/Brick/Actions.hs

@@ -702,7 +702,7 @@ getAppData mgi = runExceptT $ do
   settings <- liftIO $ readIORef settings'
 
   flip runReaderT settings $ do
-    lV <- listVersions Nothing [] False True (Nothing, Nothing)
+    lV <- listVersions [] [] False True (Nothing, Nothing)
     pure $ BrickData (reverse lV)
 
 --

lib/GHCup.hs

@@ -557,7 +557,7 @@ rmUnsetTools :: ( MonadReader env m
                 )
              => Excepts '[NotInstalled, UninstallFailed] m ()
 rmUnsetTools = do
-  vers <- lift $ listVersions Nothing [ListInstalled True, ListSet False] False True (Nothing, Nothing)
+  vers <- lift $ listVersions [] [ListInstalled True, ListSet False] False True (Nothing, Nothing)
   forM_ vers $ \ListResult{..} -> case lTool of
     GHC   -> liftE $ rmGHCVer (GHCTargetVersion lCross lVer)
     HLS   -> liftE $ rmHLSVer lVer

lib/GHCup/List.hs

@@ -103,7 +103,7 @@ listVersions :: ( MonadCatch m
                              , HasPlatformReq env
                              , HasGHCupInfo env
                              )
-                          => Maybe Tool
+                          => [Tool]
                           -> [ListCriteria]
                           -> Bool
                           -> Bool
@@ -119,17 +119,16 @@ listVersions lt' criteria hideOld showNightly days = do
   stacks <- getInstalledStacks
   hlsGHCVs <- fmap mkTVer <$> hlsGHCVersions
 
-  go lt' hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
+  go (if null lt' then [GHC, Cabal, HLS, Stack, GHCup] else lt') hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
  where
-  go lt hlsGHCVs cSet cabals hlsSet' hlses sSet stacks = do
-    case lt of
-      Just t -> do
-        GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
-        -- get versions from GHCupDownloads
-        let avTools = availableToolVersions dls t
-        lr <- filter' <$> forM (Map.toList avTools) (toListResult t hlsGHCVs cSet cabals hlsSet' hlses sSet stacks)
-
-        case t of
+  go [] _hlsGHCVs _cSet _cabals _hlsSet' _hlses _sSet _stacks = pure []
+  go (lt:lts) hlsGHCVs cSet cabals hlsSet' hlses sSet stacks = do
+    GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
+    -- get versions from GHCupDownloads
+    let avTools = availableToolVersions dls lt
+    lr <- filter' <$> forM (Map.toList avTools) (toListResult lt hlsGHCVs cSet cabals hlsSet' hlses sSet stacks)
+
+    r <- case lt of
           GHC -> do
             slr <- strayGHCs avTools
             pure (sort (slr ++ lr))
@@ -145,13 +144,8 @@ listVersions lt' criteria hideOld showNightly days = do
           GHCup -> do
             let cg = maybeToList $ currentGHCup avTools
             pure (sort (cg ++ lr))
-      Nothing -> do
-        ghcvers   <- go (Just GHC) hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
-        cabalvers <- go (Just Cabal) hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
-        hlsvers   <- go (Just HLS) hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
-        ghcupvers <- go (Just GHCup) hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
-        stackvers <- go (Just Stack) hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
-        pure (ghcvers <> cabalvers <> hlsvers <> stackvers <> ghcupvers)
+    rn <- go lts hlsGHCVs cSet cabals hlsSet' hlses sSet stacks
+    pure (r <> rn)
   strayGHCs :: ( MonadCatch m
                , MonadReader env m
                , HasDirs env

lib/GHCup/Utils/Parsers.hs

@@ -174,6 +174,7 @@ toolParser s' | t == T.pack "ghc"   = Right GHC
               | t == T.pack "cabal" = Right Cabal
               | t == T.pack "hls"   = Right HLS
               | t == T.pack "stack" = Right Stack
+              | t == T.pack "ghcup" = Right GHCup
               | otherwise           = Left ("Unknown tool: " <> s')
   where t = T.toLower (T.pack s')