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

more RawFilePath conversion

Browse source 
580/645

This commit was sponsored by Jack Hill on Patreon.
This commit is contained in:
Joey Hess 2020-11-03 18:34:27 -04:00
parent eb42cd4d46
commit 4bcb4030a5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
10 changed files with 61 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Command/ImportFeed.hs
View file

@ -454,9 +454,10 @@ feedProblem url message = ifM (checkFeedBroken url)
- least 23 hours. -}
checkFeedBroken :: URLString -> Annex Bool
checkFeedBroken url = checkFeedBroken' url =<< feedState url
checkFeedBroken' :: URLString -> FilePath -> Annex Bool
checkFeedBroken' :: URLString -> RawFilePath -> Annex Bool
checkFeedBroken' url f = do
prev <- maybe Nothing readish <$> liftIO (catchMaybeIO $ readFile f)
prev <- maybe Nothing readish
<$> liftIO (catchMaybeIO $ readFile (fromRawFlePath f))
now <- liftIO getCurrentTime
case prev of
Nothing -> do
@ -471,7 +472,9 @@ checkFeedBroken' url f = do
return broken
clearFeedProblem :: URLString -> Annex ()
clearFeedProblem url = void $ liftIO . tryIO . removeFile =<< feedState url
clearFeedProblem url =
void $ liftIO . tryIO . removeFile . fromRawFilePath
=<< feedState url
feedState :: URLString -> Annex FilePath
feedState :: URLString -> Annex RawFilePath
feedState url = fromRepo $ gitAnnexFeedState $ fromUrl url Nothing