diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-22 22:41:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-22 22:41:36 -0400 |
| commit | 280b59024768689feed03db4e7069e12f9605825 (patch) | |
| tree | 2350b2747d669d44ebaafdb2b7fefe5b550b558b /Command/AddUrl.hs | |
| parent | 0c2026f3d4109e810b050090b44bb406b6a11954 (diff) | |
fromkey, registerurl: Allow urls to be specified instead of keys, and generate URL keys.
This is especially useful because the caller doesn't need to generate valid
url keys, which involves some escaping of characters, and may involve
taking a md5sum of the url if it's too long.
Diffstat (limited to 'Command/AddUrl.hs')
| -rw-r--r-- | Command/AddUrl.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 96a966e8d..0de4da78f 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -115,7 +115,7 @@ performRemote r relaxed uri file sz = ifAnnexed file adduri geturi downloadRemoteFile :: Remote -> Bool -> URLString -> FilePath -> Maybe Integer -> Annex (Maybe Key) downloadRemoteFile r relaxed uri file sz = do - urlkey <- Backend.URL.fromUrl uri sz + let urlkey = Backend.URL.fromUrl uri sz liftIO $ createDirectoryIfMissing True (parentDir file) ifM (Annex.getState Annex.fast <||> pure relaxed) ( do @@ -206,7 +206,7 @@ performQuvi relaxed pageurl videourl file = ifAnnexed file addurl geturl #ifdef WITH_QUVI addUrlFileQuvi :: Bool -> URLString -> URLString -> FilePath -> Annex (Maybe Key) addUrlFileQuvi relaxed quviurl videourl file = do - key <- Backend.URL.fromUrl quviurl Nothing + let key = Backend.URL.fromUrl quviurl Nothing ifM (pure relaxed <||> Annex.getState Annex.fast) ( do cleanup webUUID quviurl file key Nothing @@ -264,7 +264,7 @@ addUrlFile relaxed url urlinfo file = do downloadWeb :: URLString -> Url.UrlInfo -> FilePath -> Annex (Maybe Key) downloadWeb url urlinfo file = do - dummykey <- addSizeUrlKey urlinfo <$> Backend.URL.fromUrl url Nothing + let dummykey = addSizeUrlKey urlinfo $ Backend.URL.fromUrl url Nothing let downloader f _ = do showOutput downloadUrl [url] f @@ -321,7 +321,7 @@ cleanup u url file key mtmp = do nodownload :: URLString -> Url.UrlInfo -> FilePath -> Annex (Maybe Key) nodownload url urlinfo file | Url.urlExists urlinfo = do - key <- Backend.URL.fromUrl url (Url.urlSize urlinfo) + let key = Backend.URL.fromUrl url (Url.urlSize urlinfo) cleanup webUUID url file key Nothing return (Just key) | otherwise = do |