mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Deal with box.com changing the url of their webdav endpoint.

Browse source 
Use new url when making new remotes.

Transparently rewrite old url to new for existing remotes.
This commit is contained in:
Joey Hess 2013-12-02 16:01:20 -04:00
parent 49b9aa172d
commit e425a966ed
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/WebDAV.hs
View file

@ -73,7 +73,7 @@ postAddBoxComR = boxConfigurator $ do
[ configureEncryption $ enableEncryption input [ configureEncryption $ enableEncryption input
, ("embedcreds", if embedCreds input then "yes" else "no") , ("embedcreds", if embedCreds input then "yes" else "no")
, ("type", "webdav") , ("type", "webdav")
, ("url", "https://www.box.com/dav/" ++ T.unpack (directory input)) , ("url", "https://dav.box.com/dav/" ++ T.unpack (directory input))
-- Box.com has a max file size of 100 mb, but -- Box.com has a max file size of 100 mb, but
-- using smaller chunks has better memory -- using smaller chunks has better memory
-- performance. -- performance.

5
Remote/WebDAV.hs
View file

@ -220,7 +220,10 @@ davAction r unconfigured action = do
_ -> return unconfigured _ -> return unconfigured
configUrl :: Remote -> Maybe DavUrl configUrl :: Remote -> Maybe DavUrl
configUrl r = M.lookup "url" $ config r configUrl r = fixup <$> M.lookup "url" (config r)
where
-- box.com DAV url changed
fixup = replace "https://www.box.com/dav/" "https://dav.box.com/dav/"
toDavUser :: String -> DavUser toDavUser :: String -> DavUser
toDavUser = B8.fromString toDavUser = B8.fromString

1
debian/changelog vendored
View file

@ -11,6 +11,7 @@ git-annex (5.20131131) UNRELEASED; urgency=low
use hashDirMixed. Closes: #731142 use hashDirMixed. Closes: #731142
* copy --from, get --from: When --force is used, ignore the * copy --from, get --from: When --force is used, ignore the
location log and always try to get the file from the remote. location log and always try to get the file from the remote.
* Deal with box.com changing the url of their webdav endpoint.
-- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400 -- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400