sim command fixes

This commit is contained in:
Joey Hess 2024-09-12 16:39:44 -04:00
parent 52891711d2
commit 2cbd3fb26b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -27,8 +27,9 @@ seek :: CmdParams -> CommandSeek
seek ("start":[]) = start Nothing seek ("start":[]) = start Nothing
seek ("start":simfile:[]) = start (Just simfile) seek ("start":simfile:[]) = start (Just simfile)
seek ("end":[]) = do seek ("end":[]) = do
simdir <- fromRepo gitAnnexSimDir simdir <- fromRawFilePath <$> fromRepo gitAnnexSimDir
liftIO $ removeDirectoryRecursive $ fromRawFilePath simdir whenM (liftIO $ doesDirectoryExist simdir) $ do
liftIO $ removeDirectoryRecursive simdir
seek ("visit":reponame:[]) = do seek ("visit":reponame:[]) = do
simdir <- fromRepo gitAnnexSimDir simdir <- fromRepo gitAnnexSimDir
liftIO (restoreSim simdir) >>= \case liftIO (restoreSim simdir) >>= \case
@ -76,9 +77,10 @@ start simfile = do
{ simFile = Just simlogfile } { simFile = Just simlogfile }
case simfile of case simfile of
Nothing -> startup simdir st [] Nothing -> startup simdir st []
Just f -> case parseSimFile f of Just f -> liftIO (readFile f) >>= \c ->
Left err -> giveup err case parseSimFile c of
Right cs -> startup simdir st cs Left err -> giveup err
Right cs -> startup simdir st cs
showLongNote $ UnquotedString "Sim started, logging to sim file " showLongNote $ UnquotedString "Sim started, logging to sim file "
<> QuotedPath (toRawFilePath simlogfile) <> QuotedPath (toRawFilePath simlogfile)
where where