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

display filename when file already has url

Browse source 
Otherwise it's confusing what happened..
This commit is contained in:
Joey Hess 2017-11-30 15:06:21 -04:00
parent 7c88633121
commit 67ab567bc7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Command/AddUrl.hs
View file

@ -153,7 +153,7 @@ performRemote :: Remote -> Bool -> URLString -> FilePath -> Maybe Integer -> Com
performRemote r relaxed uri file sz = ifAnnexed file adduri geturi performRemote r relaxed uri file sz = ifAnnexed file adduri geturi
where where
loguri = setDownloader uri OtherDownloader loguri = setDownloader uri OtherDownloader
adduri = addUrlChecked relaxed loguri (Remote.uuid r) checkexistssize adduri = addUrlChecked relaxed loguri file (Remote.uuid r) checkexistssize
checkexistssize key = return $ case sz of checkexistssize key = return $ case sz of
Nothing -> (True, True, uri) Nothing -> (True, True, uri)
Just n -> (True, n == fromMaybe n (keySize key), uri) Just n -> (True, n == fromMaybe n (keySize key), uri)
@ -210,7 +210,7 @@ performWeb :: AddUrlOptions -> URLString -> FilePath -> Url.UrlInfo -> CommandPe
performWeb o url file urlinfo = ifAnnexed file addurl geturl performWeb o url file urlinfo = ifAnnexed file addurl geturl
where where
geturl = next $ isJust <$> addUrlFile (Just o) (relaxedOption o) url urlinfo file geturl = next $ isJust <$> addUrlFile (Just o) (relaxedOption o) url urlinfo file
addurl = addUrlChecked (relaxedOption o) url webUUID $ \k -> addurl = addUrlChecked (relaxedOption o) url file webUUID $ \k ->
ifM (youtubeDlSupported url) ifM (youtubeDlSupported url)
( return (True, True, setDownloader url YoutubeDownloader) ( return (True, True, setDownloader url YoutubeDownloader)
, return (Url.urlExists urlinfo, Url.urlSize urlinfo == keySize k, url) , return (Url.urlExists urlinfo, Url.urlSize urlinfo == keySize k, url)
@ -218,10 +218,12 @@ performWeb o url file urlinfo = ifAnnexed file addurl geturl
{- Check that the url exists, and has the same size as the key, {- Check that the url exists, and has the same size as the key,
- and add it as an url to the key. -} - and add it as an url to the key. -}
addUrlChecked :: Bool -> URLString -> UUID -> (Key -> Annex (Bool, Bool, URLString)) -> Key -> CommandPerform addUrlChecked :: Bool -> URLString -> FilePath -> UUID -> (Key -> Annex (Bool, Bool, URLString)) -> Key -> CommandPerform
addUrlChecked relaxed url u checkexistssize key = addUrlChecked relaxed url file u checkexistssize key =
ifM ((elem url <$> getUrls key) <&&> (elem u <$> loggedLocations key)) ifM ((elem url <$> getUrls key) <&&> (elem u <$> loggedLocations key))
( next $ return True -- nothing to do ( do
showDestinationFile file
next $ return True
, do , do
(exists, samesize, url') <- checkexistssize key (exists, samesize, url') <- checkexistssize key
if exists && (samesize || relaxed) if exists && (samesize || relaxed)