diff options
author | Joey Hess <joey@kitenet.net> | 2014-02-28 14:54:02 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-02-28 14:54:02 -0400 |
commit | ba81a7b4abcc4b14072bc8d717191151a50614c8 (patch) | |
tree | 6831e53dca9737115cc8ac4f1e72689f1e17e02c /Command | |
parent | b97207881a3336a4e8befe90e530954def022d93 (diff) |
Probe for quvi version at run time.
Overhead: git annex addurl runs quvi --version once.
And more bloat to Annex state..
Diffstat (limited to 'Command')
-rw-r--r-- | Command/AddUrl.hs | 2 | ||||
-rw-r--r-- | Command/ImportFeed.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index ae56908c1..a0978a88d 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -64,7 +64,7 @@ start relaxed optfile pathdepth s = go $ fromMaybe bad $ parseURI s QuviDownloader -> usequvi DefaultDownloader -> #ifdef WITH_QUVI - ifM (liftIO $ Quvi.supported s') + ifM (quviSupported s') ( usequvi , regulardownload url ) diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index 005d42d20..50f4278b6 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -108,7 +108,7 @@ findDownloads u = go =<< downloadFeed u Nothing -> mkquvi f i #ifdef WITH_QUVI mkquvi f i = case getItemLink i of - Just link -> ifM (liftIO $ Quvi.supported link) + Just link -> ifM (quviSupported link) ( return $ Just $ ToDownload f u i $ QuviLink link , return Nothing ) |