eliminate showStart showStartOther
These were not handling control characters and are redundant. Sponsored-by: Jack Hill on Patreon
This commit is contained in:
parent
3290a09a70
commit
a0e6fa18eb
7 changed files with 22 additions and 39 deletions
|
@ -37,7 +37,7 @@ start :: CommandStart
|
|||
start = do
|
||||
guardTest
|
||||
logf <- fromRepo gitAnnexFuzzTestLogFile
|
||||
showStart "fuzztest" (toRawFilePath logf) (SeekInput [])
|
||||
showStartMessage (StartMessage "fuzztest" (ActionItemOther (Just (UnquotedString logf))) (SeekInput []))
|
||||
logh <- liftIO $ openFile logf WriteMode
|
||||
void $ forever $ fuzz logh
|
||||
stop
|
||||
|
|
|
@ -81,7 +81,7 @@ seek o = do
|
|||
|
||||
getFeed :: AddUnlockedMatcher -> ImportFeedOptions -> Cache -> URLString -> CommandSeek
|
||||
getFeed addunlockedmatcher opts cache url = do
|
||||
showStartOther "importfeed" (Just url) (SeekInput [])
|
||||
showStartMessage (StartMessage "importfeed" (ActionItemOther (Just (UnquotedString url))) (SeekInput []))
|
||||
withTmpFile "feed" $ \tmpf h -> do
|
||||
liftIO $ hClose h
|
||||
ifM (downloadFeed url tmpf)
|
||||
|
@ -148,7 +148,7 @@ getCache :: Maybe String -> Annex Cache
|
|||
getCache opttemplate = ifM (Annex.getRead Annex.force)
|
||||
( ret S.empty S.empty
|
||||
, do
|
||||
showStart "importfeed" "gathering known urls" (SeekInput [])
|
||||
showStartMessage (StartMessage "importfeed" (ActionItemOther (Just "gathering known urls")) (SeekInput []))
|
||||
(us, is) <- knownItems
|
||||
showEndOk
|
||||
ret (S.fromList us) (S.fromList is)
|
||||
|
@ -373,7 +373,7 @@ performDownload' started addunlockedmatcher opts cache todownload = case locatio
|
|||
)
|
||||
|
||||
starturl u = unless started $
|
||||
showStartOther "addurl" (Just u) (SeekInput [])
|
||||
showStartMessage (StartMessage "addurl" (ActionItemOther (Just (UnquotedString u))) (SeekInput []))
|
||||
|
||||
defaultTemplate :: String
|
||||
defaultTemplate = "${feedtitle}/${itemtitle}${extension}"
|
||||
|
|
|
@ -182,7 +182,7 @@ itemInfo o (si, p) = ifM (isdir (toRawFilePath p))
|
|||
|
||||
noInfo :: String -> SeekInput -> String -> Annex ()
|
||||
noInfo s si msg = do
|
||||
showStart "info" (encodeBS s) si
|
||||
showStartMessage (StartMessage "info" (ActionItemOther (Just (UnquotedString s))) si)
|
||||
showNote msg
|
||||
showEndFail
|
||||
Annex.incError
|
||||
|
|
|
@ -196,7 +196,7 @@ same a b
|
|||
{- reads the config of a remote, with progress display -}
|
||||
scan :: Git.Repo -> Annex Git.Repo
|
||||
scan r = do
|
||||
showStartOther "map" (Just $ Git.repoDescribe r) (SeekInput [])
|
||||
showStartMessage (StartMessage "map" (ActionItemOther (Just $ UnquotedString $ Git.repoDescribe r)) (SeekInput []))
|
||||
v <- tryScan r
|
||||
case v of
|
||||
Just r' -> do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue