reorg
This commit is contained in:
parent
bce7e0dd96
commit
a40bd29c23
1 changed files with 7 additions and 7 deletions
|
@ -150,6 +150,13 @@ startWeb relaxed optfile pathdepth s = go $ fromMaybe bad $ parseURI s
|
||||||
usequvi = error "not built with quvi support"
|
usequvi = error "not built with quvi support"
|
||||||
#endif
|
#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
|
#ifdef WITH_QUVI
|
||||||
performQuvi :: Bool -> URLString -> URLString -> FilePath -> CommandPerform
|
performQuvi :: Bool -> URLString -> URLString -> FilePath -> CommandPerform
|
||||||
performQuvi relaxed pageurl videourl file = ifAnnexed file addurl geturl
|
performQuvi relaxed pageurl videourl file = ifAnnexed file addurl geturl
|
||||||
|
@ -191,13 +198,6 @@ addUrlFileQuvi relaxed quviurl videourl file = do
|
||||||
)
|
)
|
||||||
#endif
|
#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 :: Bool -> URLString -> UUID -> (Key -> Annex (Bool, Bool)) -> Key -> CommandPerform
|
||||||
addUrlChecked relaxed url u checkexistssize key
|
addUrlChecked relaxed url u checkexistssize key
|
||||||
| relaxed = do
|
| relaxed = do
|
||||||
|
|
Loading…
Add table
Reference in a new issue