importfeed: Drop URL parameters from file extension.

Thanks, James MacMahon.
This commit is contained in:
Joey Hess 2016-10-17 16:02:05 -04:00
parent 10ca4b9788
commit 0b1c061382
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 5 additions and 1 deletions

View file

@ -5,6 +5,8 @@ git-annex (6.20161013) UNRELEASED; urgency=medium
* upgrade: Handle upgrade to v6 when the repository already contains
v6 unlocked files whose content is already present.
* Improve style of offline html build of website.
* importfeed: Drop URL parameters from file extension.
Thanks, James MacMahon.
-- Joey Hess <id@joeyh.name> Mon, 17 Oct 2016 12:46:54 -0400

View file

@ -161,7 +161,7 @@ downloadFeed url
performDownload :: ImportFeedOptions -> Cache -> ToDownload -> Annex Bool
performDownload opts cache todownload = case location todownload of
Enclosure url -> checkknown url $
rundownload url (takeExtension url) $ \f -> do
rundownload url (takeWhile (/= '?') $ takeExtension url) $ \f -> do
r <- Remote.claimingUrl url
if Remote.uuid r == webUUID || rawOption opts
then do

View file

@ -52,3 +52,5 @@ index 498d504..210aca0 100644
if Remote.uuid r == webUUID || rawOption opts
then do
> Hmm, didn't cleanly apply for some reason. And, `takeWhile (/= '?')` is a
> simpler way to do that. Thank you for the bug report and patch; [[done]] --[[Joey]]