diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:14:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:14:57 -0400 |
| commit | 1d48e19b5a47df04abcce777e6543dabb17f2ce5 (patch) | |
| tree | b0309fcfb109009a47ebbd11c0ef5cdd7f0d1452 /Command/AddUrl.hs | |
| parent | 86648b502149d32ee0f9af200e949e8240208a8c (diff) | |
remove 3 build flags
* Removed the webapp-secure build flag, rolling it into the webapp build
flag.
* Removed the quvi and tahoe build flags, which only adds aeson to
the core dependencies.
* Removed the feed build flag, which only adds feed to the core
dependencies.
Build flags have cost in both code complexity and also make Setup configure
have to work harder to find a usable set of build flags when some
dependencies are missing.
Diffstat (limited to 'Command/AddUrl.hs')
| -rw-r--r-- | Command/AddUrl.hs | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index d42d6fb46..333ca494d 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -5,8 +5,6 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - module Command.AddUrl where import Network.URI @@ -32,10 +30,8 @@ import Annex.FileMatcher import Logs.Location import Utility.Metered import qualified Annex.Transfer as Transfer -#ifdef WITH_QUVI import Annex.Quvi import qualified Utility.Quvi as Quvi -#endif cmd :: Command cmd = notBareRepo $ withGlobalOptions [jobsOption, jsonOption] $ @@ -192,15 +188,10 @@ startWeb o s = go $ fromMaybe bad $ parseURI urlstring Url.parseURIRelaxed $ urlstring go url = case downloader of QuviDownloader -> usequvi - _ -> -#ifdef WITH_QUVI - ifM (quviSupported urlstring) - ( usequvi - , regulardownload url - ) -#else - regulardownload url -#endif + _ -> ifM (quviSupported urlstring) + ( usequvi + , regulardownload url + ) regulardownload url = do pathmax <- liftIO $ fileNameLengthLimit "." urlinfo <- if relaxedOption o @@ -219,7 +210,6 @@ startWeb o s = go $ fromMaybe bad $ parseURI urlstring ) showStart "addurl" file next $ performWeb (relaxedOption o) urlstring file urlinfo -#ifdef WITH_QUVI badquvi = error $ "quvi does not know how to download url " ++ urlstring usequvi = do page <- fromMaybe badquvi @@ -231,9 +221,6 @@ startWeb o s = go $ fromMaybe bad $ parseURI urlstring Quvi.pageTitle page ++ "." ++ fromMaybe "m" (Quvi.linkSuffix link) showStart "addurl" file next $ performQuvi (relaxedOption o) urlstring (Quvi.linkUrl link) file -#else - usequvi = error "not built with quvi support" -#endif performWeb :: Bool -> URLString -> FilePath -> Url.UrlInfo -> CommandPerform performWeb relaxed url file urlinfo = ifAnnexed file addurl geturl @@ -242,7 +229,6 @@ performWeb relaxed url file urlinfo = ifAnnexed file addurl geturl addurl = addUrlChecked relaxed url webUUID $ \k -> return $ (Url.urlExists urlinfo, Url.urlSize urlinfo == keySize k) -#ifdef WITH_QUVI performQuvi :: Bool -> URLString -> URLString -> FilePath -> CommandPerform performQuvi relaxed pageurl videourl file = ifAnnexed file addurl geturl where @@ -251,9 +237,7 @@ performQuvi relaxed pageurl videourl file = ifAnnexed file addurl geturl cleanup webUUID quviurl file key Nothing return True geturl = next $ isJust <$> addUrlFileQuvi relaxed quviurl videourl file -#endif -#ifdef WITH_QUVI addUrlFileQuvi :: Bool -> URLString -> URLString -> FilePath -> Annex (Maybe Key) addUrlFileQuvi relaxed quviurl videourl file = stopUnless (doesNotExist file) $ do let key = Backend.URL.fromUrl quviurl Nothing @@ -282,7 +266,6 @@ addUrlFileQuvi relaxed quviurl videourl file = stopUnless (doesNotExist file) $ return (Just key) else return Nothing ) -#endif addUrlChecked :: Bool -> URLString -> UUID -> (Key -> Annex (Bool, Bool)) -> Key -> CommandPerform addUrlChecked relaxed url u checkexistssize key |