From d5cbbe1b9ac38972c021937b814508f55652170d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 17 Dec 2014 14:07:05 -0400 Subject: [PATCH] fix torrentUrlNum when there is no #n --- Remote/BitTorrent.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs index 1e90717f5e..9b055b19b5 100644 --- a/Remote/BitTorrent.hs +++ b/Remote/BitTorrent.hs @@ -149,9 +149,11 @@ torrentUrlWithNum :: URLString -> Int -> URLString torrentUrlWithNum u n = u ++ "#" ++ show n torrentUrlNum :: URLString -> (URLString, Int) -torrentUrlNum u = - let (n, ru) = separate (== '#') (reverse u) - in (reverse ru, fromMaybe 1 $ readish $ reverse n) +torrentUrlNum u + | '#' `elem` u = + let (n, ru) = separate (== '#') (reverse u) + in (reverse ru, fromMaybe 1 $ readish $ reverse n) + | otherwise = (u, 1) {- A Key corresponding to the URL of a torrent file. -} torrentUrlKey :: URLString -> Annex Key