From 7fc650381297dc3481e14087a54c79d22b0b92d7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 11 Jul 2023 22:08:19 -0400 Subject: [PATCH] fix waiting for all started feed downloads with -J importfeed bug fix: When -J was used with multiple feeds, some feeds did not get their items downloaded. In my case, I had added a feed to the end of the list, and no items from it were ever downloaded. Sponsored-by: Leon Schuermann on Patreon --- CHANGELOG | 2 ++ Command/ImportFeed.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3519f8a28f..402876962b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,8 @@ git-annex (10.20230627) UNRELEASED; urgency=medium * importfeed: Add feedurl to the metadata (and allow it to be used in the --template) * Improve resuming interrupted download when using yt-dlp. + * importfeed bug fix: When -J was used with multiple feeds, some feeds + did not get their items downloaded. -- Joey Hess Mon, 26 Jun 2023 13:10:40 -0400 diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index 072f285b08..9b51b03a7f 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -101,7 +101,7 @@ seek o = startConcurrency commandStages $ do return m else let (pending, rest) = M.partition ispending m - in if M.null pending + in if M.null pending || not (M.null rest) then retry else do putTMVar dlst rest -- 2.30.2