mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor

Browse source
This commit is contained in:
Joey Hess 2012-08-02 13:47:26 -04:00
parent 6b38227bad
commit d2f9759443
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Assistant/Alert.hs
View file

@ -247,18 +247,11 @@ sanityCheckFixAlert msg = Alert
combinemessage _ _ = Nothing combinemessage _ _ = Nothing
addFileAlert :: FilePath -> Alert addFileAlert :: FilePath -> Alert
addFileAlert file = (activityAlert (Just "Added") $ trim $ takeFileName file) addFileAlert file = (activityAlert (Just "Added") $ shortFile $ takeFileName file)
{ alertName = Just AddFileAlert { alertName = Just AddFileAlert
, alertCombiner = messageCombiner combinemessage , alertCombiner = messageCombiner combinemessage
} }
where where
trim f
| len < maxlen = f
| otherwise = take half f ++ ".." ++ drop (len - half) f
where
len = length f
maxlen = 20
half = (maxlen - 2) `div` 2
combinemessage (StringAlert new) (StringAlert old) = combinemessage (StringAlert new) (StringAlert old) =
Just $ StringAlert $ Just $ StringAlert $
unlines $ take 10 $ new : lines old unlines $ take 10 $ new : lines old
@ -274,3 +267,13 @@ messageCombiner combinemessage = Just go
Nothing -> Nothing Nothing -> Nothing
Just !m -> Just $! old { alertMessage = m } Just !m -> Just $! old { alertMessage = m }
| otherwise = Nothing | otherwise = Nothing
shortFile :: FilePath -> String
shortFile f
| len < maxlen = f
| otherwise = take half f ++ ".." ++ drop (len - half) f
where
len = length f
maxlen = 20
half = (maxlen - 2) `div` 2