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

importfeed: Move error to where --json-error-messages can capture it

Browse source 
Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
This commit is contained in:
Joey Hess 2023-05-09 16:22:09 -04:00
parent 04ee6c4c6b
commit 6b54ea69e3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Command/ImportFeed.hs
View file

@ -89,7 +89,7 @@ seek o = startConcurrency commandStages $ do
startpendingdownloads addunlockedmatcher cache dlst checkst True startpendingdownloads addunlockedmatcher cache dlst checkst True
checkfeedproblems checkst clearfeedproblems checkst
where where
getpendingdownloads dlst blocking getpendingdownloads dlst blocking
| blocking = do | blocking = do
@ -128,15 +128,11 @@ seek o = startConcurrency commandStages $ do
commandAction $ commandAction $
startDownload addunlockedmatcher o cache cv i startDownload addunlockedmatcher o cache cv i
checkfeedproblems checkst = do clearfeedproblems checkst = do
m <- liftIO $ atomically $ readTVar checkst m <- liftIO $ atomically $ readTVar checkst
forM_ (M.toList m) $ \(url, cvl) -> forM_ (M.toList m) $ \(url, cvl) ->
ifM (and <$> mapM (liftIO . atomically . takeTMVar) cvl) whenM (and <$> mapM (liftIO . atomically . takeTMVar) cvl) $
( clearFeedProblem url clearFeedProblem url
-- FIXME: This will not be captured in json
, void $ feedProblem url
"problem downloading some item(s) from feed"
)
getFeed getFeed
:: URLString :: URLString
@ -407,8 +403,10 @@ runDownload todownload url extension cache cv getter = do
Just ks Just ks
-- Download problem. -- Download problem.
| null ks -> do | null ks -> do
liftIO . atomically . putTMVar cv broken <- checkFeedBroken (feedurl todownload)
=<< checkFeedBroken (feedurl todownload) when broken $
void $ feedProblem url "download failed"
liftIO $ atomically $ putTMVar cv broken
next $ return False next $ return False
| otherwise -> do | otherwise -> do
forM_ ks $ \key -> forM_ ks $ \key ->
@ -456,12 +454,14 @@ runDownload todownload url extension cache cv getter = do
) )
startUrlDownload :: TMVar Bool -> URLString -> CommandPerform -> CommandStart startUrlDownload :: TMVar Bool -> URLString -> CommandPerform -> CommandStart
startUrlDownload cv u a = starting "addurl" startUrlDownload cv url a = starting "addurl"
(ActionItemOther (Just (UnquotedString u))) (ActionItemOther (Just (UnquotedString url)))
(SeekInput []) (SeekInput [])
(a `onException` recordfailure) (a `onException` recordfailure)
where where
recordfailure = liftIO $ atomically $ tryPutTMVar cv False recordfailure = do
void $ feedProblem url "download failed"
liftIO $ atomically $ tryPutTMVar cv False
defaultTemplate :: String defaultTemplate :: String
defaultTemplate = "${feedtitle}/${itemtitle}${extension}" defaultTemplate = "${feedtitle}/${itemtitle}${extension}"