From f76ea194616f8df1d630abc129613cd5b4e8fc2f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Dec 2014 16:11:38 -0400 Subject: reorg --- Command/AddUrl.hs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index a89b45477..ebfd86065 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -150,6 +150,13 @@ startWeb relaxed optfile pathdepth s = go $ fromMaybe bad $ parseURI s usequvi = error "not built with quvi support" #endif +performWeb :: Bool -> URLString -> FilePath -> CommandPerform +performWeb relaxed url file = ifAnnexed file addurl geturl + where + geturl = next $ isJust <$> addUrlFile relaxed url file + addurl = addUrlChecked relaxed url webUUID checkexistssize + checkexistssize = Url.withUrlOptions . Url.check url . keySize + #ifdef WITH_QUVI performQuvi :: Bool -> URLString -> URLString -> FilePath -> CommandPerform performQuvi relaxed pageurl videourl file = ifAnnexed file addurl geturl @@ -191,13 +198,6 @@ addUrlFileQuvi relaxed quviurl videourl file = do ) #endif -performWeb :: Bool -> URLString -> FilePath -> CommandPerform -performWeb relaxed url file = ifAnnexed file addurl geturl - where - geturl = next $ isJust <$> addUrlFile relaxed url file - addurl = addUrlChecked relaxed url webUUID checkexistssize - checkexistssize = Url.withUrlOptions . Url.check url . keySize - addUrlChecked :: Bool -> URLString -> UUID -> (Key -> Annex (Bool, Bool)) -> Key -> CommandPerform addUrlChecked relaxed url u checkexistssize key | relaxed = do -- cgit v1.2.3