diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2014-12-11 16:11:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-11 16:11:38 -0400 |
| commit | f76ea194616f8df1d630abc129613cd5b4e8fc2f (patch) | |
| tree | 7d007cbb2a36f605c0345614145301a2e0a7993e /Command/AddUrl.hs | |
| parent | 738233bdcfaf71432dba9f2857d0b3f69f14b8d5 (diff) | |
reorg
Diffstat (limited to 'Command/AddUrl.hs')
| -rw-r--r-- | Command/AddUrl.hs | 14 |
1 files 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 |