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

importfeed: Display feed title

Browse source 
When importing a bunch of feeds, this makes it more clear what it's working
on. Also, I sometimes want to delete a particular feed from a list of feeds
but don't know which url belongs to the feed, and this solves that.

Control characters are filtered out just to protect against some feed
putting escape character stuff in the feed, which could be a
security problem. (Control characters also get filtered out of
importfeed filenames.)

Sponsored-by: Luke Shumaker on Patreon
This commit is contained in:
Joey Hess 2023-03-11 13:52:41 -04:00
parent f1672fe171
commit 2323af3736
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -11,6 +11,7 @@ git-annex (10.20230228) UNRELEASED; urgency=medium
* Added arm64 build for ancient kernels, needed to support Android phones * Added arm64 build for ancient kernels, needed to support Android phones
whose kernels are too old to support kernels used by the current arm64 whose kernels are too old to support kernels used by the current arm64
build. build.
* importfeed: Display feed title.
-- Joey Hess <id@joeyh.name> Mon, 27 Feb 2023 12:31:14 -0400 -- Joey Hess <id@joeyh.name> Mon, 27 Feb 2023 12:31:14 -0400

26
Command/ImportFeed.hs
View file

@ -16,6 +16,7 @@ import Text.Feed.Query
import Text.Feed.Types import Text.Feed.Types
import qualified Data.Set as S import qualified Data.Set as S
import qualified Data.Map as M import qualified Data.Map as M
import Data.Char
import Data.Time.Clock import Data.Time.Clock
import Data.Time.Format import Data.Time.Format
import Data.Time.Calendar import Data.Time.Calendar
@ -93,15 +94,22 @@ getFeed addunlockedmatcher opts cache url = do
-- ourselves because it goes out of its way to handle encodings. -- ourselves because it goes out of its way to handle encodings.
go tmpf = liftIO (parseFeedFromFile' tmpf) >>= \case go tmpf = liftIO (parseFeedFromFile' tmpf) >>= \case
Nothing -> debugfeedcontent tmpf "parsing the feed failed" Nothing -> debugfeedcontent tmpf "parsing the feed failed"
Just f -> case findDownloads url f of Just f -> do
[] -> debugfeedcontent tmpf "bad feed content; no enclosures to download" case map sanitizetitle $ decodeBS $ fromFeedText $ getFeedTitle f of
l -> do "" -> noop
showEndOk t -> showNote ('"' : t ++ "\"")
ifM (and <$> mapM (performDownload addunlockedmatcher opts cache) l) case findDownloads url f of
( clearFeedProblem url [] -> debugfeedcontent tmpf "bad feed content; no enclosures to download"
, void $ feedProblem url l -> do
"problem downloading some item(s) from feed" showEndOk
) ifM (and <$> mapM (performDownload addunlockedmatcher opts cache) l)
( clearFeedProblem url
, void $ feedProblem url
"problem downloading some item(s) from feed"
)
sanitizetitle c
| isControl c = '_'
| otherwise = c
debugfeedcontent tmpf msg = do debugfeedcontent tmpf msg = do
feedcontent <- liftIO $ readFile tmpf feedcontent <- liftIO $ readFile tmpf
fastDebug "Command.ImportFeed" $ unlines fastDebug "Command.ImportFeed" $ unlines