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

improve tmp file cleanup

Browse source 
If youtubeDl fails, remove the tmp file. Here tmp is the
html file downloaded to check if the url is html, not what youtube-dl
might have started to download. If the tmp file were retained, a
re-run of addurl would try to resume downloading it, which the web
server might not support, causing the resume to fail.
And it's a smallish html page anyway so no benefit to
keeping it for such a resume.
This commit is contained in:
Joey Hess 2018-06-28 12:48:54 -04:00
parent 181e9019d3
commit 79ac177ea5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Command/AddUrl.hs
View file

@ -283,18 +283,20 @@ downloadWeb o url urlinfo file =
(dl dest) (dl dest)
Left _ -> normalfinish tmp Left _ -> normalfinish tmp
where where
dl dest = withTmpWorkDir mediakey $ \workdir -> dl dest = withTmpWorkDir mediakey $ \workdir -> do
let cleanuptmp = pruneTmpWorkDirBefore tmp (liftIO . nukeFile)
Transfer.notifyTransfer Transfer.Download url $ Transfer.notifyTransfer Transfer.Download url $
Transfer.download webUUID mediakey (AssociatedFile Nothing) Transfer.noRetry $ \_p -> Transfer.download webUUID mediakey (AssociatedFile Nothing) Transfer.noRetry $ \_p ->
youtubeDl url workdir >>= \case youtubeDl url workdir >>= \case
Right (Just mediafile) -> do Right (Just mediafile) -> do
pruneTmpWorkDirBefore tmp (liftIO . nukeFile) cleanuptmp
checkCanAdd dest $ do checkCanAdd dest $ do
showDestinationFile dest showDestinationFile dest
addWorkTree webUUID mediaurl dest mediakey (Just mediafile) addWorkTree webUUID mediaurl dest mediakey (Just mediafile)
return $ Just mediakey return $ Just mediakey
Right Nothing -> normalfinish tmp Right Nothing -> normalfinish tmp
Left msg -> do Left msg -> do
cleanuptmp
warning msg warning msg
return Nothing return Nothing
mediaurl = setDownloader url YoutubeDownloader mediaurl = setDownloader url YoutubeDownloader