importfeed: Error out when passed a non-url.

Command/ImportFeed.hs

@@ -146,15 +146,17 @@ findDownloads u = go =<< downloadFeed u
 
 {- Feeds change, so a feed download cannot be resumed. -}
 downloadFeed :: URLString -> Annex (Maybe Feed)
-downloadFeed url = do
+downloadFeed url
-	showOutput
+	| Url.parseURIRelaxed url == Nothing = error "invalid feed url"
-	uo <- Url.getUrlOptions
+	| otherwise = do
-	liftIO $ withTmpFile "feed" $ \f h -> do
+		showOutput
-		hClose h
+		uo <- Url.getUrlOptions
-		ifM (Url.download url f uo)
+		liftIO $ withTmpFile "feed" $ \f h -> do
-			( parseFeedString <$> readFileStrictAnyEncoding f
+			hClose h
-			, return Nothing
+			ifM (Url.download url f uo)
-			)
+				( parseFeedString <$> readFileStrictAnyEncoding f
+				, return Nothing
+				)
 
 performDownload :: Opts -> Cache -> ToDownload -> Annex Bool
 performDownload opts cache todownload = case location todownload of

debian/changelog

@@ -13,6 +13,7 @@ git-annex (5.20150406.2) UNRELEASED; urgency=medium
   * info: Display repository mode: bare when in a bare (non-direct mode)
     repo.
   * importfeed: Fix feed download when curl is used.
+  * importfeed: Error out when passed a non-url.
 
  -- Joey Hess <id@joeyh.name>  Mon, 06 Apr 2015 20:14:20 -0400
 

doc/bugs/importfeed_fails_with_local_file_urls.mdwn

@@ -26,3 +26,10 @@ Is it possible to use local files in rss format with items which reference local
 
 Cheers,
 Marco
+
+> I've fixed it with file:// urls. 
+>
+> Also made it error out on non-url feed inputs, which are not intended to be
+> supported.
+>
+> [[done]] --[[Joey]]