8e5ea28c26The hoped for optimisation of CommandStart with -J did not materialize. In fact, not runnign CommandStart in parallel is slower than -J3. So, CommandStart are still run in parallel. (The actual bad performance I've been seeing with -J in my big repo has to do with building the remoteList.) But, this is still progress toward making -J faster, because it gets rid of the onlyActionOn roadblock in the way of making CommandCleanup jobs run separate from CommandPerform jobs. Added OnlyActionOn constructor for ActionItem which fixes the onlyActionOn breakage in the last commit. Made CustomOutput include an ActionItem, so even things using it can specify OnlyActionOn. In Command.Move and Command.Sync, there were CommandStarts that used includeCommandAction, so output messages, which is no longer allowed. Fixed by using startingCustomOutput, but that's still not quite right, since it prevents message display for the includeCommandAction run inside it too.
55 lines
1.3 KiB
Haskell
55 lines
1.3 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2017 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Inprogress where
|
|
|
|
import Command
|
|
import Annex.Transfer
|
|
|
|
import qualified Data.Set as S
|
|
|
|
cmd :: Command
|
|
cmd = noCommit $ noMessages $ command "inprogress" SectionQuery
|
|
"access files while they're being downloaded"
|
|
paramPaths (seek <$$> optParser)
|
|
|
|
data InprogressOptions = InprogressOptions
|
|
{ inprogressFiles :: CmdParams
|
|
, allOption :: Bool
|
|
}
|
|
|
|
optParser :: CmdParamsDesc -> Parser InprogressOptions
|
|
optParser desc = InprogressOptions
|
|
<$> cmdParams desc
|
|
<*> switch
|
|
( long "all"
|
|
<> short 'A'
|
|
<> help "access all files currently being downloaded"
|
|
)
|
|
|
|
seek :: InprogressOptions -> CommandSeek
|
|
seek o = do
|
|
ts <- map (transferKey . fst) <$> getTransfers
|
|
if allOption o
|
|
then forM_ ts $ commandAction . start'
|
|
else do
|
|
let s = S.fromList ts
|
|
withFilesInGit
|
|
(commandAction . (whenAnnexed (start s)))
|
|
=<< workTreeItems (inprogressFiles o)
|
|
|
|
start :: S.Set Key -> FilePath -> Key -> CommandStart
|
|
start s _file k
|
|
| S.member k s = start' k
|
|
| otherwise = stop
|
|
|
|
start' :: Key -> CommandStart
|
|
start' k = startingCustomOutput k $ do
|
|
tmpf <- fromRepo $ gitAnnexTmpObjectLocation k
|
|
whenM (liftIO $ doesFileExist tmpf) $
|
|
liftIO $ putStrLn tmpf
|
|
next $ return True
|