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

honor fileNameLengthLimit for quvi

Browse source
This commit is contained in:
Joey Hess 2013-10-05 13:32:42 -04:00
parent 478eeea02e
commit 9b746ee588
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Command/AddUrl.hs
View file

@ -83,7 +83,8 @@ start relaxed optfile pathdepth s = go $ fromMaybe bad $ parseURI s
page <- fromMaybe badquvi page <- fromMaybe badquvi
<$> withQuviOptions Quvi.forceQuery [Quvi.quiet, Quvi.httponly] s' <$> withQuviOptions Quvi.forceQuery [Quvi.quiet, Quvi.httponly] s'
let link = fromMaybe badquvi $ headMaybe $ Quvi.pageLinks page let link = fromMaybe badquvi $ headMaybe $ Quvi.pageLinks page
let file = choosefile $ sanitizeFilePath $ pathmax <- liftIO $ fileNameLengthLimit "."
let file = choosefile $ truncateFilePath pathmax $ sanitizeFilePath $
Quvi.pageTitle page ++ "." ++ Quvi.linkSuffix link Quvi.pageTitle page ++ "." ++ Quvi.linkSuffix link
showStart "addurl" file showStart "addurl" file
next $ performQuvi relaxed s' (Quvi.linkUrl link) file next $ performQuvi relaxed s' (Quvi.linkUrl link) file
@ -214,7 +215,7 @@ nodownload relaxed url file = do
url2file :: URI -> Maybe Int -> Int -> FilePath url2file :: URI -> Maybe Int -> Int -> FilePath
url2file url pathdepth pathmax = case pathdepth of url2file url pathdepth pathmax = case pathdepth of
Nothing -> truncateFilePath pathmax $ escape fullurl Nothing -> truncateFilePath pathmax $ sanitizeFilePath fullurl
Just depth Just depth
| depth >= length urlbits -> frombits id | depth >= length urlbits -> frombits id
| depth > 0 -> frombits $ drop depth | depth > 0 -> frombits $ drop depth