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

nub list of files

Browse source 
yt-dlp when resumed was observed having written the same filename twice
into the file list. Perhaps once by the first download and once by the
resumed one?
This commit is contained in:
Joey Hess 2023-07-09 14:18:25 -04:00
parent 139fa76b64
commit e82823d448
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/YoutubeDl.hs
View file

@ -89,7 +89,7 @@ youtubeDl' url workdir p uo
toomanyfiles cmd fs = Left $ cmd ++ " downloaded multiple media files; git-annex is only able to deal with one per url: " ++ show fs toomanyfiles cmd fs = Left $ cmd ++ " downloaded multiple media files; git-annex is only able to deal with one per url: " ++ show fs
downloadedfiles cmd downloadedfiles cmd
| isytdlp cmd = liftIO $ | isytdlp cmd = liftIO $
(lines <$> readFile filelistfile) (nub . lines <$> readFile filelistfile)
`catchIO` (pure . const []) `catchIO` (pure . const [])
| otherwise = workdirfiles | otherwise = workdirfiles
workdirfiles = liftIO $ filter (/= filelistfile) workdirfiles = liftIO $ filter (/= filelistfile)

1
CHANGELOG
View file

@ -13,6 +13,7 @@ git-annex (10.20230627) UNRELEASED; urgency=medium
made to it since the adjusted branch was created. made to it since the adjusted branch was created.
* importfeed: Add feedurl to the metadata (and allow it to be used in the * importfeed: Add feedurl to the metadata (and allow it to be used in the
--template) --template)
* Improve resuming interrupted download when using yt-dlp.
-- Joey Hess <id@joeyh.name> Mon, 26 Jun 2023 13:10:40 -0400 -- Joey Hess <id@joeyh.name> Mon, 26 Jun 2023 13:10:40 -0400